Expand path bindings from double-brace HashMap put entries.

Resolve compile-time keys from anonymous subclass instance initializers used for inline route maps while remaining fail-closed when any put key is computed.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-07-14 18:44:25 +02:00
parent 60cd6511d4
commit a9dbf17ced
2 changed files with 162 additions and 0 deletions

View File

@@ -693,6 +693,10 @@ public final class EntryPointBindingExpander {
if (direct != null) { if (direct != null) {
return direct; return direct;
} }
Map<String, String> doubleBrace = extractDoubleBraceMapPutEntries(initializer, typeDecl, context);
if (doubleBrace != null) {
return doubleBrace;
}
} }
return extractStaticBlockMapPutEntries(typeDecl, fieldName, context); return extractStaticBlockMapPutEntries(typeDecl, fieldName, context);
} }
@@ -744,6 +748,58 @@ public final class EntryPointBindingExpander {
return entries; return entries;
} }
private static Map<String, String> extractDoubleBraceMapPutEntries(
Expression initializer,
TypeDeclaration declaringType,
CodebaseContext context) {
if (!(initializer instanceof ClassInstanceCreation creation)) {
return null;
}
AnonymousClassDeclaration anonymous = creation.getAnonymousClassDeclaration();
if (anonymous == null) {
return null;
}
LinkedHashMap<String, String> entries = new LinkedHashMap<>();
boolean[] foundPut = {false};
boolean[] invalid = {false};
for (Object bodyDeclObj : anonymous.bodyDeclarations()) {
if (!(bodyDeclObj instanceof Initializer instanceInitializer)
|| isStaticInitializer(instanceInitializer)) {
continue;
}
Block block = instanceInitializer.getBody();
if (block == null) {
continue;
}
block.accept(new ASTVisitor() {
@Override
public boolean visit(MethodInvocation node) {
if (invalid[0] || !"put".equals(node.getName().getIdentifier())
|| node.arguments().size() != 2) {
return super.visit(node);
}
Expression receiver = node.getExpression();
if (receiver != null && !(receiver instanceof ThisExpression)) {
return super.visit(node);
}
String key = resolveCompileTimeStringKey(
(Expression) node.arguments().get(0), declaringType, context);
if (key == null) {
invalid[0] = true;
return super.visit(node);
}
entries.put(key, "*");
foundPut[0] = true;
return super.visit(node);
}
});
}
if (invalid[0] || !foundPut[0] || entries.isEmpty()) {
return null;
}
return entries;
}
private static boolean isStaticInitializer(Initializer initializer) { private static boolean isStaticInitializer(Initializer initializer) {
for (Object modifierObj : initializer.modifiers()) { for (Object modifierObj : initializer.modifiers()) {
if (modifierObj instanceof Modifier modifier && modifier.isStatic()) { if (modifierObj instanceof Modifier modifier && modifier.isStatic()) {

View File

@@ -3102,4 +3102,110 @@ class EntryPointBindingExpanderTest {
assertThat(variants).isEmpty(); assertThat(variants).isEmpty();
} }
@Test
void shouldExpandCommandKeyFromDoubleBraceInitializerMapPutEntries(@TempDir Path tempDir) throws Exception {
String source = """
package com.example;
import java.util.HashMap;
import java.util.Map;
public class GenericCommandController {
OrderGateway gateway;
public void execute(String commandKey) {
gateway.trigger(commandKey);
}
}
class OrderGateway {
private static final Map<String, OrderEvent> ROUTES = new HashMap<>() {{
put("order.pay", OrderEvent.PAY);
put("order.ship", OrderEvent.SHIP);
}};
void trigger(String commandKey) {
StateMachine sm = new StateMachine();
sm.sendEvent(ROUTES.get(commandKey));
}
}
class StateMachine { void sendEvent(OrderEvent event) {} }
enum OrderEvent { PAY, SHIP }
""";
Files.writeString(tempDir.resolve("App.java"), source);
CodebaseContext context = new CodebaseContext();
context.setResolveBindings(true);
context.scan(tempDir);
HeuristicCallGraphEngine engine = new HeuristicCallGraphEngine(context);
Map<String, List<click.kamil.springstatemachineexporter.analysis.model.CallEdge>> graph = engine.buildCallGraph();
EntryPoint entryPoint = EntryPoint.builder()
.className("com.example.GenericCommandController")
.methodName("execute")
.name("POST /api/commands/{commandKey}")
.parameters(List.of(EntryPoint.Parameter.builder()
.name("commandKey")
.type("String")
.annotations(List.of("PathVariable"))
.build()))
.build();
List<Map<String, String>> variants =
EntryPointBindingExpander.expandPathVariableBindings(entryPoint, context, graph);
assertThat(variants).extracting(map -> map.get("commandKey"))
.containsExactlyInAnyOrder("order.pay", "order.ship");
}
@Test
void shouldNotExpandCommandKeyFromDoubleBraceInitializerMapWithComputedPutKeys(@TempDir Path tempDir) throws Exception {
String source = """
package com.example;
import java.util.HashMap;
import java.util.Map;
public class GenericCommandController {
OrderGateway gateway;
public void execute(String commandKey) {
gateway.trigger(commandKey);
}
}
class OrderGateway {
private static final Map<String, OrderEvent> ROUTES = new HashMap<>() {{
put(prefix("order.pay"), OrderEvent.PAY);
put("order.ship", OrderEvent.SHIP);
}};
static String prefix(String value) {
return value;
}
void trigger(String commandKey) {
StateMachine sm = new StateMachine();
sm.sendEvent(ROUTES.get(commandKey));
}
}
class StateMachine { void sendEvent(OrderEvent event) {} }
enum OrderEvent { PAY, SHIP }
""";
Files.writeString(tempDir.resolve("App.java"), source);
CodebaseContext context = new CodebaseContext();
context.setResolveBindings(true);
context.scan(tempDir);
HeuristicCallGraphEngine engine = new HeuristicCallGraphEngine(context);
Map<String, List<click.kamil.springstatemachineexporter.analysis.model.CallEdge>> graph = engine.buildCallGraph();
EntryPoint entryPoint = EntryPoint.builder()
.className("com.example.GenericCommandController")
.methodName("execute")
.name("POST /api/commands/{commandKey}")
.parameters(List.of(EntryPoint.Parameter.builder()
.name("commandKey")
.type("String")
.annotations(List.of("PathVariable"))
.build()))
.build();
List<Map<String, String>> variants =
EntryPointBindingExpander.expandPathVariableBindings(entryPoint, context, graph);
assertThat(variants).isEmpty();
}
} }