From 887708387da3b732ff3ed38ed75368369e78b78a Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Mon, 15 May 2017 16:53:02 +0700
Subject: [PATCH] Objects.requireNonNull is not pure as it executes the passed
 lambda

---
 .../inspection/obviousNotNull/ObviousNullCheck.java         | 2 +-
 java/jdkAnnotations/java/util/annotations.xml               | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/java/java-tests/testData/inspection/obviousNotNull/ObviousNullCheck.java b/java/java-tests/testData/inspection/obviousNotNull/ObviousNullCheck.java
index 50511864d955..cafa5ba4516e 100644
--- a/java/java-tests/testData/inspection/obviousNotNull/ObviousNullCheck.java
+++ b/java/java-tests/testData/inspection/obviousNotNull/ObviousNullCheck.java
@@ -12,7 +12,7 @@ abstract class ObviousNullCheck {
     Objects.requireNonNull(null);
     Objects.requireNonNull(<warning descr="Useless null-check: literal is never null">"xyz"</warning>, "xyz");
     Objects.requireNonNull((<warning descr="Useless null-check: concatenation is never null">getFoo() + getBar()</warning>));
-    Objects.requireNonNull(<warning descr="Useless null-check: newly created object is never null">new ArrayList()</warning>, () -> "new returned null");
+    Objects.requireNonNull(<warning descr="Useless null-check: newly created object is never null">new ArrayList()</warning>, "new returned null");
 
     String s = Objects.requireNonNull(<warning descr="Useless null-check: literal is never null">" x "</warning>);
     String s1 = trim(" x ");
diff --git a/java/jdkAnnotations/java/util/annotations.xml b/java/jdkAnnotations/java/util/annotations.xml
index 6bbb70b14361..5ff984020169 100644
--- a/java/jdkAnnotations/java/util/annotations.xml
+++ b/java/jdkAnnotations/java/util/annotations.xml
@@ -1109,12 +1109,6 @@
       <val name="pure" val="true"/>
     </annotation>
   </item>
-  <item name='java.util.Objects T requireNonNull(T, java.util.function.Supplier&lt;java.lang.String&gt;)'>
-    <annotation name='org.jetbrains.annotations.Contract'>
-      <val name="value" val="&quot;null, _ -&gt; fail&quot;"/>
-      <val name="pure" val="true"/>
-    </annotation>
-  </item>
   <item name='java.util.Optional T get()'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
     <annotation name='org.jetbrains.annotations.Contract'>