From c1e531638e22f2a833a6fd6343b3a672035e1a66 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Wed, 5 Jul 2023 10:55:38 +0200
Subject: [PATCH] Revert "Merge branch 'improve-error-handling' into main"

This reverts commit 61f158ba627a659d271dc828a3efdc2f374ec73e, reversing
changes made to 823a0ca9829fa371656bce09f8083ed2af5d0374.
---
 .../Configuration_WebformulierenVerwerker.xml | 114 ++----------------
 .../xsl/ParseNegativeHttpResult.xsl           |   5 +-
 2 files changed, 11 insertions(+), 108 deletions(-)

diff --git a/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml b/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
index 1f86e8b..0340657 100644
--- a/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
+++ b/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
@@ -101,19 +101,10 @@
                 <Forward name="exception" path="storeErrorResponse1" />
             </SenderPipe>
 
-
             <PutInSessionPipe name="storeErrorResponse1">
                 <Param name="corsaResponse" />
                 <Forward name="success" path="buildErrorMsg1" />
             </PutInSessionPipe>
-
-            <IsXmlIfPipe name="IsConnectErrorXML">
-                <Forward name="then" path="buildErrorMsg1" />
-                <Forward name="else" path="ConnectError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="ConnectError2XML"/>
-
             <XsltPipe name="buildErrorMsg1"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -153,7 +144,6 @@
 
             <SenderPipe name="sendQueryToCorsa">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/QueryExecute" soap="false" />
-
                 <Forward name="success" path="UnwrapQueryResponse" />
                 <Forward name="exception" path="storeQueryErrorResponse" />
             </SenderPipe>
@@ -161,18 +151,6 @@
                 <Param name="corsaResponse" />
                 <Forward name="success" path="buildQueryErrorMsg" />
             </PutInSessionPipe>
-          
-                <Forward name="success" path="IsQueryExecuteErrorXML" />
-                <Forward name="exception" path="IsQueryExecuteErrorXML" />
-            </SenderPipe>
-
-            <IsXmlIfPipe name="IsQueryExecuteErrorXML">
-                <Forward name="then" path="buildQueryErrorMsg" />
-                <Forward name="else" path="QueryExecuteError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="QueryExecuteError2XML"/>
-
             <XsltPipe name="buildQueryErrorMsg"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -224,16 +202,8 @@
             </SenderPipe>
             <PutInSessionPipe name="storeErrorResponse2">
                 <Param name="corsaResponse" />
-                <Forward name="success" path="IsCreatePersonErrorXML" />
+                <Forward name="success" path="buildErrorMsg2" />
             </PutInSessionPipe>
-
-            <IsXmlIfPipe name="IsCreatePersonErrorXML">
-                <Forward name="then" path="buildErrorMsg2" />
-                <Forward name="else" path="CreatePersonError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="CreatePersonError2XML"/>
-
             <XsltPipe name="buildErrorMsg2"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -278,16 +248,8 @@
 
             <PutInSessionPipe name="storeErrorResponse3">
                 <Param name="corsaResponse" />
-                <Forward name="success" path="IsCreateMetaDocumentErrorXML" />
+                <Forward name="success" path="buildErrorMsg3" />
             </PutInSessionPipe>
-
-            <IsXmlIfPipe name="IsCreateMetaDocumentErrorXML">
-                <Forward name="then" path="buildErrorMsg3" />
-                <Forward name="else" path="CreateMetaDocumentError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="CreateMetaDocumentError2XML"/>
-            
             <XsltPipe name="buildErrorMsg3"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -323,16 +285,8 @@
 
             <PutInSessionPipe name="storeErrorResponse4">
                 <Param name="corsaResponse" />
-                <Forward name="success" path="IsCreateFileVersionErrorXML" />
+                <Forward name="success" path="buildErrorMsg4" />
             </PutInSessionPipe>
-
-            <IsXmlIfPipe name="IsCreateFileVersionErrorXML">
-                <Forward name="then" path="buildErrorMsg4" />
-                <Forward name="else" path="CreateFileVersionError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="CreateFileVersionError2XML"/>
-
             <XsltPipe name="buildErrorMsg4"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -361,16 +315,8 @@
 
             <PutInSessionPipe name="storeDisconnectErrorResponse">
                 <Param name="corsaResponse" />
-                <Forward name="success" path="IsDisconnectErrorXML" />
+                <Forward name="success" path="buildDisconnectErrorMsg" />
             </PutInSessionPipe>
