From 5b16802ed3b9427ffac54e7c3e02dda5ae33a4f8 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <tagir.valeev@jetbrains.com>
Date: Thu, 19 Sep 2024 13:58:18 +0200
Subject: [PATCH] [java-annotations] A few more java.util annotations

GitOrigin-RevId: 903ecd35185cd509eae533e0646e129f0b9f0a4a
---
 java/jdkAnnotations/java/util/annotations.xml  | 18 ++++++++++++++++++
 .../jdk8/overrideCollectionStream.kt           |  2 +-
 .../jdk8/overrideCollectionStream.kt.after     |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/java/jdkAnnotations/java/util/annotations.xml b/java/jdkAnnotations/java/util/annotations.xml
index 654b1f05c956..2fc7381ab725 100644
--- a/java/jdkAnnotations/java/util/annotations.xml
+++ b/java/jdkAnnotations/java/util/annotations.xml
@@ -1907,6 +1907,9 @@
   <item name="java.util.Collection T[] toArray(T[]) 0">
     <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name='java.util.Collection T[] toArray(java.util.function.IntFunction&lt;T[]&gt;) 0'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
   <item name='java.util.Collection boolean add(E)'>
     <annotation name='org.jetbrains.annotations.Contract'>
       <val name="mutates" val="&quot;this&quot;"/>
@@ -1950,6 +1953,9 @@
   <item name="java.util.Collection boolean removeAll(java.util.Collection&lt;?&gt;) 0">
     <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name='java.util.Collection boolean removeIf(java.util.function.Predicate&lt;? super E&gt;) 0'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
   <item name="java.util.Collection boolean retainAll(java.util.Collection&lt;?&gt;)">
     <annotation name='org.jetbrains.annotations.Contract'>
       <val name="mutates" val="&quot;this&quot;"/>
@@ -1980,16 +1986,19 @@
     <annotation name='org.jetbrains.annotations.Contract'>
       <val name="pure" val="true"/>
     </annotation>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
   <item name='java.util.Collection java.util.stream.Stream&lt;E&gt; parallelStream()'>
     <annotation name='org.jetbrains.annotations.Contract'>
       <val name="pure" val="true"/>
     </annotation>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
   <item name='java.util.Collection java.util.stream.Stream&lt;E&gt; stream()'>
     <annotation name='org.jetbrains.annotations.Contract'>
       <val name="pure" val="true"/>
     </annotation>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
   <item name='java.util.Collection void clear()'>
     <annotation name='org.jetbrains.annotations.Contract'>
@@ -3352,6 +3361,9 @@
   <item name="java.util.List java.util.ListIterator&lt;E&gt; listIterator(int)">
     <annotation name="org.jetbrains.annotations.NotNull"/>
   </item>
+  <item name='java.util.List java.util.Spliterator&lt;E&gt; spliterator()'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
   <item name='java.util.List void add(int, E)'>
     <annotation name='org.jetbrains.annotations.Contract'>
       <val name="mutates" val="&quot;this&quot;"/>
@@ -3367,11 +3379,17 @@
       <val name="mutates" val="&quot;this&quot;"/>
     </annotation>
   </item>
+  <item name='java.util.List void replaceAll(java.util.function.UnaryOperator&lt;E&gt;) 0'>
+      <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
   <item name='java.util.List void sort(java.util.Comparator&lt;? super E&gt;)'>
     <annotation name='org.jetbrains.annotations.Contract'>
       <val name="mutates" val="&quot;this&quot;"/>
     </annotation>
   </item>
+  <item name='java.util.List void sort(java.util.Comparator&lt;? super E&gt;) 0'>
+    <annotation name='org.jetbrains.annotations.Nullable'/>
+  </item>
   <item name='java.util.Map V compute(K, java.util.function.BiFunction&lt;? super K,? super V,? extends V&gt;)'>
     <annotation name='org.jetbrains.annotations.Contract'>
       <val name="mutates" val="&quot;this&quot;"/>
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt
index 4beaf31af97b..ec7482f5921a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt
@@ -4,7 +4,7 @@ abstract class A : List<String> {
 }
 
 // MEMBER_K2: "forEach(action: Consumer<in String>?): Unit"
-// MEMBER_K2: "<T : Any?> toArray(generator: IntFunction<Array<out T?>?>?): Array<out T?>?"
+// MEMBER_K2: "<T : Any?> toArray(generator: IntFunction<Array<out T?>?>): Array<out T?>?"
 // MEMBER_K2: "spliterator(): Spliterator<String?>"
 
 // MEMBER_K1: "forEach(action: Consumer<in String!>!): Unit"
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after
index f560a99c5373..0a6f95743ab8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after
@@ -8,7 +8,7 @@ abstract class A : List<String> {
 }
 
 // MEMBER_K2: "forEach(action: Consumer<in String>?): Unit"
-// MEMBER_K2: "<T : Any?> toArray(generator: IntFunction<Array<out T?>?>?): Array<out T?>?"
+// MEMBER_K2: "<T : Any?> toArray(generator: IntFunction<Array<out T?>?>): Array<out T?>?"
 // MEMBER_K2: "spliterator(): Spliterator<String?>"
 
 // MEMBER_K1: "forEach(action: Consumer<in String!>!): Unit"