Skip to content

Fix RemoveUnusedImports for inherited nested types #8091

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

Open
sakshichitnis27 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix RemoveUnusedImports for inherited nested types #8091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions rewrite-java-test/src/test/java/org/openrewrite/java/RemoveUnusedImportsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,38 @@ public abstract class MyMapEntry<K, V> implements Entry<K, V> {
);
}

@Issue("https://github.com/openrewrite/rewrite/issues/7569")
@Test
void doNotRemoveStaticImportForInheritedNestedType() {
rewriteRun(
java(
"""
package com.helloworld;

import static com.helloworld.FakeUserAccountClient.UserAccountDataAuth;

import java.util.List;

class Main {
List<UserAccountDataAuth> getUsers() {
return List.of(UserAccountDataAuth.create());
}
}

class FakeUserAccountClient implements UserAccountClient {}

interface UserAccountClient {
record UserAccountDataAuth() {
static UserAccountDataAuth create() {
return new UserAccountDataAuth();
}
}
}
"""
)
);
}

@Test
void doNotRemoveImportUsedOnlyInNestedGeneric() {
rewriteRun(
Expand Down
65 changes: 51 additions & 14 deletions rewrite-java/src/main/java/org/openrewrite/java/RemoveUnusedImports.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,25 +153,18 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
.orElse(target);
SortedSet<String> targetMethodsAndFields = methodsAndFieldsByTypeName.get(modifiedTarget);

Set<JavaType.FullyQualified> staticClasses = null;
for (JavaType.FullyQualified maybeStatic : typesByPackage.getOrDefault(target, emptySet())) {
if (maybeStatic.getOwningClass() != null && outerType.startsWith(maybeStatic.getOwningClass().getFullyQualifiedName())) {
if (staticClasses == null) {
staticClasses = new HashSet<>();
}
staticClasses.add(maybeStatic);
}
}
Set<JavaType.FullyQualified> staticClasses = staticClassesInUse(typesByPackage, target,
qualid.getTarget().getType(), qualid.getSimpleName());

if (methodsAndFields == null && targetMethodsAndFields == null && staticClasses == null) {
if (methodsAndFields == null && targetMethodsAndFields == null && staticClasses.isEmpty()) {
anImport.used = false;
changed = true;
} else if ("*".equals(qualid.getSimpleName())) {
if (isPackageAlwaysFolded(layoutStyle.getPackagesToFold(), elem)) {
anImport.used = true;
usedStaticWildcardImports.add(elem.getTypeName());
} else if (((methodsAndFields == null ? 0 : methodsAndFields.size()) +
(staticClasses == null ? 0 : staticClasses.size())) < layoutStyle.getNameCountToUseStarImport()) {
staticClasses.size()) < layoutStyle.getNameCountToUseStarImport()) {
// replacing the star with a series of unfolded imports
anImport.imports.clear();

Expand All @@ -185,7 +178,7 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
}
}

if (staticClasses != null) {
if (!staticClasses.isEmpty()) {
for (JavaType.FullyQualified fqn : staticClasses) {
anImport.imports.add(new JRightPadded<>(elem
.withId(randomId())
Expand All @@ -204,9 +197,10 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
} else {
usedStaticWildcardImports.add(elem.getTypeName());
}
} else if (staticClasses != null && staticClasses.stream().anyMatch(c -> elem.getTypeName().equals(c.getFullyQualifiedName())) ||
} else if (!staticClasses.isEmpty() ||
(methodsAndFields != null && methodsAndFields.contains(qualid.getSimpleName())) ||
(targetMethodsAndFields != null && targetMethodsAndFields.contains(qualid.getSimpleName()))) {
(targetMethodsAndFields != null &&
targetMethodsAndFields.contains(qualid.getSimpleName()))) {
anImport.used = true;
} else {
anImport.used = false;
Expand Down Expand Up @@ -335,6 +329,49 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
return cu;
}

private static Set<JavaType.FullyQualified> staticClassesInUse(
Map<String, Set<JavaType.FullyQualified>> typesByPackage, String target, JavaType targetType,
String importedName) {
Set<String> targetTypes = staticClassTargets(target, targetType);
Set<JavaType.FullyQualified> staticClasses = new HashSet<>();
boolean wildcardImport = "*".equals(importedName);
for (String targetTypeName : targetTypes) {
for (JavaType.FullyQualified maybeStatic : typesByPackage.getOrDefault(targetTypeName, emptySet())) {
JavaType.FullyQualified owningClass = maybeStatic.getOwningClass();
if (owningClass != null &&
targetTypes.contains(toFullyQualifiedName(owningClass.getFullyQualifiedName())) &&
(wildcardImport || importedName.equals(simpleClassName(maybeStatic)))) {
staticClasses.add(maybeStatic);
}
}
}
return staticClasses;
}

private static Set<String> staticClassTargets(String target, JavaType targetType) {
Set<String> targets = new HashSet<>();
targets.add(target);
collectInheritedTypeNames(TypeUtils.asFullyQualified(targetType), targets, new HashSet<>());
return targets;
}

private static void collectInheritedTypeNames(JavaType.FullyQualified type, Set<String> targets,
Set<String> seen) {
if (type == null || !seen.add(type.getFullyQualifiedName())) {
return;
}
targets.add(toFullyQualifiedName(type.getFullyQualifiedName()));
collectInheritedTypeNames(type.getSupertype(), targets, seen);
for (JavaType.FullyQualified anInterface : type.getInterfaces()) {
collectInheritedTypeNames(anInterface, targets, seen);
}
}

private static String simpleClassName(JavaType.FullyQualified type) {
String className = type.getClassName();
return className.contains(".") ? className.substring(className.lastIndexOf('.') + 1) : className;
}

private static Set<String> getAmbiguousStaticImportNames(J.CompilationUnit cu) {
Set<String> typesWithWildcardImport = new HashSet<>();
for (J.Import elem : cu.getImports()) {
Expand Down