From 9cffe95fa7ea681d1c772407db198b0dcd41065c Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 8 Jan 2018 15:48:52 +0100
Subject: [PATCH] hardcode Map.remove as having unknown nullity (IDEA-CR-28277,
 IDEA-183875)

---
 .../intellij/codeInspection/dataFlow/DfaPsiUtil.java |  9 +++++----
 .../dataFlow/fixture/MapGetWithNotNullKeys.java      | 12 ++++++++++++
 java/jdkAnnotations/java/util/annotations.xml        |  1 -
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaPsiUtil.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaPsiUtil.java
index cc2d25715b7f..015e36bf41cd 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaPsiUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaPsiUtil.java
@@ -106,7 +106,7 @@ public class DfaPsiUtil {
       return Nullness.NOT_NULL;
     }
 
-    if (owner instanceof PsiMethod && isMapGet((PsiMethod)owner)) {
+    if (owner instanceof PsiMethod && isMapMethodWithUnknownNullity((PsiMethod)owner)) {
       return Nullness.UNKNOWN;
     }
 
@@ -127,10 +127,11 @@ public class DfaPsiUtil {
     return Nullness.UNKNOWN;
   }
 
-  private static boolean isMapGet(@NotNull PsiMethod method) {
-    if (!"get".equals(method.getName())) return false;
+  private static boolean isMapMethodWithUnknownNullity(@NotNull PsiMethod method) {
+    String name = method.getName();
+    if (!"get".equals(name) && !"remove".equals(name)) return false;
     PsiMethod superMethod = DeepestSuperMethodsSearch.search(method).findFirst();
-    return "java.util.Map.get".equals(PsiUtil.getMemberQualifiedName(superMethod != null ? superMethod : method));
+    return ("java.util.Map." + name).equals(PsiUtil.getMemberQualifiedName(superMethod != null ? superMethod : method));
   }
 
   @NotNull
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/MapGetWithNotNullKeys.java b/java/java-tests/testData/inspection/dataFlow/fixture/MapGetWithNotNullKeys.java
index c9d61344c22b..44ed68952ae2 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/MapGetWithNotNullKeys.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/MapGetWithNotNullKeys.java
@@ -14,4 +14,16 @@ class Test {
       System.out.println("it's not contained");
     }
   }
+
+  public void main2(Map<@NotNull String, @NotNull Integer> map, HashMap<@NotNull String, @NotNull Integer> hashMap) {
+    Integer value = map.remove("y");
+    if (value == null) {
+      System.out.println("it's not contained");
+    }
+
+    value = hashMap.remove("y");
+    if (value == null) {
+      System.out.println("it's not contained");
+    }
+  }
 }
\ No newline at end of file
diff --git a/java/jdkAnnotations/java/util/annotations.xml b/java/jdkAnnotations/java/util/annotations.xml
index dd8d2ec39dae..c02583de70dc 100644
--- a/java/jdkAnnotations/java/util/annotations.xml
+++ b/java/jdkAnnotations/java/util/annotations.xml
@@ -1646,7 +1646,6 @@
       <val name="source" val="&quot;this.values&quot;"/>
       <val name="sourceIsContainer" val="true" />
     </annotation>
-    <annotation name='org.jetbrains.annotations.Nullable'/>
   </item>
   <item name='java.util.Map V replace(K, V)'>
     <annotation name='org.jetbrains.annotations.Contract'>