From bcbe0a9677af90c80f844eedda3711f2ba94dceb Mon Sep 17 00:00:00 2001
From: Maarten de Keizer <github@maartendekeizer.nl>
Date: Thu, 1 Aug 2024 12:30:57 +0200
Subject: [PATCH 01/11] WIP: Save mapping uuid -> id, tell Ultimo the id
 instead of uuid. Need to transform this back when Ultimo replies.

---
 .../morcoreMessageProcessor/Configuration.xml |  2 +
 .../Configuration_ToMorCore.xml               | 11 ++-
 .../Configuration_UuidIdMapper.xml            | 84 +++++++++++++++++++
 .../DatabaseChangelog.xml                     |  8 +-
 .../xsl/Ultimo/PostZaakRequest.xsl            |  6 +-
 5 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration.xml b/src/main/configurations/morcoreMessageProcessor/Configuration.xml
index af26745..bc596a8 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration.xml
@@ -5,6 +5,7 @@
 	<!ENTITY FromUltimo SYSTEM "./Configuration_FromUltimo.xml">
 	<!ENTITY ToMSB SYSTEM "./Configuration_ToMSB.xml">
 	<!ENTITY TokenManager SYSTEM "./Configuration_TokenManager.xml">
+	<!ENTITY UuidIdMapper SYSTEM "./Configuration_UuidIdMapper.xml">
 ]>
 
 <Configuration name="morcoreMessageProcessor">
@@ -14,4 +15,5 @@
 	&FromUltimo;
 	&ToMSB;
 	&TokenManager;
+	&UuidIdMapper;
 </Configuration>
\ No newline at end of file
diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
index 54d3832..34b03c1 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
@@ -26,10 +26,19 @@
                 <Param name="Authorization" xpathExpression="concat('Token ', $MorCoreToken)">
                     <Param name="MorCoreToken" sessionKey="MorCoreToken" xpathExpression="//token" />
                 </Param>
-                <Forward name="success" path="Json2Xml" />
+                <Forward name="success" path="SaveUuidIdMapping" />
                 <Forward name="exception" path="CallMSBSender" />
             </SenderPipe>
 
+            <SenderPipe name="SaveUuidIdMapping">
+                <IbisLocalSender javaListener="Internal_SaveIdByUuid">
+                    <!-- TODO: klopt deze mapping? -->
+                    <Param name="Uuid" xpathExpression="//uuid" type="STRING" />
+                    <Param name="Id" xpathExpression="//id" type="INTEGER" />
+                </IbisLocalSender>
+                <Forward name="success" path="Json2Xml" />
+            </SenderPipe>
+
             <SenderPipe name="CallMSBSender">
                 <IbisLocalSender name="CallMSBSender" javaListener="MSB_GetMelding" />
                 <Forward name="success" path="Json2Xml" />
diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml
new file mode 100644
index 0000000..034bc4a
--- /dev/null
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml
@@ -0,0 +1,84 @@
+<Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
+
+    <Adapter name="Internal_GetUuidById">
+        <Receiver name="Internal_GetUuidById">
+            <JavaListener name="Internal_GetUuidById" />
+        </Receiver>
+
+        <Pipeline>
+            <Exits>
+                <Exit name="Exit" state="SUCCESS" />
+                <Exit name="Reject" state="REJECTED" />
+                <Exit name="Exception" state="ERROR" />
+            </Exits>
+
+            <SenderPipe name="RetrieveUuid">
+                <FixedQuerySender
+                    name="RetrieveUuid"
+                    query="SELECT uuid FROM UUIDIDMAP WHERE id = ?{Id}"
+                    queryType="SELECT"> <!-- TODO: save for sql injection? -->
+                    <Param name="Id" sessionKey="Id" />
+                </FixedQuerySender>
+            </SenderPipe>
+
+            <XsltPipe name="GetUuidValue" xpathExpression="//row[1]/field[1]" />
+
+            <Text2XmlPipe xmlTag="uuid" name="Text2Xml" />
+
+        </Pipeline>
+    </Adapter>
+
+    <Adapter name="Internal_GetIdByUuid">
+        <Receiver name="Internal_GetIdByUuid">
+            <JavaListener name="Internal_GetIdByUuid" />
+        </Receiver>
+
+        <Pipeline>
+            <Exits>
+                <Exit name="Exit" state="SUCCESS" />
+                <Exit name="Reject" state="REJECTED" />
+                <Exit name="Exception" state="ERROR" />
+            </Exits>
+
+            <SenderPipe name="RetrieveId">
+                <FixedQuerySender
+                    name="RetrieveId"
+                    query="SELECT id FROM UUIDIDMAP WHERE uuid = ?{Uuid}"
+                    queryType="SELECT"> <!-- TODO: save for sql injection? -->
+                    <Param name="Uuid" sessionKey="Uuid" />
+                </FixedQuerySender>
+            </SenderPipe>
+
+            <XsltPipe name="GetIdValue" xpathExpression="//row[1]/field[1]" />
+
+            <Text2XmlPipe xmlTag="id" name="Text2Xml" />
+
+        </Pipeline>
+    </Adapter>
+
+    <Adapter name="Internal_SaveIdByUuid">
+        <Receiver name="Internal_SaveIdByUuid">
+            <JavaListener name="Internal_SaveIdByUuid" />
+        </Receiver>
+
+        <Pipeline>
+            <Exits>
+                <Exit name="Exit" state="SUCCESS" />
+                <Exit name="Reject" state="REJECTED" />
+                <Exit name="Exception" state="ERROR" />
+            </Exits>
+
+            <SenderPipe name="SaveUuidIdMapping">
+                <FixedQuerySender
+                    name="SaveUuidIdMapping"
+                    query="INSERT INTO UUIDIDMAP (id, uuid) VALUES (?{Id}, ?{Uuid})"
+                    queryType="OTHER"> <!-- TODO: save for sql injection? -->
+                    <Param name="Id" sessionKey="Id" />
+                    <Param name="Uuid" sessionKey="Uuid" />
+                </FixedQuerySender>
+            </SenderPipe>
+        </Pipeline>
+    </Adapter>
+
+</Module>
\ No newline at end of file
diff --git a/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml b/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml
index 7d20223..22df7f5 100644
--- a/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml
+++ b/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml
@@ -8,8 +8,14 @@
         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
     <changeSet id="0" author="Delano">
         <createTable tableName="TOKENSTORE">
