Polish

Author: jkschneider

src/main/java/org/openrewrite/java/migrate/lang/MigrateClassNewInstanceToGetDeclaredConstructorNewInstance.java

@@ -57,9 +57,9 @@ protected NewInstanceToDeclaredConstructorVisitor getVisitor() {
     }
 
     private static class NewInstanceToDeclaredConstructorVisitor extends JavaIsoVisitor<ExecutionContext> {
+        private static final ChangeMethodName TO_DECLARED_CONS_NEW_INSTANCE = new ChangeMethodName("java.lang.Class newInstance()", "getDeclaredConstructor().newInstance", null, false);
         private final JavaType exType = JavaType.buildType("java.lang.Exception");
         private final JavaType thType = JavaType.buildType("java.lang.Throwable");
-        private static final ChangeMethodName TO_DECLARED_CONS_NEW_INSTANCE = new ChangeMethodName("java.lang.Class newInstance()", "getDeclaredConstructor().newInstance", null, false);
 
         @Override
         public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {

src/main/java/org/openrewrite/java/migrate/lang/MigrateCollectionsSingletonList.java

@@ -64,17 +64,17 @@ protected JavaVisitor<ExecutionContext> getVisitor() {
             public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
                 J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, executionContext);
                 if (SINGLETON_LIST.matches(method)) {
-                                maybeRemoveImport("java.util.Collections");
+                    maybeRemoveImport("java.util.Collections");
 
-                                return autoFormat(m.withTemplate(
-                                        JavaTemplate
-                                                .builder(this::getCursor, "List.of(#{any()})")
-                                                .imports("java.util.List")
-                                                .build(),
-                                        m.getCoordinates().replace(),
-                                        m.getArguments().get(0)
-                                ), executionContext);
-                            }
+                    return autoFormat(m.withTemplate(
+                            JavaTemplate
+                                    .builder(this::getCursor, "List.of(#{any()})")
+                                    .imports("java.util.List")
+                                    .build(),
+                            m.getCoordinates().replace(),
+                            m.getArguments().get(0)
+                    ), executionContext);
+                }
 
                 return m;
             }

src/main/java/org/openrewrite/java/migrate/lang/MigrateCollectionsSingletonMap.java

@@ -67,21 +67,21 @@ protected JavaVisitor<ExecutionContext> getVisitor() {
             public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
                 J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, executionContext);
                 if (SINGLETON_MAP.matches(method)) {
-                                maybeRemoveImport("java.util.Collections");
+                    maybeRemoveImport("java.util.Collections");
 
                     StringJoiner mapOf = new StringJoiner(", ", "Map.of(", ")");
                     List<Expression> args = m.getArguments();
                     args.forEach(o -> mapOf.add("#{any()}"));
 
-                                return autoFormat(m.withTemplate(
-                                        JavaTemplate
-                                                .builder(this::getCursor, mapOf.toString())
-                                                .imports("java.util.Map")
-                                                .build(),
-                                        m.getCoordinates().replace(),
-                                        m.getArguments().toArray()
-                                ), executionContext);
-                            }
+                    return autoFormat(m.withTemplate(
+                            JavaTemplate
+                                    .builder(this::getCursor, mapOf.toString())
+                                    .imports("java.util.Map")
+                                    .build(),
+                            m.getCoordinates().replace(),
+                            m.getArguments().toArray()
+                    ), executionContext);
+                }
 
                 return m;
             }

src/main/java/org/openrewrite/java/migrate/lang/MigrateCollectionsSingletonSet.java

@@ -23,13 +23,9 @@
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesJavaVersion;
 import org.openrewrite.java.search.UsesMethod;
-import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
 
 import java.time.Duration;
-import java.util.Collections;
-import java.util.List;
-import java.util.StringJoiner;
 
 public class MigrateCollectionsSingletonSet extends Recipe {
     private static final MethodMatcher SINGLETON_SET = new MethodMatcher("java.util.Collections singleton(..)", true);
@@ -68,17 +64,17 @@ protected JavaVisitor<ExecutionContext> getVisitor() {
             public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
                 J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, executionContext);
                 if (SINGLETON_SET.matches(method)) {
-                                maybeRemoveImport("java.util.Collections");
+                    maybeRemoveImport("java.util.Collections");
 
-                                return autoFormat(m.withTemplate(
-                                        JavaTemplate
-                                                .builder(this::getCursor, "Set.of(#{any()})")
-                                                .imports("java.util.Set")
-                                                .build(),
-                                        m.getCoordinates().replace(),
-                                        m.getArguments().get(0)
-                                ), executionContext);
-                            }
+                    return autoFormat(m.withTemplate(
+                            JavaTemplate
+                                    .builder(this::getCursor, "Set.of(#{any()})")
+                                    .imports("java.util.Set")
+                                    .build(),
+                            m.getCoordinates().replace(),
+                            m.getArguments().get(0)
+                    ), executionContext);
+                }
 
                 return m;
             }

src/test/kotlin/org/openrewrite/java/migrate/lang/MigrateCollectionsSingletonListTest.kt

@@ -20,7 +20,7 @@ import org.openrewrite.Issue
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaRecipeTest
 
-class MigrateCollectionsSingletonListTest: JavaRecipeTest {
+class MigrateCollectionsSingletonListTest : JavaRecipeTest {
     override val recipe: Recipe
         get() = MigrateCollectionsSingletonList()
 

src/test/kotlin/org/openrewrite/java/migrate/lang/MigrateCollectionsSingletonMapTest.kt

@@ -20,7 +20,7 @@ import org.openrewrite.Issue
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaRecipeTest
 
-class MigrateCollectionsSingletonMapTest: JavaRecipeTest {
+class MigrateCollectionsSingletonMapTest : JavaRecipeTest {
     override val recipe: Recipe
         get() = MigrateCollectionsSingletonMap()
 

src/test/kotlin/org/openrewrite/java/migrate/lang/MigrateCollectionsSingletonSetTest.kt

@@ -20,7 +20,7 @@ import org.openrewrite.Issue
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaRecipeTest
 
-class MigrateCollectionsSingletonSetTest: JavaRecipeTest {
+class MigrateCollectionsSingletonSetTest : JavaRecipeTest {
     override val recipe: Recipe
         get() = MigrateCollectionsSingletonSet()
 

src/test/kotlin/org/openrewrite/java/migrate/lang/MigrateCollectionsUnmodifiableListTest.kt

@@ -20,7 +20,7 @@ import org.openrewrite.Issue
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaRecipeTest
 
-class MigrateCollectionsUnmodifiableListTest: JavaRecipeTest {
+class MigrateCollectionsUnmodifiableListTest : JavaRecipeTest {
     override val recipe: Recipe
         get() = MigrateCollectionsUnmodifiableList()
 

src/test/kotlin/org/openrewrite/java/migrate/lang/MigrateCollectionsUnmodifiableSetTest.kt

@@ -20,7 +20,7 @@ import org.openrewrite.Issue
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaRecipeTest
 
-class MigrateCollectionsUnmodifiableSetTest: JavaRecipeTest {
+class MigrateCollectionsUnmodifiableSetTest : JavaRecipeTest {
     override val recipe: Recipe
         get() = MigrateCollectionsUnmodifiableSet()
 

src/test/kotlin/org/openrewrite/java/migrate/lang/UseMapOfTest.kt

@@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaRecipeTest
 
-class UseMapOfTest: JavaRecipeTest {
+class UseMapOfTest : JavaRecipeTest {
     override val recipe: Recipe
         get() = UseMapOf()