Fix LombokValToFinalVar removing lombok.* imports

Author: sambsnyd

src/main/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVar.java

@@ -22,7 +22,6 @@
 import org.openrewrite.internal.ListUtils;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaTemplate;
-import org.openrewrite.java.RemoveImport;
 import org.openrewrite.java.search.MaybeUsesImport;
 import org.openrewrite.java.search.UsesType;
 import org.openrewrite.java.tree.J;
@@ -69,11 +68,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
     private static class LombokValToFinalVarVisitor extends JavaIsoVisitor<ExecutionContext> {
         @Override
         public J.CompilationUnit visitCompilationUnit(J.CompilationUnit compilationUnit, ExecutionContext ctx) {
-            // Force remove `lombok.var` import; as the parser does not recognize `var` as coming from Lombok
-            RemoveImport<ExecutionContext> op = new RemoveImport<>(LOMBOK_VAR, true);
-            if (!getAfterVisit().contains(op)) {
-                doAfterVisit(op);
-            }
+            maybeRemoveImport(LOMBOK_VAR);
             return super.visitCompilationUnit(compilationUnit, ctx);
         }
 

src/test/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVarTest.java

@@ -20,7 +20,6 @@
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
-import org.openrewrite.test.TypeValidation;
 
 import static org.openrewrite.java.Assertions.java;
 import static org.openrewrite.java.Assertions.version;
@@ -64,7 +63,6 @@ void bar() {
     void replaceAssignmentVar() {
         //language=java
         rewriteRun(
-          spec -> spec.typeValidationOptions(TypeValidation.builder().identifiers(false).build()),
           version(
             java(
               """
@@ -88,12 +86,37 @@ void bar() {
         );
     }
 
+    @Test
+    void preserveStarImport() {
+        //language=java
+        rewriteRun(
+          version(
+            java(
+              """
+                import lombok.*;
+
+                @Getter
+                @Setter
+                @NoArgsConstructor
+                @Data
+                @Value
+                class A {
+                    void bar() {
+                        var foo = "foo";
+                    }
+                }
+                """
+            ),
+            17
+          )
+        );
+    }
+
     @SuppressWarnings({"StatementWithEmptyBody", "RedundantOperationOnEmptyContainer"})
     @Test
     void valInForEachStatement() {
         //language=java
         rewriteRun(
-          spec -> spec.afterTypeValidationOptions(TypeValidation.builder().identifiers(false).build()),
           version(
             java(
               """