-            <column name="id" type="int"/>  
+            <column name="id" type="int"/>
             <column name="token" type="varchar(255)"/>
         </createTable>
     </changeSet>
+    <changeSet id="1" author="Maarten">
+        <createTable tableName="UUIDIDMAP">
+            <column name="id" type="int"/>
+            <column name="uuid" type="varchar(255)"/>
+        </createTable>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/configurations/morcoreMessageProcessor/xsl/Ultimo/PostZaakRequest.xsl b/src/main/configurations/morcoreMessageProcessor/xsl/Ultimo/PostZaakRequest.xsl
index d17c6e6..b6b31af 100644
--- a/src/main/configurations/morcoreMessageProcessor/xsl/Ultimo/PostZaakRequest.xsl
+++ b/src/main/configurations/morcoreMessageProcessor/xsl/Ultimo/PostZaakRequest.xsl
@@ -13,7 +13,7 @@
         <root>
             <!-- Consists of 7 numbers, required -->
             <meldingId>
-                <xsl:value-of select="$meldingInfo/root/uuid" />
+                <xsl:value-of select="$meldingInfo/root/id" />
             </meldingId>
             <!-- Required -->
             <behandelaar>MSB</behandelaar>
@@ -35,7 +35,7 @@
             <adres>
                 <xsl:value-of
                     select="concat(
-                    $meldingInfo/root/signalen_voor_melding/locaties_voor_signaal/postcode , ' ', 
+                    $meldingInfo/root/signalen_voor_melding/locaties_voor_signaal/postcode , ' ',
                     $meldingInfo/root/signalen_voor_melding/locaties_voor_signaal/huisnummer)" />
             </adres>
             <plaatsbepaling>
@@ -57,7 +57,7 @@
                 <xsl:value-of
                     select="$meldingInfo/root/signalen_voor_melding/locaties_voor_signaal/geometrie/coordinates[1]" />
             </y>
-            
+
             <!-- These 4 values might come from GetMeldingInfo -->
             <foto1></foto1>
             <foto1_filename></foto1_filename>

From 10e87be35b6029d76cafb06a83c1c0b341527972 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 09:43:14 +0200
Subject: [PATCH 02/11] refactor: add uuid storing

---
 .../Configuration_ToMorCore.xml               |  9 --------
 .../Configuration_ToUltimo.xml                |  4 ++++
 .../Configuration_UuidIdMapper.xml            | 22 ++++++++++---------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
index 34b03c1..5c2b1a2 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
@@ -30,15 +30,6 @@
                 <Forward name="exception" path="CallMSBSender" />
             </SenderPipe>
 
-            <SenderPipe name="SaveUuidIdMapping">
-                <IbisLocalSender javaListener="Internal_SaveIdByUuid">
-                    <!-- TODO: klopt deze mapping? -->
-                    <Param name="Uuid" xpathExpression="//uuid" type="STRING" />
-                    <Param name="Id" xpathExpression="//id" type="INTEGER" />
-                </IbisLocalSender>
-                <Forward name="success" path="Json2Xml" />
-            </SenderPipe>
-
             <SenderPipe name="CallMSBSender">
                 <IbisLocalSender name="CallMSBSender" javaListener="MSB_GetMelding" />
                 <Forward name="success" path="Json2Xml" />
diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
index 08b4896..9ca6dba 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
@@ -160,6 +160,10 @@
                 </JavascriptSender>
             </SenderPipe>
 
+            <SenderPipe name="StoreUuidIdMapping" getInputFromSessionKey="meldingInfo">
+                <IbisLocalSender javaListener="Internal_StoreUuidIdMapping"/>
+            </SenderPipe>
+
             <SenderPipe name="SendToUltimo">
                 <HttpSender name="SendToUltimo" methodType="POST" contentType="application/json"
                 headersParams="ApiKey,ApplicationElementId,Accept-Crs,Content-Crs">
diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml
index 034bc4a..c622d09 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml
@@ -57,9 +57,9 @@
         </Pipeline>
     </Adapter>
 
-    <Adapter name="Internal_SaveIdByUuid">
-        <Receiver name="Internal_SaveIdByUuid">
-            <JavaListener name="Internal_SaveIdByUuid" />
+    <Adapter name="Internal_StoreUuidIdMapping">
+        <Receiver name="Internal_StoreUuidIdMapping">
+            <JavaListener name="Internal_StoreUuidIdMapping" />
         </Receiver>
 
         <Pipeline>
