Removing JavaVisitor#template

jkschneider · jkschneider · commit 7db16817ed33 · 2021-06-25T11:47:00.000-07:00
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutor.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaDirectExecutor.java
@@ -45,7 +45,7 @@ protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaVisitor<ExecutionContext>() {
-            private final JavaTemplate template = template("Runnable::run")
+            private final JavaTemplate template = JavaTemplate.builder(this::getCursor, "Runnable::run")
                     .imports("java.lang.Runnable")
                     .build();
 
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayList.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewArrayList.java
@@ -56,15 +56,15 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaVisitor<ExecutionContext>() {
-            private final JavaTemplate newArrayList = template("new ArrayList<>()")
+            private final JavaTemplate newArrayList = JavaTemplate.builder(this::getCursor, "new ArrayList<>()")
                     .imports("java.util.ArrayList")
                     .build();
 
-            private final JavaTemplate newArrayListIterable = template("new ArrayList<>(#{any(java.lang.Iterable)})")
+            private final JavaTemplate newArrayListIterable = JavaTemplate.builder(this::getCursor, "new ArrayList<>(#{any(java.lang.Iterable)})")
                     .imports("java.util.ArrayList")
                     .build();
 
-            private final JavaTemplate newArrayListCapacity = template("new ArrayList<>(#{any(int)})")
+            private final JavaTemplate newArrayListCapacity = JavaTemplate.builder(this::getCursor, "new ArrayList<>(#{any(int)})")
                     .imports("java.util.ArrayList")
                     .build();
 
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayList.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewCopyOnWriteArrayList.java
@@ -54,11 +54,11 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaVisitor<ExecutionContext>() {
-            private final JavaTemplate newArrayList = template("new CopyOnWriteArrayList<>()")
+            private final JavaTemplate newArrayList = JavaTemplate.builder(this::getCursor, "new CopyOnWriteArrayList<>()")
                     .imports("java.util.concurrent.CopyOnWriteArrayList")
                     .build();
 
-            private final JavaTemplate newArrayListIterable = template("new CopyOnWriteArrayList<>(#{any(java.lang.Iterable)})")
+            private final JavaTemplate newArrayListIterable = JavaTemplate.builder(this::getCursor, "new CopyOnWriteArrayList<>(#{any(java.lang.Iterable)})")
                     .imports("java.util.concurrent.CopyOnWriteArrayList")
                     .build();
 
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedList.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaListsNewLinkedList.java
@@ -54,11 +54,11 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaVisitor<ExecutionContext>() {
-            private final JavaTemplate newLinkedList = template("new LinkedList<>()")
+            private final JavaTemplate newLinkedList = JavaTemplate.builder(this::getCursor, "new LinkedList<>()")
                     .imports("java.util.LinkedList")
                     .build();
 
-            private final JavaTemplate newLinkedListIterable = template("new LinkedList<>(#{any(java.lang.Iterable)})")
+            private final JavaTemplate newLinkedListIterable = JavaTemplate.builder(this::getCursor, "new LinkedList<>(#{any(java.lang.Iterable)})")
                     .imports("java.util.LinkedList")
                     .build();
 
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSet.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewConcurrentHashSet.java
@@ -45,7 +45,7 @@ protected TreeVisitor<?, ExecutionContext> getApplicableTest() {
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaVisitor<ExecutionContext>() {
-            private final JavaTemplate newConcurrentHashSet = template("Collections.newSetFromMap(new ConcurrentHashMap<>())")
+            private final JavaTemplate newConcurrentHashSet = JavaTemplate.builder(this::getCursor, "Collections.newSetFromMap(new ConcurrentHashMap<>())")
                     .imports("java.util.Collections")
                     .imports("java.util.concurrent.ConcurrentHashMap")
                     .build();
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSet.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewHashSet.java
@@ -18,7 +18,6 @@
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.MethodMatcher;
@@ -50,11 +49,11 @@ protected TreeVisitor<?, ExecutionContext> getApplicableTest() {
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaVisitor<ExecutionContext>() {
-            private final JavaTemplate newHashSet = template("new HashSet<>()")
+            private final JavaTemplate newHashSet = JavaTemplate.builder(this::getCursor, "new HashSet<>()")
                     .imports("java.util.HashSet")
                     .build();
 
-            private final JavaTemplate newHashSetIterable = template("new HashSet<>(#{any(java.lang.Iterable)})")
+            private final JavaTemplate newHashSetIterable = JavaTemplate.builder(this::getCursor, "new HashSet<>(#{any(java.lang.Iterable)})")
                     .imports("java.util.HashSet")
                     .build();
 
@@ -71,7 +70,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext execu
                                 method.getArguments().get(0));
                     } else {
                         maybeAddImport("java.util.Arrays");
-                        JavaTemplate newHashSetVarargs = template("new HashSet<>(Arrays.asList(" + method.getArguments().stream().map(a -> "#{any()}").collect(Collectors.joining(",")) + "))")
+                        JavaTemplate newHashSetVarargs = JavaTemplate.builder(this::getCursor, "new HashSet<>(Arrays.asList(" + method.getArguments().stream().map(a -> "#{any()}").collect(Collectors.joining(",")) + "))")
                                 .imports("java.util.Arrays")
                                 .imports("java.util.HashSet")
                                 .build();
diff --git a/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSet.java b/src/main/java/org/openrewrite/java/migrate/guava/NoGuavaSetsNewLinkedHashSet.java
@@ -56,15 +56,15 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaVisitor<ExecutionContext>() {
-            private final JavaTemplate newLinkedHashSet = template("new LinkedHashSet<>()")
+            private final JavaTemplate newLinkedHashSet = JavaTemplate.builder(this::getCursor, "new LinkedHashSet<>()")
                     .imports("java.util.LinkedHashSet")
                     .build();
 
-            private final JavaTemplate newLinkedHashSetIterable = template("new LinkedHashSet<>(#{any(java.lang.Iterable)})")
+            private final JavaTemplate newLinkedHashSetIterable = JavaTemplate.builder(this::getCursor, "new LinkedHashSet<>(#{any(java.lang.Iterable)})")
                     .imports("java.util.LinkedHashSet")
                     .build();
 
-            private final JavaTemplate newLinkedHashSetCapacity = template("new LinkedHashSet<>(#{any(int)})")
+            private final JavaTemplate newLinkedHashSetCapacity = JavaTemplate.builder(this::getCursor, "new LinkedHashSet<>(#{any(int)})")
                     .imports("java.util.LinkedHashSet")
                     .build();
 
diff --git a/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassLoaderDefineClass.java b/src/main/java/org/openrewrite/java/migrate/lang/MigrateClassLoaderDefineClass.java
@@ -39,7 +39,7 @@ public String getDescription() {
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaIsoVisitor<ExecutionContext>() {
-            final JavaTemplate template = template("null, #{anyArray(byte)}, #{any(int)}, #{any(int)}")
+            final JavaTemplate template = JavaTemplate.builder(this::getCursor, "null, #{anyArray(byte)}, #{any(int)}, #{any(int)}")
                     .build();
 
             @Override
diff --git a/src/main/java/org/openrewrite/java/migrate/logging/MigrateGetLoggingMXBeanToGetPlatformMXBean.java b/src/main/java/org/openrewrite/java/migrate/logging/MigrateGetLoggingMXBeanToGetPlatformMXBean.java
@@ -19,6 +19,7 @@
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.tree.J;
@@ -52,7 +53,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             J.MethodInvocation m = method;
             if (MATCHER.matches(m)) {
                 m = m.withTemplate(
-                        template("ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class)")
+                        JavaTemplate.builder(this::getCursor, "ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class)")
                                 .imports("java.lang.management.ManagementFactory", "java.lang.management.PlatformLoggingMXBean")
                                 .build(),
                         m.getCoordinates().replace()
diff --git a/src/main/java/org/openrewrite/java/migrate/logging/MigrateLogRecordSetMillisToSetInstant.java b/src/main/java/org/openrewrite/java/migrate/logging/MigrateLogRecordSetMillisToSetInstant.java
@@ -19,6 +19,7 @@
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.tree.J;
@@ -52,7 +53,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             J.MethodInvocation m = method;
             if (MATCHER.matches(m)) {
                 m = m.withName(m.getName().withName("setInstant")).withTemplate(
-                        template("Instant.ofEpochMilli(#{any(long)})")
+                        JavaTemplate.builder(this::getCursor, "Instant.ofEpochMilli(#{any(long)})")
                                 .imports("java.time.Instant")
                                 .build(),
                         m.getCoordinates().replaceArguments(),
diff --git a/src/main/java/org/openrewrite/java/migrate/logging/MigrateLoggerLogrbToUseResourceBundle.java b/src/main/java/org/openrewrite/java/migrate/logging/MigrateLoggerLogrbToUseResourceBundle.java
@@ -19,6 +19,7 @@
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.tree.J;
@@ -52,7 +53,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             J.MethodInvocation m = method;
             if (MATCHER.matches(m)) {
                 m = m.withTemplate(
-                        template("#{any(java.util.logging.Level)}, #{any(String)}, #{any(String)}, ResourceBundle.getBundle(#{any(String)}), #{any(String)}" + (m.getArguments().size() == 6 ? ", #{any()}" : ""))
+                        JavaTemplate.builder(this::getCursor, "#{any(java.util.logging.Level)}, #{any(String)}, #{any(String)}, ResourceBundle.getBundle(#{any(String)}), #{any(String)}" + (m.getArguments().size() == 6 ? ", #{any()}" : ""))
                                 .imports("java.util.ResourceBundle")
                                 .build(),
                         m.getCoordinates().replaceArguments(),
diff --git a/src/main/java/org/openrewrite/java/migrate/net/MigrateMulticastSocketSetTTLToSetTimeToLive.java b/src/main/java/org/openrewrite/java/migrate/net/MigrateMulticastSocketSetTTLToSetTimeToLive.java
@@ -19,6 +19,7 @@
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.tree.J;
@@ -53,7 +54,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             if (MATCHER.matches(m)) {
                 m = m.withName(m.getName().withName("setTimeToLive"))
                         .withTemplate(
-                                template("Byte.valueOf(#{any(byte)}).intValue()").build(),
+                                JavaTemplate.builder(this::getCursor, "Byte.valueOf(#{any(byte)}).intValue()").build(),
                                 m.getCoordinates().replaceArguments(),
                                 m.getArguments().get(0)
                         );
diff --git a/src/main/java/org/openrewrite/java/migrate/net/MigrateURLDecoderDecode.java b/src/main/java/org/openrewrite/java/migrate/net/MigrateURLDecoderDecode.java
@@ -20,6 +20,7 @@
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.AddImport;
 import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.tree.J;
@@ -53,7 +54,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             J.MethodInvocation m = method;
             if (MATCHER.matches(m)) {
                 m = m.withTemplate(
-                        template("#{any(String)}, StandardCharsets.UTF_8")
+                        JavaTemplate.builder(this::getCursor, "#{any(String)}, StandardCharsets.UTF_8")
                                 .imports("java.nio.charset.StandardCharsets")
                                 .build(),
                         m.getCoordinates().replaceArguments(),
diff --git a/src/main/java/org/openrewrite/java/migrate/net/MigrateURLEncoderEncode.java b/src/main/java/org/openrewrite/java/migrate/net/MigrateURLEncoderEncode.java
@@ -20,6 +20,7 @@
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.AddImport;
 import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.tree.J;
@@ -53,7 +54,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             J.MethodInvocation m = method;
             if (MATCHER.matches(m)) {
                 m = m.withTemplate(
-                        template("#{any(String)}, StandardCharsets.UTF_8")
+                        JavaTemplate.builder(this::getCursor, "#{any(String)}, StandardCharsets.UTF_8")
                                 .imports("java.nio.charset.StandardCharsets")
                                 .build(),
                         m.getCoordinates().replaceArguments(),
@@ -66,5 +67,4 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             return super.visitMethodInvocation(m, ctx);
         }
     }
-
 }
diff --git a/src/main/java/org/openrewrite/java/migrate/sql/MigrateDriverManagerSetLogStream.java b/src/main/java/org/openrewrite/java/migrate/sql/MigrateDriverManagerSetLogStream.java
@@ -39,7 +39,7 @@ public String getDescription() {
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaIsoVisitor<ExecutionContext>() {
-            final JavaTemplate template = template("new java.io.PrintWriter(#{any(java.io.PrintStream)})")
+            final JavaTemplate template = JavaTemplate.builder(this::getCursor, "new java.io.PrintWriter(#{any(java.io.PrintStream)})")
                     .build();
 
             @Override
diff --git a/src/test/kotlin/org/openrewrite/java/migrate/javax/AddJaxbDependenciesTest.kt b/src/test/kotlin/org/openrewrite/java/migrate/javax/AddJaxbDependenciesTest.kt
@@ -16,7 +16,7 @@
 package org.openrewrite.java.migrate.javax
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.*
+import org.openrewrite.Recipe
 import org.openrewrite.config.Environment
 import org.openrewrite.maven.MavenRecipeTest
 
diff --git a/src/test/kotlin/org/openrewrite/java/migrate/javax/AddJaxwsDependenciesTest.kt b/src/test/kotlin/org/openrewrite/java/migrate/javax/AddJaxwsDependenciesTest.kt
@@ -16,7 +16,7 @@
 package org.openrewrite.java.migrate.javax
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.*
+import org.openrewrite.Recipe
 import org.openrewrite.config.Environment
 import org.openrewrite.maven.MavenRecipeTest
 
