Skip to content

fix: add errorStore for proxy #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lenardvandermaas wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: add errorStore for proxy #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/configurations/Proxy/Configuration_SoapEndpointProxy_BeantwoordVraag.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
<JavaListener name="${zaakbrug.java.proxy.beantwoord-vraag.endpoint}"/>
</Receiver>

<Receiver name="SoapEndpointProxy_BeantwoordVraag_Java_withErrorStore">
<JavaListener name="${zaakbrug.java.proxy.beantwoord-vraag.endpoint}_withErrorStore"/>
<JdbcErrorStorage name="SoapEndpointProxy_BeantwoordVraag_ErrorStore" slotId="${instance.name}/SoapEndpointProxy_BeantwoordVraag_ErrorStore" tableName="IBISSTORE"/>
</Receiver>

<Pipeline>
<Exits>
<Exit name="EXIT" state="SUCCESS"/>
Expand Down
5 changes: 5 additions & 0 deletions src/main/configurations/Proxy/Configuration_SoapEndpointProxy_OntvangAsynchroon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
<JavaListener name="${zaakbrug.java.proxy.ontvang-asynchroon.endpoint}"/>
</Receiver>

<Receiver name="SoapEndpointProxy_OntvangAsynchroon_Java_withErrorStore">
<JavaListener name="${zaakbrug.java.proxy.ontvang-asynchroon.endpoint}_withErrorStore"/>
<JdbcErrorStorage name="SoapEndpointProxy_OntvangAsynchroon_ErrorStore" slotId="${instance.name}/SoapEndpointProxy_OntvangAsynchroon_ErrorStore" tableName="IBISSTORE"/>
</Receiver>

<Pipeline>
<Exits>
<Exit name="EXIT" state="SUCCESS"/>
Expand Down
5 changes: 5 additions & 0 deletions src/main/configurations/Proxy/Configuration_SoapEndpointProxy_VrijeBerichten.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
<JavaListener name="${zaakbrug.java.proxy.vrije-berichten.endpoint}"/>
</Receiver>

<Receiver name="SoapEndpointProxy_VrijeBerichten_Java_withErrorStore">
<JavaListener name="${zaakbrug.java.proxy.vrije-berichten.endpoint}_withErrorStore"/>
<JdbcErrorStorage name="SoapEndpointProxy_VrijeBerichten_ErrorStore" slotId="${instance.name}/SoapEndpointProxy_VrijeBerichten_ErrorStore" tableName="IBISSTORE"/>
</Receiver>

<Pipeline>
<Exits>
<Exit name="EXIT" state="SUCCESS"/>
Expand Down
15 changes: 13 additions & 2 deletions src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_BeantwoordVraag.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,27 @@
returnedSessionKeys="exitState">
<Param name="SOAPAction" sessionKey="SOAPAction"/>
</IbisLocalSender>
<Forward name="success" path="SendToProxy" />
<Forward name="success" path="CheckIfShouldUseErrorStore" />
<Forward name="500" path="CheckIfShouldSendToProxyAnyways" />
<Forward name="exception" path="CheckIfShouldSendToProxyAnyways" />
</SenderPipe>

<IfPipe name="CheckIfShouldSendToProxyAnyways" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="false">
<Forward name="then" path="SendToProxy"/>
<Forward name="then" path="CheckIfShouldUseErrorStore"/>
<Forward name="else" path="EchoTranslateResponse"/>
</IfPipe>

<IfPipe name="CheckIfShouldUseErrorStore" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="true">
<Forward name="then" path="SendToProxyWithErrorStore"/>
<Forward name="else" path="SendToProxy"/>
</IfPipe>

<SenderPipe name="SendToProxyWithErrorStore">
<IbisLocalSender name="SendToProxySender" javaListener="${zaakbrug.java.proxy.beantwoord-vraag.endpoint}_withErrorStore" synchronous="false">
<Param name="SOAPAction" sessionKey="SOAPAction"/>
</IbisLocalSender>
</SenderPipe>

