From 0f65c66a353bc29b45cb378002595c1cdb6f56b6 Mon Sep 17 00:00:00 2001
From: Tobias Schaefer <tobias.schaefer@novatec-gmbh.de>
Date: Wed, 23 Mar 2022 17:18:25 +0100
Subject: [PATCH] Close #386: Load EventSubscription in stage 1 (increases
 startup by about 20 ms)

To check the order of the mappings:

In Configuration::StrictMap::get add a breakpoint which logs 'name + " does not contain value for " + key' in case of 'throw new IllegalArgumentException(name + " does not contain value for " + key)'
---
 .../src/main/resources/bpm/onboarding.bpmn                  | 6 ++++--
 .../camunda/bpm/feature/MnProcessEngineConfiguration.java   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/micronaut-camunda-bpm-example/src/main/resources/bpm/onboarding.bpmn b/micronaut-camunda-bpm-example/src/main/resources/bpm/onboarding.bpmn
index faa4cbe1..8f608e3c 100644
--- a/micronaut-camunda-bpm-example/src/main/resources/bpm/onboarding.bpmn
+++ b/micronaut-camunda-bpm-example/src/main/resources/bpm/onboarding.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0a7fv6y" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.11.1">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0a7fv6y" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.12.0">
   <bpmn:process id="Onboarding" name="Onboarding" isExecutable="true">
     <bpmn:sequenceFlow id="Flow_1sebvul" sourceRef="StartEvent_1" targetRef="Activity_0tusr5p" />
     <bpmn:sequenceFlow id="Flow_0s6llqa" sourceRef="Activity_0tusr5p" targetRef="Activity_0xo7g3f" />
@@ -44,9 +44,11 @@
     </bpmn:boundaryEvent>
     <bpmn:startEvent id="StartEvent_1" name="Customer order received">
       <bpmn:outgoing>Flow_1sebvul</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="MessageEventDefinition_02c8rnc" messageRef="Message_1kfdk55" />
     </bpmn:startEvent>
   </bpmn:process>
   <bpmn:message id="Message_14et1xs" name="MessageCustomerCancellation" />
+  <bpmn:message id="Message_1kfdk55" name="Message_Order" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Onboarding">
       <bpmndi:BPMNEdge id="Flow_0r35i03_di" bpmnElement="Flow_0r35i03">
@@ -118,7 +120,7 @@
           <dc:Bounds x="472" y="335" width="77" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0ycg8gx_di" bpmnElement="StartEvent_1">
+      <bpmndi:BPMNShape id="Event_1t5atr3_di" bpmnElement="StartEvent_1">
         <dc:Bounds x="179" y="159" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="159" y="202" width="77" height="27" />
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnProcessEngineConfiguration.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnProcessEngineConfiguration.java
index fa9ae506..f32e6d99 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnProcessEngineConfiguration.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnProcessEngineConfiguration.java
@@ -209,6 +209,7 @@ protected InputStream getMyBatisXmlConfigurationSteamStage1() {
                 "        <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/Property.xml\" />\n" +
                 "        <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/Resource.xml\" />\n" +
                 "        <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/Task.xml\" />\n" +
+                "        <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/EventSubscription.xml\" />\n" + // e.g. Message Start Events are registered during deployment
                 "        <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/Filter.xml\" />\n" + // FilterAllTasksCreator
                 "        <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/User.xml\" />\n" + //AdminUserCreator
                 "        <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/Group.xml\" />\n" + //AdminUserCreator
@@ -266,7 +267,7 @@ protected InputStream getMyBatisXmlConfigurationSteamStage2() {
                 //"    <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/Task.xml\" />\n" +
                 //"    <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/User.xml\" />\n" +
                 "    <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/VariableInstance.xml\" />\n" +
-                "    <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/EventSubscription.xml\" />\n" +
+                //"    <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/EventSubscription.xml\" />\n" +
                 "    <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/Statistics.xml\" />\n" +
                 //"    <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/Authorization.xml\" />\n" +
                 //"    <mapper resource=\"org/camunda/bpm/engine/impl/mapping/entity/Filter.xml\" />\n" +