Skip to content

Expand coverage of UseCollectionInterfaces to LinkedList, Stack, TreeMap, TreeSet and PriorityQueue #718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timtebeek merged 1 commit into from
Aug 22, 2025
Merged

Expand coverage of UseCollectionInterfaces to LinkedList, Stack, TreeMap, TreeSet and PriorityQueue #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/main/java/org/openrewrite/staticanalysis/UseCollectionInterfaces.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public Duration getEstimatedEffortPerOccurrence() {
rspecRulesReplaceTypeMap.put("java.util.AbstractSequentialList", "java.util.List");
rspecRulesReplaceTypeMap.put("java.util.ArrayList", "java.util.List");
rspecRulesReplaceTypeMap.put("java.util.concurrent.CopyOnWriteArrayList", "java.util.List");
rspecRulesReplaceTypeMap.put("java.util.LinkedList", "java.util.List");
rspecRulesReplaceTypeMap.put("java.util.Stack", "java.util.List");
rspecRulesReplaceTypeMap.put("java.util.Vector", "java.util.List");
// Map
rspecRulesReplaceTypeMap.put("java.util.AbstractMap", "java.util.Map");
Expand All @@ -73,17 +75,20 @@ public Duration getEstimatedEffortPerOccurrence() {
rspecRulesReplaceTypeMap.put("java.util.Hashtable", "java.util.Map");
rspecRulesReplaceTypeMap.put("java.util.IdentityHashMap", "java.util.Map");
rspecRulesReplaceTypeMap.put("java.util.LinkedHashMap", "java.util.Map");
rspecRulesReplaceTypeMap.put("java.util.TreeMap", "java.util.Map");
rspecRulesReplaceTypeMap.put("java.util.WeakHashMap", "java.util.Map");
// ConcurrentMap
rspecRulesReplaceTypeMap.put("java.util.concurrent.ConcurrentHashMap", "java.util.concurrent.ConcurrentMap");
rspecRulesReplaceTypeMap.put("java.util.concurrent.ConcurrentSkipListMap", "java.util.concurrent.ConcurrentMap");
// Queue
rspecRulesReplaceTypeMap.put("java.util.AbstractQueue", "java.util.Queue");
rspecRulesReplaceTypeMap.put("java.util.concurrent.ConcurrentLinkedQueue", "java.util.Queue");
rspecRulesReplaceTypeMap.put("java.util.PriorityQueue", "java.util.Queue");
// Set
rspecRulesReplaceTypeMap.put("java.util.AbstractSet", "java.util.Set");
rspecRulesReplaceTypeMap.put("java.util.HashSet", "java.util.Set");
rspecRulesReplaceTypeMap.put("java.util.LinkedHashSet", "java.util.Set");
rspecRulesReplaceTypeMap.put("java.util.TreeSet", "java.util.Set");
rspecRulesReplaceTypeMap.put("java.util.concurrent.CopyOnWriteArraySet", "java.util.Set");
}

Expand Down Expand Up @@ -279,6 +284,16 @@ private static class InterfaceIncompatibleMethodDetector extends JavaIsoVisitor<
"addElement", "capacity", "copyInto", "elementAt", "elements", "ensureCapacity", "insertElementAt", "removeAllElements", "removeElement", "removeElementAt", "setElementAt", "setSize", "trimToSize"))));
nonInterfaceMethods.put("java.util.ArrayList", unmodifiableSet(new HashSet<>(Arrays.asList(
"ensureCapacity", "trimToSize"))));
nonInterfaceMethods.put("java.util.LinkedList", unmodifiableSet(new HashSet<>(Arrays.asList(
// These have been promoted to Java 21 SequencedCollection interface, but we don't check that here
"addFirst", "addLast", "getFirst", "getLast", "removeFirst", "removeLast",
"descendingIterator", "offerFirst", "offerLast", "peekFirst", "peekLast", "pollFirst", "pollLast", "pop", "push", "removeFirstOccurrence", "removeLastOccurrence"))));
nonInterfaceMethods.put("java.util.Stack", unmodifiableSet(new HashSet<>(Arrays.asList(
"empty", "peek", "pop", "push", "search"))));
nonInterfaceMethods.put("java.util.TreeMap", unmodifiableSet(new HashSet<>(Arrays.asList(
"ceilingEntry", "ceilingKey", "descendingKeySet", "descendingMap", "firstEntry", "firstKey", "floorEntry", "floorKey", "headMap", "higherEntry", "higherKey", "lastEntry", "lastKey", "lowerEntry", "lowerKey", "navigableKeySet", "pollFirstEntry", "pollLastEntry", "subMap", "tailMap"))));
nonInterfaceMethods.put("java.util.TreeSet", unmodifiableSet(new HashSet<>(Arrays.asList(
"ceiling", "descendingIterator", "descendingSet", "first", "floor", "headSet", "higher", "last", "lower", "pollFirst", "pollLast", "subSet", "tailSet"))));
}

@Override
Expand Down
Loading