refactor: Soap endpoints naming inconsistency fix

wearefrank · Feb 14, 2023 · c3fbdfb · c3fbdfb
1 parent 3849242
commit c3fbdfb
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 36 deletions.
diff --git a/charts/zaakbrug/templates/configmap.yaml b/charts/zaakbrug/templates/configmap.yaml
@@ -45,16 +45,16 @@ metadata:
 data:
   {{- with .Values.zaakbrug.endpoints.soap }}
   {{- with .beantwoord-vraag }}
-  endpoints.soap.beantwoord-vraag.endpoint: {{ .endpoint }}
-  endpoints.soap.beantwoord-vraag.validation-soft-fail: {{ .validation-soft-fail }}
+  zaakbrug.soap.beantwoord-vraag.endpoint: {{ .endpoint }}
+  zaakbrug.soap.beantwoord-vraag.validation-soft-fail: {{ .validation-soft-fail }}
   {{- end }}
   {{- with .ontvang-asynchroon }}
-  endpoints.soap.ontvang-asynchroon.endpoint: {{ .endpoint }}
-  endpoints.soap.ontvang-asynchroon.validation-soft-fail: {{ .validation-soft-fail }}
+  zaakbrug.soap.ontvang-asynchroon.endpoint: {{ .endpoint }}
+  zaakbrug.soap.ontvang-asynchroon.validation-soft-fail: {{ .validation-soft-fail }}
   {{- end }}
   {{- with .vrije-berichten }}
-  endpoints.soap.vrije-berichten.endpoint: {{ .endpoint }}
-  endpoints.soap.vrije-berichten.validation-soft-fail: {{ .validation-soft-fail }}
+  zaakbrug.soap.vrije-berichten.endpoint: {{ .endpoint }}
+  zaakbrug.soap.vrije-berichten.validation-soft-fail: {{ .validation-soft-fail }}
   {{- end }}
   {{- end }}
   {{- with .Values.zaakbrug.zgw }}

diff --git a/charts/zaakbrug/values.yaml b/charts/zaakbrug/values.yaml
@@ -97,17 +97,16 @@ affinity: {}
 timeZone: Etc/UTC
 
 zaakbrug:
-  endpoints:
-    soap:
-      beantwoord-vraag:
-        endpoint: "translate/generic/zds/BeantwoordVraag"
-        validation-soft-fail: false
-      ontvang-asynchroon:
-        endpoint: "translate/generic/zds/OntvangAsynchroon"
-        validation-soft-fail: false
-      vrije-berichten:
-        endpoint: "translate/generic/zds/VrijBericht"
-        validation-soft-fail: false
+  soap:
+    beantwoord-vraag:
+      endpoint: "translate/generic/zds/BeantwoordVraag"
+      validation-soft-fail: false
+    ontvang-asynchroon:
+      endpoint: "translate/generic/zds/OntvangAsynchroon"
+      validation-soft-fail: false
+    vrije-berichten:
+      endpoint: "translate/generic/zds/VrijBericht"
+      validation-soft-fail: false
   zgw:
     # Empty values aren't allowed, so at least fill in the protocol.
     baseurl: "http://localhost:8000/"

diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_BeantwoordVraag.xml
@@ -4,7 +4,7 @@
         description="">
 
         <Receiver name="SoapEndpointRouter_BeantwoordVraag">
-            <WebServiceListener name="SoapEndpointRouter_BeantwoordVraag" address="${endpoints.soap.beantwoord-vraag.endpoint}" soap="false"/>
+            <WebServiceListener name="SoapEndpointRouter_BeantwoordVraag" address="${zaakbrug.soap.beantwoord-vraag.endpoint}" soap="false"/>
             <JdbcErrorStorage
                 name="JdbcErrorStorage"
                 datasourceName="jdbc/${database.instance.name}"
@@ -65,7 +65,7 @@
                 name="WsdlValidationSoftFailForwarder_GeefLijstZaakdocumenten"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.beantwoord-vraag.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.beantwoord-vraag.validation-soft-fail}" type="BOOLEAN"/>
                 <Forward name="true" path="GeefLijstZaakdocumenten_Lv01Sender" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>
@@ -87,7 +87,7 @@
                 name="WsdlValidationSoftFailForwarder_GeefZaakdocumentLezen"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.beantwoord-vraag.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.beantwoord-vraag.validation-soft-fail}" type="BOOLEAN"/>
                 <Forward name="true" path="GeefZaakdocumentLezen_Lv01Sender" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>
@@ -109,7 +109,7 @@
                 name="WsdlValidationSoftFailForwarder_GeefZaakdetails"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.beantwoord-vraag.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.beantwoord-vraag.validation-soft-fail}" type="BOOLEAN"/>
                 <Forward name="true" path="GeefZaakdetails_Lv01Sender" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>

diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_OntvangAsynchroon.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_OntvangAsynchroon.xml
@@ -4,7 +4,7 @@
         description="">
 
         <Receiver name="SoapEndpointRouter_OntvangAsynchroon">
