Skip to content

fix: Handle ImmutableOf as Select on MethodInvocation #557

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

Merged
merged 2 commits into from
Sep 18, 2024
Merged

fix: Handle ImmutableOf as Select on MethodInvocation #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
200f369
fix: Handle ImmutableOf as Select on MethodInvocation
amishra-u Sep 18, 2024
cdf17aa
Rename argument for clarity
timtebeek Sep 18, 2024
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
14 changes: 4 additions & 10 deletions src/main/java/org/openrewrite/java/migrate/guava/AbstractNoGuavaImmutableOf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
return Preconditions.check(check, new JavaVisitor<ExecutionContext>() {
@Override
public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
if (IMMUTABLE_MATCHER.matches(method) && isParentTypeDownCast()) {
if (IMMUTABLE_MATCHER.matches(method) && isParentTypeDownCast(method)) {
maybeRemoveImport(guavaType);
maybeAddImport(javaType);

Expand Down Expand Up @@ -115,7 +115,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
return super.visitMethodInvocation(method, ctx);
}

private boolean isParentTypeDownCast() {
private boolean isParentTypeDownCast(MethodCall immutableMethod) {
J parent = getCursor().dropParentUntil(J.class::isInstance).getValue();
boolean isParentTypeDownCast = false;
if (parent instanceof J.VariableDeclarations.NamedVariable) {
Expand All @@ -138,14 +138,8 @@ private boolean isParentTypeDownCast() {
}
} else if (parent instanceof J.MethodInvocation) {
J.MethodInvocation m = (J.MethodInvocation) parent;
if (m.getMethodType() != null) {
int index = 0;
for (Expression argument : m.getArguments()) {
if (IMMUTABLE_MATCHER.matches(argument)) {
break;
}
index++;
}
int index = m.getArguments().indexOf(immutableMethod);
if (m.getMethodType() != null && index != -1) {
isParentTypeDownCast = isParentTypeMatched(m.getMethodType().getParameterTypes().get(index));
}
} else if (parent instanceof J.NewClass) {
Expand Down
35 changes: 35 additions & 0 deletions src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,41 @@ class Test {
);
}

@Test
void doNotChangeMethodInvocationWithSelect() {
//language=java
rewriteRun(
java(
"""
import java.util.List;

public class A {
Object[] list;
public void method(Object[] list ) {
this.list = list;
}
}
"""
),
version(
//language=java
java(
"""
import com.google.common.collect.ImmutableList;

class Test {
void method() {
A a = new A();
a.method(ImmutableList.of().toArray());
}
}
"""
),
11
)
);
}

@Test
void methodInvocationWithListArgument() {
//language=java
Expand Down