-
-            <IsXmlIfPipe name="IsDisconnectErrorXML">
-                <Forward name="then" path="buildDisconnectErrorMsg" />
-                <Forward name="else" path="DisconnectError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="DisconnectError2XML"/>
-
             <XsltPipe name="buildDisconnectErrorMsg"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -435,16 +381,8 @@
 
             <PutInSessionPipe name="storeErrorResponse1">
                 <Param name="corsaResponse" />
-                <Forward name="success" path="IsConnectErrorXML" />
+                <Forward name="success" path="buildErrorMsg1" />
             </PutInSessionPipe>
-
-            <IsXmlIfPipe name="IsConnectErrorXML">
-                <Forward name="then" path="buildErrorMsg1" />
-                <Forward name="else" path="ConnectError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="ConnectError2XML"/>
-
             <XsltPipe name="buildErrorMsg1"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -510,16 +448,8 @@
 
             <PutInSessionPipe name="storeErrorResponse5">
                 <Param name="corsaResponse" />
-                <Forward name="success" path="IsCreateMetaDocumentErrorXML" />
+                <Forward name="success" path="buildErrorMsg5" />
             </PutInSessionPipe>
-
-            <IsXmlIfPipe name="IsCreateMetaDocumentErrorXML">
-                <Forward name="then" path="buildErrorMsg5" />
-                <Forward name="else" path="CreateMetaDocumentError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="CreateMetaDocumentError2XML"/>
-
             <XsltPipe name="buildErrorMsg5"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -559,16 +489,8 @@
 
             <PutInSessionPipe name="storeErrorResponse6">
                 <Param name="corsaResponse" />
-                <Forward name="success" path="IsFileVersionErrorXML" />
+                <Forward name="success" path="buildErrorMsg6" />
             </PutInSessionPipe>
-           
-            <IsXmlIfPipe name="IsFileVersionErrorXML">
-                <Forward name="then" path="buildErrorMsg6" />
-                <Forward name="else" path="FileVersionError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="FileVersionError2XML"/>
-
             <XsltPipe name="buildErrorMsg6"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -602,16 +524,8 @@
 
             <PutInSessionPipe name="storeErrorResponse7">
                 <Param name="corsaResponse" />
-                <Forward name="success" path="IsModObjectRelationErrorXML" />
+                <Forward name="success" path="buildErrorMsg7" />
             </PutInSessionPipe>
-
-            <IsXmlIfPipe name="IsModObjectRelationErrorXML">
-                <Forward name="then" path="buildErrorMsg7" />
-                <Forward name="else" path="ModObjectRelationError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="ModObjectRelationError2XML"/>
-            
             <XsltPipe name="buildErrorMsg7"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -644,16 +558,8 @@
 
             <PutInSessionPipe name="storeDisconnectErrorResponse">
                 <Param name="corsaResponse" />
-                <Forward name="success" path="IsDisconnectErrorXML" />
+                <Forward name="success" path="buildDisconnectErrorMsg" />
             </PutInSessionPipe>
-
-            <IsXmlIfPipe name="IsDisconnectErrorXML">
-                <Forward name="then" path="buildDisconnectErrorMsg" />
-                <Forward name="else" path="DisconnectError2XML" />
-            </IsXmlIfPipe>
-
-            <Text2XmlPipe xmlTag="errorMessage" name="DisconnectError2XML"/>
-
             <XsltPipe name="buildDisconnectErrorMsg"
                 styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
@@ -735,7 +641,7 @@
             </XmlSwitchPipe>
 
             <XmlIfPipe name="CheckForAfzender" xpathExpression="string-length($afzenderkvk) > 1">
-                <Param name="afzenderkvk" xpathExpression="//afzenderkvk" sessionKey="originalMessage"/>                
+                <Param name="afzenderkvk" xpathExpression="//afzenderkvk" sessionKey="originalMessage"/>                <Forward name="then" path="ConvertToQueryRequest" />
                 <Forward name="then" path="ConvertToQueryRequest" />
                 <Forward name="else" path="ConvertToCreateCompany" />
             </XmlIfPipe>
diff --git a/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl b/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl
index 397d179..8c872eb 100644
--- a/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl
+++ b/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl
@@ -27,15 +27,12 @@
                 </xsl:when>
                 <xsl:otherwise>
                     <code>ServerError</code>
-                    <reason>An unknown error occurred </reason>
+                    <reason>Some negative response </reason>
                 </xsl:otherwise>
             </xsl:choose>
             <details>
                 <xsl:value-of select="concat(/root/code, ' ', /root/title, ' ', /root/status, ' ', /root/detail)" />
             </details>
-            <response>
-                <xsl:value-of select="/"/>
-            </response>
         </error>
     </xsl:template>
 </xsl:stylesheet>