Skip to content

fix: ChangePackage from packageName is part of the submodule dir name issue #6058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

fix: ChangePackage from packageName is part of the submodule dir name issue #6058

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52e3771
fix: ChangePackage from packageName is part of the submodule dir name…
qxo Sep 20, 2025
f2e88da
Merge branch 'main' into fix-ChangePackage
timtebeek Oct 2, 2025
ffdbe66
fixup! fix: ChangePackage from packageName is part of the submodule d…
qxo Oct 3, 2025
f436118
Merge branch 'main' into fix-ChangePackage
timtebeek Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions rewrite-java/src/main/java/org/openrewrite/java/ChangePackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,22 @@ public J postVisit(J tree, ExecutionContext ctx) {
String path = ((SourceFile) sf).getSourcePath().toString().replace('\\', '/');
String changingFrom = getCursor().getMessage(RENAME_FROM_KEY);
assert changingFrom != null;
sf = ((SourceFile) sf).withSourcePath(Paths.get(path.replaceFirst(
changingFrom.replace('.', '/'),
changingTo.replace('.', '/')
)));
final String oldPathPart = changingFrom.replace('.', '/');
final String newPathPart = changingTo.replace('.', '/');
final String newPath;
if (path.startsWith(oldPathPart)) {
newPath = newPathPart + path.substring(oldPathPart.length());
} else {
final int dirIdx = path.indexOf('/');
final String prefix = dirIdx == -1 ? null : path.substring(0, dirIdx);
final String pathNoPrefix = dirIdx == -1 ? path : path.substring(dirIdx);
final String newPath1 = pathNoPrefix.replaceFirst(
oldPathPart,
newPathPart
);
newPath = prefix == null ? newPath1 : prefix + newPath1;
}
sf = ((SourceFile) sf).withSourcePath(Paths.get(newPath));

for (J.Import anImport : sf.getImports()) {
if (anImport.getPackageName().equals(changingTo) && !anImport.isStatic()) {
Expand Down
Loading