-            <WebServiceListener name="SoapEndpointRouter_OntvangAsynchroon" address="${endpoints.soap.ontvang-asynchroon.endpoint}" soap="false"/>
+            <WebServiceListener name="SoapEndpointRouter_OntvangAsynchroon" address="${zaakbrug.soap.ontvang-asynchroon.endpoint}" soap="false"/>
             <JdbcErrorStorage
                 name="JdbcErrorStorage"
                 datasourceName="jdbc/${database.instance.name}"
@@ -61,7 +61,7 @@
             <XmlSwitchPipe name="WsdlValidationSoftFailForwarder_UpdateZaak"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.ontvang-asynchroon.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.ontvang-asynchroon.validation-soft-fail}" type="BOOLEAN"/>
 				<Forward name="true" path="UpdateZaakSender" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>
@@ -79,7 +79,7 @@
             <XmlSwitchPipe name="WsdlValidationSoftFailForwarder_CreeerZaak"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.ontvang-asynchroon.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.ontvang-asynchroon.validation-soft-fail}" type="BOOLEAN"/>
 				<Forward name="true" path="CreeerZaakSender" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>

diff --git a/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml b/src/main/configurations/Translate/Configuration_SoapEndpointRouter_VrijeBerichten.xml
@@ -4,7 +4,7 @@
         description="">
 
         <Receiver name="SoapEndpointRouter_VrijeBerichten">
-            <WebServiceListener name="SoapEndpointRouter_VrijeBerichten" address="${endpoints.soap.vrije-berichten.endpoint}" soap="false"/>
+            <WebServiceListener name="SoapEndpointRouter_VrijeBerichten" address="${zaakbrug.soap.vrije-berichten.endpoint}" soap="false"/>
             <JdbcErrorStorage
                 name="JdbcErrorStorage"
                 datasourceName="jdbc/${database.instance.name}"
@@ -55,7 +55,7 @@
                 name="WsdlValidationSoftFailForwarder_GenereerZaakIdentificatie"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
                 <Forward name="true" path="UnwrapMessageForGenereerZaakIdentificatie_Di02" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>
@@ -105,7 +105,7 @@
             <XmlSwitchPipe name="WsdlValidationSoftFailForwarder_GenereerDocumentIdentificatie"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
 				<Forward name="true" path="UnwrapMessageForGenereerDocumentIdentificatie_Di02" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>
@@ -155,7 +155,7 @@
             <XmlSwitchPipe name="WsdlValidationSoftFailForwarder_GeefZaakdocumentbewerken"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
 				<Forward name="true" path="UnwrapMessageForGeefZaakdocumentbewerken_Di02" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>
@@ -215,7 +215,7 @@
             <XmlSwitchPipe name="WsdlValidationSoftFailForwarder_CancelCheckout"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
 				<Forward name="true" path="UnwrapMessageForCancelCheckout_Di02" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>
@@ -262,7 +262,7 @@
             <XmlSwitchPipe name="WsdlValidationSoftFailForwarder_UpdateZaakdocument"
                 xpathExpression="$SoftFail = true()"
                 >
-                <Param name="SoftFail" value="${endpoints.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
+                <Param name="SoftFail" value="${zaakbrug.soap.vrije-berichten.validation-soft-fail}" type="BOOLEAN"/>
 				<Forward name="true" path="UnwrapMessageForUpdateZaakdocument_Di02" />
                 <Forward name="false" path="InvalidXml" />
             </XmlSwitchPipe>

diff --git a/src/main/configurations/Translate/DeploymentSpecifics.properties b/src/main/configurations/Translate/DeploymentSpecifics.properties
@@ -100,14 +100,14 @@ Prefixparam=1900
 # ------------------------------------------------------------------------------
 # SOAP endpoints configuration
 # ------------------------------------------------------------------------------
-endpoints.soap.beantwoord-vraag.endpoint=translate/generic/zds/BeantwoordVraag
-endpoints.soap.beantwoord-vraag.validation-soft-fail=false
+zaakbrug.soap.beantwoord-vraag.endpoint=translate/generic/zds/BeantwoordVraag
+zaakbrug.soap.beantwoord-vraag.validation-soft-fail=false
 
-endpoints.soap.ontvang-asynchroon.endpoint=translate/generic/zds/OntvangAsynchroon
-endpoints.soap.ontvang-asynchroon.validation-soft-fail=false
+zaakbrug.soap.ontvang-asynchroon.endpoint=translate/generic/zds/OntvangAsynchroon
+zaakbrug.soap.ontvang-asynchroon.validation-soft-fail=false
 
-endpoints.soap.vrije-berichten.endpoint=translate/generic/zds/VrijBericht
-endpoints.soap.vrije-berichten.validation-soft-fail=false
+zaakbrug.soap.vrije-berichten.endpoint=translate/generic/zds/VrijBericht
+zaakbrug.soap.vrije-berichten.validation-soft-fail=false
 
 # Not needed anymore with custom Parameter.java
 # JwtToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ0ZXN0IiwiaWF0IjoxNjYzODUzNzAxLCJjbGllbnRfaWQiOiJ0ZXN0IiwidXNlcl9pZCI6IiIsInVzZXJfcmVwcmVzZW50YXRpb24iOiIifQ.JRTMevrNIotrpFTPbxxq-hU-UMlhQV-dFO0pKb5QIbY