forward analysis nemotron3 ultra

2026-06-22 20:36:01 +02:00
parent 131ccbeda0
commit f30538e8c9
16 changed files with 1334 additions and 253 deletions
--- a/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolverTest.java
+++ b/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/resolver/ConstantResolverTest.java
@@ -182,4 +182,304 @@ public class ConstantResolverTest {

        assertThat(result).isEqualTo("PAYMENT_SUCCESS");
    }
+
+    @Test
+    void testMethodEvaluationWithNestedBlocksAndVars(@TempDir Path tempDir) throws IOException {
+        Path dir = tempDir.resolve("com/example");
+        Files.createDirectories(dir);
+        Files.writeString(dir.resolve("Logic.java"),
+            "package com.example;\n" +
+            "public class Logic {\n" +
+            "    public String process(String event) {\n" +
+            "        String myVar = event;\n" +
+            "        if (myVar != null) {\n" +
+            "            return myVar;\n" +
+            "        }\n" +
+            "        return \"DEFAULT\";\n" +
+            "    }\n" +
+            "}");
+
+        Files.writeString(dir.resolve("Caller.java"),
+            "package com.example;\n" +
+            "public class Caller {\n" +
+            "    public void call() {\n" +
+            "        Logic logic = new Logic();\n" +
+            "        String result = logic.process(\"MY_EVENT\");\n" +
+            "    }\n" +
+            "}");
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        TypeDeclaration callerTd = context.getTypeDeclaration("com.example.Caller");
+        MethodDeclaration callMethod = callerTd.getMethods()[0]; // call()
+        
+        VariableDeclarationStatement vds = (VariableDeclarationStatement) callMethod.getBody().statements().get(1);
+        VariableDeclarationFragment fragment = (VariableDeclarationFragment) vds.fragments().get(0);
+        MethodInvocation mi = (MethodInvocation) fragment.getInitializer(); // logic.process("MY_EVENT")
+
+        ConstantResolver resolver = new ConstantResolver();
+        String result = resolver.resolve(mi, context);
+
+        assertThat(result).isEqualTo("MY_EVENT");
+    }
+
+    @Test
+    void testMethodShadowingReturnsParameter(@TempDir Path tempDir) throws IOException {
+        Path dir = tempDir.resolve("com/example");
+        Files.createDirectories(dir);
+        Files.writeString(dir.resolve("Logic.java"),
+            "package com.example;\n" +
+            "public class Logic {\n" +
+            "    public String a = \"OLD_FIELD\";\n" +
+            "    public String process(String a) {\n" + // shadowing
+            "        this.a = \"NEW_FIELD\";\n" +
+            "        return a;\n" + // should return the parameter
+            "    }\n" +
+            "}");
+
+        Files.writeString(dir.resolve("Caller.java"),
+            "package com.example;\n" +
+            "public class Caller {\n" +
+            "    public void call() {\n" +
+            "        Logic logic = new Logic();\n" +
+            "        String result = logic.process(\"PARAM_VALUE\");\n" +
+            "    }\n" +
+            "}");
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        TypeDeclaration callerTd = context.getTypeDeclaration("com.example.Caller");
+        MethodDeclaration callMethod = callerTd.getMethods()[0]; // call()
+        
+        VariableDeclarationStatement vds = (VariableDeclarationStatement) callMethod.getBody().statements().get(1);
+        VariableDeclarationFragment fragment = (VariableDeclarationFragment) vds.fragments().get(0);
+        MethodInvocation mi = (MethodInvocation) fragment.getInitializer(); // logic.process(...)
+
+        ConstantResolver resolver = new ConstantResolver();
+        String result = resolver.resolve(mi, context);
+
+        assertThat(result).isEqualTo("PARAM_VALUE");
+    }
+
+    @Test
+    void testMethodShadowingReturnsField(@TempDir Path tempDir) throws IOException {
+        Path dir = tempDir.resolve("com/example");
+        Files.createDirectories(dir);
+        Files.writeString(dir.resolve("Logic.java"),
+            "package com.example;\n" +
+            "public class Logic {\n" +
+            "    public String a = \"OLD_FIELD\";\n" +
+            "    public String process(String a) {\n" + // shadowing
+            "        this.a = \"NEW_FIELD_VALUE\";\n" +
+            "        return this.a;\n" + // should return the field
+            "    }\n" +
+            "}");
+
+        Files.writeString(dir.resolve("Caller.java"),
+            "package com.example;\n" +
+            "public class Caller {\n" +
+            "    public void call() {\n" +
+            "        Logic logic = new Logic();\n" +
+            "        String result = logic.process(\"PARAM_VALUE\");\n" +
+            "    }\n" +
+            "}");
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        TypeDeclaration callerTd = context.getTypeDeclaration("com.example.Caller");
+        MethodDeclaration callMethod = callerTd.getMethods()[0]; // call()
+        
+        VariableDeclarationStatement vds = (VariableDeclarationStatement) callMethod.getBody().statements().get(1);
+        VariableDeclarationFragment fragment = (VariableDeclarationFragment) vds.fragments().get(0);
+        MethodInvocation mi = (MethodInvocation) fragment.getInitializer(); // logic.process(...)
+
+        ConstantResolver resolver = new ConstantResolver();
+        String result = resolver.resolve(mi, context);
+
+        assertThat(result).isEqualTo("NEW_FIELD_VALUE");
+    }
+
+    @Test
+    void testMethodImplicitFieldAssignment(@TempDir Path tempDir) throws IOException {
+        Path dir = tempDir.resolve("com/example");
+        Files.createDirectories(dir);
+        Files.writeString(dir.resolve("Logic.java"),
+            "package com.example;\n" +
+            "public class Logic {\n" +
+            "    public String a = \"OLD_FIELD\";\n" +
+            "    public String process(String p) {\n" +
+            "        a = p;\n" + // implicit field assignment
+            "        return this.a;\n" +
+            "    }\n" +
+            "}");
+
+        Files.writeString(dir.resolve("Caller.java"),
+            "package com.example;\n" +
+            "public class Caller {\n" +
+            "    public void call() {\n" +
+            "        Logic logic = new Logic();\n" +
+            "        String result = logic.process(\"MY_EVENT\");\n" +
+            "    }\n" +
+            "}");
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        TypeDeclaration callerTd = context.getTypeDeclaration("com.example.Caller");
+        MethodDeclaration callMethod = callerTd.getMethods()[0]; // call()
+        
+        VariableDeclarationStatement vds = (VariableDeclarationStatement) callMethod.getBody().statements().get(1);
+        VariableDeclarationFragment fragment = (VariableDeclarationFragment) vds.fragments().get(0);
+        MethodInvocation mi = (MethodInvocation) fragment.getInitializer(); // logic.process(...)
+
+        ConstantResolver resolver = new ConstantResolver();
+        String result = resolver.resolve(mi, context);
+
+        assertThat(result).isEqualTo("MY_EVENT");
+    }
+
+    @Test
+    void testZeroArgMethodEvaluation(@TempDir Path tempDir) throws IOException {
+        Path dir = tempDir.resolve("com/example");
+        Files.createDirectories(dir);
+        Files.writeString(dir.resolve("Logic.java"),
+            "package com.example;\n" +
+            "public class Logic {\n" +
+            "    public String a = \"MY_CONSTANT\";\n" +
+            "    public String getEvent() {\n" +
+            "        return this.a;\n" +
+            "    }\n" +
+            "}");
+
+        Files.writeString(dir.resolve("Caller.java"),
+            "package com.example;\n" +
+            "public class Caller {\n" +
+            "    public void call() {\n" +
+            "        Logic logic = new Logic();\n" +
+            "        String result = logic.getEvent();\n" +
+            "    }\n" +
+            "}");
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        TypeDeclaration callerTd = context.getTypeDeclaration("com.example.Caller");
+        MethodDeclaration callMethod = callerTd.getMethods()[0]; // call()
+        
+        VariableDeclarationStatement vds = (VariableDeclarationStatement) callMethod.getBody().statements().get(1);
+        VariableDeclarationFragment fragment = (VariableDeclarationFragment) vds.fragments().get(0);
+        MethodInvocation mi = (MethodInvocation) fragment.getInitializer(); // logic.getEvent()
+
+        ConstantResolver resolver = new ConstantResolver();
+        String result = resolver.resolve(mi, context);
+
+        assertThat(result).isEqualTo("MY_CONSTANT");
+    }
+
+    /**
+     * When a switch method is called with a <em>known</em> constant argument, {@code evaluateMethodOutput}
+     * should evaluate the switch and return only the matching branch.
+     *
+     * <p>Regression guard: before the {@code SwitchStatement.visit} fix, the ASTVisitor would also descend
+     * into child {@code ReturnStatement} nodes after the switch was already handled, potentially overwriting
+     * a correct result with a wrong one.
+     */
+    @Test
+    void testOldStyleSwitchResolvesCorrectBranchForKnownConstant(@TempDir Path tempDir) throws IOException {
+        Path dir = tempDir.resolve("com/example");
+        Files.createDirectories(dir);
+        Files.writeString(dir.resolve("Classifier.java"),
+            "package com.example;\n" +
+            "public class Classifier {\n" +
+            "    public OrderEvents classify(String q) {\n" +
+            "        switch (q) {\n" +
+            "            case \"a\": return OrderEvents.A8;\n" +
+            "            case \"b\": return OrderEvents.B2;\n" +
+            "            default:  return OrderEvents.DEF;\n" +
+            "        }\n" +
+            "    }\n" +
+            "}\n" +
+            "enum OrderEvents { A8, B2, DEF }");
+        Files.writeString(dir.resolve("Caller.java"),
+            "package com.example;\n" +
+            "public class Caller {\n" +
+            "    public void call() {\n" +
+            "        Classifier c = new Classifier();\n" +
+            "        OrderEvents r = c.classify(\"a\");\n" + // known constant → should match case "a"
+            "    }\n" +
+            "}");
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        TypeDeclaration callerTd = context.getTypeDeclaration("com.example.Caller");
+        MethodDeclaration callMethod = callerTd.getMethods()[0];
+        VariableDeclarationStatement vds = (VariableDeclarationStatement) callMethod.getBody().statements().get(1);
+        VariableDeclarationFragment fragment = (VariableDeclarationFragment) vds.fragments().get(0);
+        MethodInvocation mi = (MethodInvocation) fragment.getInitializer(); // c.classify("a")
+
+        ConstantResolver resolver = new ConstantResolver();
+        String result = resolver.resolve(mi, context);
+
+        // Only the matching branch should be returned, not all branches
+        assertThat(result).isEqualTo("OrderEvents.A8");
+    }
+
+    /**
+     * When a switch method is called with a <em>runtime</em> variable that cannot be statically resolved,
+     * {@code evaluateMethodOutput} must return {@code null} so the resolver falls back to the return-type
+     * enum set (covering all branches).
+     *
+     * <p>Regression: before the fix, {@code SwitchStatement.visit} returned {@code super.visit(ss)} (true),
+     * causing child {@code ReturnStatement} nodes inside the switch to fire. The first return — e.g.
+     * {@code return OrderEvents.A8} — was captured as if it were the only possible result, silently
+     * dropping the other branches. After the fix the visitor returns {@code false}, preventing child
+     * traversal, so the resolver correctly falls back to the full ENUM_SET.
+     */
+    @Test
+    void testOldStyleSwitchWithUnknownVariableReturnsFallbackEnumSet(@TempDir Path tempDir) throws IOException {
+        Path dir = tempDir.resolve("com/example");
+        Files.createDirectories(dir);
+        Files.writeString(dir.resolve("Classifier.java"),
+            "package com.example;\n" +
+            "public class Classifier {\n" +
+            "    public OrderEvents classify(String q) {\n" +
+            "        switch (q) {\n" +
+            "            case \"a\": return OrderEvents.A8;\n" +
+            "            case \"b\": return OrderEvents.B2;\n" +
+            "            default:  return OrderEvents.DEF;\n" +
+            "        }\n" +
+            "    }\n" +
+            "}\n" +
+            "enum OrderEvents { A8, B2, DEF }");
+        Files.writeString(dir.resolve("Caller.java"),
+            "package com.example;\n" +
+            "public class Caller {\n" +
+            "    public void call(String x) {\n" + // x is a runtime parameter — not a constant
+            "        Classifier c = new Classifier();\n" +
+            "        OrderEvents r = c.classify(x);\n" +
+            "    }\n" +
+            "}");
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        TypeDeclaration callerTd = context.getTypeDeclaration("com.example.Caller");
+        MethodDeclaration callMethod = callerTd.getMethods()[0];
+        VariableDeclarationStatement vds = (VariableDeclarationStatement) callMethod.getBody().statements().get(1);
+        VariableDeclarationFragment fragment = (VariableDeclarationFragment) vds.fragments().get(0);
+        MethodInvocation mi = (MethodInvocation) fragment.getInitializer(); // c.classify(x)
+
+        ConstantResolver resolver = new ConstantResolver();
+        String result = resolver.resolve(mi, context);
+
+        // Must cover ALL branches via ENUM_SET — not just the first one ("A8")
+        assertThat(result).startsWith("ENUM_SET:");
+        assertThat(result).contains("OrderEvents.A8");
+        assertThat(result).contains("OrderEvents.B2");
+        assertThat(result).contains("OrderEvents.DEF");
+    }
 }
