diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaAtomicsNewReference.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaAtomicsNewReference.java index 37732bc908..63767263a4 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaAtomicsNewReference.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaAtomicsNewReference.java @@ -25,9 +25,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaAtomicsNewReference extends Recipe { private static final MethodMatcher NEW_ATOMIC_REFERENCE = new MethodMatcher("com.google.common.util.concurrent.Atomics newReference(..)"); @@ -43,7 +44,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutor.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutor.java index 339e6072a3..b5fcf8e606 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutor.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutor.java @@ -25,9 +25,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaDirectExecutor extends Recipe { private static final MethodMatcher DIRECT_EXECUTOR = new MethodMatcher("com.google.common.util.concurrent.MoreExecutors directExecutor()"); @@ -43,7 +44,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayList.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayList.java index 19c9298f6a..da864dba22 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayList.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayList.java @@ -26,9 +26,10 @@ import org.openrewrite.java.tree.J; import org.openrewrite.java.tree.TypeUtils; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaListsNewArrayList extends Recipe { private static final MethodMatcher NEW_ARRAY_LIST = new MethodMatcher("com.google.common.collect.Lists newArrayList()"); private static final MethodMatcher NEW_ARRAY_LIST_ITERABLE = new MethodMatcher("com.google.common.collect.Lists newArrayList(java.lang.Iterable)"); @@ -46,7 +47,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayList.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayList.java index 09967c2b86..dee4299504 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayList.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayList.java @@ -26,9 +26,10 @@ import org.openrewrite.java.tree.J; import org.openrewrite.java.tree.TypeUtils; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaListsNewCopyOnWriteArrayList extends Recipe { private static final MethodMatcher NEW_ARRAY_LIST = new MethodMatcher("com.google.common.collect.Lists newCopyOnWriteArrayList()"); private static final MethodMatcher NEW_ARRAY_LIST_ITERABLE = new MethodMatcher("com.google.common.collect.Lists newCopyOnWriteArrayList(java.lang.Iterable)"); @@ -45,7 +46,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedList.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedList.java index 0bf89b38e6..e8464b7ad9 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedList.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedList.java @@ -26,9 +26,10 @@ import org.openrewrite.java.tree.J; import org.openrewrite.java.tree.TypeUtils; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaListsNewLinkedList extends Recipe { private static final MethodMatcher NEW_LINKED_LIST = new MethodMatcher("com.google.common.collect.Lists newLinkedList()"); private static final MethodMatcher NEW_LINKED_LIST_ITERABLE = new MethodMatcher("com.google.common.collect.Lists newLinkedList(java.lang.Iterable)"); @@ -45,7 +46,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewHashMap.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewHashMap.java index 25b0769300..938233f690 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewHashMap.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewHashMap.java @@ -25,9 +25,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaMapsNewHashMap extends Recipe { private static final MethodMatcher NEW_HASH_MAP = new MethodMatcher("com.google.common.collect.Maps newHashMap()"); private static final MethodMatcher NEW_HASH_MAP_WITH_MAP = new MethodMatcher("com.google.common.collect.Maps newHashMap(java.util.Map)"); @@ -44,7 +45,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewLinkedHashMap.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewLinkedHashMap.java index fe6748c2ba..ffb61bb79e 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewLinkedHashMap.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewLinkedHashMap.java @@ -25,9 +25,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaMapsNewLinkedHashMap extends Recipe { private static final MethodMatcher NEW_LINKED_HASH_MAP = new MethodMatcher("com.google.common.collect.Maps newLinkedHashMap()"); private static final MethodMatcher NEW_LINKED_HASH_MAP_WITH_MAP = new MethodMatcher("com.google.common.collect.Maps newLinkedHashMap(java.util.Map)"); @@ -44,7 +45,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewTreeMap.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewTreeMap.java index f306508e68..34820d4ec2 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewTreeMap.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaMapsNewTreeMap.java @@ -25,9 +25,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaMapsNewTreeMap extends Recipe { private static final MethodMatcher NEW_TREE_MAP = new MethodMatcher("com.google.common.collect.Maps newTreeMap()"); private static final MethodMatcher NEW_TREE_MAP_WITH_COMPARATOR = new MethodMatcher("com.google.common.collect.Maps newTreeMap(java.util.Comparator)"); @@ -45,7 +46,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaPrimitiveAsList.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaPrimitiveAsList.java index 4d83350a0d..5fa76f8f45 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaPrimitiveAsList.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaPrimitiveAsList.java @@ -25,7 +25,7 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; +import static java.util.Collections.nCopies; public class NoGuavaPrimitiveAsList extends Recipe { @@ -59,7 +59,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation elem, Executi maybeRemoveImport("com.google.common.primitives.Bytes"); maybeAddImport("java.util.Arrays"); - String args = String.join(",", Collections.nCopies(elem.getArguments().size(), "#{any()}")); + String args = String.join(",", nCopies(elem.getArguments().size(), "#{any()}")); return JavaTemplate .builder("Arrays.asList(" + args + ')') .imports("java.util.Arrays") diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSet.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSet.java index 94990547e6..367709fbb3 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSet.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSet.java @@ -25,9 +25,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaSetsNewConcurrentHashSet extends Recipe { private static final MethodMatcher NEW_HASH_SET = new MethodMatcher("com.google.common.collect.Sets newConcurrentHashSet()"); @@ -43,7 +44,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSet.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSet.java index bbd65d699b..45e3528ca0 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSet.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSet.java @@ -26,9 +26,10 @@ import org.openrewrite.java.tree.J; import org.openrewrite.java.tree.TypeUtils; -import java.util.Collections; import java.util.Set; -import java.util.stream.Collectors; + +import static java.util.Collections.singleton; +import static java.util.stream.Collectors.joining; public class NoGuavaSetsNewHashSet extends Recipe { private static final MethodMatcher NEW_HASH_SET = new MethodMatcher("com.google.common.collect.Sets newHashSet(..)"); @@ -45,7 +46,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override @@ -71,7 +72,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) .apply(getCursor(), method.getCoordinates().replace(), method.getArguments().get(0)); } maybeAddImport("java.util.Arrays"); - JavaTemplate newHashSetVarargs = JavaTemplate.builder("new HashSet<>(Arrays.asList(" + method.getArguments().stream().map(a -> "#{any()}").collect(Collectors.joining(",")) + "))") + JavaTemplate newHashSetVarargs = JavaTemplate.builder("new HashSet<>(Arrays.asList(" + method.getArguments().stream().map(a -> "#{any()}").collect(joining(",")) + "))") .contextSensitive() .imports("java.util.Arrays") .imports("java.util.HashSet") diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSet.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSet.java index 331525a258..be3a332201 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSet.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSet.java @@ -26,9 +26,10 @@ import org.openrewrite.java.tree.J; import org.openrewrite.java.tree.TypeUtils; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class NoGuavaSetsNewLinkedHashSet extends Recipe { private static final MethodMatcher NEW_LINKED_HASH_SET = new MethodMatcher("com.google.common.collect.Sets newLinkedHashSet()"); private static final MethodMatcher NEW_LINKED_HASH_SET_ITERABLE = new MethodMatcher("com.google.common.collect.Sets newLinkedHashSet(java.lang.Iterable)"); @@ -46,7 +47,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoin.java b/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoin.java index cf26c5e09e..7573d3b180 100644 --- a/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoin.java +++ b/src/main/java/org/openrewrite/java/migrate/guava/PreferJavaStringJoin.java @@ -22,9 +22,10 @@ import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.search.UsesMethod; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class PreferJavaStringJoin extends Recipe { static final MethodMatcher JOIN_METHOD_MATCHER = new MethodMatcher("com.google.common.base.Joiner join(..)"); @@ -41,7 +42,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("guava"); + return singleton("guava"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/io/ReplaceFileInOrOutputStreamFinalizeWithClose.java b/src/main/java/org/openrewrite/java/migrate/io/ReplaceFileInOrOutputStreamFinalizeWithClose.java index de91cea186..fa02344e63 100644 --- a/src/main/java/org/openrewrite/java/migrate/io/ReplaceFileInOrOutputStreamFinalizeWithClose.java +++ b/src/main/java/org/openrewrite/java/migrate/io/ReplaceFileInOrOutputStreamFinalizeWithClose.java @@ -30,9 +30,10 @@ import org.openrewrite.java.tree.JavaType; import org.openrewrite.java.tree.TypeUtils; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + @EqualsAndHashCode(callSuper = false) @Value public class ReplaceFileInOrOutputStreamFinalizeWithClose extends Recipe { @@ -53,7 +54,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("JDK-8212050"); + return singleton("JDK-8212050"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/jakarta/ApplicationPathWildcardNoLongerAccepted.java b/src/main/java/org/openrewrite/java/migrate/jakarta/ApplicationPathWildcardNoLongerAccepted.java index b771cf363f..0e3b0f3848 100644 --- a/src/main/java/org/openrewrite/java/migrate/jakarta/ApplicationPathWildcardNoLongerAccepted.java +++ b/src/main/java/org/openrewrite/java/migrate/jakarta/ApplicationPathWildcardNoLongerAccepted.java @@ -24,7 +24,7 @@ import org.openrewrite.java.tree.Expression; import org.openrewrite.java.tree.J; -import java.util.Collections; +import static java.util.Collections.singletonList; public class ApplicationPathWildcardNoLongerAccepted extends Recipe { @Override @@ -61,7 +61,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct String value = literal.getValue().toString(); if (value.endsWith("/*")) { String newValue = "\"" + value.substring(0, value.length() - 2) + "\""; - return a.withArguments(Collections.singletonList(assig.withAssignment(literal.withValue(newValue).withValueSource(newValue)))); + return a.withArguments(singletonList(assig.withAssignment(literal.withValue(newValue).withValueSource(newValue)))); } } // Should we handle constants? } else if (it instanceof J.Literal) { @@ -69,7 +69,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct String value = literal.getValue().toString(); if (value.endsWith("/*")) { String newValue = "\"" + value.substring(0, value.length() - 2) + "\""; - return a.withArguments(Collections.singletonList(((J.Literal) it).withValue(newValue).withValueSource(newValue))); + return a.withArguments(singletonList(((J.Literal) it).withValue(newValue).withValueSource(newValue))); } } diff --git a/src/main/java/org/openrewrite/java/migrate/jakarta/UpdateBeanManagerMethods.java b/src/main/java/org/openrewrite/java/migrate/jakarta/UpdateBeanManagerMethods.java index 54278dae75..d24197f4d2 100644 --- a/src/main/java/org/openrewrite/java/migrate/jakarta/UpdateBeanManagerMethods.java +++ b/src/main/java/org/openrewrite/java/migrate/jakarta/UpdateBeanManagerMethods.java @@ -25,9 +25,10 @@ import org.openrewrite.java.tree.Expression; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.List; +import static java.util.Collections.nCopies; + public class UpdateBeanManagerMethods extends Recipe { @Override public String getDisplayName() { @@ -66,7 +67,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu args[arguments.size()] = arguments.get(0); String template = "#{any(jakarta.enterprise.inject.spi.BeanManager)}.getEvent()" + - ".select(" + String.join(", ", Collections.nCopies(arguments.size() - 1, "#{any(java.lang.annotation.Annotation)}")) + ')' + + ".select(" + String.join(", ", nCopies(arguments.size() - 1, "#{any(java.lang.annotation.Annotation)}")) + ')' + ".fire(#{any(jakarta.enterprise.inject.spi.BeforeBeanDiscovery)})"; return JavaTemplate.builder(template) .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "jakarta.enterprise.cdi-api-3.0.0-M4")) diff --git a/src/main/java/org/openrewrite/java/migrate/javax/AddTransientAnnotationToPrivateAccessor.java b/src/main/java/org/openrewrite/java/migrate/javax/AddTransientAnnotationToPrivateAccessor.java index a395a030c9..b4c1ee8bce 100644 --- a/src/main/java/org/openrewrite/java/migrate/javax/AddTransientAnnotationToPrivateAccessor.java +++ b/src/main/java/org/openrewrite/java/migrate/javax/AddTransientAnnotationToPrivateAccessor.java @@ -31,7 +31,8 @@ import org.openrewrite.java.tree.JavaType; import java.util.*; -import java.util.stream.Collectors; + +import static java.util.stream.Collectors.toList; @EqualsAndHashCode(callSuper = false) @Value @@ -67,7 +68,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex .flatMap(Collection::stream) .map(var -> var.getName().getFieldType()) .filter(Objects::nonNull) - .collect(Collectors.toList()); + .collect(toList()); return super.visitClassDeclaration(classDecl, ctx); } diff --git a/src/main/java/org/openrewrite/java/migrate/javax/RemoveTemporalAnnotation.java b/src/main/java/org/openrewrite/java/migrate/javax/RemoveTemporalAnnotation.java index 2950ba2d07..445a425c79 100644 --- a/src/main/java/org/openrewrite/java/migrate/javax/RemoveTemporalAnnotation.java +++ b/src/main/java/org/openrewrite/java/migrate/javax/RemoveTemporalAnnotation.java @@ -31,9 +31,11 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.stream.Collectors.toMap; +import static java.util.stream.Collectors.toSet; + @EqualsAndHashCode(callSuper = false) @Value public class RemoveTemporalAnnotation extends Recipe { @@ -74,13 +76,13 @@ public TreeVisitor getVisitor() { JAVA_SQL_TIMESTAMP, JAVA_SQL_TIME, JAVA_SQL_DATE - ).collect(Collectors.toSet()); + ).collect(toSet()); // Combinations of TemporalType and java.sql classes that do not need removal Map doNotRemove = Stream.of(new String[][]{ {"DATE", JAVA_SQL_TIMESTAMP}, {"TIME", JAVA_SQL_TIMESTAMP}, {"TIMESTAMP", JAVA_SQL_DATE} - }).collect(Collectors.toMap(data -> data[0], data -> data[1])); + }).collect(toMap(data -> data[0], data -> data[1])); // TODO: maybe future recipe to handle these by creating a converter class // https://wiki.eclipse.org/EclipseLink/Examples/JPA/Migration/OpenJPA/Mappings#.40Temporal_on_java.sql.Date.2FTime.2FTimestamp_fields diff --git a/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeRecipe.java b/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeRecipe.java index a86370f092..7bb2571067 100644 --- a/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeRecipe.java +++ b/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeRecipe.java @@ -28,6 +28,8 @@ import java.util.*; +import static java.util.Collections.emptyList; + public class JodaTimeRecipe extends ScanningRecipe { @Override public String getDisplayName() { @@ -78,7 +80,7 @@ public void addVars(J.MethodDeclaration methodDeclaration) { } public @Nullable NamedVariable getVarByName(@Nullable JavaType declaringType, String varName) { - return vars.getOrDefault(declaringType, Collections.emptyList()).stream() + return vars.getOrDefault(declaringType, emptyList()).stream() .filter(v -> v.getSimpleName().equals(varName)) .findFirst() // there should be only one variable with the same name .orElse(null); diff --git a/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeScanner.java b/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeScanner.java index d5b04767d8..e636dc915c 100644 --- a/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeScanner.java +++ b/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeScanner.java @@ -33,6 +33,8 @@ import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; import static org.openrewrite.java.migrate.joda.templates.TimeClassNames.JODA_CLASS_PATTERN; class JodaTimeScanner extends ScopeAwareVisitor { @@ -78,7 +80,7 @@ public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) { unsafeMethods.add(method); return; } - Set intersection = new HashSet<>(methodReferencedVars.getOrDefault(method, Collections.emptySet())); + Set intersection = new HashSet<>(methodReferencedVars.getOrDefault(method, emptySet())); intersection.retainAll(acc.getUnsafeVars()); if (!intersection.isEmpty()) { unsafeMethods.add(method); @@ -86,7 +88,7 @@ public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) { }); for (JavaType.Method method : unsafeMethods) { acc.getSafeMethodMap().put(method, false); - acc.getUnsafeVars().addAll(methodReferencedVars.getOrDefault(method, Collections.emptySet())); + acc.getUnsafeVars().addAll(methodReferencedVars.getOrDefault(method, emptySet())); } return cu; } @@ -149,7 +151,7 @@ public J visitAssignment(J.Assignment assignment, ExecutionContext ctx) { @Override public J visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) { acc.getVarTable().addVars(method); - unsafeVarsByType.getOrDefault(method.getMethodType(), Collections.emptySet()).forEach(varName -> { + unsafeVarsByType.getOrDefault(method.getMethodType(), emptySet()).forEach(varName -> { NamedVariable var = acc.getVarTable().getVarByName(method.getMethodType(), varName); if (var != null) { // var can only be null if method is not correctly type attributed acc.getUnsafeVars().add(var); @@ -277,7 +279,7 @@ private static boolean isJodaExpr(Expression expression) { private List findSinks(Cursor cursor) { Option mayBeSinks = Dataflow.startingAt(cursor).findSinks(new JodaTimeFlowSpec()); if (mayBeSinks.isNone()) { - return Collections.emptyList(); + return emptyList(); } return mayBeSinks.some().getExpressionSinks(); } @@ -291,7 +293,7 @@ private void dfs(NamedVariable root, Set visited) { return; } visited.add(root); - for (NamedVariable dep : varDependencies.getOrDefault(root, Collections.emptySet())) { + for (NamedVariable dep : varDependencies.getOrDefault(root, emptySet())) { dfs(dep, visited); } } diff --git a/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassLoaderDefineClass.java b/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassLoaderDefineClass.java index b08d1f3a77..7cc5e6e19e 100644 --- a/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassLoaderDefineClass.java +++ b/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassLoaderDefineClass.java @@ -23,9 +23,10 @@ import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateClassLoaderDefineClass extends Recipe { private static final MethodMatcher DEFINE_CLASS_MATCHER = new MethodMatcher("java.lang.ClassLoader defineClass(byte[], int, int)"); @@ -41,7 +42,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassNewInstanceToGetDeclaredConstructorNewInstance.java b/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassNewInstanceToGetDeclaredConstructorNewInstance.java index 3b867ec9a4..dc5d6ab398 100644 --- a/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassNewInstanceToGetDeclaredConstructorNewInstance.java +++ b/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassNewInstanceToGetDeclaredConstructorNewInstance.java @@ -29,9 +29,10 @@ import org.openrewrite.java.tree.JavaType; import org.openrewrite.java.tree.TypeUtils; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateClassNewInstanceToGetDeclaredConstructorNewInstance extends Recipe { private static final MethodMatcher NEW_INSTANCE_MATCHER = new MethodMatcher("java.lang.Class newInstance()"); @@ -47,7 +48,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/lang/MigrateSecurityManagerMulticast.java b/src/main/java/org/openrewrite/java/migrate/lang/MigrateSecurityManagerMulticast.java index c8690fdae4..dfa7d6b107 100644 --- a/src/main/java/org/openrewrite/java/migrate/lang/MigrateSecurityManagerMulticast.java +++ b/src/main/java/org/openrewrite/java/migrate/lang/MigrateSecurityManagerMulticast.java @@ -24,9 +24,11 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; +import static java.util.Collections.singletonList; + public class MigrateSecurityManagerMulticast extends Recipe { private static final MethodMatcher MULTICAST_METHOD = new MethodMatcher("java.lang.SecurityManager checkMulticast(java.net.InetAddress, byte)"); @@ -42,7 +44,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override @@ -53,7 +55,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu J.MethodInvocation m = super.visitMethodInvocation(method, ctx); if (MULTICAST_METHOD.matches(m) && m.getArguments().size() == 2) { - return m.withArguments(Collections.singletonList(m.getArguments().get(0))) + return m.withArguments(singletonList(m.getArguments().get(0))) .withMethodType(m.getMethodType() .withParameterNames(m.getMethodType().getParameterNames().subList(0, 1)) .withParameterTypes(m.getMethodType().getParameterTypes().subList(0, 1)) diff --git a/src/main/java/org/openrewrite/java/migrate/lang/ThreadStopUnsupported.java b/src/main/java/org/openrewrite/java/migrate/lang/ThreadStopUnsupported.java index e93be8b3ec..356a569041 100644 --- a/src/main/java/org/openrewrite/java/migrate/lang/ThreadStopUnsupported.java +++ b/src/main/java/org/openrewrite/java/migrate/lang/ThreadStopUnsupported.java @@ -27,7 +27,7 @@ import org.openrewrite.java.tree.TextComment; import org.openrewrite.marker.Markers; -import java.util.Collections; +import static java.util.Collections.singletonList; public class ThreadStopUnsupported extends Recipe { private static final MethodMatcher THREAD_STOP_MATCHER = new MethodMatcher("java.lang.Thread stop()"); @@ -75,7 +75,7 @@ private J getWithComment(J j, String methodName) { prefixWhitespace + " * For detailed migration instructions see the migration guide available at" + prefixWhitespace + " * https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/doc-files/threadPrimitiveDeprecation.html" + prefixWhitespace + " "; - return j.withComments(Collections.singletonList(new TextComment(true, commentText, prefixWhitespace, Markers.EMPTY))); + return j.withComments(singletonList(new TextComment(true, commentText, prefixWhitespace, Markers.EMPTY))); } }; } diff --git a/src/main/java/org/openrewrite/java/migrate/lang/UseTextBlocks.java b/src/main/java/org/openrewrite/java/migrate/lang/UseTextBlocks.java index c23f36a263..7fe5208380 100644 --- a/src/main/java/org/openrewrite/java/migrate/lang/UseTextBlocks.java +++ b/src/main/java/org/openrewrite/java/migrate/lang/UseTextBlocks.java @@ -38,9 +38,9 @@ import java.util.Base64; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; import static java.util.Objects.requireNonNull; +import static java.util.stream.Collectors.toList; import static org.openrewrite.Tree.randomId; @EqualsAndHashCode(callSuper = false) @@ -127,7 +127,7 @@ private J.Literal toTextBlock(J.Binary binary, String content, List s StringBuilder originalContent = new StringBuilder(); stringLiterals = stringLiterals.stream() .filter(s -> s.getValue() != null && !s.getValue().toString().isEmpty()) - .collect(Collectors.toList()); + .collect(toList()); for (int i = 0; i < stringLiterals.size(); i++) { String s = requireNonNull(stringLiterals.get(i).getValue()).toString(); sb.append(s); diff --git a/src/main/java/org/openrewrite/java/migrate/logging/MigrateGetLoggingMXBeanToGetPlatformMXBean.java b/src/main/java/org/openrewrite/java/migrate/logging/MigrateGetLoggingMXBeanToGetPlatformMXBean.java index 43b6cd23ba..9f0044caf3 100644 --- a/src/main/java/org/openrewrite/java/migrate/logging/MigrateGetLoggingMXBeanToGetPlatformMXBean.java +++ b/src/main/java/org/openrewrite/java/migrate/logging/MigrateGetLoggingMXBeanToGetPlatformMXBean.java @@ -27,9 +27,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateGetLoggingMXBeanToGetPlatformMXBean extends Recipe { private static final MethodMatcher MATCHER = new MethodMatcher("java.util.logging.LogManager getLoggingMXBean()"); @@ -45,7 +46,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/logging/MigrateLogRecordSetMillisToSetInstant.java b/src/main/java/org/openrewrite/java/migrate/logging/MigrateLogRecordSetMillisToSetInstant.java index de52bc4538..379ef4d1e9 100644 --- a/src/main/java/org/openrewrite/java/migrate/logging/MigrateLogRecordSetMillisToSetInstant.java +++ b/src/main/java/org/openrewrite/java/migrate/logging/MigrateLogRecordSetMillisToSetInstant.java @@ -26,9 +26,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateLogRecordSetMillisToSetInstant extends Recipe { private static final MethodMatcher MATCHER = new MethodMatcher("java.util.logging.LogRecord setMillis(long)"); @@ -44,7 +45,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/logging/MigrateLoggerLogrbToUseResourceBundle.java b/src/main/java/org/openrewrite/java/migrate/logging/MigrateLoggerLogrbToUseResourceBundle.java index a148c6f52c..c1ffefdf72 100644 --- a/src/main/java/org/openrewrite/java/migrate/logging/MigrateLoggerLogrbToUseResourceBundle.java +++ b/src/main/java/org/openrewrite/java/migrate/logging/MigrateLoggerLogrbToUseResourceBundle.java @@ -25,9 +25,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateLoggerLogrbToUseResourceBundle extends Recipe { private static final MethodMatcher MATCHER = new MethodMatcher("java.util.logging.Logger logrb(java.util.logging.Level, String, String, String, String, ..)"); @@ -43,7 +44,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/LombokOnXToOnX_.java b/src/main/java/org/openrewrite/java/migrate/lombok/LombokOnXToOnX_.java index 7052490aaf..224cdfd21e 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/LombokOnXToOnX_.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/LombokOnXToOnX_.java @@ -26,9 +26,10 @@ import org.openrewrite.java.tree.Expression; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class LombokOnXToOnX_ extends Recipe { private static final AnnotationMatcher LOMBOK_GETTER = new AnnotationMatcher("@lombok.Getter"); @@ -54,7 +55,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("lombok"); + return singleton("lombok"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVar.java b/src/main/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVar.java index acc7f6e7ec..6912d387b4 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVar.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVar.java @@ -27,9 +27,10 @@ import org.openrewrite.java.tree.TypeUtils; import java.time.Duration; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class LombokValToFinalVar extends Recipe { private static final String LOMBOK_VAL = "lombok.val"; @@ -47,7 +48,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("lombok"); + return singleton("lombok"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java b/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java index d283932a18..a87196915b 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/LombokValueToRecord.java @@ -32,9 +32,11 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.Collections.emptyList; +import static java.util.Collections.singleton; +import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; @EqualsAndHashCode(callSuper = false) @@ -62,7 +64,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("lombok"); + return singleton("lombok"); } @Override @@ -320,7 +322,7 @@ private static List mapToConstructorArguments(List it - .withModifiers(Collections.emptyList()) + .withModifiers(emptyList()) .withVariables(it.getVariables()) ) .map(Statement.class::cast) @@ -340,7 +342,7 @@ private static String memberVariablesToString(Set memberVariables) { return memberVariables .stream() .map(member -> String.format(TO_STRING_MEMBER_LINE_PATTERN, member, member)) - .collect(Collectors.joining(TO_STRING_MEMBER_DELIMITER)); + .collect(joining(TO_STRING_MEMBER_DELIMITER)); } private static JavaType.Class buildRecordType(J.ClassDeclaration classDeclaration) { diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/UseLombokGetter.java b/src/main/java/org/openrewrite/java/migrate/lombok/UseLombokGetter.java index 11dcc7978b..660f61f910 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/UseLombokGetter.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/UseLombokGetter.java @@ -27,9 +27,10 @@ import org.openrewrite.java.tree.Expression; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + @EqualsAndHashCode(callSuper = false) @Value public class UseLombokGetter extends Recipe { @@ -47,7 +48,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("lombok"); + return singleton("lombok"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/lombok/UseLombokSetter.java b/src/main/java/org/openrewrite/java/migrate/lombok/UseLombokSetter.java index 5f82dc7739..e40c2600ec 100644 --- a/src/main/java/org/openrewrite/java/migrate/lombok/UseLombokSetter.java +++ b/src/main/java/org/openrewrite/java/migrate/lombok/UseLombokSetter.java @@ -27,9 +27,10 @@ import org.openrewrite.java.tree.Expression; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + @EqualsAndHashCode(callSuper = false) @Value public class UseLombokSetter extends Recipe { @@ -46,7 +47,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("lombok"); + return singleton("lombok"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/metrics/SimplifyMicrometerMeterTags.java b/src/main/java/org/openrewrite/java/migrate/metrics/SimplifyMicrometerMeterTags.java index 9e833436d1..b2d765e96e 100644 --- a/src/main/java/org/openrewrite/java/migrate/metrics/SimplifyMicrometerMeterTags.java +++ b/src/main/java/org/openrewrite/java/migrate/metrics/SimplifyMicrometerMeterTags.java @@ -23,9 +23,10 @@ import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class SimplifyMicrometerMeterTags extends Recipe { private static final MethodMatcher COUNTER_TAGS = new MethodMatcher("io.micrometer.core.instrument.Counter.Builder tags(String[])"); @@ -41,7 +42,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("micrometer"); + return singleton("micrometer"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/net/MigrateHttpURLConnectionHttpServerErrorToHttpInternalError.java b/src/main/java/org/openrewrite/java/migrate/net/MigrateHttpURLConnectionHttpServerErrorToHttpInternalError.java index 543458b8bb..ca88a52fcc 100644 --- a/src/main/java/org/openrewrite/java/migrate/net/MigrateHttpURLConnectionHttpServerErrorToHttpInternalError.java +++ b/src/main/java/org/openrewrite/java/migrate/net/MigrateHttpURLConnectionHttpServerErrorToHttpInternalError.java @@ -26,9 +26,10 @@ import org.openrewrite.java.tree.JavaType; import org.openrewrite.java.tree.TypeUtils; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateHttpURLConnectionHttpServerErrorToHttpInternalError extends Recipe { @Override public String getDisplayName() { @@ -42,7 +43,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/net/MigrateMulticastSocketSetTTLToSetTimeToLive.java b/src/main/java/org/openrewrite/java/migrate/net/MigrateMulticastSocketSetTTLToSetTimeToLive.java index 1533552233..f24ef641de 100644 --- a/src/main/java/org/openrewrite/java/migrate/net/MigrateMulticastSocketSetTTLToSetTimeToLive.java +++ b/src/main/java/org/openrewrite/java/migrate/net/MigrateMulticastSocketSetTTLToSetTimeToLive.java @@ -25,9 +25,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateMulticastSocketSetTTLToSetTimeToLive extends Recipe { private static final MethodMatcher MATCHER = new MethodMatcher("java.net.MulticastSocket setTTL(byte)"); @@ -43,7 +44,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/net/MigrateURLDecoderDecode.java b/src/main/java/org/openrewrite/java/migrate/net/MigrateURLDecoderDecode.java index b23fc3a4ea..e87e987ed6 100644 --- a/src/main/java/org/openrewrite/java/migrate/net/MigrateURLDecoderDecode.java +++ b/src/main/java/org/openrewrite/java/migrate/net/MigrateURLDecoderDecode.java @@ -26,9 +26,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateURLDecoderDecode extends Recipe { private static final MethodMatcher MATCHER = new MethodMatcher("java.net.URLDecoder decode(String)"); @@ -44,7 +45,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/net/MigrateURLEncoderEncode.java b/src/main/java/org/openrewrite/java/migrate/net/MigrateURLEncoderEncode.java index 0bd59d6800..f74f5497a9 100644 --- a/src/main/java/org/openrewrite/java/migrate/net/MigrateURLEncoderEncode.java +++ b/src/main/java/org/openrewrite/java/migrate/net/MigrateURLEncoderEncode.java @@ -27,9 +27,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateURLEncoderEncode extends Recipe { private static final MethodMatcher MATCHER = new MethodMatcher("java.net.URLEncoder encode(String)"); @@ -45,7 +46,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/search/FindInternalJavaxApis.java b/src/main/java/org/openrewrite/java/migrate/search/FindInternalJavaxApis.java index e364e7416c..99673a9391 100644 --- a/src/main/java/org/openrewrite/java/migrate/search/FindInternalJavaxApis.java +++ b/src/main/java/org/openrewrite/java/migrate/search/FindInternalJavaxApis.java @@ -28,7 +28,8 @@ import org.openrewrite.marker.SearchResult; import java.util.regex.Pattern; -import java.util.stream.Collectors; + +import static java.util.stream.Collectors.joining; @EqualsAndHashCode(callSuper = false) @RequiredArgsConstructor @@ -89,7 +90,7 @@ private void insertRow(MethodAccess ma, ExecutionContext ctx, JavaType.Method me methodType.getDeclaringType().toString(), methodType.getName(), methodType.getParameterTypes().stream().map(String::valueOf) - .collect(Collectors.joining(", ")) + .collect(joining(", ")) )); } } diff --git a/src/main/java/org/openrewrite/java/migrate/search/PlanJavaMigration.java b/src/main/java/org/openrewrite/java/migrate/search/PlanJavaMigration.java index 7a30a7d7c1..071c8eb855 100644 --- a/src/main/java/org/openrewrite/java/migrate/search/PlanJavaMigration.java +++ b/src/main/java/org/openrewrite/java/migrate/search/PlanJavaMigration.java @@ -24,7 +24,8 @@ import java.io.File; import java.util.Collection; -import java.util.Collections; + +import static java.util.Collections.emptyList; public class PlanJavaMigration extends ScanningRecipe { transient JavaVersionMigrationPlan plan = new JavaVersionMigrationPlan(this); @@ -87,6 +88,6 @@ public Tree preVisit(Tree tree, ExecutionContext ctx) { @Override public Collection generate(JavaVersionMigrationPlan.Row.Builder acc, ExecutionContext ctx) { plan.insertRow(ctx, acc.build()); - return Collections.emptyList(); + return emptyList(); } } diff --git a/src/main/java/org/openrewrite/java/migrate/sql/MigrateDriverManagerSetLogStream.java b/src/main/java/org/openrewrite/java/migrate/sql/MigrateDriverManagerSetLogStream.java index da6ad753ea..e89079f469 100644 --- a/src/main/java/org/openrewrite/java/migrate/sql/MigrateDriverManagerSetLogStream.java +++ b/src/main/java/org/openrewrite/java/migrate/sql/MigrateDriverManagerSetLogStream.java @@ -25,9 +25,10 @@ import org.openrewrite.java.search.UsesMethod; import org.openrewrite.java.tree.J; -import java.util.Collections; import java.util.Set; +import static java.util.Collections.singleton; + public class MigrateDriverManagerSetLogStream extends Recipe { private static final MethodMatcher METHOD_MATCHER = new MethodMatcher("java.sql.DriverManager setLogStream(java.io.PrintStream)"); @@ -43,7 +44,7 @@ public String getDescription() { @Override public Set getTags() { - return Collections.singleton("deprecated"); + return singleton("deprecated"); } @Override diff --git a/src/main/java/org/openrewrite/java/migrate/util/ListFirstAndLast.java b/src/main/java/org/openrewrite/java/migrate/util/ListFirstAndLast.java index 8ea89f9b82..d0ae2323d8 100644 --- a/src/main/java/org/openrewrite/java/migrate/util/ListFirstAndLast.java +++ b/src/main/java/org/openrewrite/java/migrate/util/ListFirstAndLast.java @@ -29,9 +29,10 @@ import org.openrewrite.java.tree.Space; import java.util.ArrayList; -import java.util.Collections; import java.util.List; +import static java.util.Collections.singletonList; + public class ListFirstAndLast extends Recipe { // While more SequencedCollections have `*First` and `*Last` methods, only list has `get`, `add`, and `remove` methods that take an index @@ -116,8 +117,8 @@ private static J.MethodInvocation getMethodInvocation(J.MethodInvocation mi, Str arguments.add(mi.getArguments().get(1).withPrefix(Space.EMPTY)); newMethodType = originalMethodType .withName(operation + firstOrLast) - .withParameterNames(Collections.singletonList(originalMethodType.getParameterNames().get(1))) - .withParameterTypes(Collections.singletonList(originalMethodType.getParameterTypes().get(1))); + .withParameterNames(singletonList(originalMethodType.getParameterNames().get(1))) + .withParameterTypes(singletonList(originalMethodType.getParameterTypes().get(1))); } else { newMethodType = originalMethodType .withName(operation + firstOrLast) diff --git a/src/main/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonList.java b/src/main/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonList.java index 26890125f7..ce27191e66 100644 --- a/src/main/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonList.java +++ b/src/main/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonList.java @@ -26,7 +26,7 @@ import org.openrewrite.java.tree.JavaType.ShallowClass; import org.openrewrite.java.tree.Space; -import java.util.Collections; +import static java.util.Collections.emptyList; public class MigrateCollectionsSingletonList extends Recipe { private static final MethodMatcher SINGLETON_LIST = new MethodMatcher("java.util.Collections singletonList(..)", true); @@ -61,7 +61,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu return m.withSelect(((J.Identifier) m.getSelect()).withSimpleName("List").withType(classType)); } return m.withSelect(new J.Identifier( - Tree.randomId(), m.getPrefix(), m.getMarkers(), Collections.emptyList(), "List", classType, null)) + Tree.randomId(), m.getPrefix(), m.getMarkers(), emptyList(), "List", classType, null)) .withPrefix(Space.EMPTY); } return m; diff --git a/src/main/java/org/openrewrite/java/migrate/util/ReplaceStreamCollectWithToList.java b/src/main/java/org/openrewrite/java/migrate/util/ReplaceStreamCollectWithToList.java index 67c1bef233..c6c2ff2ffb 100644 --- a/src/main/java/org/openrewrite/java/migrate/util/ReplaceStreamCollectWithToList.java +++ b/src/main/java/org/openrewrite/java/migrate/util/ReplaceStreamCollectWithToList.java @@ -31,10 +31,11 @@ import org.openrewrite.java.tree.TypeUtils; import java.time.Duration; -import java.util.Collections; import java.util.HashSet; import java.util.Set; +import static java.util.Collections.singletonList; + @EqualsAndHashCode(callSuper = false) @Value public class ReplaceStreamCollectWithToList extends Recipe { @@ -68,7 +69,7 @@ public Duration getEstimatedEffortPerOccurrence() { @Override public Set getTags() { - return new HashSet<>(Collections.singletonList("RSPEC-S6204")); + return new HashSet<>(singletonList("RSPEC-S6204")); } @Override diff --git a/src/test/java/org/openrewrite/java/migrate/joda/JodaTimeFlowSpecTest.java b/src/test/java/org/openrewrite/java/migrate/joda/JodaTimeFlowSpecTest.java index 78172503cb..66949495d1 100644 --- a/src/test/java/org/openrewrite/java/migrate/joda/JodaTimeFlowSpecTest.java +++ b/src/test/java/org/openrewrite/java/migrate/joda/JodaTimeFlowSpecTest.java @@ -34,8 +34,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; +import static java.util.stream.Collectors.joining; import static org.openrewrite.java.Assertions.java; import static org.openrewrite.test.RewriteTest.toRecipe; @@ -74,7 +74,7 @@ public Expression visitExpression(Expression expression, ExecutionContext ctx) { if (identifiers == null || identifiers.isEmpty()) { return expression; } - String desc = identifiers.stream().map(J.Identifier::getSimpleName).collect(Collectors.joining(", ")); + String desc = identifiers.stream().map(J.Identifier::getSimpleName).collect(joining(", ")); return SearchResult.found(expression, desc); }