From 67815f7982607e71340ed12f172dfaa755deeb4a Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Fri, 8 Dec 2023 20:16:45 +0000 Subject: [PATCH] refactor: OpenRewrite recipe best practices Use this link to re-run the recipe: https://app.moderne.io/recipes/builder/XX1hrwagC?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne --- .../httpclient4/MigrateDefaultHttpClient.java | 4 +- .../httpclient5/AddTimeUnitArgument.java | 4 +- .../spring/ImplicitWebAnnotationNames.java | 4 +- .../openrewrite/java/spring/RenameBean.java | 16 ++-- .../java/spring/UpdateApiManifest.java | 2 +- .../spring/batch/MigrateItemWriterWrite.java | 12 +-- .../batch/RemoveDefaultBatchConfigurer.java | 8 +- .../spring/security6/UpdateRequestCache.java | 8 +- .../httpclient4/CookieConstantsTest.java | 44 ++++----- .../MigrateDefaultHttpClientTest.java | 54 +++++------ .../httpclient5/AddTimeUnitArgumentTest.java | 78 +++++++-------- .../httpclient5/CookieConstantsTest.java | 32 +++---- .../UpgradeApacheHttpClient5Test.java | 94 ++++++++++--------- .../MigrateWebMvcConfigurerAdapterTest.java | 3 +- .../EntityIdForRepositoryVisitorTest.java | 42 +++++---- .../batch/MigrateItemWriterWriteTest.java | 30 ++++-- .../batch/MigrateJobBuilderFactoryTest.java | 12 ++- .../RemoveDefaultBatchConfigurerTest.java | 18 ++-- ...placeSupportClassWithItsInterfaceTest.java | 15 ++- .../security5/UseNewSecurityMatchersTest.java | 3 +- 20 files changed, 264 insertions(+), 219 deletions(-) diff --git a/src/main/java/org/openrewrite/java/apache/httpclient4/MigrateDefaultHttpClient.java b/src/main/java/org/openrewrite/java/apache/httpclient4/MigrateDefaultHttpClient.java index e33c940a9..0351196d6 100644 --- a/src/main/java/org/openrewrite/java/apache/httpclient4/MigrateDefaultHttpClient.java +++ b/src/main/java/org/openrewrite/java/apache/httpclient4/MigrateDefaultHttpClient.java @@ -45,7 +45,7 @@ public TreeVisitor getVisitor() { .build(); @Override - public J visitNewClass(J.NewClass newClass, ExecutionContext executionContext) { + public J visitNewClass(J.NewClass newClass, ExecutionContext ctx) { if (noArgsMatcher.matches(newClass.getConstructorType())) { maybeAddImport("org.apache.http.impl.client.HttpClients"); doAfterVisit(new ChangeType( @@ -54,7 +54,7 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext executionContext) { ).getVisitor()); return noArgsTemplate.apply(getCursor(), newClass.getCoordinates().replace()); } - return super.visitNewClass(newClass, executionContext); + return super.visitNewClass(newClass, ctx); } }); } diff --git a/src/main/java/org/openrewrite/java/apache/httpclient5/AddTimeUnitArgument.java b/src/main/java/org/openrewrite/java/apache/httpclient5/AddTimeUnitArgument.java index ec1f082ab..5d168f013 100644 --- a/src/main/java/org/openrewrite/java/apache/httpclient5/AddTimeUnitArgument.java +++ b/src/main/java/org/openrewrite/java/apache/httpclient5/AddTimeUnitArgument.java @@ -71,8 +71,8 @@ public TreeVisitor getVisitor() { final MethodMatcher matcher = new MethodMatcher(methodPattern); @Override - public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) { - J.MethodInvocation m = super.visitMethodInvocation(method, executionContext); + public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) { + J.MethodInvocation m = super.visitMethodInvocation(method, ctx); if (matcher.matches(m)) { JavaTemplate template = JavaTemplate .builder(StringUtils.repeat("#{any()}, ", m.getArguments().size()) + "TimeUnit.#{}") diff --git a/src/main/java/org/openrewrite/java/spring/ImplicitWebAnnotationNames.java b/src/main/java/org/openrewrite/java/spring/ImplicitWebAnnotationNames.java index db0cc6172..c1d20d2ad 100644 --- a/src/main/java/org/openrewrite/java/spring/ImplicitWebAnnotationNames.java +++ b/src/main/java/org/openrewrite/java/spring/ImplicitWebAnnotationNames.java @@ -65,8 +65,8 @@ private static class ImplicitWebAnnotationNamesVisitor extends JavaIsoVisitor getVisitor() { return Preconditions.check(precondition(), new JavaIsoVisitor() { @Override public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, - ExecutionContext executionContext) { - J.MethodDeclaration m = super.visitMethodDeclaration(method, executionContext); + ExecutionContext ctx) { + J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx); // handle bean declarations if (m.getMethodType() != null && isRelevantType(m.getMethodType().getReturnType())) { @@ -232,8 +232,8 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, @Override public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, - ExecutionContext executionContext) { - J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, executionContext); + ExecutionContext ctx) { + J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx); // handle bean declarations if (cd.getType() != null && isRelevantType(cd.getType())) { @@ -330,8 +330,8 @@ private TreeVisitor renameBeanAnnotationValue(J.Annotation J.Assignment beanNameAssignment) { return new JavaIsoVisitor() { @Override - public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext executionContext) { - J.Annotation a = super.visitAnnotation(annotation, executionContext); + public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ctx) { + J.Annotation a = super.visitAnnotation(annotation, ctx); if (a == beanAnnotation) { a = a.withArguments(ListUtils.map(a.getArguments(), arg -> { if (arg == beanNameAssignment) { @@ -349,8 +349,8 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ex private TreeVisitor renameBeanAnnotationValue(J.Annotation beanAnnotation) { return new JavaIsoVisitor() { @Override - public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext executionContext) { - J.Annotation a = super.visitAnnotation(annotation, executionContext); + public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ctx) { + J.Annotation a = super.visitAnnotation(annotation, ctx); if (a == beanAnnotation) { a = a.withArguments(ListUtils.map(a.getArguments(), arg -> replace(arg, oldName, newName))); } diff --git a/src/main/java/org/openrewrite/java/spring/UpdateApiManifest.java b/src/main/java/org/openrewrite/java/spring/UpdateApiManifest.java index 5ea953f85..73440e318 100644 --- a/src/main/java/org/openrewrite/java/spring/UpdateApiManifest.java +++ b/src/main/java/org/openrewrite/java/spring/UpdateApiManifest.java @@ -75,7 +75,7 @@ public Collection generate(ApiManifest acc, ExecutionContext ctx) { public TreeVisitor getVisitor(ApiManifest acc) { return Preconditions.check(!acc.isGenerate(), new PlainTextVisitor() { @Override - public PlainText visitText(PlainText text, ExecutionContext executionContext) { + public PlainText visitText(PlainText text, ExecutionContext ctx) { if (text.getSourcePath().equals(Paths.get("META-INF/api-manifest.txt"))) { return text.withText(generateManifest(acc.getApis()).getText()); } diff --git a/src/main/java/org/openrewrite/java/spring/batch/MigrateItemWriterWrite.java b/src/main/java/org/openrewrite/java/spring/batch/MigrateItemWriterWrite.java index d44c4179e..bcdf4fea1 100644 --- a/src/main/java/org/openrewrite/java/spring/batch/MigrateItemWriterWrite.java +++ b/src/main/java/org/openrewrite/java/spring/batch/MigrateItemWriterWrite.java @@ -120,8 +120,8 @@ public UpdateListMethodInvocations(String parameterName) { private static final MethodMatcher LIST_MATCHER = new MethodMatcher("java.util.List *(..)", true); @Override - public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) { - J.MethodInvocation mi = super.visitMethodInvocation(method, executionContext); + public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) { + J.MethodInvocation mi = super.visitMethodInvocation(method, ctx); if (LIST_MATCHER.matches(mi) && isParameter(mi.getSelect())) { assert mi.getPadding().getSelect() != null; // No need to take care of typing here, since it's going to be printed and parsed on the JavaTemplate later on. @@ -149,8 +149,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu } @Override - public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable variable, ExecutionContext executionContext) { - J.VariableDeclarations.NamedVariable var = super.visitVariable(variable, executionContext); + public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable variable, ExecutionContext ctx) { + J.VariableDeclarations.NamedVariable var = super.visitVariable(variable, ctx); if (notAssignableFromChunk(var) && isParameter(var.getInitializer())) { var = var.withInitializer(newGetItemsMethodInvocation( @@ -161,8 +161,8 @@ public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations } @Override - public J.Assignment visitAssignment(J.Assignment assignment, ExecutionContext executionContext) { - J.Assignment a = super.visitAssignment(assignment, executionContext); + public J.Assignment visitAssignment(J.Assignment assignment, ExecutionContext ctx) { + J.Assignment a = super.visitAssignment(assignment, ctx); if (notAssignableFromChunk(a.getVariable().getType()) && isParameter(a.getAssignment())) { a = a.withAssignment(newGetItemsMethodInvocation( new JRightPadded<>(a.getAssignment(), Space.EMPTY, Markers.EMPTY) diff --git a/src/main/java/org/openrewrite/java/spring/batch/RemoveDefaultBatchConfigurer.java b/src/main/java/org/openrewrite/java/spring/batch/RemoveDefaultBatchConfigurer.java index 7d59cb2b5..9c5d8a2b5 100644 --- a/src/main/java/org/openrewrite/java/spring/batch/RemoveDefaultBatchConfigurer.java +++ b/src/main/java/org/openrewrite/java/spring/batch/RemoveDefaultBatchConfigurer.java @@ -54,8 +54,8 @@ public TreeVisitor getVisitor() { static final class RemoveDefaultBatchConfigurerVisitor extends JavaIsoVisitor { @Override - public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext executionContext) { - J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, executionContext); + public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) { + J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx); if (TypeUtils.isAssignableTo(DEFAULT_BATCH_CONFIGURER, cd.getType())) { // Strip extends DefaultBatchConfigurer maybeRemoveImport(DEFAULT_BATCH_CONFIGURER); @@ -65,8 +65,8 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex } @Override - public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) { - J.MethodDeclaration md = super.visitMethodDeclaration(method, executionContext); + public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) { + J.MethodDeclaration md = super.visitMethodDeclaration(method, ctx); if (overridesDefaultBatchConfigurerMethod(md) || callsDefaultBatchConfigurerSuperConstructor(md)) { // Strip @Override md = md.withLeadingAnnotations(ListUtils.map(md.getLeadingAnnotations(), diff --git a/src/main/java/org/openrewrite/java/spring/security6/UpdateRequestCache.java b/src/main/java/org/openrewrite/java/spring/security6/UpdateRequestCache.java index 87d8d3e88..1f324038d 100644 --- a/src/main/java/org/openrewrite/java/spring/security6/UpdateRequestCache.java +++ b/src/main/java/org/openrewrite/java/spring/security6/UpdateRequestCache.java @@ -60,8 +60,8 @@ public TreeVisitor getVisitor() { return Preconditions.check(new UsesMethod<>(REQUEST_CACHE_MATCHER), new JavaIsoVisitor() { @Override - public J.Block visitBlock(J.Block block, ExecutionContext executionContext) { - block = super.visitBlock(block, executionContext); + public J.Block visitBlock(J.Block block, ExecutionContext ctx) { + block = super.visitBlock(block, ctx); List statements = block.getStatements(); boolean hasContinueParameterStatement = findContinueParameterStatement(statements); @@ -94,7 +94,7 @@ public J.Block visitBlock(J.Block block, ExecutionContext executionContext) { @Override public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, - ExecutionContext executionContext) { + ExecutionContext ctx) { if (REQUEST_CACHE_MATCHER.matches(method)) { Expression arg = method.getArguments().get(0); if (isNewHttpSessionRequestCacheExpression(arg)) { @@ -115,7 +115,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, return method; } - return super.visitMethodInvocation(method, executionContext); + return super.visitMethodInvocation(method, ctx); } }); } diff --git a/src/test/java/org/openrewrite/java/apache/httpclient4/CookieConstantsTest.java b/src/test/java/org/openrewrite/java/apache/httpclient4/CookieConstantsTest.java index 0f7675f34..16f052989 100644 --- a/src/test/java/org/openrewrite/java/apache/httpclient4/CookieConstantsTest.java +++ b/src/test/java/org/openrewrite/java/apache/httpclient4/CookieConstantsTest.java @@ -41,31 +41,31 @@ void testCookieConstantsMapping() { //language=java java( """ - import org.apache.http.client.params.CookiePolicy; - - class A { - void method() { - String c1 = CookiePolicy.BROWSER_COMPATIBILITY; - String c2 = CookiePolicy.NETSCAPE; - String c3 = CookiePolicy.RFC_2109; - String c4 = CookiePolicy.RFC_2965; - String c5 = CookiePolicy.BEST_MATCH; - String c6 = CookiePolicy.IGNORE_COOKIES; - } + import org.apache.http.client.params.CookiePolicy; + + class A { + void method() { + String c1 = CookiePolicy.BROWSER_COMPATIBILITY; + String c2 = CookiePolicy.NETSCAPE; + String c3 = CookiePolicy.RFC_2109; + String c4 = CookiePolicy.RFC_2965; + String c5 = CookiePolicy.BEST_MATCH; + String c6 = CookiePolicy.IGNORE_COOKIES; } + } """, """ - import org.apache.http.client.config.CookieSpecs; - - class A { - void method() { - String c1 = CookieSpecs.BROWSER_COMPATIBILITY; - String c2 = CookieSpecs.NETSCAPE; - String c3 = CookieSpecs.STANDARD; - String c4 = CookieSpecs.STANDARD_STRICT; - String c5 = CookieSpecs.BEST_MATCH; - String c6 = CookieSpecs.IGNORE_COOKIES; - } + import org.apache.http.client.config.CookieSpecs; + + class A { + void method() { + String c1 = CookieSpecs.BROWSER_COMPATIBILITY; + String c2 = CookieSpecs.NETSCAPE; + String c3 = CookieSpecs.STANDARD; + String c4 = CookieSpecs.STANDARD_STRICT; + String c5 = CookieSpecs.BEST_MATCH; + String c6 = CookieSpecs.IGNORE_COOKIES; } + } """ ) ); diff --git a/src/test/java/org/openrewrite/java/apache/httpclient4/MigrateDefaultHttpClientTest.java b/src/test/java/org/openrewrite/java/apache/httpclient4/MigrateDefaultHttpClientTest.java index ca2cbad97..dc4fbad33 100644 --- a/src/test/java/org/openrewrite/java/apache/httpclient4/MigrateDefaultHttpClientTest.java +++ b/src/test/java/org/openrewrite/java/apache/httpclient4/MigrateDefaultHttpClientTest.java @@ -37,34 +37,34 @@ void noArgsDefaultHttpClient() { //language=java java( """ - import org.apache.http.HttpResponse; - import org.apache.http.client.methods.HttpPost; - import org.apache.http.impl.client.DefaultHttpClient; - - import java.io.IOException; - - class A { - void method() throws IOException { - DefaultHttpClient httpClient = new DefaultHttpClient(); - HttpPost httpPost = new HttpPost("https://moderne.io"); - HttpResponse httpResponse = httpClient.execute(httpPost); - } - } + import org.apache.http.HttpResponse; + import org.apache.http.client.methods.HttpPost; + import org.apache.http.impl.client.DefaultHttpClient; + + import java.io.IOException; + + class A { + void method() throws IOException { + DefaultHttpClient httpClient = new DefaultHttpClient(); + HttpPost httpPost = new HttpPost("https://moderne.io"); + HttpResponse httpResponse = httpClient.execute(httpPost); + } + } """, """ - import org.apache.http.HttpResponse; - import org.apache.http.client.methods.HttpPost; - import org.apache.http.impl.client.CloseableHttpClient; - import org.apache.http.impl.client.HttpClients; - - import java.io.IOException; - - class A { - void method() throws IOException { - CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost("https://moderne.io"); - HttpResponse httpResponse = httpClient.execute(httpPost); - } - } + import org.apache.http.HttpResponse; + import org.apache.http.client.methods.HttpPost; + import org.apache.http.impl.client.CloseableHttpClient; + import org.apache.http.impl.client.HttpClients; + + import java.io.IOException; + + class A { + void method() throws IOException { + CloseableHttpClient httpClient = HttpClients.createDefault(); + HttpPost httpPost = new HttpPost("https://moderne.io"); + HttpResponse httpResponse = httpClient.execute(httpPost); + } + } """ ) ); diff --git a/src/test/java/org/openrewrite/java/apache/httpclient5/AddTimeUnitArgumentTest.java b/src/test/java/org/openrewrite/java/apache/httpclient5/AddTimeUnitArgumentTest.java index 91d6df699..4a38fc06a 100644 --- a/src/test/java/org/openrewrite/java/apache/httpclient5/AddTimeUnitArgumentTest.java +++ b/src/test/java/org/openrewrite/java/apache/httpclient5/AddTimeUnitArgumentTest.java @@ -25,40 +25,41 @@ public class AddTimeUnitArgumentTest implements RewriteTest { //language=java - private static final SourceSpecs stubCode = java(""" - import java.util.concurrent.TimeUnit; - - class A { - private long value; - private float foo; - private TimeUnit timeunit; - - A method(int value) { - this.value = value; - this.timeunit = TimeUnit.MILLISECONDS; - return this; - } - - A method(long value, TimeUnit timeunit) { - this.value = value; - this.timeunit = timeunit; - return this; - } - - A method(int value, float foo) { - this.value = value; - this.foo = foo; - this.timeunit = TimeUnit.MILLISECONDS; - return this; - } - - A method(long value, float foo, TimeUnit timeunit) { - this.value = value; - this.foo = foo; - this.timeunit = timeunit; - return this; - } - } + private static final SourceSpecs stubCode = java( + """ + import java.util.concurrent.TimeUnit; + + class A { + private long value; + private float foo; + private TimeUnit timeunit; + + A method(int value) { + this.value = value; + this.timeunit = TimeUnit.MILLISECONDS; + return this; + } + + A method(long value, TimeUnit timeunit) { + this.value = value; + this.timeunit = timeunit; + return this; + } + + A method(int value, float foo) { + this.value = value; + this.foo = foo; + this.timeunit = TimeUnit.MILLISECONDS; + return this; + } + + A method(long value, float foo, TimeUnit timeunit) { + this.value = value; + this.foo = foo; + this.timeunit = timeunit; + return this; + } + } """); @Test @@ -67,7 +68,8 @@ void addTimeUnitDefaultMilliseconds() { spec -> spec.recipe(new AddTimeUnitArgument("A method(int)", null)), stubCode, //language=java - java(""" + java( + """ class B { void test() { A a = new A(); @@ -93,7 +95,8 @@ void addTimeUnitSpecificTimeUnit() { spec -> spec.recipe(new AddTimeUnitArgument("A method(int)", TimeUnit.SECONDS)), stubCode, //language=java - java(""" + java( + """ class B { void test() { A a = new A(); @@ -120,7 +123,8 @@ void doesModifyMethodsWithMoreThanOneArgument() { //language=java stubCode, //language=java - java(""" + java( + """ class B { void test() { A a = new A(); diff --git a/src/test/java/org/openrewrite/java/apache/httpclient5/CookieConstantsTest.java b/src/test/java/org/openrewrite/java/apache/httpclient5/CookieConstantsTest.java index de2165146..64c3147b8 100644 --- a/src/test/java/org/openrewrite/java/apache/httpclient5/CookieConstantsTest.java +++ b/src/test/java/org/openrewrite/java/apache/httpclient5/CookieConstantsTest.java @@ -41,25 +41,25 @@ void testCookieConstantsMapping() { //language=java java( """ - import org.apache.http.client.config.CookieSpecs; - - class A { - void method() { - String c1 = CookieSpecs.IGNORE_COOKIES; - String c2 = CookieSpecs.STANDARD; - String c3 = CookieSpecs.STANDARD_STRICT; - } + import org.apache.http.client.config.CookieSpecs; + + class A { + void method() { + String c1 = CookieSpecs.IGNORE_COOKIES; + String c2 = CookieSpecs.STANDARD; + String c3 = CookieSpecs.STANDARD_STRICT; } + } """, """ - import org.apache.hc.client5.http.cookie.StandardCookieSpec; - - class A { - void method() { - String c1 = StandardCookieSpec.IGNORE; - String c2 = StandardCookieSpec.RELAXED; - String c3 = StandardCookieSpec.STRICT; - } + import org.apache.hc.client5.http.cookie.StandardCookieSpec; + + class A { + void method() { + String c1 = StandardCookieSpec.IGNORE; + String c2 = StandardCookieSpec.RELAXED; + String c3 = StandardCookieSpec.STRICT; } + } """ ) ); diff --git a/src/test/java/org/openrewrite/java/apache/httpclient5/UpgradeApacheHttpClient5Test.java b/src/test/java/org/openrewrite/java/apache/httpclient5/UpgradeApacheHttpClient5Test.java index 69a062bd3..6cdba7cdf 100644 --- a/src/test/java/org/openrewrite/java/apache/httpclient5/UpgradeApacheHttpClient5Test.java +++ b/src/test/java/org/openrewrite/java/apache/httpclient5/UpgradeApacheHttpClient5Test.java @@ -47,7 +47,8 @@ public void defaults(RecipeSpec spec) { void migrateDependencies() { rewriteRun( //language=xml - pomXml(""" + pomXml( + """ 4.0.0 org.example @@ -86,7 +87,8 @@ void migrateDependencies() { void importReplacementsInGroupsWithSomeSpecificMappings() { rewriteRun( //language=java - java(""" + java( + """ import org.apache.http.HttpEntity; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpUriRequest; @@ -118,7 +120,8 @@ void method(HttpEntity entity, String urlStr) throws Exception { void addTimeUnitsToTimeoutAndDurationMethods() { rewriteRun( //language=java - java(""" + java( + """ import org.apache.http.client.config.RequestConfig; import org.apache.http.config.SocketConfig; @@ -164,52 +167,53 @@ void method() { void removeStatusLineHttpResponse() { rewriteRun( //language=java - java(""" - import org.apache.http.HttpStatus; - import org.apache.http.client.methods.CloseableHttpResponse; - import org.apache.http.client.methods.HttpGet; - import org.apache.http.impl.client.CloseableHttpClient; - import org.apache.http.impl.client.HttpClientBuilder; - import org.apache.http.ProtocolVersion; - - import java.io.IOException; - - class A { - void method() throws IOException { - HttpGet httpGet = new HttpGet("https://moderne.io"); - CloseableHttpClient instance = HttpClientBuilder.create().build(); - CloseableHttpResponse response = instance.execute(httpGet); - - System.out.println("response.getStatusLine() :: " + response.getStatusLine()); - int statusCode = response.getStatusLine().getStatusCode(); - String reason = response.getStatusLine().getReasonPhrase(); - ProtocolVersion version = response.getStatusLine().getProtocolVersion(); - } + java( + """ + import org.apache.http.HttpStatus; + import org.apache.http.client.methods.CloseableHttpResponse; + import org.apache.http.client.methods.HttpGet; + import org.apache.http.impl.client.CloseableHttpClient; + import org.apache.http.impl.client.HttpClientBuilder; + import org.apache.http.ProtocolVersion; + + import java.io.IOException; + + class A { + void method() throws IOException { + HttpGet httpGet = new HttpGet("https://moderne.io"); + CloseableHttpClient instance = HttpClientBuilder.create().build(); + CloseableHttpResponse response = instance.execute(httpGet); + + System.out.println("response.getStatusLine() :: " + response.getStatusLine()); + int statusCode = response.getStatusLine().getStatusCode(); + String reason = response.getStatusLine().getReasonPhrase(); + ProtocolVersion version = response.getStatusLine().getProtocolVersion(); } + } """, """ - import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; - import org.apache.hc.core5.http.HttpStatus; - import org.apache.hc.client5.http.classic.methods.HttpGet; - import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; - import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; - import org.apache.hc.core5.http.ProtocolVersion; - import org.apache.hc.core5.http.message.StatusLine; - - import java.io.IOException; - - class A { - void method() throws IOException { - HttpGet httpGet = new HttpGet("https://moderne.io"); - CloseableHttpClient instance = HttpClientBuilder.create().build(); - CloseableHttpResponse response = instance.execute(httpGet); - - System.out.println("response.getStatusLine() :: " + new StatusLine(response)); - int statusCode = response.getCode(); - String reason = response.getReasonPhrase(); - ProtocolVersion version = response.getVersion(); - } + import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; + import org.apache.hc.core5.http.HttpStatus; + import org.apache.hc.client5.http.classic.methods.HttpGet; + import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; + import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; + import org.apache.hc.core5.http.ProtocolVersion; + import org.apache.hc.core5.http.message.StatusLine; + + import java.io.IOException; + + class A { + void method() throws IOException { + HttpGet httpGet = new HttpGet("https://moderne.io"); + CloseableHttpClient instance = HttpClientBuilder.create().build(); + CloseableHttpResponse response = instance.execute(httpGet); + + System.out.println("response.getStatusLine() :: " + new StatusLine(response)); + int statusCode = response.getCode(); + String reason = response.getReasonPhrase(); + ProtocolVersion version = response.getVersion(); } + } """) ); } diff --git a/src/testWithSpringBoot_2_1/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapterTest.java b/src/testWithSpringBoot_2_1/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapterTest.java index 92ed1e89f..b9bf4ed1e 100644 --- a/src/testWithSpringBoot_2_1/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapterTest.java +++ b/src/testWithSpringBoot_2_1/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapterTest.java @@ -37,7 +37,8 @@ public void defaults(RecipeSpec spec) { void transformSimple() { rewriteRun( //language=java - java(""" + java( + """ package a.b.c; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; diff --git a/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/boot2/search/EntityIdForRepositoryVisitorTest.java b/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/boot2/search/EntityIdForRepositoryVisitorTest.java index da610b923..57c73ca05 100644 --- a/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/boot2/search/EntityIdForRepositoryVisitorTest.java +++ b/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/boot2/search/EntityIdForRepositoryVisitorTest.java @@ -366,7 +366,8 @@ public class Customer { } """ ), - java(""" + java( + """ package demo; import org.springframework.data.repository.NoRepositoryBean; @@ -406,7 +407,8 @@ public class Customer { } """ ), - java(""" + java( + """ package demo; import org.springframework.data.repository.NoRepositoryBean; @@ -446,7 +448,8 @@ public class Customer { } """ ), - java(""" + java( + """ package demo; import org.springframework.data.repository.NoRepositoryBean; @@ -486,7 +489,8 @@ public class Customer { } """ ), - java(""" + java( + """ package demo; import org.springframework.data.repository.NoRepositoryBean; @@ -527,7 +531,8 @@ public class Customer { } """ ), - java(""" + java( + """ package demo; import org.springframework.data.repository.NoRepositoryBean; @@ -537,7 +542,8 @@ public class Customer { interface MyOtherIntermediateRepository1 extends Repository{} """ ), - java(""" + java( + """ package demo; import org.springframework.data.repository.NoRepositoryBean; @@ -577,7 +583,8 @@ public class Customer { } """ ), - java(""" + java( + """ package demo; import org.springframework.data.repository.NoRepositoryBean; @@ -617,7 +624,8 @@ public class Customer { } """ ), - java(""" + java( + """ package demo; import org.springframework.data.repository.NoRepositoryBean; @@ -657,7 +665,8 @@ public class Customer { } """ ), - java(""" + java( + """ package demo; import org.springframework.data.repository.NoRepositoryBean; @@ -667,15 +676,16 @@ public class Customer { interface MyOtherIntermediateRepository1 extends Repository, Iterator, List{} """ ), - java(""" - package demo; - - interface MyOtherIntermediateRepository2 extends MyOtherIntermediateRepository1{} + java( + """ + package demo; + + interface MyOtherIntermediateRepository2 extends MyOtherIntermediateRepository1{} """, """ - package demo; - - interface MyOtherIntermediateRepository2 extends MyOtherIntermediateRepository1*/Long, Customer>{} + package demo; + + interface MyOtherIntermediateRepository2 extends MyOtherIntermediateRepository1*/Long, Customer>{} """ ), java( diff --git a/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateItemWriterWriteTest.java b/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateItemWriterWriteTest.java index 82f94931d..ddb82fd54 100644 --- a/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateItemWriterWriteTest.java +++ b/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateItemWriterWriteTest.java @@ -41,7 +41,8 @@ public void defaults(RecipeSpec spec) { void replaceItemWriterWriteMethod() { // language=java rewriteRun( - java(""" + java( + """ import java.util.List; import org.springframework.batch.item.ItemWriter; @@ -75,7 +76,8 @@ public void write(final Chunk items) throws Exception { void replaceExtendedItemWriterWriteMethod() { // language=java rewriteRun( - java(""" + java( + """ import java.util.List; import org.springframework.batch.item.database.JdbcBatchItemWriter; @@ -105,7 +107,8 @@ public void write(Chunk a) throws Exception { void abstractClass() { // language=java rewriteRun( - java(""" + java( + """ import java.util.List; import org.springframework.batch.item.ItemWriter; @@ -132,7 +135,8 @@ public abstract class AbstractItemWriter implements ItemWriter { void replaceListMethodInvocations() { // language=java rewriteRun( - java(""" + java( + """ import java.util.List; import org.springframework.batch.item.ItemWriter; @@ -169,7 +173,8 @@ public void write(final Chunk items) throws Exception { void updateListInitialization() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.item.ItemWriter; import java.util.List; @@ -211,7 +216,8 @@ public void write(final Chunk items) throws Exception { void updateListAssignment() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.item.ItemWriter; import java.util.List; @@ -255,7 +261,8 @@ public void write(final Chunk items) throws Exception { void updateListMethodParameter() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.item.ItemWriter; import java.util.List; @@ -299,7 +306,8 @@ public void write(final Chunk items) throws Exception { void doesNotUpdateIterableAssignment() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.item.ItemWriter; import java.util.List; @@ -336,7 +344,8 @@ public void write(final Chunk items) throws Exception { void doesNotChangeIterableMethodParameter() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.item.ItemWriter; import java.util.List; @@ -378,7 +387,8 @@ public void write(final Chunk items) throws Exception { void doesNotChangeOtherLists() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.item.ItemWriter; import java.util.ArrayList; diff --git a/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateJobBuilderFactoryTest.java b/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateJobBuilderFactoryTest.java index 1742c3cec..78dc7f542 100644 --- a/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateJobBuilderFactoryTest.java +++ b/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateJobBuilderFactoryTest.java @@ -39,7 +39,8 @@ public void defaults(RecipeSpec spec) { void doNotChangeCurrentApi() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.job.builder.JobBuilder; @@ -65,7 +66,8 @@ void replaceAutowiredJobBuilderFactory() { // language=java rewriteRun( spec -> spec.typeValidationOptions(TypeValidation.builder().identifiers(false).build()), - java(""" + java( + """ import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; @@ -109,7 +111,8 @@ void replaceJobBuilderFactory() { // language=java rewriteRun( spec -> spec.typeValidationOptions(TypeValidation.builder().identifiers(false).build()), - java(""" + java( + """ import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; @@ -149,7 +152,8 @@ void replaceJobBuilderFactoryInsideConstructor() { // language=java rewriteRun( spec -> spec.typeValidationOptions(TypeValidation.builder().identifiers(false).build()), - java(""" + java( + """ import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; diff --git a/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/RemoveDefaultBatchConfigurerTest.java b/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/RemoveDefaultBatchConfigurerTest.java index 98268fbf7..7cc611082 100644 --- a/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/RemoveDefaultBatchConfigurerTest.java +++ b/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/RemoveDefaultBatchConfigurerTest.java @@ -40,7 +40,8 @@ public void defaults(RecipeSpec spec) { void removeSetDataSourceWithCommentOnly() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.core.configuration.annotation.DefaultBatchConfigurer; class Foo extends DefaultBatchConfigurer { @Override @@ -59,7 +60,8 @@ class Foo { void removeSetDatasourceWithSuperCallOnly() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.core.configuration.annotation.DefaultBatchConfigurer; class Foo extends DefaultBatchConfigurer { Foo() { @@ -82,7 +84,8 @@ class Foo { void retainSetDataSourceWithAdditionalStatements() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.core.configuration.annotation.DefaultBatchConfigurer; class Foo extends DefaultBatchConfigurer { @Override @@ -106,13 +109,15 @@ public void setDataSource(javax.sql.DataSource dataSource) { void retainInterfaceOverrides() { // language=java rewriteRun( - java(""" + java( + """ package bar; public interface Bar { void baz(); } """), - java(""" + java( + """ import org.springframework.batch.core.configuration.annotation.DefaultBatchConfigurer; class Foo extends DefaultBatchConfigurer implements bar.Bar { @Override @@ -141,7 +146,8 @@ public void baz() { void removeBeanUsage() { // language=java rewriteRun( - java(""" + java( + """ import org.springframework.batch.core.configuration.annotation.BatchConfigurer; import org.springframework.batch.core.configuration.annotation.DefaultBatchConfigurer; class FooConfig { diff --git a/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/ReplaceSupportClassWithItsInterfaceTest.java b/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/ReplaceSupportClassWithItsInterfaceTest.java index 5ef27ee81..57ad8204d 100644 --- a/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/ReplaceSupportClassWithItsInterfaceTest.java +++ b/src/testWithSpringBoot_3_0/java/org/openrewrite/java/spring/batch/ReplaceSupportClassWithItsInterfaceTest.java @@ -39,7 +39,8 @@ void replaceChunkListenerSupport() { "org.springframework.batch.core.listener.ChunkListenerSupport", "org.springframework.batch.core.ChunkListener")), // language=java - java(""" + java( + """ import org.springframework.batch.core.listener.ChunkListenerSupport; public class MyClass extends ChunkListenerSupport { @@ -62,7 +63,8 @@ void replaceJobExecutionListenerSupport() { "org.springframework.batch.core.listener.JobExecutionListenerSupport", "org.springframework.batch.core.JobExecutionListener")), // language=java - java(""" + java( + """ import org.springframework.batch.core.listener.JobExecutionListenerSupport; public class MyClass extends JobExecutionListenerSupport { @@ -85,7 +87,8 @@ void replaceStepExecutionListenerSupport() { "org.springframework.batch.core.listener.StepExecutionListenerSupport", "org.springframework.batch.core.StepExecutionListener")), // language=java - java(""" + java( + """ import org.springframework.batch.core.listener.StepExecutionListenerSupport; public class MyClass extends StepExecutionListenerSupport { @@ -108,7 +111,8 @@ void replaceRepeatListenerSupport() { "org.springframework.batch.repeat.listener.RepeatListenerSupport", "org.springframework.batch.repeat.RepeatListener")), // language=java - java(""" + java( + """ import org.springframework.batch.repeat.listener.RepeatListenerSupport; public class MyClass extends RepeatListenerSupport { @@ -131,7 +135,8 @@ void replaceSkipListenerSupport() { "org.springframework.batch.core.listener.SkipListenerSupport", "org.springframework.batch.core.SkipListener")), // language=java - java(""" + java( + """ import org.springframework.batch.core.listener.SkipListenerSupport; public class MyClass extends SkipListenerSupport { diff --git a/src/testWithSpringSecurity_5_7/java/org/openrewrite/spring/security5/UseNewSecurityMatchersTest.java b/src/testWithSpringSecurity_5_7/java/org/openrewrite/spring/security5/UseNewSecurityMatchersTest.java index 9abb617ab..6fe805059 100644 --- a/src/testWithSpringSecurity_5_7/java/org/openrewrite/spring/security5/UseNewSecurityMatchersTest.java +++ b/src/testWithSpringSecurity_5_7/java/org/openrewrite/spring/security5/UseNewSecurityMatchersTest.java @@ -103,7 +103,8 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) { void chainedCalls() { rewriteRun( //language=java - java(""" + java( + """ package com.example.demo; import org.springframework.context.annotation.Bean;