Move all switch expression recipes to Java 21 migration (#824)

* Move all switch expression recipes to Java 21 migration

* Apply suggestion from @github-actions[bot]

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Apply suggestion from @github-actions[bot]

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Apply suggestion from @github-actions[bot]

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: jevanlingen

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

@@ -44,13 +44,14 @@ 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<>())
         );
@@ -63,12 +64,7 @@ public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
                         J.Switch sw = (J.Switch) statement;
                         if (canConvertToSwitchExpression(sw)) {
                             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/resources/META-INF/rewrite/java-version-17.yml

@@ -59,9 +59,6 @@ recipeList:
       artifactId: commons-codec
       newVersion: 1.17.x
   - org.openrewrite.java.migrate.AddLombokMapstructBinding
-  - org.openrewrite.java.migrate.lang.SwitchCaseAssignmentsToSwitchExpression
-  - org.openrewrite.java.migrate.lang.SwitchCaseReturnsToSwitchExpression
-  - org.openrewrite.java.migrate.lang.SwitchExpressionYieldToArrow
   - org.openrewrite.java.migrate.UpdateJakartaAnnotationsIfForJavax
   - org.openrewrite.java.migrate.UpdateJakartaAnnotationsIfExistsForJakarta
 

src/main/resources/META-INF/rewrite/java-version-21.yml

@@ -39,6 +39,10 @@ recipeList:
   - org.openrewrite.java.migrate.UpgradePluginsForJava21
   - org.openrewrite.java.migrate.DeleteDeprecatedFinalize
   - org.openrewrite.java.migrate.RemovedSubjectMethods
+  # TODO: Remove these recipes from this list once `SwitchPatternMatching` has been enabled
+  - org.openrewrite.java.migrate.lang.SwitchCaseAssignmentsToSwitchExpression
+  - org.openrewrite.java.migrate.lang.SwitchCaseReturnsToSwitchExpression
+  - org.openrewrite.java.migrate.lang.SwitchExpressionYieldToArrow
   #- org.openrewrite.java.migrate.SwitchPatternMatching
   #- org.openrewrite.java.migrate.lang.NullCheckAsSwitchCase
 
@@ -142,6 +146,9 @@ description: >-
 tags:
   - java21
 recipeList:
+  - org.openrewrite.java.migrate.lang.SwitchCaseAssignmentsToSwitchExpression
+  - org.openrewrite.java.migrate.lang.SwitchCaseReturnsToSwitchExpression
+  - org.openrewrite.java.migrate.lang.SwitchExpressionYieldToArrow
   - org.openrewrite.java.migrate.lang.IfElseIfConstructToSwitch
   - org.openrewrite.java.migrate.lang.RefineSwitchCases
   - org.openrewrite.java.migrate.lang.SwitchCaseEnumGuardToLabel