Merge branch 'main' into hotfix-NoGuavaJava21

Author: timtebeek

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2024 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.migrate;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Preconditions;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.java.ChangeType;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.search.FindMethods;
+import org.openrewrite.java.search.UsesMethod;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.TypeUtils;
+
+public class ArrayStoreExceptionToTypeNotPresentException extends Recipe {
+
+    private static final String ARRAY_STORE_EXCEPTION = "java.lang.ArrayStoreException";
+    private static final String TYPE_NOT_PRESENT_EXCEPTION = "java.lang.TypeNotPresentException";
+
+    @Override
+    public String getDisplayName() {
+        return "Catch `TypeNotPresentException` thrown by `Class.getAnnotation()`";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Replace catch blocks for `ArrayStoreException` around `Class.getAnnotation()` with `TypeNotPresentException` to ensure compatibility with Java 11+.";
+    }
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
+        String classGetAnnotationPattern = "java.lang.Class getAnnotation(java.lang.Class)";
+        return Preconditions.check(new UsesMethod<>(classGetAnnotationPattern), new JavaIsoVisitor<ExecutionContext>() {
+            @Override
+            public J.Try visitTry(J.Try tryStatement, ExecutionContext ctx) {
+                J.Try try_ = super.visitTry(tryStatement, ctx);
+                if (FindMethods.find(try_, classGetAnnotationPattern).isEmpty()) {
+                    return try_;
+                }
+                return try_.withCatches(ListUtils.map(try_.getCatches(), catch_ -> {
+                    if (TypeUtils.isOfClassType(catch_.getParameter().getType(), ARRAY_STORE_EXCEPTION)) {
+                        return (J.Try.Catch) new ChangeType(ARRAY_STORE_EXCEPTION, TYPE_NOT_PRESENT_EXCEPTION, true)
+                                .getVisitor().visit(catch_, ctx);
+                    }
+                    return catch_;
+                }));
+            }
+        });
+    }
+}

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

@@ -90,7 +90,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
 
                         // Update existing @Column annotation
                         J.VariableDeclarations updatedVariable = (J.VariableDeclarations) new AddOrUpdateAnnotationAttribute(
-                                "javax.persistence.Column", "name", "element", true)
+                                "javax.persistence.Column", "name", "element", true, null)
                                 .getVisitor().visit(multiVariable, ctx, getCursor().getParentTreeCursor());
                         return super.visitVariableDeclarations(updatedVariable, ctx);
                     }

src/main/java/org/openrewrite/java/migrate/javax/AddColumnAnnotation.java

@@ -53,7 +53,11 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
 
                 if (MULTICAST_METHOD.matches(m) && m.getArguments().size() == 2) {
-                    return m.withArguments(Collections.singletonList(m.getArguments().get(0)));
+                    return m.withArguments(Collections.singletonList(m.getArguments().get(0)))
+                            .withMethodType(m.getMethodType()
+                                    .withParameterNames(m.getMethodType().getParameterNames().subList(0, 1))
+                                    .withParameterTypes(m.getMethodType().getParameterTypes().subList(0, 1))
+                            );
                 }
                 return m;
             }

src/main/java/org/openrewrite/java/migrate/lang/MigrateSecurityManagerMulticast.java

@@ -15,6 +15,7 @@
  */
 package org.openrewrite.java.migrate.lang.var;
 
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.Cursor;
 import org.openrewrite.java.tree.*;
 
@@ -198,4 +199,30 @@ private static boolean isInsideInitializer(Cursor cursor, int nestedBlockLevel)
 
         return isInsideInitializer(requireNonNull(cursor.getParent()), nestedBlockLevel);
     }
+
+    /**
+     * Checks whether the initializer {@linkplain Expression} is a {@linkplain J.MethodInvocation} targeting a static method.
+     *
+     * @param initializer {@linkplain J.VariableDeclarations.NamedVariable#getInitializer()} value
+     * @return true iff is initialized by static method
+     */
+    public static boolean initializedByStaticMethod(@Nullable Expression initializer) {
+        if (initializer == null) {
+            return false;
+        }
+        initializer = initializer.unwrap();
+
+        if (!(initializer instanceof J.MethodInvocation)) {
+            // no MethodInvocation -> false
+            return false;
+        }
+
+        J.MethodInvocation invocation = (J.MethodInvocation) initializer;
+        if (invocation.getMethodType() == null) {
+            // not a static method -> false
+            return false;
+        }
+
+        return invocation.getMethodType().hasFlags(Flag.Static);
+    }
 }

src/main/java/org/openrewrite/java/migrate/lang/var/DeclarationCheck.java

@@ -75,8 +75,10 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations v
             boolean isPrimitive = DeclarationCheck.isPrimitive(vd);
             boolean usesGenerics = DeclarationCheck.useGenerics(vd);
             boolean usesTernary = DeclarationCheck.initializedByTernary(vd);