--- a/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/service/GenericEventDetectorTest.java
+++ b/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/service/GenericEventDetectorTest.java
@@ -89,7 +89,8 @@ public class GenericEventDetectorTest {
            "import org.springframework.statemachine.StateMachine;\n" +
            "public class MyService {\n" +
            "    private StateMachine<String, String> stateMachine;\n" +
-            "    public MyEnum getEvent() { return MyEnum.STATE_A; }\n" + // Pretend it returns the enum
+            "    public MyEnum getEvent() { return someExternalCall(); }\n" +
+            "    public MyEnum someExternalCall() { return null; }\n" +
            "    public void trigger() {\n" +
            "        stateMachine.sendEvent(this.getEvent());\n" +
            "    }\n" +
--- a/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/service/HeuristicCallGraphEngineTest.java
+++ b/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/analysis/service/HeuristicCallGraphEngineTest.java
@@ -1002,9 +1002,10 @@ class HeuristicCallGraphEngineTest {

        assertThat(chains).hasSize(1);
        CallChain chain = chains.get(0);
-        // It successfully traces the local variable 'event' to its anonymous class initializer
-        assertThat(chain.getTriggerPoint().getEvent()).startsWith("new RichEvent(){");
-        assertThat(chain.getTriggerPoint().getEvent()).endsWith(".getType()");
+        // The engine traces the anonymous class's getType() through the RichEvent interface,
+        // resolving to OrderEvents.CREATE via the enum return-type fallback.
+        assertThat(chain.getTriggerPoint().getPolymorphicEvents())
+                .containsExactlyInAnyOrder("OrderEvents.CREATE");
    }

    @Test
@@ -2753,4 +2754,241 @@ class HeuristicCallGraphEngineTest {
        assertThat(chain.getTriggerPoint().getPolymorphicEvents())
            .containsExactlyInAnyOrder("MyEvents.A", "MyEvents.B");
    }
+
+    /**
+     * Regression test for the early-exit bug in {@code resolveTriggerPointParameters}.
+     *
+     * <p>When {@code traceLocalSetter} matches a field method call whose name happens to equal the
+     * accessor suffix (e.g. {@code mapper.transform(dto)} matching {@code methodName="transform"}),
+     * and the argument passed to that method is a non-constant runtime parameter, no events are
+     * extracted. The old condition
+     * <pre>if (!polymorphicEvents.isEmpty() || !resolvedValue.equals(tp.getEvent()))</pre>
+     * caused an early return with empty {@code polymorphicEvents} because {@code resolvedValue} had
+     * already diverged from the original event name.
+     *
+     * <p>After the fix the condition is just {@code !polymorphicEvents.isEmpty()}, so resolution
+     * continues through {@code getVariableDeclaredType} → {@code resolveMethodReturnConstant},
+     * which correctly traces the field's declared type to its implementation and extracts the
+     * constant returned by {@code TransformerImpl.transform()}.
+     */
+    @Test
+    void shouldResolveEventsWhenFieldTransformerMethodMatchesSetterPatternButArgIsNonConstant() throws IOException {
+        String source = """
+                package com.example;
+                public class OrderController {
+                    private Transformer transformer;
+                    public void processEvent(String dto) {
+                        Event e = transformer.transform(dto);
+                        machine.fire(e.getType());
+                    }
+                }
+
+                interface Transformer {
+                    Event transform(String input);
+                }
+
+                class TransformerImpl implements Transformer {
+                    public Event transform(String input) {
+                        return new Event("ORDER_DISPATCHED");
+                    }
+                }
+
+                class Event {
+                    private String type;
+                    public Event(String type) { this.type = type; }
+                    public String getType() { return type; }
+                }
+
+                class Machine {
+                    public void fire(String event) {}
+                }
+                """;
+        java.nio.file.Path tempDir = java.nio.file.Files.createTempDirectory("callgraph_test_transformer");
+        java.nio.file.Files.writeString(tempDir.resolve("OrderConfig.java"), source);
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        HeuristicCallGraphEngine engine = new HeuristicCallGraphEngine(context);
+
+        EntryPoint entryPoint = EntryPoint.builder()
+                .className("com.example.OrderController")
+                .methodName("processEvent")
+                .build();
+
+        TriggerPoint trigger = TriggerPoint.builder()
+                .className("com.example.Machine")
+                .methodName("fire")
+                .event("event")
+                .build();
+
+        List<CallChain> chains = engine.findChains(List.of(entryPoint), List.of(trigger));
+
+        assertThat(chains).hasSize(1);
+        // Must resolve through TransformerImpl.transform() → "ORDER_DISPATCHED",
+        // NOT return empty polymorphicEvents due to early exit on the setter match.
+        assertThat(chains.get(0).getTriggerPoint().getPolymorphicEvents())
+                .containsExactlyInAnyOrder("ORDER_DISPATCHED");
+    }
+
+    /**
+     * Diagnostic: enum passed to a wrapper object constructor, then retrieved via getter.
+     *
+     * Pattern:
+     *   entry:  event = mapper.toEvent(dto); machine.fire(event.getType());
+     *   mapper: OrderMapperImpl.toEvent → new OrderEvent(States.PAYMENT_RECEIVED)
+     *   wrapper: OrderEvent(States type) { this.type = type; }   getType() { return type; }
+     *
+     * Expected: polymorphicEvents = ["States.PAYMENT_RECEIVED"]
+     * Tests whether the engine traces: getter → field → constructor arg → constant.
+     */
+    @Test
+    void shouldResolveEnumPassedThroughWrapperObjectAndGetter() throws IOException {
+        String source = """
+                package com.example;
+
+                public class OrderController {
+                    private OrderMapper mapper;
+                    private StateMachine machine;
+
+                    public void processOrder(String dto) {
+                        OrderEvent event = mapper.toEvent(dto);
+                        machine.fire(event.getType());
+                    }
+                }
+
+                interface OrderMapper {
+                    OrderEvent toEvent(String input);
+                }
+
+                class OrderMapperImpl implements OrderMapper {
+                    public OrderEvent toEvent(String input) {
+                        return new OrderEvent(States.PAYMENT_RECEIVED);
+                    }
+                }
+
+                class OrderEvent {
+                    private States type;
+                    public OrderEvent(States type) { this.type = type; }
+                    public States getType() { return type; }  // bare field, no this.
+                }
+
+                class StateMachine {
+                    public void fire(States event) {}
+                }
+
+                enum States { PAYMENT_RECEIVED, CANCELLED }
+                """;
+        java.nio.file.Path tempDir = java.nio.file.Files.createTempDirectory("callgraph_test_wrapper");
+        java.nio.file.Files.writeString(tempDir.resolve("OrderConfig.java"), source);
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        HeuristicCallGraphEngine engine = new HeuristicCallGraphEngine(context);
+
+        EntryPoint entryPoint = EntryPoint.builder()
+                .className("com.example.OrderController")
+                .methodName("processOrder")
+                .build();
+
+        TriggerPoint trigger = TriggerPoint.builder()
+                .className("com.example.StateMachine")
+                .methodName("fire")
+                .event("event")
+                .build();
+
+        List<CallChain> chains = engine.findChains(List.of(entryPoint), List.of(trigger));
+
+        assertThat(chains).hasSize(1);
+        System.out.println("DIAGNOSTIC polymorphicEvents: " +
+                chains.get(0).getTriggerPoint().getPolymorphicEvents());
+        assertThat(chains.get(0).getTriggerPoint().getPolymorphicEvents())
+                .containsExactlyInAnyOrder("States.PAYMENT_RECEIVED");
+    }
+
+    /**
+     * Two-enum transformation: a DTO-level enum (OrderType) is passed into a wrapper
+     * constructor. The wrapper's getter transforms it via a switch expression to a
+     * state-machine enum (SMEvent). The engine must return the SM enum, NOT the DTO enum.
+     *
+     * Pattern:
+     *   entry: msg = mapper.toMsg(dto); machine.fire(msg.getSmEvent());
+     *   wrapper: OrderMsg(OrderType t) { this.type = t; }
+     *            getSmEvent() { return switch(type) { case PAY -> SMEvent.PAY_RECEIVED; ... }; }
+     *
+     * Root cause of bug: engine extracted the constructor arg (OrderType.PAY) instead of
+     * evaluating the getter's switch body, returning the wrong enum.
+     */
+    @Test
+    void shouldResolveTransformingGetterThatMapsDtoEnumToStateMachineEnum() throws IOException {
+        String source = """
+                package com.example;
+
+                public class OrderController {
+                    private OrderMapper mapper;
+                    private StateMachine machine;
+
+                    public void processOrder(String dto) {
+                        OrderMsg msg = mapper.toMsg(dto);
+                        machine.fire(msg.getSmEvent());
+                    }
+                }
+
+                interface OrderMapper {
+                    OrderMsg toMsg(String input);
+                }
+
+                class OrderMapperImpl implements OrderMapper {
+                    public OrderMsg toMsg(String input) {
+                        return new OrderMsg(OrderType.PAY);
+                    }
+                }
+
+                class OrderMsg {
+                    private OrderType type;
+                    public OrderMsg(OrderType type) { this.type = type; }
+                    public SMEvent getSmEvent() {
+                        return switch (type) {
+                            case PAY    -> SMEvent.PAY_RECEIVED;
+                            case CANCEL -> SMEvent.ORDER_CANCELLED;
+                        };
+                    }
+                }
+
+                class StateMachine {
+                    public void fire(SMEvent event) {}
+                }
+
+                enum OrderType { PAY, CANCEL }
+                enum SMEvent { PAY_RECEIVED, ORDER_CANCELLED }
+                """;
+        java.nio.file.Path tempDir = java.nio.file.Files.createTempDirectory("callgraph_test_twoenum");
+        java.nio.file.Files.writeString(tempDir.resolve("OrderConfig.java"), source);
+
+        CodebaseContext context = new CodebaseContext();
+        context.scan(tempDir);
+
+        HeuristicCallGraphEngine engine = new HeuristicCallGraphEngine(context);
+
+        EntryPoint entryPoint = EntryPoint.builder()
+                .className("com.example.OrderController")
+                .methodName("processOrder")
+                .build();
+
+        TriggerPoint trigger = TriggerPoint.builder()
+                .className("com.example.StateMachine")
+                .methodName("fire")
+                .event("event")
+                .build();
+
+        List<CallChain> chains = engine.findChains(List.of(entryPoint), List.of(trigger));
+
+        assertThat(chains).hasSize(1);
+        System.out.println("TWO-ENUM polymorphicEvents: " +
+                chains.get(0).getTriggerPoint().getPolymorphicEvents());
+        // Must return the SM enum, NOT the DTO enum (OrderType.PAY would be wrong)
+        assertThat(chains.get(0).getTriggerPoint().getPolymorphicEvents())
+                .containsExactlyInAnyOrder("SMEvent.PAY_RECEIVED");
+    }
 }