@@ -69,16 +69,18 @@
                 <Exit name="Exception" state="ERROR" />
             </Exits>
 
-            <SenderPipe name="SaveUuidIdMapping">
+            <SenderPipe name="StoreUuidIdMapping">
                 <FixedQuerySender
-                    name="SaveUuidIdMapping"
-                    query="INSERT INTO UUIDIDMAP (id, uuid) VALUES (?{Id}, ?{Uuid})"
-                    queryType="OTHER"> <!-- TODO: save for sql injection? -->
-                    <Param name="Id" sessionKey="Id" />
-                    <Param name="Uuid" sessionKey="Uuid" />
+                    name="StoreUuidIdMapping"
+                    query="INSERT INTO UUIDIDMAP (id, uuid) VALUES (?{Id}, ?{Uuid}) ON CONFLICT DO UPDATE"
+                    queryType="OTHER">
+                    <Param name="Id" xpathExpression="/root/id" type="INTEGER"/>
+                    <Param name="Uuid" xpathExpression="/root/uuid" type="STRING" />
                 </FixedQuerySender>
+                <Forward name="success" path="Exit" />
+                <Forward name="exception" path="Exception" />
             </SenderPipe>
         </Pipeline>
     </Adapter>
-
+    
 </Module>
\ No newline at end of file

From f58d6626a8781aacb1318a8ffab944f1cc5d556a Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 09:46:23 +0200
Subject: [PATCH 03/11] refactor: remove excess adapters

---
 .../Configuration_ToUltimo.xml                | 168 ------------------
 1 file changed, 168 deletions(-)

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
index 9ca6dba..b3d0b4f 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
@@ -1,101 +1,6 @@
 <Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
 
-    <!-- Not used. Ultimo does not currently support DeleteZaak. -->
-    <Adapter name="Ultimo_DeleteZaak">
-        <Receiver name="Ultimo_DeleteZaak">
-            <JavaListener name="Ultimo_DeleteZaak" />
-        </Receiver>
-
-        <Pipeline>
-            <Exits>
-                <Exit name="Exit" state="SUCCESS" code="201" />
-                <Exit name="BadRequest" state="ERROR" code="400" />
-                <Exit name="Forbidden" state="ERROR" code="403" />
-                <Exit name="Conflict" state="ERROR" code="409" />
-                <Exit name="ServerError" state="ERROR" code="500" />
-            </Exits>
-
-            <PutSystemDateInSessionPipe name="StoreSystemDate">
-                <Forward name="success" path="StoreToelichting" />
-                <Forward name="exception" path="exception" />
-            </PutSystemDateInSessionPipe>
-
-            <XsltPipe name="StoreToelichting" getInputFromSessionKey="originalMessage"
-                xpathExpression="//reden" storeResultInSessionKey="toelichtingHeader">
-                <Forward name="success" path="RequestGetMelding" />
-                <Forward name="exception" path="exception" />
-            </XsltPipe>
-
-            <!-- TODO: Currently, this sender exists to ask for extra info regarding the zaak in
-            question. Need to investigate if MorCore stores info. Potentially add the uuid as a param to the
-            senderpipe.
-            However, it is unclear whether MorCore stores any information relating to the case in the storage
-            application (Ultimo).
-            If MorCore does not store any information or references, we are unable to link their delete request
-            to a specific case. -->
-            <SenderPipe name="RequestGetMelding" getInputFromSessionKey="originalMessage">
-                <IbisLocalSender name="RequestGetMelding" javaListener="MorCore_GetMelding" />
-                <Forward name="success" path="Json2Xml" />
-                <Forward name="exception" path="exception" />
-            </SenderPipe>
-
-            <JsonPipe name="Json2Xml" prettyPrint="true">
-                <Forward name="success" path="StoreUltimoReference" />
-                <Forward name="exception" path="Exception" />
-            </JsonPipe>
-
-            <XsltPipe name="StoreUltimoReference" xpathExpression="//self/href"
-                storeResultInSessionKey="UltimoReference">
-                <Forward name="success" path="CreateDeleteZaakRequest" />
-                <Forward name="exception" path="exception" />
-            </XsltPipe>
-
-            <XsltPipe name="CreateDeleteZaakRequest" getInputFromSessionKey="originalMessage"
-                styleSheetName="xsl/Ultimo/DeleteZaakRequest.xsl">
-                <Param name="UltimoReference" sessionKey="UltimoReference" />
-                <Param name="currentDate" sessionKey="systemDate" />
-                <Forward name="success" path="XmlToJson" />
-                <Forward name="exception" path="exception" />
-            </XsltPipe>
-
-            <JsonPipe name="XmlToJson" direction="XML2JSON">
-                <Forward name="success" path="SendToUltimo" />
-                <Forward name="exception" path="exception" />
-            </JsonPipe>
-
-            <SenderPipe name="SendToUltimo">
-                <HttpSender name="SendToUltimo" methodType="POST" contentType="application/json"
-                    headersParams="X-Audit-Toelichting">
-                    <Param name="X-Audit-Toelichting" sessionKey="toelichtingHeader" />
-                    <Param name="url" value="${Ultimo.ESB.root-url}statussen" />
-                </HttpSender>
-                <Forward name="success" path="Exit" />
-                <Forward name="exception" path="exception" />
-                <Forward name="timeout" path="timeout" />
-                <Forward name="illegalResult" path="illegalResult" />
-                <Forward name="interrupt" path="interrupt" />
-            </SenderPipe>
-
-            <FixedResultPipe name="exception" filename="ErrorResponses/BadRequest.json">
-                <Forward name="success" path="BadRequest" />
-            </FixedResultPipe>
-
-            <FixedResultPipe name="timeout" filename="ErrorResponses/ServerError.json">
-                <Forward name="success" path="ServerError" />
-            </FixedResultPipe>
-
-            <FixedResultPipe name="illegalResult" filename="ErrorResponses/Forbidden.json">
-                <Forward name="success" path="Forbidden" />
-            </FixedResultPipe>
-
-            <FixedResultPipe name="interrupt" filename="ErrorResponses/Conflict.json">
-                <Forward name="success" path="Conflict" />
-            </FixedResultPipe>
-
-        </Pipeline>
-    </Adapter>
-
     <Adapter name="Ultimo_PostZaak">
         <Receiver name="Ultimo_PostZaak">
             <JavaListener name="Ultimo_PostZaak" />
