From e3dd26c0d442fe4bdea197cda124d307fd7adde0 Mon Sep 17 00:00:00 2001
From: Kamil Patryk Kozakowski <kamil.p.kozakowski@gmail.com>
Date: Mon, 6 Jul 2026 18:05:41 +0200
Subject: [PATCH] 5

---
 .../analysis/model/TriggerPoint.java                         | 4 ----
 .../analysis/resolver/ConstantResolver.java                  | 4 ++--
 .../analysis/service/CallGraphPathFinder.java                | 5 ++---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/model/TriggerPoint.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/model/TriggerPoint.java
index 4aa6d58..266e425 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/model/TriggerPoint.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/model/TriggerPoint.java
@@ -53,9 +53,6 @@ public class TriggerPoint {
         this.eventTypeFqn = eventTypeFqn;
         this.event = qualifyEvent(event, eventTypeFqn);
         if (polymorphicEvents != null) {
-            if (polymorphicEvents.contains("CustomEvents.ALPHA")) {
-                new Exception("DEBUG TriggerPoint constructed with CustomEvents.ALPHA!").printStackTrace(System.out);
-            }
             this.polymorphicEvents = polymorphicEvents.stream()
                     .map(pe -> qualifyEvent(pe, eventTypeFqn))
                     .collect(java.util.stream.Collectors.toList());
@@ -67,7 +64,6 @@ public class TriggerPoint {
     }
 
     private static String qualifyEvent(String e, String eventTypeFqn) {
-        System.out.println("qualifyEvent e=" + e + " eventTypeFqn=" + eventTypeFqn);
         if (e == null || eventTypeFqn == null || e.isEmpty()) {
             return e;
         }
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolver.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolver.java
index fd0d419..f562225 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolver.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolver.java
@@ -96,9 +96,9 @@ public class ConstantResolver {
                 
                 // Fallback for unresolved AST nodes
                 if (mi.getExpression() instanceof QualifiedName qn) {
-                    System.out.println("RETURNING qn name: " + qn.getName().getIdentifier()); return qn.getName().getIdentifier();
+                    return qn.getName().getIdentifier();
                 } else if (mi.getExpression() instanceof SimpleName sn) {
-                    System.out.println("RETURNING sn name: " + sn.getIdentifier()); return sn.getIdentifier();
+                    return sn.getIdentifier();
                 }
             }
                 
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/CallGraphPathFinder.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/CallGraphPathFinder.java
index 2eddf6d..f13f2b6 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/CallGraphPathFinder.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/CallGraphPathFinder.java
@@ -9,7 +9,7 @@ import java.util.*;
 @Slf4j
 public class CallGraphPathFinder {
     private final CodebaseContext context;
-    private final Map<String, Boolean> heuristicCache = new HashMap<>();
+    private final Map<java.util.Map.Entry<String, String>, Boolean> heuristicCache = new HashMap<>();
 
     public CallGraphPathFinder(CodebaseContext context) {
         this.context = context;
@@ -169,7 +169,7 @@ public class CallGraphPathFinder {
         if (neighbor == null || target == null) return false;
         if (neighbor.equals(target)) return true;
 
-        String cacheKey = neighbor + "|" + target;
+        java.util.Map.Entry<String, String> cacheKey = new java.util.AbstractMap.SimpleImmutableEntry<>(neighbor, target);
         Boolean cached = heuristicCache.get(cacheKey);
         if (cached != null) return cached;
 
@@ -179,7 +179,6 @@ public class CallGraphPathFinder {
     }
 
     private boolean calculateHeuristicMatch(String neighbor, String target) {
-        System.out.println("calculateHeuristicMatch: neighbor=" + neighbor + ", target=" + target);
         if (neighbor.equals(target)) return true;
 
         if (isFullyQualifiedMethod(neighbor) && isFullyQualifiedMethod(target)) {