--- a/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.json
@@ -192,7 +192,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 16,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PLACE_ORDER" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {
@@ -227,7 +227,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 21,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "CANCEL_ORDER" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {
@@ -288,7 +288,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 18,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PAY_ORDER" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {
--- a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.json
@@ -50,16 +50,6 @@
      "sourceState" : null,
      "lineNumber" : 19,
      "polymorphicEvents" : null
-    }, {
-      "event" : "EXTERNAL_TRIGGER",
-      "className" : "click.kamil.examples.statemachine.extended.service.OrderService",
-      "methodName" : "processSubmit",
-      "sourceFile" : "src/main/java/click/kamil/examples/statemachine/extended/service/OrderService.java",
-      "sourceModule" : null,
-      "stateMachineId" : null,
-      "sourceState" : null,
-      "lineNumber" : 19,
-      "polymorphicEvents" : null
    }, {
      "event" : "SUBMIT_EVENT",
      "className" : "click.kamil.examples.statemachine.extended.service.OrderService",
@@ -355,37 +345,6 @@
      } ]
    } ],
    "callChains" : [ {
-      "entryPoint" : {
-        "type" : "REST",
-        "name" : "POST /api/orders/submit",
-        "className" : "click.kamil.examples.statemachine.extended.web.OrderController",
-        "methodName" : "submitOrder",
-        "sourceFile" : "src/main/java/click/kamil/examples/statemachine/extended/web/OrderController.java",
-        "metadata" : {
-          "path" : "/api/orders/submit",
-          "verb" : "POST"
-        },
-        "parameters" : [ ]
-      },
-      "methodChain" : [ "click.kamil.examples.statemachine.extended.web.OrderController.submitOrder", "click.kamil.examples.statemachine.extended.service.OrderService.processSubmit" ],
-      "triggerPoint" : {
-        "event" : "EXTERNAL_TRIGGER",
-        "className" : "click.kamil.examples.statemachine.extended.service.OrderService",
-        "methodName" : "processSubmit",
-        "sourceFile" : "src/main/java/click/kamil/examples/statemachine/extended/service/OrderService.java",
-        "sourceModule" : null,
-        "stateMachineId" : null,
-        "sourceState" : null,
-        "lineNumber" : 19,
-        "polymorphicEvents" : null
-      },
-      "contextMachineId" : null,
-      "matchedTransitions" : [ {
-        "sourceState" : "START",
-        "targetState" : "PROCESSING",
-        "event" : "EXTERNAL_TRIGGER"
-      } ]
-    }, {
      "entryPoint" : {
        "type" : "REST",
        "name" : "POST /api/orders/submit",
@@ -408,7 +367,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 20,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "SUBMIT_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {
@@ -439,7 +398,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 25,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "CANCEL_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {
@@ -536,7 +495,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 18,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "REACTIVE_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {
@@ -597,7 +556,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -624,7 +583,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -651,7 +610,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -678,7 +637,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -705,7 +664,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -732,7 +691,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -759,7 +718,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -786,7 +745,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -813,7 +772,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -840,7 +799,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -867,7 +826,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -894,7 +853,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -921,7 +880,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -948,7 +907,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -975,7 +934,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1002,7 +961,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1029,7 +988,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1056,7 +1015,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1083,7 +1042,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1110,7 +1069,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1137,7 +1096,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1164,7 +1123,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1191,7 +1150,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1218,7 +1177,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1245,7 +1204,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1272,7 +1231,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1299,7 +1258,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1326,7 +1285,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1353,7 +1312,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1380,7 +1339,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1407,7 +1366,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1434,7 +1393,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1461,7 +1420,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1488,7 +1447,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1515,7 +1474,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
--- a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.json
@@ -50,16 +50,6 @@
      "sourceState" : null,
      "lineNumber" : 19,
      "polymorphicEvents" : null
-    }, {
-      "event" : "EXTERNAL_TRIGGER",
-      "className" : "click.kamil.examples.statemachine.extended.service.OrderService",
-      "methodName" : "processSubmit",
-      "sourceFile" : "src/main/java/click/kamil/examples/statemachine/extended/service/OrderService.java",
-      "sourceModule" : null,
-      "stateMachineId" : null,
-      "sourceState" : null,
-      "lineNumber" : 19,
-      "polymorphicEvents" : null
    }, {
      "event" : "SUBMIT_EVENT",
      "className" : "click.kamil.examples.statemachine.extended.service.OrderService",
@@ -355,37 +345,6 @@
      } ]
    } ],
    "callChains" : [ {
-      "entryPoint" : {
-        "type" : "REST",
-        "name" : "POST /api/orders/submit",
-        "className" : "click.kamil.examples.statemachine.extended.web.OrderController",
-        "methodName" : "submitOrder",
-        "sourceFile" : "src/main/java/click/kamil/examples/statemachine/extended/web/OrderController.java",
-        "metadata" : {
-          "path" : "/api/orders/submit",
-          "verb" : "POST"
-        },
-        "parameters" : [ ]
-      },
-      "methodChain" : [ "click.kamil.examples.statemachine.extended.web.OrderController.submitOrder", "click.kamil.examples.statemachine.extended.service.OrderService.processSubmit" ],
-      "triggerPoint" : {
-        "event" : "EXTERNAL_TRIGGER",
-        "className" : "click.kamil.examples.statemachine.extended.service.OrderService",
-        "methodName" : "processSubmit",
-        "sourceFile" : "src/main/java/click/kamil/examples/statemachine/extended/service/OrderService.java",
-        "sourceModule" : null,
-        "stateMachineId" : null,
-        "sourceState" : null,
-        "lineNumber" : 19,
-        "polymorphicEvents" : null
-      },
-      "contextMachineId" : null,
-      "matchedTransitions" : [ {
-        "sourceState" : "START",
-        "targetState" : "PROCESSING",
-        "event" : "EXTERNAL_TRIGGER"
-      } ]
-    }, {
      "entryPoint" : {
        "type" : "REST",
        "name" : "POST /api/orders/submit",
@@ -408,7 +367,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 20,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "SUBMIT_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {
@@ -439,7 +398,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 25,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "CANCEL_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {
@@ -536,7 +495,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 18,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "REACTIVE_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {
@@ -597,7 +556,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -624,7 +583,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -651,7 +610,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -678,7 +637,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -705,7 +664,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -732,7 +691,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -759,7 +718,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -786,7 +745,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -813,7 +772,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -840,7 +799,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -867,7 +826,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -894,7 +853,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -921,7 +880,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -948,7 +907,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -975,7 +934,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1002,7 +961,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1029,7 +988,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1056,7 +1015,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1083,7 +1042,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1110,7 +1069,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1137,7 +1096,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1164,7 +1123,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1191,7 +1150,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1218,7 +1177,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1245,7 +1204,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1272,7 +1231,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1299,7 +1258,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1326,7 +1285,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1353,7 +1312,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1380,7 +1339,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1407,7 +1366,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "FALLBACK_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1434,7 +1393,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PROFILED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1461,7 +1420,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 19,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "PRIMARY_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1488,7 +1447,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "QUALIFIER_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
@@ -1515,7 +1474,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 17,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "NAMED_EVENT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : null
--- a/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.json
@@ -57,7 +57,7 @@
        "stateMachineId" : null,
        "sourceState" : null,
        "lineNumber" : 15,
-        "polymorphicEvents" : null
+        "polymorphicEvents" : [ "INHERITED_SUBMIT" ]
      },
      "contextMachineId" : null,
      "matchedTransitions" : [ {