Only change package declaration if the source path needs updating

openrewrite · May 10, 2024 · 2988966 · 2988966
1 parent fb6e863
commit 2988966
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/ChangeTypeTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/ChangeTypeTest.java
@@ -1823,7 +1823,9 @@ public class Test {
           java(
             """
               package org.openrewrite;
-
+              
+              import org.openrewrite.Test;
+              
               public class Sibling {
                   public Test test() {
                       return new Test();
@@ -1832,9 +1834,9 @@ public Test test() {
               """,
             """
               package org.openrewrite;
-
+              
               import org.openrewrite.subpackage.Test;
-
+              
               public class Sibling {
                   public Test test() {
                       return new Test();

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ChangeType.java b/rewrite-java/src/main/java/org/openrewrite/java/ChangeType.java
@@ -491,6 +491,7 @@ private static class ChangeClassDefinition extends JavaIsoVisitor<ExecutionConte
         private final JavaType.Class originalType;
         private final JavaType.Class targetType;
         private final MethodMatcher originalConstructor;
+        private boolean updatePath;
 
         private ChangeClassDefinition(String oldFullyQualifiedTypeName, String newFullyQualifiedTypeName) {
             this.originalType = JavaType.ShallowClass.build(oldFullyQualifiedTypeName);
@@ -508,7 +509,8 @@ public J visit(@Nullable Tree tree, ExecutionContext ctx) {
                 String newFqn = fqnToPath(targetType.getFullyQualifiedName());
 
                 Path newPath = Paths.get(oldPath.replaceFirst(oldFqn, newFqn));
-                if (updatePath(cu, oldPath, newPath.toString())) {
+                updatePath = updatePath(cu, oldPath, newPath.toString());
+                if (updatePath) {
                     cu = cu.withSourcePath(newPath);
                 }
                 return super.visit(cu, ctx);
@@ -532,7 +534,7 @@ private boolean updatePath(JavaSourceFile sf, String oldPath, String newPath) {
         @Override
         public J.Package visitPackage(J.Package pkg, ExecutionContext ctx) {
             String original = pkg.getExpression().printTrimmed(getCursor()).replaceAll("\\s", "");
-            if (original.equals(originalType.getPackageName())) {
+            if (updatePath && original.equals(originalType.getPackageName())) {
                 JavaType.FullyQualified fq = TypeUtils.asFullyQualified(targetType);
                 if (fq != null) {
                     if (fq.getPackageName().isEmpty()) {