This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 62473572bb Fix in cxf-soap-client
62473572bb is described below
commit 62473572bbe6e5b465e826e610a5786c47cd7161
Author: JiriOndrusek <[email protected]>
AuthorDate: Tue Mar 28 09:58:37 2023 +0200
Fix in cxf-soap-client
---
.../src/main/resources/wsdl/CalculatorService.wsdl | 204 +++++++++++++++------
.../cxf/soap/client/it/CxfSoapClientTest.java | 2 +-
poms/bom/pom.xml | 18 ++
poms/bom/src/main/generated/flattened-full-pom.xml | 18 ++
.../src/main/generated/flattened-reduced-pom.xml | 18 ++
.../generated/flattened-reduced-verbose-pom.xml | 18 ++
6 files changed, 225 insertions(+), 53 deletions(-)
diff --git
a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl
b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl
index 2b0be31507..48b0ebccdb 100644
---
a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl
+++
b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/resources/wsdl/CalculatorService.wsdl
@@ -1,26 +1,20 @@
<?xml version="1.0" ?><wsdl:definitions
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:ns1="http://schemas.xmlsoap.org/soap/http"; name="CalculatorService"
targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator";>
-<!--
+ <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator";
elementFormDefault="unqualified"
targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator";
version="1.0">
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ <xs:element name="add" type="tns:add"></xs:element>
- http://www.apache.org/licenses/LICENSE-2.0
+ <xs:element name="addArray" type="tns:addArray"></xs:element>
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ <xs:element name="addArrayResponse" type="tns:addArrayResponse"></xs:element>
--->
- <wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:tns="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator";
elementFormDefault="unqualified"
targetNamespace="http://www.jboss.org/eap/quickstarts/wscalculator/Calculator";
version="1.0">
+ <xs:element name="addList" type="tns:addList"></xs:element>
- <xs:element name="add" type="tns:add"></xs:element>
+ <xs:element name="addListResponse" type="tns:addListResponse"></xs:element>
+
+ <xs:element name="addNumberAndOperands"
type="tns:addNumberAndOperands"></xs:element>
+
+ <xs:element name="addNumberAndOperandsResponse"
type="tns:addNumberAndOperandsResponse"></xs:element>
<xs:element name="addOperands" type="tns:addOperands"></xs:element>
@@ -40,27 +34,26 @@
<xs:element name="subtractResponse" type="tns:subtractResponse"></xs:element>
- <xs:complexType name="divide">
+ <xs:complexType name="add">
<xs:sequence>
<xs:element name="arg0" type="xs:int"></xs:element>
<xs:element name="arg1" type="xs:int"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="divideResponse">
+ <xs:complexType name="addResponse">
<xs:sequence>
<xs:element name="return" type="xs:int"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="add">
+ <xs:complexType name="addArray">
<xs:sequence>
- <xs:element name="arg0" type="xs:int"></xs:element>
- <xs:element name="arg1" type="xs:int"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="arg0"
type="xs:int"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="addResponse">
+ <xs:complexType name="addArrayResponse">
<xs:sequence>
<xs:element name="return" type="xs:int"></xs:element>
</xs:sequence>
@@ -79,9 +72,35 @@
</xs:sequence>
</xs:complexType>
- <xs:complexType name="addOperands">
+ <xs:complexType name="divide">
<xs:sequence>
- <xs:element minOccurs="0" name="arg0" type="tns:operands"></xs:element>
+ <xs:element name="arg0" type="xs:int"></xs:element>
+ <xs:element name="arg1" type="xs:int"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="divideResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:int"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="addList">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="arg0"
type="xs:int"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="addListResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:int"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="addNumberAndOperands">
+ <xs:sequence>
+ <xs:element name="arg0" type="xs:int"></xs:element>
+ <xs:element minOccurs="0" name="arg1" type="tns:operands"></xs:element>
</xs:sequence>
</xs:complexType>
@@ -92,6 +111,18 @@
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="addNumberAndOperandsResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:int"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="addOperands">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="tns:operands"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
<xs:complexType name="addOperandsResponse">
<xs:sequence>
<xs:element minOccurs="0" name="return" type="tns:result"></xs:element>
@@ -120,6 +151,42 @@
</xs:schema>
</wsdl:types>
+ <wsdl:message name="addListResponse">
+ <wsdl:part element="tns:addListResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="addArray">
+ <wsdl:part element="tns:addArray" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="divide">
+ <wsdl:part element="tns:divide" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="addList">
+ <wsdl:part element="tns:addList" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="addOperandsResponse">
+ <wsdl:part element="tns:addOperandsResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="addNumberAndOperands">
+ <wsdl:part element="tns:addNumberAndOperands" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="addNumberAndOperandsResponse">
+ <wsdl:part element="tns:addNumberAndOperandsResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="addOperands">
+ <wsdl:part element="tns:addOperands" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="multiply">
+ <wsdl:part element="tns:multiply" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
<wsdl:message name="add">
<wsdl:part element="tns:add" name="parameters">
</wsdl:part>
@@ -144,41 +211,47 @@
<wsdl:part element="tns:divideResponse" name="parameters">
</wsdl:part>
</wsdl:message>
- <wsdl:message name="divide">
- <wsdl:part element="tns:divide" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="addOperandsResponse">
- <wsdl:part element="tns:addOperandsResponse" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="addOperands">
- <wsdl:part element="tns:addOperands" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="multiply">
- <wsdl:part element="tns:multiply" name="parameters">
+ <wsdl:message name="addArrayResponse">
+ <wsdl:part element="tns:addArrayResponse" name="parameters">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="CalculatorService">
- <wsdl:operation name="divide">
- <wsdl:input message="tns:divide" name="divide">
- </wsdl:input>
- <wsdl:output message="tns:divideResponse" name="divideResponse">
- </wsdl:output>
- </wsdl:operation>
<wsdl:operation name="add">
<wsdl:input message="tns:add" name="add">
</wsdl:input>
<wsdl:output message="tns:addResponse" name="addResponse">
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="addArray">
+ <wsdl:input message="tns:addArray" name="addArray">
+ </wsdl:input>
+ <wsdl:output message="tns:addArrayResponse" name="addArrayResponse">
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="subtract">
<wsdl:input message="tns:subtract" name="subtract">
</wsdl:input>
<wsdl:output message="tns:subtractResponse" name="subtractResponse">
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="divide">
+ <wsdl:input message="tns:divide" name="divide">
+ </wsdl:input>
+ <wsdl:output message="tns:divideResponse" name="divideResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="addList">
+ <wsdl:input message="tns:addList" name="addList">
+ </wsdl:input>
+ <wsdl:output message="tns:addListResponse" name="addListResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="addNumberAndOperands">
+ <wsdl:input message="tns:addNumberAndOperands"
name="addNumberAndOperands">
+ </wsdl:input>
+ <wsdl:output message="tns:addNumberAndOperandsResponse"
name="addNumberAndOperandsResponse">
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="addOperands">
<wsdl:input message="tns:addOperands" name="addOperands">
</wsdl:input>
@@ -194,21 +267,21 @@
</wsdl:portType>
<wsdl:binding name="CalculatorServiceSoapBinding"
type="tns:CalculatorService">
<soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http";></soap:binding>
- <wsdl:operation name="divide">
+ <wsdl:operation name="add">
<soap:operation soapAction="" style="document"></soap:operation>
- <wsdl:input name="divide">
+ <wsdl:input name="add">
<soap:body use="literal"></soap:body>
</wsdl:input>
- <wsdl:output name="divideResponse">
+ <wsdl:output name="addResponse">
<soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="add">
+ <wsdl:operation name="addArray">
<soap:operation soapAction="" style="document"></soap:operation>
- <wsdl:input name="add">
+ <wsdl:input name="addArray">
<soap:body use="literal"></soap:body>
</wsdl:input>
- <wsdl:output name="addResponse">
+ <wsdl:output name="addArrayResponse">
<soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
@@ -221,6 +294,33 @@
<soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="divide">
+ <soap:operation soapAction="" style="document"></soap:operation>
+ <wsdl:input name="divide">
+ <soap:body use="literal"></soap:body>
+ </wsdl:input>
+ <wsdl:output name="divideResponse">
+ <soap:body use="literal"></soap:body>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="addList">
+ <soap:operation soapAction="" style="document"></soap:operation>
+ <wsdl:input name="addList">
+ <soap:body use="literal"></soap:body>
+ </wsdl:input>
+ <wsdl:output name="addListResponse">
+ <soap:body use="literal"></soap:body>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="addNumberAndOperands">
+ <soap:operation soapAction="" style="document"></soap:operation>
+ <wsdl:input name="addNumberAndOperands">
+ <soap:body use="literal"></soap:body>
+ </wsdl:input>
+ <wsdl:output name="addNumberAndOperandsResponse">
+ <soap:body use="literal"></soap:body>
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="addOperands">
<soap:operation soapAction="" style="document"></soap:operation>
<wsdl:input name="addOperands">
@@ -242,7 +342,7 @@
</wsdl:binding>
<wsdl:service name="CalculatorService">
<wsdl:port binding="tns:CalculatorServiceSoapBinding" name="Calculator">
- <soap:address
location="http://172.17.0.4:8080/calculator-ws/CalculatorService";></soap:address>
+ <soap:address
location="http://172.17.0.2:8080/calculator-ws/CalculatorService";></soap:address>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
diff --git
a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java
b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java
index 236c35295f..7dd84300c8 100644
---
a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java
+++
b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java
@@ -51,7 +51,7 @@ class CxfSoapClientTest {
.post("/cxf-soap/client/simple")
.then()
.statusCode(201)
- .body(equalTo("3"));
+ .body(equalTo("12"));
}
@ParameterizedTest
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 6c78c6758b..e03e693901 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -2094,6 +2094,24 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-salesforce</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.android</groupId>
+ <artifactId>annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 3bbde05aaa..5bf7e04a6b 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -2027,6 +2027,24 @@
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-salesforce</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.android</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>annotations</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jsr305</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>checker-qual</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.mojo</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>animal-sniffer-annotations</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 75cdb08979..21d9110ff1 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -2027,6 +2027,24 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-salesforce</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.android</groupId>
+ <artifactId>annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index be025b9e15..04dfc55d7c 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -2027,6 +2027,24 @@
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-salesforce</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.0.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.android</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>annotations</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jsr305</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>checker-qual</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.mojo</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>animal-sniffer-annotations</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
