Skip to content

fixes #186, fix a template error #187

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
Mar 2, 2023
Merged

fixes #186, fix a template error #187

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
65fd870
fixes #186, fix a template error
kunli2 Mar 2, 2023
eca7dda
polish
kunli2 Mar 2, 2023
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
28 changes: 16 additions & 12 deletions src/main/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
import org.openrewrite.ExecutionContext;
import org.openrewrite.Recipe;
import org.openrewrite.TreeVisitor;
import org.openrewrite.java.JavaTemplate;
import org.openrewrite.java.JavaVisitor;
import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.NoMissingTypes;
import org.openrewrite.internal.lang.Nullable;
import org.openrewrite.java.*;
import org.openrewrite.java.search.UsesJavaVersion;
import org.openrewrite.java.search.UsesMethod;
import org.openrewrite.java.tree.J;
Expand All @@ -31,6 +29,8 @@

public class MigrateCollectionsSingletonList extends Recipe {
private static final MethodMatcher SINGLETON_LIST = new MethodMatcher("java.util.Collections singletonList(..)", true);
@Nullable
private static J.MethodInvocation listOfTemplate = null;

@Override
public String getDisplayName() {
Expand Down Expand Up @@ -62,18 +62,22 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext execu
if (SINGLETON_LIST.matches(method)) {
maybeRemoveImport("java.util.Collections");
maybeAddImport("java.util.List");
return autoFormat(m.withTemplate(
JavaTemplate
.builder(this::getCursor, "List.of(#{any()})")
.imports("java.util.List")
.build(),
m.getCoordinates().replace(),
m.getArguments().get(0)
), executionContext);
return getListOfTemplate().withArguments(m.getArguments()).withPrefix(m.getPrefix());
}

return m;
}
};
}

private static J.MethodInvocation getListOfTemplate() {
if (listOfTemplate == null) {
listOfTemplate = PartProvider.buildPart("import java.util.List;" +
"class A {\n" +
" Object a=List.of(\"X\");" +
"\n}", J.MethodInvocation.class);
}

return listOfTemplate;
}
}
52 changes: 52 additions & 0 deletions src/test/java/org/openrewrite/java/migrate/util/MigrateCollectionsSingletonListTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,58 @@ public void defaults(RecipeSpec spec) {
spec.recipe(new MigrateCollectionsSingletonList());
}

@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/186")
@Test
void templateError() {
rewriteRun(
version(
java(
"""
import java.util.*;

interface ConnectionListener {
void onCreate();
}

class A {
public void setConnectionListeners(List<? extends ConnectionListener> listeners) {
}

public void test() {
setConnectionListeners(Collections.singletonList(new ConnectionListener() {
@Override
public void onCreate() {
}
}));
}
}
""",
"""
import java.util.List;

interface ConnectionListener {
void onCreate();
}

class A {
public void setConnectionListeners(List<? extends ConnectionListener> listeners) {
}

public void test() {
setConnectionListeners(List.of(new ConnectionListener() {
@Override
public void onCreate() {
}
}));
}
}
"""
),
9
)
);
}

@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/72")
@Test
void singletonList() {
Expand Down