ChangeType leads to botched imports for nested fields

rewrite-java-test/src/test/java/org/openrewrite/java/ChangeTypeTest.java

@@ -1850,11 +1850,13 @@ public Test test() {
 
     @Issue("https://github.com/openrewrite/rewrite-jackson/pull/6")
     @Test
-    void changeTypeOfStaticImportOfNestedEnumValue() {
+    void changeTypeOfStaticImportOfNestedEnumValueUnused() {
         rewriteRun(
-          recipeSpec -> recipeSpec.recipe(new ChangeType(
-            "org.codehaus.jackson.map.SerializationConfig$Feature",
-            "com.fasterxml.jackson.databind.SerializationFeature", true)),
+          recipeSpec -> recipeSpec.recipes(
+            new ChangeType(
+              "org.codehaus.jackson.map.SerializationConfig$Feature",
+              "com.fasterxml.jackson.databind.SerializationFeature", true)
+          ),
           java(
             """
               package org.codehaus.jackson.map;
@@ -1868,37 +1870,77 @@ public static enum Feature {
           ),
           java(
             """
-              package com.fasterxml.jackson.databind;
-              public enum SerializationFeature {
-                  WRAP_ROOT_VALUE
+              import static org.codehaus.jackson.map.SerializationConfig.Feature.WRAP_ROOT_VALUE;
+
+              class A {
+              }
+              """,
+            """
+              import static com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE;
+
+              class A {
+              }
+              """
+          )
+        );
+    }
+
+    @Issue("https://github.com/openrewrite/rewrite-jackson/pull/6")
+    @Test
+    void changeTypeOfStaticImportOfNestedEnumValueUsed() {
+        rewriteRun(
+          recipeSpec -> recipeSpec.recipes(
+            new ChangeType(
+              "org.codehaus.jackson.map.ObjectMapper",
+              "com.fasterxml.jackson.databind.ObjectMapper", true),
+            new ChangeType(
+              "org.codehaus.jackson.map.SerializationConfig$Feature",
+              "com.fasterxml.jackson.databind.SerializationFeature", true)
+          ),
+          java(
+            """
+              package org.codehaus.jackson.map;
+              public class SerializationConfig {
+                  public static enum Feature {
+                      WRAP_ROOT_VALUE
+                  }
+              }
+              """,
+            SourceSpec::skip
+          ),
+          java(
+            """
+              package org.codehaus.jackson.map;
+              public class ObjectMapper {
+                  public ObjectMapper configure(SerializationConfig.Feature f, boolean state) {
+                      return this;
+                  }
               }
               """,
             SourceSpec::skip
           ),
           java(
             """
-              import org.codehaus.jackson.map.SerializationConfig.Feature;
+              import org.codehaus.jackson.map.ObjectMapper;
 
               import static org.codehaus.jackson.map.SerializationConfig.Feature.WRAP_ROOT_VALUE;
 
               class A {
                   void test() {
-                      configure(WRAP_ROOT_VALUE, true);
-                  }
-                  void configure(Feature f, boolean b) {
+                      ObjectMapper mapper = new ObjectMapper();
+                      mapper.configure(WRAP_ROOT_VALUE, true);
                   }
               }
               """,
             """
-              import com.fasterxml.jackson.databind.SerializationFeature;
+              import com.fasterxml.jackson.databind.ObjectMapper;
 
               import static com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE;
 
               class A {
                   void test() {
-                      configure(WRAP_ROOT_VALUE, true);
-                  }
-                  void configure(SerializationFeature f, boolean b) {
+                      ObjectMapper mapper = new ObjectMapper();
+                      mapper.configure(WRAP_ROOT_VALUE, true);
                   }
               }
               """

rewrite-java/src/main/java/org/openrewrite/java/ChangeType.java

@@ -227,7 +227,10 @@ private void addImport(JavaType.FullyQualified owningClass) {
                 }
 
                 if (sf != null) {
-                    sf = sf.withImports(ListUtils.map(sf.getImports(), i -> visitAndCast(i, ctx, super::visitImport)));
+                    sf = sf.withImports(ListUtils.map(sf.getImports(), originalImport -> {
+                        J.Import modifiedImport = visitAndCast(originalImport, ctx, super::visitImport);
+                        return modifiedImport; // FIXME Mangles import
+                    }));
                 }
 
                 j = sf;