-            boolean usesArrayInitializer = vd.getVariables().get(0).getInitializer() instanceof J.NewArray;
-            if (isPrimitive || usesGenerics || usesTernary || usesArrayInitializer) {
+            Expression initializer = vd.getVariables().get(0).getInitializer();
+            boolean usesArrayInitializer = initializer instanceof J.NewArray;
+            boolean initializedByStaticMethod = DeclarationCheck.initializedByStaticMethod(initializer);
+            if (isPrimitive || usesGenerics || usesTernary || usesArrayInitializer || initializedByStaticMethod) {
                 return vd;
             }
 

src/main/java/org/openrewrite/java/migrate/lang/var/UseVarForObject.java

@@ -88,10 +88,7 @@ public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
                 Xml.Document d = super.visitDocument(document, ctx);
 
                 // Return early if the parent appears to be within the current repository, as properties defined there will be updated
-                if (d.getRoot().getChild("parent")
-                        .flatMap(parent -> parent.getChild("relativePath"))
-                        .flatMap(Xml.Tag::getValue)
-                        .isPresent()) {
+                if (getResolutionResult().parentPomIsProjectPom()) {
                     return d;
                 }
 

src/main/java/org/openrewrite/java/migrate/maven/UpdateMavenProjectPropertyJavaVersion.java

@@ -50,10 +50,6 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
     }
 
     private static class OptionalStreamVisitor extends JavaIsoVisitor<ExecutionContext> {
-        private static final JavaTemplate template =
-                JavaTemplate.builder("#{any(java.util.stream.Stream)}.flatMap(Optional::stream)")
-                        .imports("java.util.Optional")
-                        .build();
 
         @Override
         public J.MethodInvocation visitMethodInvocation(J.MethodInvocation invocation, ExecutionContext ctx) {
@@ -77,6 +73,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation invocation, E
             JRightPadded<Expression> mapSelect = mapInvocation.getPadding().getSelect();
             JavaType.Method mapInvocationType = mapInvocation.getMethodType();
             Space flatMapComments = getFlatMapComments(mapSelect, filterSelect);
+            JavaTemplate template =
+                    JavaTemplate.builder("#{any(java.util.stream.Stream)}.flatMap(Optional::stream)")
+                            .imports("java.util.Optional")
+                            .build();
             J.MethodInvocation flatMapInvocation = template
                     .apply(updateCursor(mapInvocation), mapInvocation.getCoordinates().replace(), filterInvocation.getSelect());
             return flatMapInvocation.getPadding()

src/main/java/org/openrewrite/java/migrate/util/OptionalStreamRecipe.java

@@ -42,21 +42,21 @@ type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.migrate.jakarta.ServletCookieBehaviorChangeRFC6265
 displayName: Remove `getComment` and `getVersion` methods
 description: >-
-  Jakarta Servlet methods have been deprecated for removal in Jakarta Servlet 6.0 to align with RFC 6265. 
+  Jakarta Servlet methods have been deprecated for removal in Jakarta Servlet 6.0 to align with RFC 6265.
   In addition, the behavior of these methods has been changed so the setters no longer have any effect, the getComment methods return null, and the getVersion method returns 0.
   The deprecated methods are removed.
 recipeList:
-  - org.openrewrite.java.migrate.RemoveMethodInvocation:
+  - org.openrewrite.java.RemoveMethodInvocations:
       methodPattern: jakarta.servlet.http.Cookie getComment()
-  - org.openrewrite.java.migrate.RemoveMethodInvocation:
+  - org.openrewrite.java.RemoveMethodInvocations:
       methodPattern: jakarta.servlet.http.Cookie getVersion()
-  - org.openrewrite.java.migrate.RemoveMethodInvocation:
+  - org.openrewrite.java.RemoveMethodInvocations:
       methodPattern: jakarta.servlet.http.Cookie setComment(String)
-  - org.openrewrite.java.migrate.RemoveMethodInvocation:
+  - org.openrewrite.java.RemoveMethodInvocations:
       methodPattern: jakarta.servlet.http.Cookie setVersion(int)
-  - org.openrewrite.java.migrate.RemoveMethodInvocation:
+  - org.openrewrite.java.RemoveMethodInvocations:
       methodPattern: jakarta.servlet.SessionCookieConfig getComment()
-  - org.openrewrite.java.migrate.RemoveMethodInvocation:
+  - org.openrewrite.java.RemoveMethodInvocations:
       methodPattern: jakarta.servlet.SessionCookieConfig setComment(String)
 ---
 type: specs.openrewrite.org/v1beta/recipe
@@ -75,7 +75,7 @@ type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.migrate.jakarta.RemovedIsParmetersProvidedMethod
 displayName: Use `isParametersProvided()`
 description: >-
-  Expression Language prior to 5.0 provides the deprecated MethodExpression.isParmetersProvided() method, with the word 'parameter' misspelled in the method name. 
+  Expression Language prior to 5.0 provides the deprecated MethodExpression.isParmetersProvided() method, with the word 'parameter' misspelled in the method name.
   This method is unavailable in Jakarta Expression Language 5.0. Use the correctly spelled MethodExpression.isParametersProvided() method instead.
 recipeList:
   - org.openrewrite.java.ChangeMethodName:
@@ -86,7 +86,7 @@ type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.migrate.jakarta.RemovedSOAPElementFactory
 displayName: Use `jakarta.xml.soap.SOAPFactory` to create `SOAPElements`
 description: >-
-  XML Web Services prior to 4.0 provides the deprecated SOAPElementFactory class, 
+  XML Web Services prior to 4.0 provides the deprecated SOAPElementFactory class,
   which is removed in XML Web Services 4.0. The recommended replacement is to use jakarta.xml.soap.SOAPFactory to create SOAPElements.
 recipeList:
   - org.openrewrite.java.ChangeMethodName: