Do not use nested recipes where visitors suffice (#837)

Author: timtebeek

src/main/java/org/openrewrite/java/spring/amqp/UseTlsAmqpConnectionString.java

@@ -54,20 +54,20 @@ public class UseTlsAmqpConnectionString extends Recipe {
     @Nullable
     String propertyKey;
 
-    @Option(displayName = "Old Port",
+    @Option(displayName = "Old port",
             description = "The non-TLS enabled port number to replace with the TLS-enabled port. " +
                     "If this value is specified, no changes will be made to amqp connection strings which do not contain this port number. ",
             example = "1234")
     @Nullable
     Integer oldPort;
 
-    @Option(displayName = "TLS Port",
+    @Option(displayName = "TLS port",
             description = "The TLS-enabled port to use.",
             example = "1234")
     @Nullable
     Integer port;
 
-    @Option(displayName = "TLS Property Key",
+    @Option(displayName = "TLS property key",
             description = "The Spring property key to enable default TLS mode against. " +
                     "If this value is specified, the specified property will be used when updating the default TLS mode, otherwise a default of " +
                     "`spring.rabbitmq.ssl.enabled` will be used instead.",
@@ -139,7 +139,7 @@ private boolean sourcePathMatches(Path sourcePath, ExecutionContext ctx) {
 
     @EqualsAndHashCode(callSuper = false)
     @Value
-    static class UseTlsAmqpConnectionStringYaml extends Recipe {
+    static class UseTlsAmqpConnectionStringYaml {
         String propertyKey;
 
         @Nullable
@@ -153,17 +153,6 @@ static class UseTlsAmqpConnectionStringYaml extends Recipe {
         @Nullable
         List<String> pathExpressions;
 
-        @Override
-        public String getDisplayName() {
-            return "Use TLS for AMQP connection strings";
-        }
-
-        @Override
-        public String getDescription() {
-            return "Use TLS for AMQP connection strings.";
-        }
-
-        @Override
         public TreeVisitor<?, ExecutionContext> getVisitor() {
             return Preconditions.check(new YamlVisitor<ExecutionContext>() {
                 @Override
@@ -225,7 +214,7 @@ public Yaml.Mapping.Entry visitMappingEntry(Yaml.Mapping.Entry entry, ExecutionC
                             }
 
                             if (updated) {
-                                e = e.withValue(((Yaml.Scalar) e.getValue()).withValue(join(connectionStrings, ",")));
+                                e = e.withValue(((Yaml.Scalar) e.getValue()).withValue(String.join(",", connectionStrings)));
                             }
                         } catch (URISyntaxException | IllegalArgumentException ignored) {
                             // do nothing
@@ -239,7 +228,7 @@ public Yaml.Mapping.Entry visitMappingEntry(Yaml.Mapping.Entry entry, ExecutionC
 
     @EqualsAndHashCode(callSuper = false)
     @Value
-    static class UseTlsAmqpConnectionStringProperties extends Recipe {
+    static class UseTlsAmqpConnectionStringProperties {
         String propertyKey;
 
         @Nullable
@@ -253,17 +242,6 @@ static class UseTlsAmqpConnectionStringProperties extends Recipe {
         @Nullable
         List<String> pathExpressions;
 
-        @Override
-        public String getDisplayName() {
-            return "Use TLS for AMQP connection strings";
-        }
-
-        @Override
-        public String getDescription() {
-            return "Use TLS for AMQP connection strings.";
-        }
-
-        @Override
         public TreeVisitor<?, ExecutionContext> getVisitor() {
             return Preconditions.check(new PropertiesVisitor<ExecutionContext>() {
                 @Override
@@ -323,7 +301,7 @@ public Properties.Entry visitEntry(Properties.Entry entry, ExecutionContext ctx)
                             }
 
                             if (updated) {
-                                e = e.withValue(e.getValue().withText(join(connectionStrings, ",")));
+                                e = e.withValue(e.getValue().withText(String.join(",", connectionStrings)));
                             }
                         } catch (URISyntaxException | IllegalArgumentException ignored) {
                             // do nothing
@@ -354,17 +332,4 @@ private static String maybeUpdateAmqpConnectionString(String amqpUrl, @Nullable
         }
         return updatedAmqpUrl;
     }
-
-    private static String join(String[] strings, String separator) {
-        if (strings.length == 0) {
-            return "";
-        }
-
-        StringBuilder builder = new StringBuilder();
-        int idx = 0;
-        while (idx < strings.length - 1) {
-            builder.append(strings[idx++]).append(separator);
-        }
-        return builder.append(strings[idx]).toString();
-    }
 }

src/main/java/org/openrewrite/java/spring/data/UseTlsJdbcConnectionString.java

@@ -48,15 +48,15 @@ public class UseTlsJdbcConnectionString extends Recipe {
     String propertyKey;
 
     @Option(
-            displayName = "Old Port",
+            displayName = "Old port",
             description = "The non-TLS enabled port number to replace with the TLS-enabled port. " +
                     "If this value is specified, no changes will be made to jdbc connection strings which do not contain this port number. ",
             example = "1234")
     @Nullable
     Integer oldPort;
 
     @Option(
-            displayName = "TLS Port",
+            displayName = "TLS port",
             description = "The TLS-enabled port to use.",
             example = "1234")
     @Nullable
@@ -111,7 +111,7 @@ public Tree preVisit(Tree tree, ExecutionContext ctx) {
 
     @EqualsAndHashCode(callSuper = false)
     @Value
-    static class UseTlsJdbcConnectionStringYaml extends Recipe {
+    static class UseTlsJdbcConnectionStringYaml {
         String propertyKey;
 
         @Nullable
@@ -123,16 +123,6 @@ static class UseTlsJdbcConnectionStringYaml extends Recipe {
         @Nullable
         String attribute;
 
-        @Override
-        public String getDisplayName() {
-            return "Use TLS for JDBC connection strings";
-        }
-
-        @Override
-        public String getDescription() {
-            return "Use TLS for JDBC connection strings.";
-        }
-
         private TreeVisitor<?, ExecutionContext> precondition() {
             return new YamlVisitor<ExecutionContext>() {
                 @Override
@@ -145,7 +135,6 @@ public Yaml visitDocuments(Yaml.Documents documents, ExecutionContext ctx) {
             };
         }
 
-        @Override
         public TreeVisitor<?, ExecutionContext> getVisitor() {
             return Preconditions.check(precondition(), new YamlIsoVisitor<ExecutionContext>() {
                 final JsonPathMatcher jdbcUrl = new JsonPathMatcher("$." + propertyKey);
@@ -178,7 +167,7 @@ public Yaml.Mapping.Entry visitMappingEntry(Yaml.Mapping.Entry entry, ExecutionC
 
     @EqualsAndHashCode(callSuper = false)
     @Value
-    static class UseTlsJdbcConnectionStringProperties extends Recipe {
+    static class UseTlsJdbcConnectionStringProperties {
         String propertyKey;
 
         @Nullable
@@ -190,16 +179,6 @@ static class UseTlsJdbcConnectionStringProperties extends Recipe {
         @Nullable
         String attribute;
 
-        @Override
-        public String getDisplayName() {
-            return "Use TLS for JDBC connection strings";
-        }
-
-        @Override
-        public String getDescription() {
-            return "Use TLS for JDBC connection strings.";
-        }
-
         private TreeVisitor<?, ExecutionContext> precondition() {
             return new PropertiesVisitor<ExecutionContext>() {
                 @Override
@@ -212,7 +191,6 @@ public Properties visitFile(Properties.File file, ExecutionContext ctx) {
             };
         }
 
-        @Override
         public TreeVisitor<?, ExecutionContext> getVisitor() {
             return Preconditions.check(precondition(), new PropertiesIsoVisitor<ExecutionContext>() {
                 @Override