@@ -199,77 +104,4 @@
         </Pipeline>
     </Adapter>
 
-    <!-- Not used. Ultimo does not currently support GetZaak. -->
-    <Adapter name="Ultimo_GetZaak">
-        <Receiver name="Ultimo_GetZaak">
-            <JavaListener name="Ultimo_GetZaak" />
-        </Receiver>
-
-        <Receiver name="Ultimo_GetZaak_Internal">
-            <JavaListener name="Ultimo_GetZaak_Internal" />
-        </Receiver>
-
-        <Pipeline>
-            <Exits>
-                <Exit name="Exit" state="SUCCESS" code="200" />
-                <Exit name="BadRequest" state="ERROR" code="400" />
-                <Exit name="Forbidden" state="ERROR" code="403" />
-                <Exit name="Conflict" state="ERROR" code="409" />
-                <Exit name="ServerError" state="ERROR" code="500" />
-            </Exits>
-
-            <SenderPipe name="SendToUltimo">
-                <HttpSender name="SendToUltimo" methodType="GET"
-                    headersParams="ApiKey,ApplicationElementId">
-                    <Param name="Accept-Crs"
-                        value="EPSG:4326" />
-                    <Param name="Content-Crs" value="EPSG:4326" />
-                    <Param
-                        name="uuid" sessionKey="uuid" />
-                    <Param name="url"
-                        value="${Ultimo.ESB.root-url}_REST_MSB_CreateJob/${uuid}" />
-                </HttpSender>
-                <Forward name="success" path="Json2XML" />
-                <Forward name="exception" path="exception" />
-                <Forward name="timeout" path="timeout" />
-                <Forward name="illegalResult" path="illegalResult" />
-                <Forward name="interrupt" path="interrupt" />
-            </SenderPipe>
-
-            <JsonPipe name="Json2XML">
-                <Forward name="success" path="CreateGetZaakRequest" />
-                <Forward name="exception" path="exception" />
-            </JsonPipe>
-
-            <XsltPipe name="CreateGetZaakRequest" styleSheetName="xsl/Ultimo/GetZaakResponse.xsl">
-                <Param name="currentDate" sessionKey="systemDate" />
-                <Param name="MorcoreRootURL" value="${MorCore.taak.API.root-url}"/> 
-                <Forward name="success" path="Xml2Json" />
-                <Forward name="exception" path="exception" />
-            </XsltPipe>
-
-            <JsonPipe name="Xml2Json" direction="XML2JSON">
-                <Forward name="success" path="Exit" />
-                <Forward name="exception" path="exception" />
-            </JsonPipe>
-
-            <FixedResultPipe name="exception" filename="ErrorResponses/BadRequest.json">
-                <Forward name="success" path="BadRequest" />
-            </FixedResultPipe>
-
-            <FixedResultPipe name="timeout" filename="ErrorResponses/ServerError.json">
-                <Forward name="success" path="ServerError" />
-            </FixedResultPipe>
-
-            <FixedResultPipe name="illegalResult" filename="ErrorResponses/Forbidden.json">
-                <Forward name="success" path="Forbidden" />
-            </FixedResultPipe>
-
-            <FixedResultPipe name="interrupt" filename="ErrorResponses/Conflict.json">
-                <Forward name="success" path="Conflict" />
-            </FixedResultPipe>
-
-        </Pipeline>
-    </Adapter>
-
 </Module>
\ No newline at end of file

From feae509a1948bc8012603d705190fdefd0def9a8 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 09:50:32 +0200
Subject: [PATCH 04/11] refactor: remove unnecessary forwards from ToMorcore

---
 .../Configuration_ToMorCore.xml               | 30 +++----------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
index 5c2b1a2..56847aa 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
@@ -16,8 +16,6 @@
 
             <SenderPipe name="CallMorCore_GetToken" storeResultInSessionKey="MorCoreToken">
                 <IbisLocalSender name="CallMorCore_GetToken" javaListener="MorCore_GetToken" />
-                <Forward name="success" path="Send2MorCore" />
-                <Forward name="exception" path="Exception" />
             </SenderPipe>
 
             <SenderPipe name="Send2MorCore" getInputFromSessionKey="originalMessage" emptyInputReplacement="&lt;NoInput/>">
@@ -32,19 +30,11 @@
 
             <SenderPipe name="CallMSBSender">
                 <IbisLocalSender name="CallMSBSender" javaListener="MSB_GetMelding" />
