From 2dc72cf505760227b26ee51ce745058f702473a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Roaldseth?= <andre.roaldseth@nav.no>
Date: Fri, 5 Jul 2024 16:15:09 +0200
Subject: [PATCH] =?UTF-8?q?S=C3=B8rg=20for=20at=20PortName=20alltid=20f?=
 =?UTF-8?q?=C3=A5r=20postfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../no/nav/dagpenger/soap/client/SoapPort.kt  |  2 +-
 .../nav/dagpenger/soap/client/SoapPortTest.kt | 41 ++++++++++++-------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/soap-client/src/main/kotlin/no/nav/dagpenger/soap/client/SoapPort.kt b/soap-client/src/main/kotlin/no/nav/dagpenger/soap/client/SoapPort.kt
index 2dbed8a..05fac7a 100644
--- a/soap-client/src/main/kotlin/no/nav/dagpenger/soap/client/SoapPort.kt
+++ b/soap-client/src/main/kotlin/no/nav/dagpenger/soap/client/SoapPort.kt
@@ -25,7 +25,7 @@ inline fun <reified T> createSoapClient(block: Config.() -> Unit): T =
         val annotations = T::class.java.getAnnotation(WebService::class.java)
         val namespace = annotations.targetNamespace + "/Binding"
         val svcName = svcName ?: annotations.name
-        val portName = portName ?: svcName + "Port"
+        val portName = (portName ?: svcName) + "Port"
 
         JaxWsProxyFactoryBean()
             .apply {
diff --git a/soap-client/src/test/kotlin/no/nav/dagpenger/soap/client/SoapPortTest.kt b/soap-client/src/test/kotlin/no/nav/dagpenger/soap/client/SoapPortTest.kt
index e0011d7..e2ebaf5 100644
--- a/soap-client/src/test/kotlin/no/nav/dagpenger/soap/client/SoapPortTest.kt
+++ b/soap-client/src/test/kotlin/no/nav/dagpenger/soap/client/SoapPortTest.kt
@@ -59,20 +59,33 @@ internal class SoapPortTest {
     fun `kan overstyre svcName og PortName for å lage klient`() {
         val stsClient = mockk<STSClient>()
 
-        val e: ServiceConstructionException =
-            assertThrows<ServiceConstructionException> {
-                createSoapClient<YtelseskontraktV3> {
-                    sts = stsClient
-                    stsAllowInsecure = true
-                    endpoint = "foo"
-                    wsdl = "wsdl/tjenestespesifikasjon/no/nav/tjeneste/virksomhet/ytelseskontrakt/v3/Binding.wsdl"
-                    svcName = "Blupr"
-                    portName = "Blarp"
-                }
+        assertThrows<ServiceConstructionException> {
+            createSoapClient<YtelseskontraktV3> {
+                sts = stsClient
+                stsAllowInsecure = true
+                endpoint = "foo"
+                wsdl = "wsdl/tjenestespesifikasjon/no/nav/tjeneste/virksomhet/ytelseskontrakt/v3/Binding.wsdl"
+                svcName = "Blupr"
             }
-        assertEquals(
-            "Could not find definition for service {http://nav.no/tjeneste/virksomhet/ytelseskontrakt/v3/Binding}Blupr.",
-            e.message,
-        )
+        }.also {
+            assertEquals(
+                "Could not find definition for service {http://nav.no/tjeneste/virksomhet/ytelseskontrakt/v3/Binding}Blupr.",
+                it.message,
+            )
+        }
+        assertThrows<ServiceConstructionException> {
+            createSoapClient<YtelseskontraktV3> {
+                sts = stsClient
+                stsAllowInsecure = true
+                endpoint = "foo"
+                wsdl = "wsdl/tjenestespesifikasjon/no/nav/tjeneste/virksomhet/ytelseskontrakt/v3/Binding.wsdl"
+                portName = "Blarp"
+            }
+        }.also {
+            assertEquals(
+                "Could not find definition for port {http://nav.no/tjeneste/virksomhet/ytelseskontrakt/v3/Binding}BlarpPort.",
+                it.message,
+            )
+        }
     }
 }