<SenderPipe name="SendToProxy">
<!-- <FrankSender name="SendToProxySender" target="Proxy/SoapEndpointProxy_BeantwoordVraag" synchronous="false">-->
<!-- <Param name="SOAPAction" sessionKey="SOAPAction"/>-->
Expand Down
13 changes: 12 additions & 1 deletion src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_OntvangAsynchroon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,21 @@
</SenderPipe>

<IfPipe name="CheckIfShouldSendToProxyAnyways" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="false">
<Forward name="then" path="SendToProxy"/>
<Forward name="then" path="CheckIfShouldUseErrorStore"/>
<Forward name="else" path="EchoTranslateResponse"/>
</IfPipe>

<IfPipe name="CheckIfShouldUseErrorStore" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="true">
<Forward name="then" path="SendToProxyWithErrorStore"/>
<Forward name="else" path="SendToProxy"/>
</IfPipe>

<SenderPipe name="SendToProxyWithErrorStore">
<IbisLocalSender name="SendToProxySender" javaListener="${zaakbrug.java.proxy.ontvang-asynchroon.endpoint}_withErrorStore" synchronous="false">
<Param name="SOAPAction" sessionKey="SOAPAction"/>
</IbisLocalSender>
</SenderPipe>

<SenderPipe name="SendToProxy">
<!-- <FrankSender name="SendToProxySender" target="Proxy/SoapEndpointProxy_OntvangAsynchroon" synchronous="false">-->
<!-- <Param name="SOAPAction" sessionKey="SOAPAction"/>-->
Expand Down
17 changes: 15 additions & 2 deletions src/main/configurations/Replicate/Configuration_SoapEndpointReplicator_VrijeBerichten.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
</SenderPipe>

<IfPipe name="CheckIfShouldSendToProxyAnyways" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="false">
<Forward name="then" path="SendToProxy"/>
<Forward name="then" path="CheckIfShouldUseErrorStore"/>
<Forward name="else" path="EchoTranslateResponse"/>
</IfPipe>

<!--If this is an orchestration scenario (stopOnError=true), then we should not send genereerZaak- and document-Identificatie messages to proxy,
because it will result in multiple ids for the same message. In all other cases, send to proxy, because this pipe is only reached if translate was succesful-->
<IfPipe name="CheckIfReplicateAllowed"
preserveInput="true"
xpathExpression="$stopOnError = 'true' and $fromSoapAction = ['genereerZaakIdentificatie_Di02', 'genereerDocumentIdentificatie_Di02']"
Expand All @@ -58,10 +60,21 @@
<Param name="SOAPAction" sessionKey="SOAPAction"/>
</Param>
<Param name="stopOnError" sessionKey="stopOnError"/>
<Forward name="then" path="SendToProxy"/>
<Forward name="then" path="CheckIfShouldUseErrorStore"/>
<Forward name="else" path="EchoTranslateResponse"/>
</IfPipe>

<IfPipe name="CheckIfShouldUseErrorStore" getInputFromSessionKey="stopOnError" preserveInput="true" expressionValue="true">
<Forward name="then" path="SendToProxyWithErrorStore"/>
<Forward name="else" path="SendToProxy"/>
</IfPipe>

<SenderPipe name="SendToProxyWithErrorStore">
<IbisLocalSender name="SendToProxySender" javaListener="${zaakbrug.java.proxy.vrije-berichten.endpoint}_withErrorStore" synchronous="false">
<Param name="SOAPAction" sessionKey="SOAPAction"/>
</IbisLocalSender>
</SenderPipe>

<SenderPipe name="SendToProxy">
<!-- <FrankSender name="SendToProxySender" target="Proxy/SoapEndpointProxy_VrijeBerichten" synchronous="false">-->
<!-- <Param name="SOAPAction" sessionKey="SOAPAction"/>-->
Expand Down
Loading