Don't modify package declaration of siblings in ChangeType

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

@@ -1802,4 +1802,48 @@ public void test(String s) {
         );
 
     }
+
+    @Issue("https://github.com/openrewrite/rewrite/issues/4182")
+    @Test
+    void doesNotModifyPackageOfSibling() {
+        rewriteRun(
+          spec -> spec.recipe(new ChangeType("org.openrewrite.Test", "org.openrewrite.subpackage.Test", false)),
+          java(
+            """
+              package org.openrewrite;
+              public class Test {
+              }
+              """,
+            """
+              package org.openrewrite.subpackage;
+              public class Test {
+              }
+              """
+          ),
+          java(
+            """
+              package org.openrewrite;
+
+              import org.openrewrite.Test;
+
+              public class Sibling {
+                  public Test test() {
+                      return new Test();
+                  }
+              }
+              """,
+            """
+              package org.openrewrite;
+
+              import org.openrewrite.subpackage.Test;
+
+              public class Sibling {
+                  public Test test() {
+                      return new Test();
+                  }
+              }
+              """
+          )
+        );
+    }
 }

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

@@ -502,6 +502,15 @@ private ChangeClassDefinition(String oldFullyQualifiedTypeName, String newFullyQ
         public J visit(@Nullable Tree tree, ExecutionContext ctx) {
             if (tree instanceof JavaSourceFile) {
                 JavaSourceFile cu = (JavaSourceFile) tree;
+                for (J.ClassDeclaration declaration : cu.getClasses()) {
+                    // Check the class name instead of source path, as it might differ
+                    String fqn = declaration.getType().getFullyQualifiedName();
+                    if (fqn.equals(originalType.getFullyQualifiedName())) {
+                        getCursor().putMessage("UPDATE_PACKAGE", true);
+                        break;
+                    }
+                }
+
                 String oldPath = cu.getSourcePath().toString().replace('\\', '/');
                 // The old FQN must exist in the path.
                 String oldFqn = fqnToPath(originalType.getFullyQualifiedName());
@@ -531,17 +540,20 @@ 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())) {
-                JavaType.FullyQualified fq = TypeUtils.asFullyQualified(targetType);
-                if (fq != null) {
-                    if (fq.getPackageName().isEmpty()) {
-                        getCursor().putMessageOnFirstEnclosing(J.CompilationUnit.class, "UPDATE_PREFIX", true);
-                        //noinspection DataFlowIssue
-                        return null;
-                    } else {
-                        String newPkg = targetType.getPackageName();
-                        return JavaTemplate.builder(newPkg).contextSensitive().build().apply(getCursor(), pkg.getCoordinates().replace());
+            Boolean updatePackage = getCursor().pollNearestMessage("UPDATE_PACKAGE");
+            if (updatePackage != null && updatePackage) {
+                String original = pkg.getExpression().printTrimmed(getCursor()).replaceAll("\\s", "");
+                if (original.equals(originalType.getPackageName())) {
+                    JavaType.FullyQualified fq = TypeUtils.asFullyQualified(targetType);
+                    if (fq != null) {
+                        if (fq.getPackageName().isEmpty()) {
+                            getCursor().putMessageOnFirstEnclosing(J.CompilationUnit.class, "UPDATE_PREFIX", true);
+                            //noinspection DataFlowIssue
+                            return null;
+                        } else {
+                            String newPkg = targetType.getPackageName();
+                            return JavaTemplate.builder(newPkg).contextSensitive().build().apply(getCursor(), pkg.getCoordinates().replace());
+                        }
                     }
                 }
             }

rewrite-test/src/main/java/org/openrewrite/test/SourceSpec.java

@@ -106,7 +106,7 @@ Path getSourcePath() {
     protected boolean noTrim = false;
 
     /**
-     * @param sourcePath The source path after the recipe is run.
+     * @param sourcePath The source path before the recipe is run.
      * @return This source spec.
      */
     public SourceSpec<T> path(Path sourcePath) {
@@ -115,7 +115,7 @@ public SourceSpec<T> path(Path sourcePath) {
     }
 
     /**
-     * @param sourcePath The source path after the recipe is run.
+     * @param sourcePath The source path before the recipe is run.
      * @return This source spec.
      */
     public SourceSpec<T> path(String sourcePath) {