Fixes after review: IDEA-202309

GitOrigin-RevId: 542cdc5e1c3b401a6a3e37504cf9351212aac4be

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/afterIntermediateMethod.java

@@ -1,24 +1,21 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 class Main {
 
   public static void main(String[] args) {
-    getEmptyList();
+    Collection unmodifiableCollection = getEmptyList();
 
-    getEmptyList();
-    getEmptySet();
-    getEmptyMap();
+    List unmodifiableList = getEmptyList();
+    Set unmodifiableSet = getEmptySet();
+    Map unmodifiableMap = getEmptyMap();
 
-    getEmptySet();
-    getEmptyMap();
+    SortedSet unmodifiableSortedSet = getEmptySet();
+    SortedMap unmodifiableSortedMap = getEmptyMap();
 
-    getEmptySet();
-    getEmptyMap();
+    NavigableSet unmodifiableNavigableSet = getEmptySet();
+    NavigableMap unmodifiableNavigableMap = getEmptyMap();
   }
 
   static List getEmptyList() {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/afterIntermediateVar.java

@@ -1,4 +1,4 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
 import java.util.*;
 
@@ -14,16 +14,16 @@ class Main {
     Map map = new HashMap();
     map = Collections.emptyMap();
 
-    list;
+    Collection unmodifiableCollection = list;
 
-    list;
-    set;
-    map;
+    List unmodifiableList = list;
+    Set unmodifiableSet = set;
+    Map unmodifiableMap = map;
 
-    set;
-    map;
+    SortedSet unmodifiableSortedSet = set;
+    SortedMap unmodifiableSortedMap = map;
 
-    set;
-    map;
+    NavigableSet unmodifiableNavigableSet = set;
+    NavigableMap unmodifiableNavigableMap = map;
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/afterUnmodifiableArg.java

@@ -1,20 +1,20 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
+import java.util.*;
 
 class Main {
 
   public static void main(String[] args) {
-    Collections.EMPTY_LIST;
+    Collections unmodifiableCollection = Collections.EMPTY_LIST;
 
-    Collections.EMPTY_LIST;
-    Collections.EMPTY_SET;
-    Collections.EMPTY_MAP;
+    List unmodifiableList = Collections.EMPTY_LIST;
+    Set unmodifiableSet = Collections.EMPTY_SET;
+    Map unmodifiableMap = Collections.EMPTY_MAP;
 
-    Collections.EMPTY_SET;
-    Collections.EMPTY_MAP;
+    SortedSet unmodifiableSortedSet = Collections.EMPTY_SET;
+    SortedMap unmodifiableSortedMap = Collections.EMPTY_MAP;
 
-    Collections.EMPTY_SET;
-    Collections.EMPTY_MAP;
+    NavigableSet unmodifiableNavigableSet = Collections.EMPTY_SET;
+    NavigableMap unmodifiableNavigableMap = Collections.EMPTY_MAP;
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/afterUnmodifiableMethod.java

@@ -1,20 +1,20 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
+import java.util.*;
 
 class Main {
 
   public static void main(String[] args) {
-    Collections.emptyList();
+    Collections unmodifiableCollection = Collections.emptyList();
 
-    Collections.emptyList();
-    Collections.emptySet();
-    Collections.emptyMap();
+    List unmodifiableList = Collections.emptyList();
+    Set unmodifiableSet = Collections.emptySet();
+    Map unmodifiableMap = Collections.emptyMap();
 
-    Collections.emptySet();
-    Collections.emptyMap();
+    SortedSet unmodifiableSortedSet = Collections.emptySet();
+    SortedMap unmodifiableSortedMap = Collections.emptyMap();
 
-    Collections.emptySet();
-    Collections.emptyMap();
+    NavigableSet unmodifiableNavigableSet = Collections.emptySet();
+    NavigableMap unmodifiableNavigableMap = Collections.emptyMap();
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/afterWithComments.java

@@ -1,6 +1,6 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
+import java.util.*;
 
 class Main {
 
@@ -8,37 +8,37 @@ class Main {
         /*empty*/
         /*empty too*/
         /*blah blah blah*/
-        Collections.emptyList();
+        Collection unmodifiableCollection = Collections.emptyList();
 
         /*empty*/
         /*empty too*/
         /*blah blah blah*/
-        Collections.emptyList();
+        List unmodifiableList = Collections.emptyList();
         /*empty*/
         /*empty too*/
         /*blah blah blah*/
-        Collections.emptySet();
+        Set unmodifiableSet = Collections.emptySet();
         /*empty*/
         /*empty too*/
         /*blah blah blah*/
-        Collections.emptyMap();
+        Map unmodifiableMap = Collections.emptyMap();
 
         /*empty*/
         /*empty too*/
         /*blah blah blah*/
-        Collections.emptySet();
+        SortedSet unmodifiableSortedSet = Collections.emptySet();
         /*empty*/
         /*empty too*/
         /*blah blah blah*/
-        Collections.emptyMap();
+        SortedMap unmodifiableSortedMap = Collections.emptyMap();
 
         /*empty*/
         /*empty too*/
         /*blah blah blah*/
-        Collections.emptySet();
+        NavigableSet unmodifiableNavigableSet = Collections.emptySet();
         /*empty*/
         /*empty too*/
         /*blah blah blah*/
-        Collections.emptyMap();
+        NavigableMap unmodifiableNavigableMap = Collections.emptyMap();
     }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/afterWithParentheses.java

@@ -1,20 +1,20 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
+import java.util.*;
 
 class Main {
 
   public static void main(String[] args) {
-    ((Collections.emptyList()));
+    Collection unmodifiableCollection = ((Collections.emptyList()));
 
-    ((Collections.emptyList()));
-    ((Collections.emptySet()));
-    ((Collections.emptyMap()));
+    List unmodifiableList = ((Collections.emptyList()));
+    Set unmodifiableSet = ((Collections.emptySet()));
+    Map unmodifiableMap = ((Collections.emptyMap()));
 
-    ((Collections.emptySet()));
-    ((Collections.emptyMap()));
+    SortedSet unmodifiableSortedSet = ((Collections.emptySet()));
+    SortedMap unmodifiableSortedMap = ((Collections.emptyMap()));
 
-    ((Collections.emptySet()));
-    ((Collections.emptyMap()));
+    NavigableSet unmodifiableNavigableSet = ((Collections.emptySet()));
+    NavigableMap unmodifiableNavigableMap = ((Collections.emptyMap()));
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/beforeIntermediateMethod.java

@@ -1,24 +1,21 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 class Main {
 
   public static void main(String[] args) {
-    Collections.unmodifiableCollecti<caret>on(getEmptyList());
+    Collection unmodifiableCollection = Collections.unmodifiableCollecti<caret>on(getEmptyList());
 
-    Collections.unmodifiableList(getEmptyList());
-    Collections.unmodifiableSet(getEmptySet());
-    Collections.unmodifiableMap(getEmptyMap());
+    List unmodifiableList = Collections.unmodifiableList(getEmptyList());
+    Set unmodifiableSet = Collections.unmodifiableSet(getEmptySet());
+    Map unmodifiableMap = Collections.unmodifiableMap(getEmptyMap());
 
-    Collections.unmodifiableSortedSet(getEmptySet());
-    Collections.unmodifiableSortedMap(getEmptyMap());
+    SortedSet unmodifiableSortedSet = Collections.unmodifiableSortedSet(getEmptySet());
+    SortedMap unmodifiableSortedMap = Collections.unmodifiableSortedMap(getEmptyMap());
 
-    Collections.unmodifiableNavigableSet(getEmptySet());
-    Collections.unmodifiableNavigableMap(getEmptyMap());
+    NavigableSet unmodifiableNavigableSet = Collections.unmodifiableNavigableSet(getEmptySet());
+    NavigableMap unmodifiableNavigableMap = Collections.unmodifiableNavigableMap(getEmptyMap());
   }
 
   static List getEmptyList() {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/beforeIntermediateVar.java

@@ -1,4 +1,4 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
 import java.util.*;
 
@@ -14,16 +14,16 @@ class Main {
     Map map = new HashMap();
     map = Collections.emptyMap();
 
-    Collections.unmodifiableCollecti<caret>on(list);
+    Collection unmodifiableCollection = Collections.unmodifiableCollecti<caret>on(list);
 
-    Collections.unmodifiableList(list);
-    Collections.unmodifiableSet(set);
-    Collections.unmodifiableMap(map);
+    List unmodifiableList = Collections.unmodifiableList(list);
+    Set unmodifiableSet = Collections.unmodifiableSet(set);
+    Map unmodifiableMap = Collections.unmodifiableMap(map);
 
-    Collections.unmodifiableSortedSet(set);
-    Collections.unmodifiableSortedMap(map);
+    SortedSet unmodifiableSortedSet = Collections.unmodifiableSortedSet(set);
+    SortedMap unmodifiableSortedMap = Collections.unmodifiableSortedMap(map);
 
-    Collections.unmodifiableNavigableSet(set);
-    Collections.unmodifiableNavigableMap(map);
+    NavigableSet unmodifiableNavigableSet = Collections.unmodifiableNavigableSet(set);
+    NavigableMap unmodifiableNavigableMap = Collections.unmodifiableNavigableMap(map);
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/beforeUnmodifiableArg.java

@@ -1,20 +1,20 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
+import java.util.*;
 
 class Main {
 
   public static void main(String[] args) {
-    Collections.unmodifiableCollecti<caret>on(Collections.EMPTY_LIST);
+    Collections unmodifiableCollection = Collections.unmodifiableCollecti<caret>on(Collections.EMPTY_LIST);
 
-    Collections.unmodifiableList(Collections.EMPTY_LIST);
-    Collections.unmodifiableSet(Collections.EMPTY_SET);
-    Collections.unmodifiableMap(Collections.EMPTY_MAP);
+    List unmodifiableList = Collections.unmodifiableList(Collections.EMPTY_LIST);
+    Set unmodifiableSet = Collections.unmodifiableSet(Collections.EMPTY_SET);
+    Map unmodifiableMap = Collections.unmodifiableMap(Collections.EMPTY_MAP);
 
-    Collections.unmodifiableSortedSet(Collections.EMPTY_SET);
-    Collections.unmodifiableSortedMap(Collections.EMPTY_MAP);
+    SortedSet unmodifiableSortedSet = Collections.unmodifiableSortedSet(Collections.EMPTY_SET);
+    SortedMap unmodifiableSortedMap = Collections.unmodifiableSortedMap(Collections.EMPTY_MAP);
 
-    Collections.unmodifiableNavigableSet(Collections.EMPTY_SET);
-    Collections.unmodifiableNavigableMap(Collections.EMPTY_MAP);
+    NavigableSet unmodifiableNavigableSet = Collections.unmodifiableNavigableSet(Collections.EMPTY_SET);
+    NavigableMap unmodifiableNavigableMap = Collections.unmodifiableNavigableMap(Collections.EMPTY_MAP);
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/beforeUnmodifiableMethod.java

@@ -1,20 +1,20 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
+import java.util.*;
 
 class Main {
 
   public static void main(String[] args) {
-    Collections.unmodifiableCollecti<caret>on(Collections.emptyList());
+    Collections unmodifiableCollection = Collections.unmodifiableCollecti<caret>on(Collections.emptyList());
 
-    Collections.unmodifiableList(Collections.emptyList());
-    Collections.unmodifiableSet(Collections.emptySet());
-    Collections.unmodifiableMap(Collections.emptyMap());
+    List unmodifiableList = Collections.unmodifiableList(Collections.emptyList());
+    Set unmodifiableSet = Collections.unmodifiableSet(Collections.emptySet());
+    Map unmodifiableMap = Collections.unmodifiableMap(Collections.emptyMap());
 
-    Collections.unmodifiableSortedSet(Collections.emptySet());
-    Collections.unmodifiableSortedMap(Collections.emptyMap());
+    SortedSet unmodifiableSortedSet = Collections.unmodifiableSortedSet(Collections.emptySet());
+    SortedMap unmodifiableSortedMap = Collections.unmodifiableSortedMap(Collections.emptyMap());
 
-    Collections.unmodifiableNavigableSet(Collections.emptySet());
-    Collections.unmodifiableNavigableMap(Collections.emptyMap());
+    NavigableSet unmodifiableNavigableSet = Collections.unmodifiableNavigableSet(Collections.emptySet());
+    NavigableMap unmodifiableNavigableMap = Collections.unmodifiableNavigableMap(Collections.emptyMap());
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/beforeWithComments.java

@@ -1,20 +1,20 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
+import java.util.*;
 
 class Main {
 
     public static void main(String[] args) {
-        Collections/*empty*/./*empty too*/unmodifiableCollecti<caret>on/*blah blah blah*/(Collections.emptyList());
+        Collection unmodifiableCollection = Collections/*empty*/./*empty too*/unmodifiableCollecti<caret>on/*blah blah blah*/(Collections.emptyList());
 
-        Collections/*empty*/./*empty too*/unmodifiableList/*blah blah blah*/(Collections.emptyList());
-        Collections/*empty*/./*empty too*/unmodifiableSet/*blah blah blah*/(Collections.emptySet());
-        Collections/*empty*/./*empty too*/unmodifiableMap/*blah blah blah*/(Collections.emptyMap());
+        List unmodifiableList = Collections/*empty*/./*empty too*/unmodifiableList/*blah blah blah*/(Collections.emptyList());
+        Set unmodifiableSet = Collections/*empty*/./*empty too*/unmodifiableSet/*blah blah blah*/(Collections.emptySet());
+        Map unmodifiableMap = Collections/*empty*/./*empty too*/unmodifiableMap/*blah blah blah*/(Collections.emptyMap());
 
-        Collections/*empty*/./*empty too*/unmodifiableSortedSet/*blah blah blah*/(Collections.emptySet());
-        Collections/*empty*/./*empty too*/unmodifiableSortedMap/*blah blah blah*/(Collections.emptyMap());
+        SortedSet unmodifiableSortedSet = Collections/*empty*/./*empty too*/unmodifiableSortedSet/*blah blah blah*/(Collections.emptySet());
+        SortedMap unmodifiableSortedMap = Collections/*empty*/./*empty too*/unmodifiableSortedMap/*blah blah blah*/(Collections.emptyMap());
 
-        Collections/*empty*/./*empty too*/unmodifiableNavigableSet/*blah blah blah*/(Collections.emptySet());
-        Collections/*empty*/./*empty too*/unmodifiableNavigableMap/*blah blah blah*/(Collections.emptyMap());
+        NavigableSet unmodifiableNavigableSet = Collections/*empty*/./*empty too*/unmodifiableNavigableSet/*blah blah blah*/(Collections.emptySet());
+        NavigableMap unmodifiableNavigableMap = Collections/*empty*/./*empty too*/unmodifiableNavigableMap/*blah blah blah*/(Collections.emptyMap());
     }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantUnmodifiable/beforeWithParentheses.java

@@ -1,20 +1,20 @@
-// "Fix all 'Redundant usage of unmodifiable collection factories' problems in file" "true"
+// "Fix all 'Redundant usage of unmodifiable collection wrappers' problems in file" "true"
 
-import java.util.Collections;
+import java.util.*;
 
 class Main {
 
   public static void main(String[] args) {
-    Collections.unmodifiableCollecti<caret>on(((Collections.emptyList())));
+    Collection unmodifiableCollection = Collections.unmodifiableCollecti<caret>on(((Collections.emptyList())));
 
-    Collections.unmodifiableList(((Collections.emptyList())));
-    Collections.unmodifiableSet(((Collections.emptySet())));
-    Collections.unmodifiableMap(((Collections.emptyMap())));
+    List unmodifiableList = Collections.unmodifiableList(((Collections.emptyList())));
+    Set unmodifiableSet = Collections.unmodifiableSet(((Collections.emptySet())));
+    Map unmodifiableMap = Collections.unmodifiableMap(((Collections.emptyMap())));
 
-    Collections.unmodifiableSortedSet(((Collections.emptySet())));
-    Collections.unmodifiableSortedMap(((Collections.emptyMap())));
+    SortedSet unmodifiableSortedSet = Collections.unmodifiableSortedSet(((Collections.emptySet())));
+    SortedMap unmodifiableSortedMap = Collections.unmodifiableSortedMap(((Collections.emptyMap())));
 
-    Collections.unmodifiableNavigableSet(((Collections.emptySet())));
-    Collections.unmodifiableNavigableMap(((Collections.emptyMap())));
+    NavigableSet unmodifiableNavigableSet = Collections.unmodifiableNavigableSet(((Collections.emptySet())));
+    NavigableMap unmodifiableNavigableMap = Collections.unmodifiableNavigableMap(((Collections.emptyMap())));
   }
 }