-                <Forward name="success" path="Json2Xml" />
-                <Forward name="exception" path="Exception" />
             </SenderPipe>
 
-            <JsonPipe name="Json2Xml" prettyPrint="true">
-                <Forward name="success" path="Xml2Json" />
-                <Forward name="exception" path="Exception" />
-            </JsonPipe>
+            <JsonPipe name="Json2Xml" prettyPrint="true"/>
 
-            <JsonPipe name="Xml2Json" direction="XML2JSON">
-                <Forward name="success" path="Exit" />
-                <Forward name="exception" path="Exception" />
-            </JsonPipe>
+            <JsonPipe name="Xml2Json" direction="XML2JSON"/>
 
         </Pipeline>
     </Adapter>
@@ -64,8 +54,6 @@
 
             <SenderPipe name="CallMorCore_GetToken" storeResultInSessionKey="MorCoreToken">
                 <IbisLocalSender name="CallMorCore_GetToken" javaListener="MorCore_GetToken" />
-                <Forward name="success" path="Send2MorCore" />
-                <Forward name="exception" path="Exception" />
             </SenderPipe>
 
             <SenderPipe name="Send2MorCore" getInputFromSessionKey="originalMessage" emptyInputReplacement="&lt;NoInput/>">
@@ -80,20 +68,13 @@
 
             <SenderPipe name="CallMSBSender">
                 <IbisLocalSender name="CallMSBSender" javaListener="MSB_GetMelding" />
-                <Forward name="success" path="Json2Xml" />
-                <Forward name="exception" path="Exception" />
             </SenderPipe>
 
-            <JsonPipe name="Json2Xml" prettyPrint="true">
-                <Forward name="success" path="CorrectFormat" />
-                <Forward name="exception" path="Exception" />
-            </JsonPipe>
+            <JsonPipe name="Json2Xml" prettyPrint="true"/>
 
             <XsltPipe name="CorrectFormat" styleSheetName="xsl/TaakApi/CorrectGetTaakOpdrachtResponse.xsl"
                 outputType="XML">
                 <Param name="MorCoreRootUrl" value="${MorCore.taak.API.root-url}" />
-                <Forward name="success" path="XmlCheck" />
-                <Forward name="exception" path="Exception" />
             </XsltPipe>
 
             <XmlValidatorPipe name="XmlCheck" schema="xsd/TaakApi/ValidateGetMeldingTaak.xsd"
@@ -102,10 +83,7 @@
                 <Forward name="failure" path="Reject" />
             </XmlValidatorPipe>
 
-            <JsonPipe name="Xml2Json" direction="XML2JSON">
-                <Forward name="success" path="Exit" />
-                <Forward name="exception" path="Exception" />
-            </JsonPipe>
+            <JsonPipe name="Xml2Json" direction="XML2JSON"/>
 
         </Pipeline>
     </Adapter>

From 12847f8a31a98e3e9559116b11ff70c7875de966 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 09:51:39 +0200
Subject: [PATCH 05/11] refactor: set success forward on Send2MorCore to
 Json2XML

---
 .../morcoreMessageProcessor/Configuration_ToMorCore.xml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
index 56847aa..e285471 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
@@ -24,7 +24,7 @@
                 <Param name="Authorization" xpathExpression="concat('Token ', $MorCoreToken)">
                     <Param name="MorCoreToken" sessionKey="MorCoreToken" xpathExpression="//token" />
                 </Param>
-                <Forward name="success" path="SaveUuidIdMapping" />
+                <Forward name="success" path="Json2Xml" />
                 <Forward name="exception" path="CallMSBSender" />
             </SenderPipe>
 

From c901c345d5a14ae7a1e05cc9a3ea01d92ca6e68f Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 10:43:06 +0200
Subject: [PATCH 06/11] refactor: set database primary key

---
 .../morcoreMessageProcessor/DatabaseChangelog.xml             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml b/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml
index 22df7f5..49b1a18 100644
--- a/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml
+++ b/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml
@@ -15,7 +15,9 @@
     <changeSet id="1" author="Maarten">
         <createTable tableName="UUIDIDMAP">
             <column name="id" type="int"/>
-            <column name="uuid" type="varchar(255)"/>
+            <column name="uuid" type="varchar(255)">
+                <constraints primaryKey="true" nullable="false" primaryKeyName="PK_UUIDIDMAP" />    
+            </column>
         </createTable>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file

From ba10a37e90e43b53908cfce2203e4e7be75dc807 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 12:26:14 +0200
Subject: [PATCH 07/11] refactor: add duplication prevention to database

---
 .../Configuration_UuidIdMapper.xml            | 23 ++++++++++++++++---
 .../DatabaseChangelog.xml                     |  4 ++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml
index c622d09..5e08e00 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_UuidIdMapper.xml
@@ -69,10 +69,25 @@
                 <Exit name="Exception" state="ERROR" />
             </Exits>
 
-            <SenderPipe name="StoreUuidIdMapping">
+            <SenderPipe name="GetUuidIdMapping" >
+                <FixedQuerySender
+                    name="GetUuidIdMapping"
+                    query="SELECT * FROM UUIDIDMAP WHERE UUID = ?{Uuid} OR ID = ?{Id}"
+                    queryType="SELECT">
+                    <Param name="Id" xpathExpression="/root/id" type="INTEGER"/>
+                    <Param name="Uuid" xpathExpression="/root/uuid" type="STRING" />
+                </FixedQuerySender>
+            </SenderPipe>
+
+            <XmlIfPipe name="IfResultCount0" xpathExpression="count(//row) > 0">
+                <Forward name="then" path="RecordAlreadyExists" />
+                <Forward name="else" path="StoreUuidIdMapping" />
+            </XmlIfPipe>
+
+            <SenderPipe name="StoreUuidIdMapping" getInputFromSessionKey="originalMessage">
                 <FixedQuerySender
                     name="StoreUuidIdMapping"
