Merge branch 'main' into lredor/bug/908-Predicates-instanceOf

Author: timtebeek

.run/InlineMethodCallsRecipeGenerator.run.xml

@@ -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.7-tem
+java=21.0.8-tem

.sdkmanrc

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.jar

@@ -202,7 +202,7 @@ fi
 
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=
 
 # Collect all arguments for the java command:
 #   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,

gradle/wrapper/gradle-wrapper.properties

@@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME%
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew

@@ -15,7 +15,10 @@
  */
 package org.openrewrite.java.migrate.guava;
 
-import org.openrewrite.*;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Preconditions;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.ChangeMethodName;
 import org.openrewrite.java.ChangeType;
 import org.openrewrite.java.JavaIsoVisitor;

gradlew.bat

@@ -106,15 +106,16 @@ private boolean hasNoArgConstructor(J.ClassDeclaration classDecl) {
                         .filter(J.MethodDeclaration::isConstructor)
                         .collect(toList());
 
-                // If no constructors are declared, the class has an implicit no-arg constructor
+                // If no constructors are declared, the class has an implicit public no-arg constructor
                 if (constructors.isEmpty()) {
                     return true;
                 }
 
-                // Check if any explicit constructor is a no-arg constructor
+                // Instance main requires a public no args constructor
                 return constructors.stream()
-                        .anyMatch(ctor -> ctor.getParameters().isEmpty() ||
-                                (ctor.getParameters().size() == 1 && ctor.getParameters().get(0) instanceof J.Empty));
+                        .anyMatch(ctor -> (ctor.getParameters().isEmpty() ||
+                                (ctor.getParameters().size() == 1 && ctor.getParameters().get(0) instanceof J.Empty)) &&
+                                ctor.hasModifier(J.Modifier.Type.Public));
             }
 
             private boolean isMainMethodReferenced(J.MethodDeclaration mainMethod) {

src/main/java/org/openrewrite/java/migrate/guava/NoGuavaPredicate.java

@@ -33,7 +33,7 @@ recipeList:
       newGroupId: jakarta.annotation
       newArtifactId: jakarta.annotation-api
       newVersion: 1.3.x
-      # set explicitly even if  managed, as higher versions do not have the javax namespace
+      # Set explicitly even if managed, as higher versions do not have the javax namespace
       overrideManagedVersion: true
       changeManagedDependency: false
   # Jakarta EE recommends `provided` scope