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

Keep whitespace between arguments in Guava immutable recipes #583

Merged
merged 2 commits into from
Oct 20, 2024
Merged

Keep whitespace between arguments in Guava immutable recipes #583

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13b5268
Keep whitespace between arguments in Guava immutable recipes
knutwannheden Oct 20, 2024
29ff98e
Add `@DocumentExample` to one test case
knutwannheden Oct 20, 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
51 changes: 15 additions & 36 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 @@ -28,8 +28,6 @@
import org.openrewrite.java.tree.*;

import java.time.Duration;
import java.util.Objects;
import java.util.stream.Collectors;

abstract class AbstractNoGuavaImmutableOf extends Recipe {

Expand Down Expand Up @@ -72,45 +70,26 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
maybeRemoveImport(guavaType);
maybeAddImport(javaType);

String template = method.getArguments().stream()
.map(arg -> {
if (arg.getType() instanceof JavaType.Primitive) {
String type = "";
if (JavaType.Primitive.Boolean == arg.getType()) {
type = "Boolean";
} else if (JavaType.Primitive.Byte == arg.getType()) {
type = "Byte";
} else if (JavaType.Primitive.Char == arg.getType()) {
type = "Character";
} else if (JavaType.Primitive.Double == arg.getType()) {
type = "Double";
} else if (JavaType.Primitive.Float == arg.getType()) {
type = "Float";
} else if (JavaType.Primitive.Int == arg.getType()) {
type = "Integer";
} else if (JavaType.Primitive.Long == arg.getType()) {
type = "Long";
} else if (JavaType.Primitive.Short == arg.getType()) {
type = "Short";
} else if (JavaType.Primitive.String == arg.getType()) {
type = "String";
}
return TypeUtils.asFullyQualified(JavaType.buildType("java.lang." + type));
} else {
return TypeUtils.asFullyQualified(arg.getType());
}
})
.filter(Objects::nonNull)
.map(type -> "#{any(" + type.getFullyQualifiedName() + ")}")
.collect(Collectors.joining(",", getShortType(javaType) + ".of(", ")"));
String template;
Object[] args;
if (method.getArguments().isEmpty() || method.getArguments().get(0) instanceof J.Empty) {
template = getShortType(javaType) + ".of()";
args = new Object[]{};
} else if ("com.google.common.collect.ImmutableMap".equals(guavaType)) {
template = getShortType(javaType) + ".of(#{any()}, #{any()})";
args = new Object[]{method.getArguments().get(0), method.getArguments().get(1)};
} else {
template = getShortType(javaType) + ".of(#{any()})";
args = new Object[]{method.getArguments().get(0)};
}

return JavaTemplate.builder(template)
.contextSensitive()
J.MethodInvocation templated = JavaTemplate.builder(template)
.imports(javaType)
.build()
.apply(getCursor(),
method.getCoordinates().replace(),
method.getArguments().get(0) instanceof J.Empty ? new Object[]{} : method.getArguments().toArray());
args);
return templated.getPadding().withArguments(method.getPadding().getArguments());
}
return super.visitMethodInvocation(method, ctx);
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -505,7 +505,7 @@ class A {

@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/256")
@Test
void doNotchangeAssignToImmutableList() {
void doNotChangeAssignToImmutableList() {
//language=java
rewriteRun(
version(
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableMapOfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ class A {

@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/256")
@Test
void doNotchangeAssignToImmutableMap() {
void doNotChangeAssignToImmutableMap() {
//language=java
rewriteRun(
version(
Expand Down
52 changes: 40 additions & 12 deletions src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableSetOfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;

import static org.openrewrite.java.Assertions.java;
import static org.openrewrite.java.Assertions.version;
import static org.openrewrite.java.Assertions.*;

class NoGuavaImmutableSetOfTest implements RewriteTest {
@Override
Expand Down Expand Up @@ -471,20 +470,49 @@ class A {

@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/256")
@Test
void doNotchangeAssignToImmutableSet() {
void doNotChangeAssignToImmutableSet() {
//language=java
rewriteRun(
version(
java(
spec -> spec.allSources(all -> all.markers(javaVersion(9))),
java(
"""
import com.google.common.collect.ImmutableSet;

class Test {
ImmutableSet<String> m = ImmutableSet.of();
}
"""
import com.google.common.collect.ImmutableSet;
)
);
}

class Test {
ImmutableSetp<String> m = ImmutableSet.of();
}
"""
),
9
@Test
knutwannheden marked this conversation as resolved.
Show resolved Hide resolved
void multiLine() {
//language=java
rewriteRun(
spec -> spec.allSources(all -> all.markers(javaVersion(11))),
java(
"""
import com.google.common.collect.ImmutableSet;
import java.util.Set;

class Test {
Set<String> m = ImmutableSet.of(
"foo",
"bar"
);
}
""",
"""
import java.util.Set;

class Test {
Set<String> m = Set.of(
"foo",
"bar"
);
}
"""
)
);
}
Expand Down