feat(soap): working support for WSDL 1.1 messages specifying type not element.

Author: outofcoffee

mock/soap/src/main/java/io/gatehill/imposter/plugin/soap/SoapResourceMatcher.kt

@@ -54,6 +54,7 @@ import io.gatehill.imposter.plugin.soap.config.SoapPluginResourceConfig
 import io.gatehill.imposter.plugin.soap.model.BindingType
 import io.gatehill.imposter.plugin.soap.model.ElementOperationMessage
 import io.gatehill.imposter.plugin.soap.model.MessageBodyHolder
+import io.gatehill.imposter.plugin.soap.model.TypeOperationMessage
 import io.gatehill.imposter.plugin.soap.model.WsdlBinding
 import io.gatehill.imposter.plugin.soap.model.WsdlOperation
 import io.gatehill.imposter.plugin.soap.util.SoapUtil
@@ -202,9 +203,17 @@ class SoapResourceMatcher(
         }
 
         val matchedOps = binding.operations.filter { op ->
-            op.inputRef is ElementOperationMessage &&
-                op.inputRef.elementName.namespaceURI == bodyRootElement.namespaceURI &&
-                op.inputRef.elementName.localPart == bodyRootElement.name
+            when (op.inputRef) {
+                is ElementOperationMessage -> {
+                    op.inputRef.elementName.namespaceURI == bodyRootElement.namespaceURI &&
+                        op.inputRef.elementName.localPart == bodyRootElement.name
+                }
+                is TypeOperationMessage -> {
+                    op.inputRef.typeName.namespaceURI == bodyRootElement.namespaceURI &&
+                        op.inputRef.operationName == bodyRootElement.name
+                }
+                else -> false
+            }
         }
         if (LOGGER.isTraceEnabled) {
             LOGGER.trace(

mock/soap/src/test/java/io/gatehill/imposter/plugin/soap/AbstractEndToEndTest.kt

@@ -65,7 +65,7 @@ abstract class AbstractEndToEndTest : BaseVerticleTest() {
     protected abstract val soapEnvNamespace: Namespace
     protected abstract val soapContentType: String
 
-    private val getPetByIdEnv
+    protected open val getPetByIdEnv
         get() = SoapUtil.wrapInEnv(
             """
 <getPetByIdRequest xmlns="urn:com:example:petstore">
@@ -74,7 +74,7 @@ abstract class AbstractEndToEndTest : BaseVerticleTest() {
 """.trim(), soapEnvNamespace
         )
 
-    private val getPetByNameEnv
+    protected open val getPetByNameEnv
         get() = SoapUtil.wrapInEnv(
             """
 <getPetByNameRequest xmlns="urn:com:example:petstore">

mock/soap/src/test/java/io/gatehill/imposter/plugin/soap/JAXWSTest.kt

@@ -58,7 +58,7 @@ import org.junit.Test
  */
 class JAXWSTest : BaseVerticleTest() {
     override val pluginClass = SoapPluginImpl::class.java
-    override val testConfigDirs = listOf("/wsdl1-soap11")
+    override val testConfigDirs = listOf("/wsdl1-soap11-document")
 
     private lateinit var baseURI: String
 
@@ -71,7 +71,7 @@ class JAXWSTest : BaseVerticleTest() {
 
     @Test
     fun testRequestResponseUsingSoapClient() {
-        val wsdlUrl = JAXWSTest::class.java.getResource("/wsdl1-soap11/service.wsdl")
+        val wsdlUrl = JAXWSTest::class.java.getResource("/wsdl1-soap11-document/service.wsdl")
         val soapEndpoint = PetService(wsdlUrl).soapEndpoint
 
         (soapEndpoint as BindingProvider)

mock/soap/src/test/java/io/gatehill/imposter/plugin/soap/Wsdl1Soap11EndToEndTest.kt renamed to mock/soap/src/test/java/io/gatehill/imposter/plugin/soap/Wsdl1Soap11DocumentEndToEndTest.kt

@@ -50,8 +50,8 @@ import org.junit.Test
  *
  * @author Pete Cornish
  */
-class Wsdl1Soap11EndToEndTest : AbstractEndToEndTest() {
-    override val testConfigDirs = listOf("/wsdl1-soap11")
+class Wsdl1Soap11DocumentEndToEndTest : AbstractEndToEndTest() {
+    override val testConfigDirs = listOf("/wsdl1-soap11-document")
     override val soapEnvNamespace = SoapUtil.soap11EnvNamespace
     override val soapContentType = SoapUtil.soap11ContentType
 

mock/soap/src/test/java/io/gatehill/imposter/plugin/soap/Wsdl1Soap11MessageTypeEndToEndTest.kt

@@ -43,6 +43,7 @@
 package io.gatehill.imposter.plugin.soap
 
 import io.gatehill.imposter.plugin.soap.util.SoapUtil
+import org.junit.Test
 
 /**
  * Tests for [SoapPluginImpl] using WSDL v1 and SOAP 1.1.
@@ -53,4 +54,25 @@ class Wsdl1Soap11MessageTypeEndToEndTest : AbstractEndToEndTest() {
     override val testConfigDirs = listOf("/wsdl1-soap11-message-type")
     override val soapEnvNamespace = SoapUtil.soap11EnvNamespace
     override val soapContentType = SoapUtil.soap11ContentType
+
+    override val getPetByIdEnv: String
+        get() = SoapUtil.wrapInEnv(
+            """
+<getPetById xmlns="urn:com:example:petstore">
+  <id>3</id>
+</getPetById>
+""".trim(), soapEnvNamespace
+        )
+
+    override val getPetByNameEnv
+        get() = SoapUtil.wrapInEnv(
+            """
+<getPetByName xmlns="urn:com:example:petstore">
+  <name>Fluffy</name>
+</getPetByName>
+""".trim(), soapEnvNamespace
+        )
+
+    @Test
+    fun testHttpBinding() = httpBinding()
 }

mock/soap/src/test/java/io/gatehill/imposter/plugin/soap/Wsdl1Soap11RpcEndToEndTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2021.
+ * Copyright (c) 2016-2024.
  *
  * This file is part of Imposter.
  *
@@ -53,4 +53,22 @@ class Wsdl1Soap11RpcEndToEndTest : AbstractEndToEndTest() {
     override val testConfigDirs = listOf("/wsdl1-soap11-rpc")
     override val soapEnvNamespace = SoapUtil.soap11EnvNamespace
     override val soapContentType = SoapUtil.soap11ContentType
+
+    override val getPetByIdEnv: String
+        get() = SoapUtil.wrapInEnv(
+            """
+<getPetById xmlns="urn:com:example:petstore">
+  <id>3</id>
+</getPetById>
+""".trim(), soapEnvNamespace
+        )
+
+    override val getPetByNameEnv
+        get() = SoapUtil.wrapInEnv(
+            """
+<getPetByName xmlns="urn:com:example:petstore">
+  <name>Fluffy</name>
+</getPetByName>
+""".trim(), soapEnvNamespace
+        )
 }

mock/soap/src/test/java/io/gatehill/imposter/plugin/soap/parser/VersionAwareWsdlParserTest.kt

@@ -55,7 +55,7 @@ import java.io.File
 class VersionAwareWsdlParserTest {
     @Test
     fun parseV1() {
-        val wsdlFile = File(VersionAwareWsdlParserTest::class.java.getResource("/wsdl1-soap11/service.wsdl")!!.toURI())
+        val wsdlFile = File(VersionAwareWsdlParserTest::class.java.getResource("/wsdl1-soap11-document/service.wsdl")!!.toURI())
         val parser = VersionAwareWsdlParser(wsdlFile)
 
         assertEquals(WsdlParser.WsdlVersion.V1, parser.version)

mock/soap/src/test/java/io/gatehill/imposter/plugin/soap/parser/Wsdl1Soap11ParserTest.kt

@@ -63,7 +63,7 @@ class Wsdl1Soap11ParserTest {
 
     @Before
     fun setUp() {
-        val wsdlFile = File(Wsdl1Soap11ParserTest::class.java.getResource("/wsdl1-soap11/service.wsdl")!!.toURI())
+        val wsdlFile = File(Wsdl1Soap11ParserTest::class.java.getResource("/wsdl1-soap11-document/service.wsdl")!!.toURI())
         val document = SAXBuilder().build(wsdlFile)
         val entityResolver = WsdlRelativeXsdEntityResolver(wsdlFile.parentFile)
         parser = Wsdl1Parser(wsdlFile, document, entityResolver)