From f0afe9d161e45a853ec94ce1e459893407f7d3e4 Mon Sep 17 00:00:00 2001
From: MLenterman <marcellenterman@hotmail.com>
Date: Mon, 22 Jul 2024 11:07:17 +0200
Subject: [PATCH] fix: replace restoreElementToMove with replacerPipe due to
 elementToMove not working on non-xml anymore

---
 .../Translate/Configuration_PutZgwZaakDocument.xml    | 10 +++++-----
 ...nfiguration_SoapEndpointRouter_BeantwoordVraag.xml |  8 ++++----
 ...onfiguration_SoapEndpointRouter_VrijeBerichten.xml |  8 ++++----
 ...onfiguration_Zaken_PostZgwZaakInformatieObject.xml | 11 +++++++----
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/main/configurations/Translate/Configuration_PutZgwZaakDocument.xml b/src/main/configurations/Translate/Configuration_PutZgwZaakDocument.xml
index 517f0d369..704f56987 100644
--- a/src/main/configurations/Translate/Configuration_PutZgwZaakDocument.xml
+++ b/src/main/configurations/Translate/Configuration_PutZgwZaakDocument.xml
@@ -33,17 +33,17 @@
             <ReplacerPipe
                 name="ReplaceBase64EncodedRefWithInhoudRef"
                 find="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
-                replace="{sessionKey:ref_inhoud}"
+                replace="?{ref_inhoud}"
                 >
                 <Forward name="success" path="SubstituteDocumentDataRef" />
             </ReplacerPipe>
 
-            <EchoPipe
+            <ReplacerPipe
                 name="SubstituteDocumentDataRef"
-                restoreMovedElements="true"
                 >
-                <Forward name="success" path="PutZaakDocument"/>
-            </EchoPipe>
+                <Param name="ref_inhoud" sessionKey="ref_inhoud" />
+                <Forward name="success" path="PutZaakDocument" />
+            </ReplacerPipe>
 
             <SenderPipe name="PutZaakDocument">
 				<HttpSender 
diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml
index 8800955d4..d640e3320 100644
--- a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml
+++ b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml
@@ -196,17 +196,17 @@
             <ReplacerPipe
                 name="ReplaceBase64EncodedRefWithInhoudRef"
                 find="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
-                replace="{sessionKey:ref_inhoud}"
+                replace="?{ref_inhoud}"
                 >
                 <Forward name="success" path="SubstituteDocumentDataRef" />
             </ReplacerPipe>
 
-            <EchoPipe
+            <ReplacerPipe
                 name="SubstituteDocumentDataRef"
-                restoreMovedElements="true"
                 >
+                <Param name="ref_inhoud" sessionKey="ref_inhoud" />
                 <Forward name="success" path="EXIT" />
-            </EchoPipe>
+            </ReplacerPipe> 
 
             <!-- ERRORS -->
             <XsltPipe 
diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml
index d9aa3a95b..24aa921ce 100644
--- a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml
+++ b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml
@@ -254,17 +254,17 @@
             <ReplacerPipe
                 name="ReplaceBase64EncodedRefWithInhoudRef"
                 find="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
-                replace="{sessionKey:ref_inhoud}"
+                replace="?{ref_inhoud}"
                 >
                 <Forward name="success" path="SubstituteDocumentDataRef" />
             </ReplacerPipe>
 
-            <EchoPipe
+            <ReplacerPipe
                 name="SubstituteDocumentDataRef"
-                restoreMovedElements="true"
                 >
+                <Param name="ref_inhoud" sessionKey="ref_inhoud" />
                 <Forward name="success" path="EXIT" />
-            </EchoPipe>
+            </ReplacerPipe> 
 
             <SoapWrapperPipe
                 name="WrapCheckOutZaakDocument_Di02Response"
diff --git a/src/main/configurations/Translate/Configuration_Zaken_PostZgwZaakInformatieObject.xml b/src/main/configurations/Translate/Configuration_Zaken_PostZgwZaakInformatieObject.xml
index bdd470f13..5a1e411bc 100644
--- a/src/main/configurations/Translate/Configuration_Zaken_PostZgwZaakInformatieObject.xml
+++ b/src/main/configurations/Translate/Configuration_Zaken_PostZgwZaakInformatieObject.xml
@@ -40,14 +40,17 @@
             <ReplacerPipe
                 name="ReplaceBase64EncodedRefWithInhoudRef"
                 find="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
-                replace="{sessionKey:ref_inhoud}"
+                replace="?{ref_inhoud}"
                 >
                 <Forward name="success" path="SubstituteDocumentDataRef" />
             </ReplacerPipe>
 
-            <EchoPipe name="SubstituteDocumentDataRef" restoreMovedElements="true">
-                <Forward name="success" path="PostZgwEnkelvoudigInformatieObjectSender"/>
-            </EchoPipe>            
+            <ReplacerPipe
+                name="SubstituteDocumentDataRef"
+                >
+                <Param name="ref_inhoud" sessionKey="ref_inhoud" />
+                <Forward name="success" path="PostZgwEnkelvoudigInformatieObjectSender" />
+            </ReplacerPipe>           
 
             <SenderPipe name="PostZgwEnkelvoudigInformatieObjectSender">
                 <HttpSender name="PostZgwEnkelvoudigInformatieObjectHttpSender"