Skip to content

Skip UseMapOf for HashMap subclasses like LinkedHashMap and TreeMap #1113

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
timtebeek merged 1 commit into from
May 28, 2026
+46 −1
Merged

Skip UseMapOf for HashMap subclasses like LinkedHashMap and TreeMap #1113

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
4 changes: 3 additions & 1 deletion src/main/java/org/openrewrite/java/migrate/util/UseMapOf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.Statement;
import org.openrewrite.java.tree.TypeUtils;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -54,7 +55,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
public J visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
J.NewClass n = (J.NewClass) super.visitNewClass(newClass, ctx);
J.Block body = n.getBody();
if (NEW_HASH_MAP.matches(n) && body != null && body.getStatements().size() == 1) {
if (NEW_HASH_MAP.matches(n) && body != null && body.getStatements().size() == 1 &&
TypeUtils.isOfClassType(n.getClazz() != null ? n.getClazz().getType() : null, "java.util.HashMap")) {
Statement statement = body.getStatements().get(0);
if (statement instanceof J.Block) {
List<Statement> putStatements = ((J.Block) statement).getStatements();
Expand Down
43 changes: 43 additions & 0 deletions src/test/java/org/openrewrite/java/migrate/util/UseMapOfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,49 @@ class Test {
);
}

@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/1112")
@Test
void doNotChangeLinkedHashMap() {
//language=java
rewriteRun(
java(
"""
import java.util.LinkedHashMap;
import java.util.Map;

class Test {
static final Map<String, String> ORDERED = new LinkedHashMap<>() {{
put("a", "1");
put("b", "2");
put("c", "3");
}};
}
"""
)
);
}

@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/1112")
@Test
void doNotChangeTreeMap() {
//language=java
rewriteRun(
java(
"""
import java.util.Map;
import java.util.TreeMap;

class Test {
static final Map<String, String> SORTED = new TreeMap<>() {{
put("a", "1");
put("b", "2");
}};
}
"""
)
);
}

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