refactor: Spaces

Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.format.Spaces?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne <[email protected]>
openrewrite · Sep 26, 2023 · 23e0c1b · 23e0c1b
1 parent a7c3d5f
commit 23e0c1b
Show file tree

Hide file tree

Showing 25 changed files with 30 additions and 30 deletions.
diff --git a/src/main/java/org/openrewrite/java/spring/AddSpringProperty.java b/src/main/java/org/openrewrite/java/spring/AddSpringProperty.java
@@ -88,9 +88,9 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
 
             @Override
             public @Nullable Tree visit(@Nullable Tree t, ExecutionContext ctx) {
-                if (t instanceof Yaml.Documents && sourcePathMatches(((SourceFile)t).getSourcePath(), ctx)) {
+                if (t instanceof Yaml.Documents && sourcePathMatches(((SourceFile) t).getSourcePath(), ctx)) {
                     t = createMergeYamlVisitor().getVisitor().visit(t, ctx);
-                } else if (t instanceof Properties.File && sourcePathMatches(((SourceFile)t).getSourcePath(), ctx)) {
+                } else if (t instanceof Properties.File && sourcePathMatches(((SourceFile) t).getSourcePath(), ctx)) {
                     t = new AddProperty(property, value, null).getVisitor().visit(t, ctx);
                 }
                 return t;

diff --git a/src/main/java/org/openrewrite/java/spring/UpdateApiManifest.java b/src/main/java/org/openrewrite/java/spring/UpdateApiManifest.java
@@ -76,7 +76,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor(ApiManifest acc) {
         return Preconditions.check(!acc.isGenerate(), new PlainTextVisitor<ExecutionContext>() {
             @Override
             public PlainText visitText(PlainText text, ExecutionContext executionContext) {
-                if(text.getSourcePath().equals(Paths.get("META-INF/api-manifest.txt"))) {
+                if (text.getSourcePath().equals(Paths.get("META-INF/api-manifest.txt"))) {
                     return text.withText(generateManifest(acc.getApis()).getText());
                 }
                 return text;

diff --git a/src/main/java/org/openrewrite/java/spring/boot2/ConvertToSecurityDslVisitor.java b/src/main/java/org/openrewrite/java/spring/boot2/ConvertToSecurityDslVisitor.java
@@ -245,7 +245,7 @@ private J.MethodInvocation createDefaultsCall(JavaType type) {
         }
         maybeAddImport(methodType.getDeclaringType().getFullyQualifiedName(), methodType.getName());
         return new J.MethodInvocation(Tree.randomId(), Space.EMPTY, Markers.EMPTY, null, null,
-                new J.Identifier(Tree.randomId(), Space.EMPTY, Markers.EMPTY,  emptyList(),"withDefaults", null, null),
+                new J.Identifier(Tree.randomId(), Space.EMPTY, Markers.EMPTY, emptyList(), "withDefaults", null, null),
                 JContainer.empty(), methodType)
                 .withSelect(null);
     }

diff --git a/src/main/java/org/openrewrite/java/spring/boot2/OutputCaptureExtension.java b/src/main/java/org/openrewrite/java/spring/boot2/OutputCaptureExtension.java
@@ -175,7 +175,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                                 new J.VariableDeclarations.NamedVariable(Tree.randomId(),
                                         Space.format(" "),
                                         Markers.EMPTY,
-                                        new J.Identifier(Tree.randomId(), Space.EMPTY, Markers.EMPTY,  emptyList(), variableName, CAPTURED_OUTPUT_TYPE, null),
+                                        new J.Identifier(Tree.randomId(), Space.EMPTY, Markers.EMPTY, emptyList(), variableName, CAPTURED_OUTPUT_TYPE, null),
                                         emptyList(),
                                         null,
                                         null),

diff --git a/src/main/java/org/openrewrite/java/spring/boot2/search/EntityIdForRepositoryVisitor.java b/src/main/java/org/openrewrite/java/spring/boot2/search/EntityIdForRepositoryVisitor.java
@@ -79,7 +79,7 @@ private J.ClassDeclaration handleRepoType(J.ClassDeclaration typeDecl) {
                 int domainTypeIndex = 0;
                 int idTypeIndex = 1;
                 int idTypeIndexInChain = repoTypeChain.size() - 1;
-                for (int i = repoTypeChain.size() - 1; i >=0 && (idType == null || idType instanceof JavaType.GenericTypeVariable || domainType == null || domainType instanceof JavaType.GenericTypeVariable); i--) {
+                for (int i = repoTypeChain.size() - 1; i >= 0 && (idType == null || idType instanceof JavaType.GenericTypeVariable || domainType == null || domainType instanceof JavaType.GenericTypeVariable); i--) {
                     JavaType.FullyQualified repoType = repoTypeChain.get(i);
                     List<JavaType> typeParams = repoType.getTypeParameters();
                     boolean domainTypeChanged = false;

diff --git a/src/main/java/org/openrewrite/java/spring/security5/AuthorizeHttpRequests.java b/src/main/java/org/openrewrite/java/spring/security5/AuthorizeHttpRequests.java
@@ -53,7 +53,7 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaVisitor<ExecutionContext>() {
-            private void changeTypesAfterVisit(){
+            private void changeTypesAfterVisit() {
                 doAfterVisit(new ChangeType(
                         "org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry",
                         "org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry",

diff --git a/src/main/java/org/openrewrite/java/spring/security5/UpdateArgon2PasswordEncoder.java b/src/main/java/org/openrewrite/java/spring/security5/UpdateArgon2PasswordEncoder.java
@@ -100,7 +100,7 @@ && resolvedValueMatchesLiteral(hashLength, DEFAULT_V52_HASH_LENGTH)
                                     && resolvedValueMatchesLiteral(parallelism, DEFAULT_V52_PARALLELISM)
                                     && resolvedValueMatchesLiteral(memory, DEFAULT_V52_MEMORY)
                                     && resolvedValueMatchesLiteral(iterations, DEFAULT_V52_ITERATIONS)) {
-                                return newV52FactoryMethodTemplate(ctx).apply(getCursor(),newClass.getCoordinates().replace());
+                                return newV52FactoryMethodTemplate(ctx).apply(getCursor(), newClass.getCoordinates().replace());
                             }
                         }
                     }

diff --git a/src/test/java/org/openrewrite/java/spring/ChangeSpringPropertyKeyTest.java b/src/test/java/org/openrewrite/java/spring/ChangeSpringPropertyKeyTest.java
@@ -209,7 +209,7 @@ void loggingFileSubproperties() {
             logging.file.max-size=10MB
             logging.file.max-history=10
             logging.path=${user.home}/some-folder
-              ""","""
+              """, """
             logging.file.max-size=10MB
             logging.file.max-history=10
             logging.file.path=${user.home}/some-folder

diff --git a/src/test/java/org/openrewrite/java/spring/amqp/UseTlsAmqpConnectionStringTest.java b/src/test/java/org/openrewrite/java/spring/amqp/UseTlsAmqpConnectionStringTest.java
@@ -64,7 +64,7 @@ void useTls() {
     @Test
     void useTlsEmptyProperties() {
         rewriteRun(
-          spec ->  spec.recipe(new UseTlsAmqpConnectionString("", 5672, 5671, null, null)),
+          spec -> spec.recipe(new UseTlsAmqpConnectionString("", 5672, 5671, null, null)),
           yaml(
             """
               spring:

diff --git a/src/test/java/org/openrewrite/java/spring/internal/SpringBootReleases.java b/src/test/java/org/openrewrite/java/spring/internal/SpringBootReleases.java
@@ -46,7 +46,7 @@ public Stream<ModuleDownload> download(String version) {
                 "maven", "tests", "spring-boot-versions");
         HttpUrlConnectionSender httpSender = new HttpUrlConnectionSender();
 
-        HttpSender.Request request = HttpSender.Request.build((version.contains("-RC") ? milestoneRepositoryUrl :  repositoryUrl) + "/org/springframework/boot", httpSender)
+        HttpSender.Request request = HttpSender.Request.build((version.contains("-RC") ? milestoneRepositoryUrl : repositoryUrl) + "/org/springframework/boot", httpSender)
                 .withMethod(HttpSender.Method.GET)
                 .build();
 
@@ -71,20 +71,20 @@ public Stream<ModuleDownload> download(String version) {
                 return modules.stream()
                         .map(module -> {
                             HttpSender.Request moduleRequest = HttpSender.Request
-                                    .build((version.contains("-RC") ? milestoneRepositoryUrl :  repositoryUrl) + "/org/springframework/boot/" + module + "/" + version +
+                                    .build((version.contains("-RC") ? milestoneRepositoryUrl : repositoryUrl) + "/org/springframework/boot/" + module + "/" + version +
                                             "/" + module + "-" + version + ".jar", httpSender)
                                     .withMethod(HttpSender.Method.GET)
                                     .build();
 
-                            try(HttpSender.Response moduleResponse = httpSender.send(moduleRequest)) {
+                            try (HttpSender.Response moduleResponse = httpSender.send(moduleRequest)) {
                                 if (!moduleResponse.isSuccessful()) {
                                     if (moduleResponse.getCode() == 404) {
                                         return null;
                                     }
                                     throw new IOException("Unexpected code " + moduleResponse);
                                 }
                                 byte[] body = moduleResponse.getBodyAsBytes();
-                                if(body.length == 0) {
+                                if (body.length == 0) {
                                     return null;
                                 }
                                 return new ModuleDownload(module, body);

diff --git a/...1_5/java/org/openrewrite/java/spring/boot2/ReplaceDeprecatedEnvironmentTestUtilsTest.java b/...1_5/java/org/openrewrite/java/spring/boot2/ReplaceDeprecatedEnvironmentTestUtilsTest.java
@@ -29,7 +29,7 @@ class ReplaceDeprecatedEnvironmentTestUtilsTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec.recipe(new ReplaceDeprecatedEnvironmentTestUtils())
-          .parser(JavaParser.fromJavaVersion().classpath("spring-beans","spring-core","spring-context","spring-boot-test","spring-web"));
+          .parser(JavaParser.fromJavaVersion().classpath("spring-beans", "spring-core", "spring-context", "spring-boot-test", "spring-web"));
     }
 
     @DocumentExample

diff --git a/...ot_2_1/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapterTest.java b/...ot_2_1/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapterTest.java
@@ -49,7 +49,7 @@ public CustomMvcConfigurer(String someArg) {
                     this.someArg = someArg;
                 }
             }
-            ""","""
+            """, """
             package a.b.c;
             
             import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

diff --git a/src/testWithSpringBoot_2_3/java/org/openrewrite/java/spring/data/MigrateJpaSortTest.java b/src/testWithSpringBoot_2_3/java/org/openrewrite/java/spring/data/MigrateJpaSortTest.java
@@ -64,7 +64,7 @@ void test() {
         );
     }
 
-    @Disabled ("see an error: AST contains missing or invalid type information")
+    @Disabled("see an error: AST contains missing or invalid type information")
     @Test
     void constructorWithAttributeArray() {
         rewriteRun(

diff --git a/src/testWithSpringBoot_2_7/java/org/openrewrite/java/spring/http/ReplaceLiteralsTest.java b/src/testWithSpringBoot_2_7/java/org/openrewrite/java/spring/http/ReplaceLiteralsTest.java
@@ -56,7 +56,7 @@ Map<String, Object> foo() {
                         return Map.of("foo", "bar");
                     }
                 }
-                ""","""
+                """, """
                 import java.util.Map;
                 
                 import org.springframework.http.MediaType;
@@ -113,7 +113,7 @@ Map<String, Object> foo() {
                         return Map.of("foo", "bar");
                     }
                 }
-                ""","""
+                """, """
                 import java.util.Map;
                 
                 import org.springframework.http.MediaType;

diff --git a/...a/org/openrewrite/spring/security5/ReplaceGlobalMethodSecurityWithMethodSecurityTest.java b/...a/org/openrewrite/spring/security5/ReplaceGlobalMethodSecurityWithMethodSecurityTest.java
@@ -33,7 +33,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new ReplaceGlobalMethodSecurityWithMethodSecurity())
           .parser(JavaParser.fromJavaVersion()
             .logCompilationWarningsAndErrors(true)
-            .classpathFromResources(new InMemoryExecutionContext(),"spring-security-config-5.8.+"));
+            .classpathFromResources(new InMemoryExecutionContext(), "spring-security-config-5.8.+"));
     }
 
     @DocumentExample

diff --git a/...ngSecurity_5_7/java/org/openrewrite/spring/security5/UpdateArgon2PasswordEncoderTest.java b/...ngSecurity_5_7/java/org/openrewrite/spring/security5/UpdateArgon2PasswordEncoderTest.java
@@ -31,7 +31,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new UpdateArgon2PasswordEncoder())
                 .parser(JavaParser.fromJavaVersion()
                         .logCompilationWarningsAndErrors(true)
-                        .classpathFromResources(new InMemoryExecutionContext(),"spring-security-crypto-5.8.+"));
+                        .classpathFromResources(new InMemoryExecutionContext(), "spring-security-crypto-5.8.+"));
     }
 
     @DocumentExample

diff --git a/...ngSecurity_5_7/java/org/openrewrite/spring/security5/UpdatePbkdf2PasswordEncoderTest.java b/...ngSecurity_5_7/java/org/openrewrite/spring/security5/UpdatePbkdf2PasswordEncoderTest.java
@@ -31,7 +31,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new UpdatePbkdf2PasswordEncoder())
                 .parser(JavaParser.fromJavaVersion()
                         .logCompilationWarningsAndErrors(true)
-                        .classpathFromResources(new InMemoryExecutionContext(),"spring-security-crypto-5.8.+"));
+                        .classpathFromResources(new InMemoryExecutionContext(), "spring-security-crypto-5.8.+"));
     }
 
     @DocumentExample

diff --git a/...ngSecurity_5_7/java/org/openrewrite/spring/security5/UpdateSCryptPasswordEncoderTest.java b/...ngSecurity_5_7/java/org/openrewrite/spring/security5/UpdateSCryptPasswordEncoderTest.java
@@ -31,7 +31,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new UpdateSCryptPasswordEncoder())
                 .parser(JavaParser.fromJavaVersion()
                         .logCompilationWarningsAndErrors(true)
-                        .classpathFromResources(new InMemoryExecutionContext(),"spring-security-crypto-5.8.+"));
+                        .classpathFromResources(new InMemoryExecutionContext(), "spring-security-crypto-5.8.+"));
     }
 
     @DocumentExample

diff --git a/...hSpringSecurity_5_7/java/org/openrewrite/spring/security5/UseNewSecurityMatchersTest.java b/...hSpringSecurity_5_7/java/org/openrewrite/spring/security5/UseNewSecurityMatchersTest.java
@@ -124,7 +124,7 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) {
                     return http.build();
                 }
             }
-            ""","""
+            """, """
             package com.example.demo;
                         
             import org.springframework.context.annotation.Bean;

diff --git a/...8/java/org/openrewrite/spring/security5/PropagateAuthenticationServiceExceptionsTest.java b/...8/java/org/openrewrite/spring/security5/PropagateAuthenticationServiceExceptionsTest.java
@@ -31,7 +31,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new PropagateAuthenticationServiceExceptions())
                 .parser(JavaParser.fromJavaVersion()
                         .logCompilationWarningsAndErrors(true)
-                        .classpathFromResources(new InMemoryExecutionContext(),"spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+"));
+                        .classpathFromResources(new InMemoryExecutionContext(), "spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+"));
     }
 
     @DocumentExample

diff --git a/...a/org/openrewrite/spring/security5/RemoveFilterSecurityInterceptorOncePerRequestTest.java b/...a/org/openrewrite/spring/security5/RemoveFilterSecurityInterceptorOncePerRequestTest.java
@@ -32,7 +32,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new RemoveFilterSecurityInterceptorOncePerRequest())
           .parser(JavaParser.fromJavaVersion()
             .logCompilationWarningsAndErrors(true)
-            .classpathFromResources(new InMemoryExecutionContext(),"spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+"));
+            .classpathFromResources(new InMemoryExecutionContext(), "spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+"));
     }
 
     @DocumentExample

diff --git a/...SpringSecurity_5_8/java/org/openrewrite/spring/security5/RemoveOauth2LoginConfigTest.java b/...SpringSecurity_5_8/java/org/openrewrite/spring/security5/RemoveOauth2LoginConfigTest.java
@@ -31,7 +31,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new RemoveOauth2LoginConfig())
           .parser(JavaParser.fromJavaVersion()
             .logCompilationWarningsAndErrors(true)
-            .classpathFromResources(new InMemoryExecutionContext(),"spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+"));
+            .classpathFromResources(new InMemoryExecutionContext(), "spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+"));
     }
 
     @DocumentExample

diff --git a/...rg/openrewrite/spring/security5/RequireExplicitSavingOfSecurityContextRepositoryTest.java b/...rg/openrewrite/spring/security5/RequireExplicitSavingOfSecurityContextRepositoryTest.java
@@ -33,7 +33,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new RequireExplicitSavingOfSecurityContextRepository())
           .parser(JavaParser.fromJavaVersion()
             .logCompilationWarningsAndErrors(true)
-            .classpathFromResources(new InMemoryExecutionContext(),"spring-security-config-5.8.+", "spring-security-web-5.8.+"));
+            .classpathFromResources(new InMemoryExecutionContext(), "spring-security-config-5.8.+", "spring-security-web-5.8.+"));
     }
 
     @DocumentExample

diff --git a/...tWithSpringSecurity_5_8/java/org/openrewrite/spring/security5/UpdateRequestCacheTest.java b/...tWithSpringSecurity_5_8/java/org/openrewrite/spring/security5/UpdateRequestCacheTest.java
@@ -32,7 +32,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new UpdateRequestCache())
           .parser(JavaParser.fromJavaVersion()
             .logCompilationWarningsAndErrors(true)
-            .classpathFromResources(new InMemoryExecutionContext(),"spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+"));
+            .classpathFromResources(new InMemoryExecutionContext(), "spring-context-5.3.+", "spring-beans-5.3.+", "spring-web-5.3.+", "spring-security-web-5.8.+", "spring-security-config-5.8.+"));
     }
 
     @DocumentExample

diff --git a/...thSpringSecurity_5_8/java/org/openrewrite/spring/security5/UseSha256InRememberMeTest.java b/...thSpringSecurity_5_8/java/org/openrewrite/spring/security5/UseSha256InRememberMeTest.java
@@ -32,7 +32,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipe(new UseSha256InRememberMe())
           .parser(JavaParser.fromJavaVersion()
             .logCompilationWarningsAndErrors(true)
-            .classpathFromResources(new InMemoryExecutionContext(),"spring-beans-6.0.+", "spring-context-6.0.+", "spring-security-core-6.0.+", "spring-security-config-6.0.+", "spring-security-web-6.0.+"));
+            .classpathFromResources(new InMemoryExecutionContext(), "spring-beans-6.0.+", "spring-context-6.0.+", "spring-security-core-6.0.+", "spring-security-config-6.0.+", "spring-security-web-6.0.+"));
     }
 
     @DocumentExample