Skip to content
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

Do not convert return types in NoGuavaJava21 by default #601

Merged
merged 14 commits into from
Nov 25, 2024
Merged

Do not convert return types in NoGuavaJava21 by default #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0890b40
[HotFix] NoGuavaJava21 causing invalid code since v2.28.0
BramliAK Nov 13, 2024
a36e0e9
Merge branch 'main' into hotfix-NoGuavaJava21
timtebeek Nov 13, 2024
85ecc14
Apply formatter to minimize diff
timtebeek Nov 13, 2024
20ce9da
add Ability To Convert Return Type as an option
BramliAK Nov 13, 2024
961f8d6
Merge branch 'main' into hotfix-NoGuavaJava21
BramliAK Nov 13, 2024
e49def9
Apply suggestions from code review
timtebeek Nov 14, 2024
88642b5
Merge branch 'main' into hotfix-NoGuavaJava21
BramliAK Nov 14, 2024
25464eb
fix conflicts
BramliAK Nov 14, 2024
1388ca4
Apply formatter
timtebeek Nov 25, 2024
483b01e
Merge branch 'main' into hotfix-NoGuavaJava21
timtebeek Nov 25, 2024
f9a731f
Minimize diff by restoring original method order
timtebeek Nov 25, 2024
aec9ec8
Minimize diff by restoring original method order
timtebeek Nov 25, 2024
05d79fd
Move tests into nested sub class
timtebeek Nov 25, 2024
22c6dfa
Correctly evaluate nullable Boolean
timtebeek Nov 25, 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
35 changes: 25 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 @@ -37,11 +37,25 @@ abstract class AbstractNoGuavaImmutableOf extends Recipe {
private final String guavaType;
private final String javaType;

@Option(displayName = "Whether to convert return type (the default value is false).",
description = "converting the return type from Guava Type to Java Type " +
"The default value is false.",
example = "true",
required = false)
@Nullable
Boolean convertReturnType;

AbstractNoGuavaImmutableOf(String guavaType, String javaType) {
this.guavaType = guavaType;
this.javaType = javaType;
}

AbstractNoGuavaImmutableOf(String guavaType, String javaType, @Nullable Boolean convertReturnType) {
this.guavaType = guavaType;
this.javaType = javaType;
this.convertReturnType = convertReturnType;
}

private String getShortType(String fullyQualifiedType) {
return fullyQualifiedType.substring(javaType.lastIndexOf(".") + 1);
}
Expand Down Expand Up @@ -103,8 +117,9 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
@Override
public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
J.VariableDeclarations mv = (J.VariableDeclarations) super.visitVariableDeclarations(multiVariable, ctx);

if (multiVariable != mv && TypeUtils.isOfClassType(mv.getType(), guavaType)) {
if (Boolean.TRUE.equals(convertReturnType) &&
multiVariable != mv &&
TypeUtils.isOfClassType(mv.getType(), guavaType)) {
JavaType newType = JavaType.buildType(javaType);
mv = mv.withTypeExpression(mv.getTypeExpression() == null ?
null : createNewTypeExpression(mv.getTypeExpression(), newType));
Expand All @@ -117,7 +132,6 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
return variable;
}));
}

return mv;
}

Expand Down Expand Up @@ -148,7 +162,6 @@ private TypeTree createNewTypeExpression(TypeTree typeTree, JavaType newType) {
);
}


private boolean isParentTypeDownCast(MethodCall immutableMethod) {
J parent = getCursor().dropParentUntil(J.class::isInstance).getValue();
boolean isParentTypeDownCast = false;
Expand All @@ -173,10 +186,12 @@ private boolean isParentTypeDownCast(MethodCall immutableMethod) {
} else if (parent instanceof J.MethodInvocation) {
J.MethodInvocation m = (J.MethodInvocation) parent;
int index = m.getArguments().indexOf(immutableMethod);
if (m.getMethodType() != null && index != -1 && !m.getMethodType().getParameterTypes().isEmpty()) {
isParentTypeDownCast = isParentTypeMatched(m.getMethodType().getParameterTypes().get(index));
} else {
isParentTypeDownCast = true;
if (m.getMethodType() != null) {
if (index != -1 && !m.getMethodType().getParameterTypes().isEmpty()) {
isParentTypeDownCast = isParentTypeMatched(m.getMethodType().getParameterTypes().get(index));
} else {
isParentTypeDownCast = !TypeUtils.isOfClassType(m.getMethodType().getReturnType(), guavaType);
}
}
} else if (parent instanceof J.NewClass) {
J.NewClass c = (J.NewClass) parent;
Expand Down Expand Up @@ -207,8 +222,8 @@ private boolean isParentTypeDownCast(MethodCall immutableMethod) {
private boolean isParentTypeMatched(@Nullable JavaType type) {
JavaType.FullyQualified fq = TypeUtils.asFullyQualified(type);
return TypeUtils.isOfClassType(fq, javaType) ||
TypeUtils.isOfClassType(fq, "java.lang.Object") ||
TypeUtils.isOfClassType(fq, guavaType);
(Boolean.TRUE.equals(convertReturnType) && TypeUtils.isOfClassType(fq, guavaType)) ||
TypeUtils.isOfClassType(fq, "java.lang.Object");
}
});
}
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@
*/
package org.openrewrite.java.migrate.guava;

import org.jspecify.annotations.Nullable;

public class NoGuavaImmutableListOf extends AbstractNoGuavaImmutableOf {
public NoGuavaImmutableListOf() {
super("com.google.common.collect.ImmutableList", "java.util.List");
}

public NoGuavaImmutableListOf(@Nullable Boolean convertReturnType) {
super("com.google.common.collect.ImmutableList", "java.util.List", convertReturnType);
}
}
6 changes: 6 additions & 0 deletions src/main/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableMapOf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@
*/
package org.openrewrite.java.migrate.guava;

import org.jspecify.annotations.Nullable;

public class NoGuavaImmutableMapOf extends AbstractNoGuavaImmutableOf {
public NoGuavaImmutableMapOf() {
super("com.google.common.collect.ImmutableMap", "java.util.Map");
}

public NoGuavaImmutableMapOf(@Nullable Boolean convertReturnType) {
super("com.google.common.collect.ImmutableMap", "java.util.Map", convertReturnType);
}
}
6 changes: 6 additions & 0 deletions src/main/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableSetOf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@
*/
package org.openrewrite.java.migrate.guava;

import org.jspecify.annotations.Nullable;

public class NoGuavaImmutableSetOf extends AbstractNoGuavaImmutableOf {
public NoGuavaImmutableSetOf() {
super("com.google.common.collect.ImmutableSet", "java.util.Set");
}

public NoGuavaImmutableSetOf(@Nullable Boolean convertReturnType) {
super("com.google.common.collect.ImmutableSet", "java.util.Set", convertReturnType);
}
}
Loading