-                    query="INSERT INTO UUIDIDMAP (id, uuid) VALUES (?{Id}, ?{Uuid}) ON CONFLICT DO UPDATE"
+                    query="INSERT INTO UUIDIDMAP (id, uuid) VALUES (?{Id}, ?{Uuid})"
                     queryType="OTHER">
                     <Param name="Id" xpathExpression="/root/id" type="INTEGER"/>
                     <Param name="Uuid" xpathExpression="/root/uuid" type="STRING" />
@@ -80,7 +95,9 @@
                 <Forward name="success" path="Exit" />
                 <Forward name="exception" path="Exception" />
             </SenderPipe>
+
+            <FixedResultPipe name="RecordAlreadyExists" returnString="&lt;result>Record already exists&lt;/result>"/>
         </Pipeline>
     </Adapter>
-    
+
 </Module>
\ No newline at end of file
diff --git a/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml b/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml
index 49b1a18..560332a 100644
--- a/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml
+++ b/src/main/configurations/morcoreMessageProcessor/DatabaseChangelog.xml
@@ -19,5 +19,9 @@
                 <constraints primaryKey="true" nullable="false" primaryKeyName="PK_UUIDIDMAP" />    
             </column>
         </createTable>
+
+        <addUniqueConstraint columnNames="id"
+                         constraintName="UK_UUIDIDMAP_ID"
+                         tableName="UUIDIDMAP"/>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file

From 22d718bbf4d8a90ae25cc88f3c4081a781990929 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 12:34:43 +0200
Subject: [PATCH 08/11] fix: correct input with sessionkey

---
 .../morcoreMessageProcessor/Configuration_ToUltimo.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
index b3d0b4f..835ae82 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
@@ -69,7 +69,7 @@
                 <IbisLocalSender javaListener="Internal_StoreUuidIdMapping"/>
             </SenderPipe>
 
-            <SenderPipe name="SendToUltimo">
+            <SenderPipe name="SendToUltimo" getInputFromSessionKey="jsonMessage">
                 <HttpSender name="SendToUltimo" methodType="POST" contentType="application/json"
                 headersParams="ApiKey,ApplicationElementId,Accept-Crs,Content-Crs">
                     <Param name="Accept-Crs" value="EPSG:4326" />

From c9bb7770cdfac474ab0954c5851af3de39d7b9b3 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 12:40:37 +0200
Subject: [PATCH 09/11] test: update test 01

---
 src/test/testtool/scenario01/UltimoPostZaakRequest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/testtool/scenario01/UltimoPostZaakRequest.json b/src/test/testtool/scenario01/UltimoPostZaakRequest.json
