Merge branch 'main' into recipe-for-InlineMe-annotation

Author: timtebeek

.github/workflows/sdkman-candidates.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

build.gradle.kts

@@ -12,6 +12,7 @@ recipeDependencies {
     parserClasspath("jakarta.servlet:jakarta.servlet-api:6.0.0")
     parserClasspath("javax.persistence:javax.persistence-api:2.2")
     parserClasspath("org.glassfish:javax.servlet:3.0")
+    parserClasspath("javax.annotation:javax.annotation-api:1.3.2")
 }
 
 val rewriteVersion = rewriteRecipe.rewriteVersion.get()

src/main/java/org/openrewrite/java/migrate/joda/JodaTimeRecipe.java

@@ -15,11 +15,12 @@
  */
 package org.openrewrite.java.migrate.joda;
 
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.Value;
 import org.jspecify.annotations.Nullable;
-import org.openrewrite.*;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Preconditions;
+import org.openrewrite.ScanningRecipe;
+import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.search.UsesType;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.J.VariableDeclarations.NamedVariable;
@@ -29,23 +30,7 @@
 
 import static java.util.Collections.emptyList;
 
-@EqualsAndHashCode(callSuper = false)
-@Value
 public class JodaTimeRecipe extends ScanningRecipe<JodaTimeRecipe.Accumulator> {
-
-    /**
-     * Controls whether additional safety checks are performed during the migration process.
-     * When enabled, the recipe will verify that expressions are safe to migrate before performing the migration.
-     * This helps prevent potential issues or bugs that might arise from automatic migration.
-     */
-    @Option(displayName = "Safe migration only",
-      description = "When enabled, performs additional safety checks to verify that expressions are safe to migrate before converting them. " +
-                    "Safety checks include analyzing method parameters, return values, and variable usages across class boundaries.",
-      required = false
-    )
-    @Nullable
-    Boolean safeMigrationOnly;
-
     @Override
     public String getDisplayName() {
         return "Migrate Joda-Time to Java time";
@@ -63,12 +48,12 @@ public Accumulator getInitialValue(ExecutionContext ctx) {
 
     @Override
     public TreeVisitor<?, ExecutionContext> getScanner(Accumulator acc) {
-        return new JodaTimeScanner(acc, Boolean.TRUE.equals(safeMigrationOnly));
+        return new JodaTimeScanner(acc);
     }
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor(Accumulator acc) {
-        JodaTimeVisitor jodaTimeVisitor = new JodaTimeVisitor(acc, Boolean.TRUE.equals(safeMigrationOnly), new LinkedList<>());
+        JodaTimeVisitor jodaTimeVisitor = new JodaTimeVisitor(acc, true, new LinkedList<>());
         return Preconditions.check(new UsesType<>("org.joda.time.*", true), jodaTimeVisitor);
     }
 

src/main/java/org/openrewrite/java/migrate/joda/JodaTimeScanner.java

@@ -41,21 +41,15 @@ class JodaTimeScanner extends ScopeAwareVisitor {
 
     @Getter
     private final JodaTimeRecipe.Accumulator acc;
-    private final boolean safeMigrationOnly;
 
     private final Map<NamedVariable, Set<NamedVariable>> varDependencies = new HashMap<>();
     private final Map<JavaType, Set<String>> unsafeVarsByType = new HashMap<>();
     private final Map<JavaType.Method, Set<NamedVariable>> methodReferencedVars = new HashMap<>();
     private final Map<JavaType.Method, Set<UnresolvedVar>> methodUnresolvedReferencedVars = new HashMap<>();
 
     public JodaTimeScanner(JodaTimeRecipe.Accumulator acc) {
-        this(acc, true);
-    }
-
-    public JodaTimeScanner(JodaTimeRecipe.Accumulator acc, boolean safeMigrationOnly) {
         super(new LinkedList<>());
         this.acc = acc;
-        this.safeMigrationOnly = safeMigrationOnly;
     }
 
     @Override
@@ -73,9 +67,6 @@ public Javadoc visitReference(Javadoc.Reference reference, ExecutionContext ctx)
 
     @Override
     public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
-        if (!safeMigrationOnly) { // skip scan if safe mode is disabled
-            return cu;
-        }
         super.visitCompilationUnit(cu, ctx);
         Set<NamedVariable> allReachable = new HashSet<>();
         for (NamedVariable var : acc.getUnsafeVars()) {

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

@@ -48,13 +48,13 @@ public String getDisplayName() {
     @Override
     public String getDescription() {
         return "Switch statements for which each case is assigning a value to the same variable can be converted to a switch expression that returns the value of the variable. " +
-                "This is only applicable for Java 17 and later.";
+                "This recipe is only applicable for Java 21 and later.";
     }
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         TreeVisitor<?, ExecutionContext> preconditions = Preconditions.and(
-                new UsesJavaVersion<>(17),
+                new UsesJavaVersion<>(21),
                 Preconditions.not(new KotlinFileChecker<>()),
                 Preconditions.not(new GroovyFileChecker<>())
         );

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

@@ -31,6 +31,7 @@
 import org.openrewrite.staticanalysis.kotlin.KotlinFileChecker;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static org.openrewrite.Tree.randomId;
 
@@ -44,31 +45,32 @@ public String getDisplayName() {
 
     @Override
     public String getDescription() {
-        return "Switch statements where each case returns a value can be converted to a switch expression that returns the value directly.";
+        return "Switch statements where each case returns a value can be converted to a switch expression that returns the value directly. " +
+               "This recipe is only applicable for Java 21 and later.";
     }
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         TreeVisitor<?, ExecutionContext> preconditions = Preconditions.and(
-                new UsesJavaVersion<>(14),
+                new UsesJavaVersion<>(21),
                 Preconditions.not(new KotlinFileChecker<>()),
                 Preconditions.not(new GroovyFileChecker<>())
         );
         return Preconditions.check(preconditions, new JavaIsoVisitor<ExecutionContext>() {
             @Override
             public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
                 J.Block b = super.visitBlock(block, ctx);
+                AtomicReference<Boolean> newReturn = new AtomicReference<>(false);
                 return b.withStatements(ListUtils.map(b.getStatements(), statement -> {
+                    if (newReturn.get()) {
+                        return null; // Drop statements after the first converted switch expression
+                    }
                     if (statement instanceof J.Switch) {
                         J.Switch sw = (J.Switch) statement;
                         if (canConvertToSwitchExpression(sw)) {
+                            newReturn.set(true);
                             J.SwitchExpression switchExpression = convertToSwitchExpression(sw);
-                            return new J.Return(
-                                    randomId(),
-                                    sw.getPrefix(),
-                                    Markers.EMPTY,
-                                    switchExpression
-                            );
+                            return new J.Return(randomId(), sw.getPrefix(), Markers.EMPTY, switchExpression);
                         }
                     }
                     return statement;

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

@@ -43,13 +43,14 @@ public String getDisplayName() {
 
     @Override
     public String getDescription() {
-        return "Convert switch expressions with colon cases and yield statements to arrow syntax.";
+        return "Convert switch expressions with colon cases and yield statements to arrow syntax. " +
+               "This recipe is only applicable for Java 21 and later.";
     }
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         TreeVisitor<?, ExecutionContext> preconditions = Preconditions.and(
-                new UsesJavaVersion<>(14),
+                new UsesJavaVersion<>(21),
                 Preconditions.not(new KotlinFileChecker<>()),
                 Preconditions.not(new GroovyFileChecker<>())
         );

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

@@ -106,6 +106,10 @@ public J visitBinary(J.Binary binary, ExecutionContext ctx) {
                 }
 
                 String content = contentSb.toString();
+                if (content.contains("\r")) {
+                    // Carriage returns aren't yet carried over into text blocks, which always end with a newline \n
+                    return super.visitBinary(binary, ctx);
+                }
 
                 if (!convertStringsWithoutNewlines && !containsNewLineInContent(content)) {
                     return super.visitBinary(binary, ctx);

src/main/resources/META-INF/rewrite/add-common-annotations-dependencies.yml

@@ -26,13 +26,16 @@ tags:
   - jsr250
   - jakarta
 recipeList:
-  # Add or update the jakarta.annotation-api to a maven project. This artifact still uses the javax.annotation name space.
+  # Add or update the jakarta.annotation-api. Use version 1.3.x, as this version still kept the old javax namespace (starting from 2.x it's changed to jakarta).
   - org.openrewrite.java.dependencies.ChangeDependency:
       oldGroupId: javax.annotation
       oldArtifactId: javax.annotation-api
       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
+      overrideManagedVersion: true
+      changeManagedDependency: false
   # Jakarta EE recommends `provided` scope
   - org.openrewrite.maven.ChangeDependencyScope:
       groupId: jakarta.annotation