Skip to content

Commit

Permalink
refactor: replace XsltPipe error forwards to exception and use Replac…
Browse files Browse the repository at this point in the history
…erPipe instead of FixedResultPipe due to deprecated functionality (#456)

[skip ci]
Co-authored-by: INTERPAR\sena <[email protected]>
  • Loading branch information
RayetSena authored Oct 21, 2024
1 parent c8954bd commit 42b7867
Show file tree
Hide file tree
Showing 37 changed files with 63 additions and 61 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
styleSheetName="Common/xsl/GetSingleElementFromList.xslt"
>
<Forward name="success" path="CheckForGetZgwAndereZaakResult"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XmlIfPipe name="CheckForGetZgwAndereZaakResult"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Param name="MatchWithZdsRol" sessionKey="MatchWithZdsRol" type="DOMDOC" />
<Param name="debug" value="true" />
<Forward name="success" path="ZdsRolMatchesExactlyOneZdsRolInList" />
<Forward name="error" path="EXCEPTION" />
<Forward name="exception" path="EXCEPTION" />
</XsltPipe>

<XmlIfPipe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<Param name="RolMapping" sessionKey="RolMapping" type="DOMDOC" />
</Param>
<Forward name="success" path="GetSingleZgwRolTypeFromList"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XsltPipe
Expand All @@ -58,7 +58,7 @@
storeResultInSessionKey="ZgwRolType"
>
<Forward name="success" path="CheckForGetRolTypeResult"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XmlIfPipe name="CheckForGetRolTypeResult"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
>
<Param name="Type" value="ZgwZaakInformatieObject" />
<Forward name="success" path="EXIT" />
<Forward name="error" path="EXCEPTION" />
<Forward name="exception" path="EXCEPTION" />
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
storeResultInSessionKey="GetZgwZaakResult"
>
<Forward name="success" path="CallGetZgwZaaktypeByUrl"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<SenderPipe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@
</Base64Pipe>

<!-- Fixed value is "{sessionKey:ref_inhoud}" encoded to base64, so that it remains valid base64 for validation -->
<FixedResultPipe
<ReplacerPipe
name="ReplaceInhoudRefWithBase64EncodedRef"
returnString="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
>
storeResultInSessionKey="SafeOriginalMessage"
find="{sessionKey:ref_inhoud}"
replace="e3Nlc3Npb25LZXk6cmVmX2luaG91ZH0="
>
<Forward name="success" path="EXIT" />
</FixedResultPipe>
</ReplacerPipe>
</Pipeline>
</Adapter>
</Module>
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<Param name="List" value="Rollen"/>
<Param name="Type" value="Rol"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

</Pipeline>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
styleSheetName="Common/xsl/UnwrapOpenZaakApiEnvelopeToSingle.xslt" >
<Param name="Type" value="ZgwRolType" />
<Forward name="success" path="EXIT" />
<Forward name="error" path="EXCEPTION" />
<Forward name="exception" path="EXCEPTION" />
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<Param name="Type" value="ZgwRollen"/>
<Param name="List" value="ZgwRol"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Param name="GemeenteCode" sessionKey="GemeenteCode"/>
</Param>
<Forward name="success" path="Rsin_NotEmpty"/>
<Forward name="error" path="EXCEPTION" />
<Forward name="exception" path="EXCEPTION" />
</PutInSessionPipe>

<XmlIfPipe
Expand All @@ -29,7 +29,7 @@
>
<Forward name="then" path="EXIT"/>
<Forward name="else" path="Rsin_NotEmpty_Exception"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XmlIfPipe>

<XsltPipe
Expand All @@ -44,7 +44,7 @@
<!-- <Param name="details" sessionKey="" /> -->
<Param name="detailsXml" sessionKey="originalMessage" type="DOMDOC" />
<Forward name="success" path="EXCEPTION" />
<Forward name="error" path="EXCEPTION" />
<Forward name="exception" path="EXCEPTION" />
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Param name="Where" value="omschrijving"/>
<Param name="StartsWith" sessionKey="Omschrijving"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<Param name="Type" value="ZgwStatusType"/>
<Param name="List" value="ZgwStatusTypes"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
storeResultInSessionKey="GetZgwZaakResult"
>
<Forward name="success" path="CallGetZgwZaaktypeByUrl"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<SenderPipe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
>
<Param name="Type" value="ZgwEnkelvoudigInformatieObject"/>
<Forward name="success" path="CheckForGetZaakDocumentResult"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XmlIfPipe name="CheckForGetZaakDocumentResult"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<Param name="List" value="ZgwZaakInformatieObjecten"/>
<Param name="Type" value="ZgwZaakInformatieObject"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
>
<Param name="Type" value="ZgwZaakType"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
>
<Param name="With" sessionKey="Rollen" type="DOMDOC"/>
<Forward name="success" path="CreateZdsIsVan"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XsltPipe name="CreateZdsIsVan"
Expand All @@ -107,7 +107,7 @@
>
<Param name="With" sessionKey="ZdsIsVan" type="DOMDOC"/>
<Forward name="success" path="ZgwZaakHasHoofdzaak"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XmlIfPipe name="ZgwZaakHasHoofdzaak"
Expand Down Expand Up @@ -150,7 +150,7 @@
>
<Param name="With" sessionKey="ZdsHeeftAlsHoofdzaak" type="DOMDOC"/>
<Forward name="success" path="ZgwZaakHasDeelzaken"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<!-- not tested -->
Expand Down Expand Up @@ -182,7 +182,7 @@
>
<Param name="With" sessionKey="ZgwDeelzaken" type="DOMDOC"/>
<Forward name="success" path="ZgwZaakHasZdsRelevanteAndereZaken"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<!-- not tested -->
Expand Down Expand Up @@ -214,7 +214,7 @@
>
<Param name="With" sessionKey="ZdsRelevanteAndereZaken" type="DOMDOC"/>
<Forward name="success" path="GetZgwStatusByZaakUrlSender"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<SenderPipe
Expand Down Expand Up @@ -251,7 +251,7 @@
>
<Param name="With" sessionKey="ZdsHeeft" type="DOMDOC"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

</Pipeline>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@
<Param name="List" value="ZgwEnkelvoudigInformatieObjecten"/>
<Param name="Type" value="ZgwEnkelvoudigInformatieObject"/>
<Forward name="success" path="GetSingleZgwEnkelvoudigInformatieObjectFromList"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XsltPipe
name="GetSingleZgwEnkelvoudigInformatieObjectFromList"
styleSheetName="Common/xsl/GetSingleElementFromList.xslt"
>
<Forward name="success" path="RemoveNullNodes"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XsltPipe name="RemoveNullNodes"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
>
<Param name="List" value="ZgwInformatieObjectTypen"/>
<Forward name="success" path="GetZgwInformatieObjectTypenMatchingOmschrijving"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XsltPipe
Expand All @@ -46,7 +46,7 @@
<Param name="Where" value="omschrijving"/>
<Param name="Equals" sessionKey="Omschrijving"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
>
<Param name="Type" value="ZgwInformatieObjectType"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
>
<Param name="ZgwLock" sessionKey="ZgwLock"/>
<Forward name="success" path="XmlToJson"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<JsonPipe name="XmlToJson"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<Param name="Type" value="zgwRol" />
<Param name="List" value="ZgwRollen" />
<Forward name="success" path="EXIT" />
<Forward name="error" path="EXCEPTION" />
<Forward name="exception" path="EXCEPTION" />
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
>
<Param name="Type" value="ZgwStatusType"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Param name="Type" value="ZgwZaak"/>
<Param name="List" value="ZgwZaken"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
>
<Param name="Type" value="ZgwZaak"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<Param name="List" value="ZgwZaakInformatieObjecten"/>
<Param name="Type" value="ZgwZaakInformatieObject"/>
<Forward name="success" path="CheckForGetZgwZaakInformatieObjectResult"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XmlIfPipe name="CheckForGetZgwZaakInformatieObjectResult"
Expand All @@ -75,7 +75,7 @@
styleSheetName="Common/xsl/GetSingleElementFromList.xslt"
>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<Param name="Type" value="ZgwZaakType"/>
<Param name="List" value="ZgwZaakTypen"/>
<Forward name="success" path="EXIT"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
styleSheetName="Common/xsl/GetSingleResultFromOpenZaakEnvelope.xslt"
>
<Forward name="success" path="MatchHeeftBetrekkingOpOmschrijving"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XsltPipe>

<XmlIfPipe name="MatchHeeftBetrekkingOpOmschrijving"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
>
<Param name="Type" value="ZgwZaak" />
<Forward name="success" path="EXIT" />
<Forward name="error" path="EXCEPTION" />
<Forward name="exception" path="EXCEPTION" />
</XsltPipe>
</Pipeline>
</Adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
pattern="The status of the document is already final, it cannot be updated."
ignoreUnresolvablePatternElements="true" />
<Forward name="success" path="EXCEPTION" />
<Forward name="error" path="EXCEPTION" />
<Forward name="exception" path="EXCEPTION" />
</XsltPipe>

<PutInSessionPipe name="StoreTaal"
Expand All @@ -63,7 +63,7 @@
<Param name="Taal" sessionKey="Taal"/>
<Forward name="true" path="ConvertISO639TaalSender"/>
<Forward name="false" path="DecodeInhoud"/>
<Forward name="error" path="EXCEPTION"/>
<Forward name="exception" path="EXCEPTION"/>
</XmlSwitchPipe>

<SenderPipe
Expand Down
Loading

0 comments on commit 42b7867

Please sign in to comment.