Limit JodaTimeRecipe import changes (#666)

* Limit JodaTimeRecipe import changes - Fixes #665 * Remove unused import * Remove unused import
openrewrite · Jan 23, 2025 · 4c17bc3 · 4c17bc3
1 parent ffa69ef
commit 4c17bc3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 32 deletions.
diff --git a/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeRecipe.java b/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeRecipe.java
@@ -18,7 +18,10 @@
 import lombok.Getter;
 import org.jspecify.annotations.Nullable;
 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;
 import org.openrewrite.java.tree.JavaType;
@@ -42,13 +45,14 @@ public Accumulator getInitialValue(ExecutionContext ctx) {
     }
 
     @Override
-    public JodaTimeScanner getScanner(Accumulator acc) {
+    public TreeVisitor<?, ExecutionContext> getScanner(Accumulator acc) {
         return new JodaTimeScanner(acc);
     }
 
     @Override
-    public JodaTimeVisitor getVisitor(Accumulator acc) {
-        return new JodaTimeVisitor(acc, true, new LinkedList<>());
+    public TreeVisitor<?, ExecutionContext> getVisitor(Accumulator acc) {
+        JodaTimeVisitor jodaTimeVisitor = new JodaTimeVisitor(acc, true, new LinkedList<>());
+        return Preconditions.check(new UsesType<>("org.joda.time.*", true), jodaTimeVisitor);
     }
 
     @Getter

diff --git a/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeVisitor.java b/src/main/java/org/openrewrite/java/migrate/joda/JodaTimeVisitor.java
@@ -59,29 +59,32 @@ public Javadoc visitReference(Javadoc.Reference reference, ExecutionContext ctx)
 
     @Override
     public @NonNull J visitCompilationUnit(@NonNull J.CompilationUnit cu, @NonNull ExecutionContext ctx) {
-        maybeRemoveImport(JODA_DATE_TIME);
-        maybeRemoveImport(JODA_DATE_TIME_ZONE);
-        maybeRemoveImport(JODA_TIME_FORMAT);
-        maybeRemoveImport(JODA_DURATION);
-        maybeRemoveImport(JODA_ABSTRACT_INSTANT);
-        maybeRemoveImport(JODA_INSTANT);
-        maybeRemoveImport(JODA_INTERVAL);
-        maybeRemoveImport("java.util.Locale");
+        J j = super.visitCompilationUnit(cu, ctx);
+        if (j != cu) {
+            maybeRemoveImport(JODA_DATE_TIME);
+            maybeRemoveImport(JODA_DATE_TIME_ZONE);
+            maybeRemoveImport(JODA_TIME_FORMAT);
+            maybeRemoveImport(JODA_DURATION);
+            maybeRemoveImport(JODA_ABSTRACT_INSTANT);
+            maybeRemoveImport(JODA_INSTANT);
+            maybeRemoveImport(JODA_INTERVAL);
+            maybeRemoveImport("java.util.Locale");
 
-        maybeAddImport(JAVA_DATE_TIME);
-        maybeAddImport(JAVA_ZONE_OFFSET);
-        maybeAddImport(JAVA_ZONE_ID);
-        maybeAddImport(JAVA_INSTANT);
-        maybeAddImport(JAVA_TIME_FORMATTER);
-        maybeAddImport(JAVA_TIME_FORMAT_STYLE);
-        maybeAddImport(JAVA_DURATION);
-        maybeAddImport(JAVA_LOCAL_DATE);
-        maybeAddImport(JAVA_LOCAL_TIME);
-        maybeAddImport(JAVA_TEMPORAL_ISO_FIELDS);
-        maybeAddImport(JAVA_CHRONO_FIELD);
-        maybeAddImport(JAVA_UTIL_DATE);
-        maybeAddImport(THREE_TEN_EXTRA_INTERVAL);
-        return super.visitCompilationUnit(cu, ctx);
+            maybeAddImport(JAVA_DATE_TIME);
+            maybeAddImport(JAVA_ZONE_OFFSET);
+            maybeAddImport(JAVA_ZONE_ID);
+            maybeAddImport(JAVA_INSTANT);
+            maybeAddImport(JAVA_TIME_FORMATTER);
+            maybeAddImport(JAVA_TIME_FORMAT_STYLE);
+            maybeAddImport(JAVA_DURATION);
+            maybeAddImport(JAVA_LOCAL_DATE);
+            maybeAddImport(JAVA_LOCAL_TIME);
+            maybeAddImport(JAVA_TEMPORAL_ISO_FIELDS);
+            maybeAddImport(JAVA_CHRONO_FIELD);
+            maybeAddImport(JAVA_UTIL_DATE);
+            maybeAddImport(THREE_TEN_EXTRA_INTERVAL);
+        }
+        return j;
     }
 
     @Override

diff --git a/src/test/java/org/openrewrite/java/migrate/joda/JodaTimeVisitorTest.java b/src/test/java/org/openrewrite/java/migrate/joda/JodaTimeVisitorTest.java
@@ -15,7 +15,6 @@
  */
 package org.openrewrite.java.migrate.joda;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
 import org.openrewrite.java.JavaParser;
@@ -425,7 +424,8 @@ void migrateAbstractInstant() {
           java(
             """
               import org.joda.time.DateTime;
-              import org.joda.time.Duration;import org.joda.time.Instant;
+              import org.joda.time.Duration;
+              import org.joda.time.Instant;
               import org.joda.time.format.DateTimeFormat;
 
               class A {
@@ -484,7 +484,6 @@ public void foo() {
         );
     }
 
-    @Disabled
     @Test
     void migrateAbstractDateTime() {
         // language=java
@@ -804,7 +803,7 @@ void migrateInterval() {
               import org.joda.time.Duration;
               import org.joda.time.Interval;
               import org.joda.time.DateTimeZone;
-    
+
               class A {
                   public void foo() {
                       System.out.println(new Interval(50, 100));
@@ -820,7 +819,7 @@ public void foo() {
               import java.time.Duration;
               import java.time.Instant;
               import java.time.ZonedDateTime;
-    
+
               class A {
                   public void foo() {
                       System.out.println(Interval.of(Instant.ofEpochMilli(50), Instant.ofEpochMilli(100)));
@@ -880,7 +879,7 @@ void migrateBaseDuration() {
           java(
             """
                 import org.joda.time.Duration;
-  
+
                 class A {
                     public void foo() {
                         Duration d = new Duration(100);
@@ -909,7 +908,7 @@ void migrateBaseInterval() {
           java(
             """
                 import org.joda.time.Interval;
-  
+
                 class A {
                     public void foo() {
                         Interval i = new Interval(50, 100);