Skip to content

Commit

Permalink
Revert "Merge branch 'improve-error-handling' into main"
Browse files Browse the repository at this point in the history 
This reverts commit 61f158b, reversing
changes made to 823a0ca.
  • Loading branch information
@DelanoWAF
DelanoWAF committed Jul 5, 2023
1 parent 61f158b commit c1e5316
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 108 deletions.
114 changes: 10 additions & 104 deletions configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;">
Expand Down Expand Up @@ -153,26 +144,13 @@

<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>
<PutInSessionPipe name="storeQueryErrorResponse">
<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;">
Expand Down Expand Up @@ -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;">
Expand Down Expand Up @@ -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;">
Expand Down Expand Up @@ -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;">
Expand Down Expand Up @@ -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;">
Expand Down Expand Up @@ -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;">
Expand Down Expand Up @@ -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;">
Expand Down Expand Up @@ -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;">
Expand Down Expand Up @@ -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;">
Expand Down Expand Up @@ -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;">
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 1 addition & 4 deletions configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit c1e5316

Please sign in to comment.