Merge Conflicts

Author: bhavanapidapa

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[src/test*/java/**.java]
+indent_size = 4
+ij_continuation_indent_size = 2

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=21.0.2-tem
+java=21.0.5-tem

build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     testImplementation("org.projectlombok:lombok:latest.release")
 
     annotationProcessor("org.openrewrite:rewrite-templating:$rewriteVersion")
-    compileOnly("com.google.errorprone:error_prone_core:2.19.1") {
+    compileOnly("com.google.errorprone:error_prone_core:2.+") {
         exclude("com.google.auto.service", "auto-service-annotations")
     }
 
@@ -29,6 +29,7 @@ dependencies {
     implementation("org.openrewrite.recipe:rewrite-static-analysis:$rewriteVersion")
     implementation("org.openrewrite.recipe:rewrite-jenkins:$rewriteVersion")
     implementation("org.openrewrite:rewrite-templating:$rewriteVersion")
+    implementation("org.openrewrite.meta:rewrite-analysis:$rewriteVersion")
 
     runtimeOnly("org.openrewrite:rewrite-java-8")
     runtimeOnly("org.openrewrite:rewrite-java-11")
@@ -48,12 +49,29 @@ dependencies {
     testImplementation("org.assertj:assertj-core:latest.release")
 
     testImplementation("com.google.guava:guava:33.0.0-jre")
+    testImplementation("joda-time:joda-time:2.12.3")
 
     testRuntimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jsr353")
     testRuntimeOnly("com.fasterxml.jackson.core:jackson-core")
     testRuntimeOnly("com.fasterxml.jackson.core:jackson-databind")
+    testRuntimeOnly("org.apache.johnzon:johnzon-core:1.2.18")
     testRuntimeOnly("org.codehaus.groovy:groovy:latest.release")
     testRuntimeOnly("jakarta.annotation:jakarta.annotation-api:2.1.1")
+    testRuntimeOnly("org.springframework:spring-core:6.1.13")
     testRuntimeOnly("com.google.code.findbugs:jsr305:3.0.2")
     testRuntimeOnly(gradleApi())
 }
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+tasks.withType(Javadoc::class.java) {
+    exclude("**/PlanJavaMigration.java")
+}
+
+tasks.test {
+    maxHeapSize = "2g"  // Set max heap size to 2GB or adjust as necessary
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

lombok.config

@@ -4,3 +4,4 @@ lombok.addNullAnnotations = CUSTOM:org.openrewrite.internal.lang.NonNull:org.ope
 lombok.copyableAnnotations += org.openrewrite.internal.lang.Nullable
 lombok.copyableAnnotations += org.openrewrite.internal.lang.NonNull
 lombok.anyConstructor.addConstructorProperties=true
+lombok.builder.className=Builder

src/main/java/org/openrewrite/java/migrate/BeanDiscovery.java

@@ -72,7 +72,7 @@ public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
                 // Update or apply bean-discovery-mode=all
                 if (hasBeanDiscoveryMode) {
                     TreeVisitor<?, ExecutionContext> changeTagVisitor = new ChangeTagAttribute("beans", "bean-discovery-mode", "all", null, null).getVisitor();
-                    t = (Xml.Tag) changeTagVisitor.visit(t, ctx, getCursor());
+                    t = (Xml.Tag) changeTagVisitor.visit(t, ctx, getCursor().getParentOrThrow());
                 } else {
                     t = addAttribute(t, "bean-discovery-mode", "all", ctx);
                 }

src/main/java/org/openrewrite/java/migrate/CastArraysAsListToList.java

@@ -63,11 +63,11 @@ public J visitTypeCast(J.TypeCast typeCast, ExecutionContext ctx) {
                 elementType = ((JavaType.Array) elementType).getElemType();
             }
 
-            boolean matches = (elementType instanceof JavaType.Class || elementType instanceof JavaType.Parameterized)
-                              && ((JavaType.FullyQualified) elementType).getOwningClass() == null // does not support inner class now
-                              && LIST_TO_ARRAY.matches(typeCast.getExpression())
-                              && typeCast.getExpression() instanceof J.MethodInvocation
-                              && ARRAYS_AS_LIST.matches(((J.MethodInvocation) typeCast.getExpression()).getSelect());
+            boolean matches = (elementType instanceof JavaType.Class || elementType instanceof JavaType.Parameterized) &&
+                              ((JavaType.FullyQualified) elementType).getOwningClass() == null // does not support inner class now
+                              && LIST_TO_ARRAY.matches(typeCast.getExpression()) &&
+                              typeCast.getExpression() instanceof J.MethodInvocation &&
+                              ARRAYS_AS_LIST.matches(((J.MethodInvocation) typeCast.getExpression()).getSelect());
             if (!matches) {
                 return typeCast;
             }

src/main/java/org/openrewrite/java/migrate/JREThrowableFinalMethods.java

@@ -30,7 +30,7 @@
 import org.openrewrite.java.tree.TypeUtils;
 
 @EqualsAndHashCode(callSuper = false)
-class JREThrowableFinalMethods extends Recipe {
+public class JREThrowableFinalMethods extends Recipe {
 
     private final String methodPatternAddSuppressed;
     private final String methodPatternGetSuppressed;
@@ -56,9 +56,9 @@ public String getDisplayName() {
 
     @Override
     public String getDescription() {
-        return "The recipe renames  `getSuppressed()` and `addSuppressed(Throwable exception)` methods  in classes "
-               + "that extend `java.lang.Throwable` to `myGetSuppressed` and `myAddSuppressed(Throwable)`."
-               + "These methods were added to Throwable in Java 7 and are marked final which cannot be overridden.";
+        return "The recipe renames  `getSuppressed()` and `addSuppressed(Throwable exception)` methods  in classes " +
+               "that extend `java.lang.Throwable` to `myGetSuppressed` and `myAddSuppressed(Throwable)`." +
+               "These methods were added to Throwable in Java 7 and are marked final which cannot be overridden.";
     }
 
     @Override

src/main/java/org/openrewrite/java/migrate/MXBeanRule.java

@@ -108,9 +108,9 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDeclarat
             }
 
             List<Modifier> modifiers = new ArrayList<>(cd.getModifiers());
-            modifiers.removeIf(modifier -> modifier.getType() == Modifier.Type.Private
-                    || modifier.getType() == Modifier.Type.Protected
-                    || modifier.getType() == Modifier.Type.Abstract);
+            modifiers.removeIf(modifier -> modifier.getType() == Modifier.Type.Private ||
+                    modifier.getType() == Modifier.Type.Protected ||
+                    modifier.getType() == Modifier.Type.Abstract);
             modifiers.add(new J.Modifier(randomId(), Space.EMPTY, Markers.EMPTY, Modifier.Type.Public, emptyList()));
             return maybeAutoFormat(cd, cd.withModifiers(sortModifiers(modifiers)), ctx);
         }

src/main/java/org/openrewrite/java/migrate/ReferenceCloneMethod.java

@@ -32,7 +32,7 @@
 
 @Value
 @EqualsAndHashCode(callSuper = false)
-class ReferenceCloneMethod extends Recipe {
+public class ReferenceCloneMethod extends Recipe {
     private static final MethodMatcher REFERENCE_CLONE = new MethodMatcher("java.lang.ref.Reference clone()", true);
 
     @Override
@@ -57,8 +57,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                     @Override
                     public J visitTypeCast(J.TypeCast typeCast, ExecutionContext ctx) {
                         J j = super.visitTypeCast(typeCast, ctx);
-                        if (Boolean.TRUE.equals(getCursor().pollNearestMessage(REFERENCE_CLONE_REPLACED))
-                            && j instanceof J.TypeCast) {
+                        if (Boolean.TRUE.equals(getCursor().pollNearestMessage(REFERENCE_CLONE_REPLACED)) &&
+                            j instanceof J.TypeCast) {
                             J.TypeCast tc = (J.TypeCast) j;
                             if (TypeUtils.isOfType(tc.getType(), tc.getExpression().getType())) {
                                 return tc.getExpression();