index e2720e0..cf60798 100644
--- a/src/test/testtool/scenario01/UltimoPostZaakRequest.json
+++ b/src/test/testtool/scenario01/UltimoPostZaakRequest.json
@@ -1,5 +1,5 @@
 {
-    "meldingId": "123456",
+    "meldingId": "1234",
     "behandelaar": "MSB",
     "afdeling": "",
     "opmerkingBehandelaar": "",

From 2bebcaa51da83c42982e3bf478a722e817bb566c Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 12:40:50 +0200
Subject: [PATCH 10/11] Revert "refactor: remove excess adapters"

This reverts commit f58d6626a8781aacb1318a8ffab944f1cc5d556a.
---
 .../Configuration_ToUltimo.xml                | 168 ++++++++++++++++++
 1 file changed, 168 insertions(+)

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
index 835ae82..0fe3d13 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_ToUltimo.xml
@@ -1,6 +1,101 @@
 <Module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../FrankConfig.xsd">
 
+    <!-- Not used. Ultimo does not currently support DeleteZaak. -->
+    <Adapter name="Ultimo_DeleteZaak">
+        <Receiver name="Ultimo_DeleteZaak">
+            <JavaListener name="Ultimo_DeleteZaak" />
+        </Receiver>
+
+        <Pipeline>
+            <Exits>
+                <Exit name="Exit" state="SUCCESS" code="201" />
+                <Exit name="BadRequest" state="ERROR" code="400" />
+                <Exit name="Forbidden" state="ERROR" code="403" />
+                <Exit name="Conflict" state="ERROR" code="409" />
+                <Exit name="ServerError" state="ERROR" code="500" />
+            </Exits>
+
+            <PutSystemDateInSessionPipe name="StoreSystemDate">
+                <Forward name="success" path="StoreToelichting" />
+                <Forward name="exception" path="exception" />
+            </PutSystemDateInSessionPipe>
+
+            <XsltPipe name="StoreToelichting" getInputFromSessionKey="originalMessage"
+                xpathExpression="//reden" storeResultInSessionKey="toelichtingHeader">
+                <Forward name="success" path="RequestGetMelding" />
+                <Forward name="exception" path="exception" />
+            </XsltPipe>
+
+            <!-- TODO: Currently, this sender exists to ask for extra info regarding the zaak in
+            question. Need to investigate if MorCore stores info. Potentially add the uuid as a param to the
+            senderpipe.
+            However, it is unclear whether MorCore stores any information relating to the case in the storage
+            application (Ultimo).
+            If MorCore does not store any information or references, we are unable to link their delete request
+            to a specific case. -->
+            <SenderPipe name="RequestGetMelding" getInputFromSessionKey="originalMessage">
+                <IbisLocalSender name="RequestGetMelding" javaListener="MorCore_GetMelding" />
+                <Forward name="success" path="Json2Xml" />
+                <Forward name="exception" path="exception" />
+            </SenderPipe>
+
+            <JsonPipe name="Json2Xml" prettyPrint="true">
+                <Forward name="success" path="StoreUltimoReference" />
+                <Forward name="exception" path="Exception" />
+            </JsonPipe>
+
+            <XsltPipe name="StoreUltimoReference" xpathExpression="//self/href"
+                storeResultInSessionKey="UltimoReference">
+                <Forward name="success" path="CreateDeleteZaakRequest" />
+                <Forward name="exception" path="exception" />
+            </XsltPipe>
+
+            <XsltPipe name="CreateDeleteZaakRequest" getInputFromSessionKey="originalMessage"
+                styleSheetName="xsl/Ultimo/DeleteZaakRequest.xsl">
+                <Param name="UltimoReference" sessionKey="UltimoReference" />
+                <Param name="currentDate" sessionKey="systemDate" />
+                <Forward name="success" path="XmlToJson" />
+                <Forward name="exception" path="exception" />
+            </XsltPipe>
+
+            <JsonPipe name="XmlToJson" direction="XML2JSON">
+                <Forward name="success" path="SendToUltimo" />
+                <Forward name="exception" path="exception" />
+            </JsonPipe>
+
+            <SenderPipe name="SendToUltimo">
+                <HttpSender name="SendToUltimo" methodType="POST" contentType="application/json"
+                    headersParams="X-Audit-Toelichting">
+                    <Param name="X-Audit-Toelichting" sessionKey="toelichtingHeader" />
+                    <Param name="url" value="${Ultimo.ESB.root-url}statussen" />
+                </HttpSender>
+                <Forward name="success" path="Exit" />
+                <Forward name="exception" path="exception" />
+                <Forward name="timeout" path="timeout" />
+                <Forward name="illegalResult" path="illegalResult" />
+                <Forward name="interrupt" path="interrupt" />
+            </SenderPipe>
+
+            <FixedResultPipe name="exception" filename="ErrorResponses/BadRequest.json">
+                <Forward name="success" path="BadRequest" />
+            </FixedResultPipe>
+
+            <FixedResultPipe name="timeout" filename="ErrorResponses/ServerError.json">
+                <Forward name="success" path="ServerError" />
+            </FixedResultPipe>
+
+            <FixedResultPipe name="illegalResult" filename="ErrorResponses/Forbidden.json">
+                <Forward name="success" path="Forbidden" />
+            </FixedResultPipe>
+
+            <FixedResultPipe name="interrupt" filename="ErrorResponses/Conflict.json">
+                <Forward name="success" path="Conflict" />
+            </FixedResultPipe>
+
+        </Pipeline>
+    </Adapter>
+
     <Adapter name="Ultimo_PostZaak">
         <Receiver name="Ultimo_PostZaak">
             <JavaListener name="Ultimo_PostZaak" />
@@ -104,4 +199,77 @@
         </Pipeline>
     </Adapter>
 
+    <!-- Not used. Ultimo does not currently support GetZaak. -->
+    <Adapter name="Ultimo_GetZaak">
+        <Receiver name="Ultimo_GetZaak">
+            <JavaListener name="Ultimo_GetZaak" />
+        </Receiver>
+
+        <Receiver name="Ultimo_GetZaak_Internal">
+            <JavaListener name="Ultimo_GetZaak_Internal" />
+        </Receiver>
+
+        <Pipeline>
+            <Exits>
+                <Exit name="Exit" state="SUCCESS" code="200" />
+                <Exit name="BadRequest" state="ERROR" code="400" />
+                <Exit name="Forbidden" state="ERROR" code="403" />
+                <Exit name="Conflict" state="ERROR" code="409" />
+                <Exit name="ServerError" state="ERROR" code="500" />
+            </Exits>
+
+            <SenderPipe name="SendToUltimo">
+                <HttpSender name="SendToUltimo" methodType="GET"
+                    headersParams="ApiKey,ApplicationElementId">
+                    <Param name="Accept-Crs"
+                        value="EPSG:4326" />
+                    <Param name="Content-Crs" value="EPSG:4326" />
+                    <Param
+                        name="uuid" sessionKey="uuid" />
+                    <Param name="url"
+                        value="${Ultimo.ESB.root-url}_REST_MSB_CreateJob/${uuid}" />
+                </HttpSender>
+                <Forward name="success" path="Json2XML" />
+                <Forward name="exception" path="exception" />
+                <Forward name="timeout" path="timeout" />
+                <Forward name="illegalResult" path="illegalResult" />
+                <Forward name="interrupt" path="interrupt" />
+            </SenderPipe>
+
+            <JsonPipe name="Json2XML">
+                <Forward name="success" path="CreateGetZaakRequest" />
+                <Forward name="exception" path="exception" />
+            </JsonPipe>
+
+            <XsltPipe name="CreateGetZaakRequest" styleSheetName="xsl/Ultimo/GetZaakResponse.xsl">
+                <Param name="currentDate" sessionKey="systemDate" />
+                <Param name="MorcoreRootURL" value="${MorCore.taak.API.root-url}"/> 
+                <Forward name="success" path="Xml2Json" />
+                <Forward name="exception" path="exception" />
+            </XsltPipe>
+
+            <JsonPipe name="Xml2Json" direction="XML2JSON">
+                <Forward name="success" path="Exit" />
+                <Forward name="exception" path="exception" />
+            </JsonPipe>
+
+            <FixedResultPipe name="exception" filename="ErrorResponses/BadRequest.json">
+                <Forward name="success" path="BadRequest" />
+            </FixedResultPipe>
+
+            <FixedResultPipe name="timeout" filename="ErrorResponses/ServerError.json">
+                <Forward name="success" path="ServerError" />
+            </FixedResultPipe>
+
+            <FixedResultPipe name="illegalResult" filename="ErrorResponses/Forbidden.json">
+                <Forward name="success" path="Forbidden" />
+            </FixedResultPipe>
+
+            <FixedResultPipe name="interrupt" filename="ErrorResponses/Conflict.json">
+                <Forward name="success" path="Conflict" />
+            </FixedResultPipe>
+
+        </Pipeline>
+    </Adapter>
+
 </Module>
\ No newline at end of file

From fc6b69f88afa824c2b580a986bffebb47c5a12f0 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Thu, 8 Aug 2024 12:45:04 +0200
Subject: [PATCH 11/11] Revert "refactor: remove unnecessary forwards from
 ToMorcore"

This reverts commit feae509a1948bc8012603d705190fdefd0def9a8.
---
 .../Configuration_ToMorCore.xml               | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
index e285471..54d3832 100644
--- a/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
+++ b/src/main/configurations/morcoreMessageProcessor/Configuration_ToMorCore.xml
@@ -16,6 +16,8 @@
 
             <SenderPipe name="CallMorCore_GetToken" storeResultInSessionKey="MorCoreToken">
                 <IbisLocalSender name="CallMorCore_GetToken" javaListener="MorCore_GetToken" />
+                <Forward name="success" path="Send2MorCore" />
+                <Forward name="exception" path="Exception" />
             </SenderPipe>
 
             <SenderPipe name="Send2MorCore" getInputFromSessionKey="originalMessage" emptyInputReplacement="&lt;NoInput/>">
@@ -30,11 +32,19 @@
 
             <SenderPipe name="CallMSBSender">
                 <IbisLocalSender name="CallMSBSender" javaListener="MSB_GetMelding" />
+                <Forward name="success" path="Json2Xml" />
+                <Forward name="exception" path="Exception" />
             </SenderPipe>
 
-            <JsonPipe name="Json2Xml" prettyPrint="true"/>
+            <JsonPipe name="Json2Xml" prettyPrint="true">
+                <Forward name="success" path="Xml2Json" />
+                <Forward name="exception" path="Exception" />
+            </JsonPipe>
 
-            <JsonPipe name="Xml2Json" direction="XML2JSON"/>
+            <JsonPipe name="Xml2Json" direction="XML2JSON">
+                <Forward name="success" path="Exit" />
+                <Forward name="exception" path="Exception" />
+            </JsonPipe>
 
         </Pipeline>
     </Adapter>
@@ -54,6 +64,8 @@
 
             <SenderPipe name="CallMorCore_GetToken" storeResultInSessionKey="MorCoreToken">
                 <IbisLocalSender name="CallMorCore_GetToken" javaListener="MorCore_GetToken" />
+                <Forward name="success" path="Send2MorCore" />
+                <Forward name="exception" path="Exception" />
             </SenderPipe>
 
             <SenderPipe name="Send2MorCore" getInputFromSessionKey="originalMessage" emptyInputReplacement="&lt;NoInput/>">
@@ -68,13 +80,20 @@
 
             <SenderPipe name="CallMSBSender">
                 <IbisLocalSender name="CallMSBSender" javaListener="MSB_GetMelding" />
+                <Forward name="success" path="Json2Xml" />
+                <Forward name="exception" path="Exception" />
             </SenderPipe>
 
-            <JsonPipe name="Json2Xml" prettyPrint="true"/>
+            <JsonPipe name="Json2Xml" prettyPrint="true">
+                <Forward name="success" path="CorrectFormat" />
+                <Forward name="exception" path="Exception" />
+            </JsonPipe>
 
             <XsltPipe name="CorrectFormat" styleSheetName="xsl/TaakApi/CorrectGetTaakOpdrachtResponse.xsl"
                 outputType="XML">
                 <Param name="MorCoreRootUrl" value="${MorCore.taak.API.root-url}" />
+                <Forward name="success" path="XmlCheck" />
+                <Forward name="exception" path="Exception" />
             </XsltPipe>
 
             <XmlValidatorPipe name="XmlCheck" schema="xsd/TaakApi/ValidateGetMeldingTaak.xsd"
@@ -83,7 +102,10 @@
                 <Forward name="failure" path="Reject" />
             </XmlValidatorPipe>
 
-            <JsonPipe name="Xml2Json" direction="XML2JSON"/>
+            <JsonPipe name="Xml2Json" direction="XML2JSON">
+                <Forward name="success" path="Exit" />
+                <Forward name="exception" path="Exception" />
+            </JsonPipe>
 
         </Pipeline>
     </Adapter>