Delegate from RemoveIllegalSemicolons to RemoveExtraSemicolons

timtebeek · timtebeek · commit d9674d11f2a6 · 2025-08-07T12:20:56.000+02:00
diff --git a/src/main/java/org/openrewrite/java/migrate/RemoveIllegalSemicolons.java b/src/main/java/org/openrewrite/java/migrate/RemoveIllegalSemicolons.java
@@ -15,14 +15,17 @@
  */
 package org.openrewrite.java.migrate;
 
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
-import org.openrewrite.TreeVisitor;
-import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.search.UsesJavaVersion;
-import org.openrewrite.java.tree.J;
+import org.openrewrite.staticanalysis.RemoveExtraSemicolons;
 
+import java.util.List;
+
+import static java.util.Collections.singletonList;
+
+/**
+ * @deprecated Use {@link RemoveExtraSemicolons} instead.
+ */
+@Deprecated
 public class RemoveIllegalSemicolons extends Recipe {
     @Override
     public String getDisplayName() {
@@ -33,22 +36,11 @@ public String getDisplayName() {
     public String getDescription() {
         //language=markdown
         return "Remove semicolons after package declarations and imports, no longer accepted in Java 21 as of " +
-               "[JDK-8027682](https://bugs.openjdk.org/browse/JDK-8027682).";
+                "[JDK-8027682](https://bugs.openjdk.org/browse/JDK-8027682).";
     }
 
     @Override
-    public TreeVisitor<?, ExecutionContext> getVisitor() {
-        return Preconditions.check(new UsesJavaVersion<>(21), new JavaIsoVisitor<ExecutionContext>() {
-            @Override
-            public J.Import visitImport(J.Import _import, ExecutionContext ctx) {
-                J.Import im = super.visitImport(_import, ctx);
-                if (im.getPrefix().getWhitespace().contains(";")) {
-                    im = im.withPrefix(im.getPrefix()
-                            .withWhitespace(im.getPrefix().getWhitespace()
-                                    .replaceAll("\\s*;(\\R*)\\s*", "$1")));
-                }
-                return im;
-            }
-        });
+    public List<Recipe> getRecipeList() {
+        return singletonList(new RemoveExtraSemicolons());
     }
 }
diff --git a/src/main/resources/META-INF/rewrite/java-version-21.yml b/src/main/resources/META-INF/rewrite/java-version-21.yml
@@ -27,7 +27,7 @@ tags:
 recipeList:
   - org.openrewrite.java.migrate.UpgradeToJava17
   - org.openrewrite.java.migrate.UpgradeBuildToJava21
-  - org.openrewrite.java.migrate.RemoveIllegalSemicolons
+  - org.openrewrite.staticanalysis.RemoveExtraSemicolons
   - org.openrewrite.java.migrate.lang.ThreadStopUnsupported
   - org.openrewrite.java.migrate.net.URLConstructorToURICreate
   # Fails to introduce new exception handling https://github.com/openrewrite/rewrite-migrate-java/issues/467
diff --git a/src/test/java/org/openrewrite/java/migrate/RemoveIllegalSemicolonsTest.java b/src/test/java/org/openrewrite/java/migrate/RemoveIllegalSemicolonsTest.java
