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 82a090de87 [camel-main] fixed salesforce (CAMEL-18551),
cxf-soap-client (updates in image)
82a090de87 is described below
commit 82a090de87efb97c7f98e9abfabaab0e47c89c85
Author: JiriOndrusek <[email protected]>
AuthorDate: Wed Mar 29 14:18:43 2023 +0200
[camel-main] fixed salesforce (CAMEL-18551), cxf-soap-client (updates in
image)
---
.../src/main/resources/wsdl/CalculatorService.wsdl | 188 ++++-----------------
.../cxf/soap/client/it/CxfSoapClientTest.java | 2 +-
.../src/test/resources/mappings/oauth2.json | 2 +-
3 files changed, 37 insertions(+), 155 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 19da442c0e..2b0be31507 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
@@ -22,18 +22,6 @@
<xs:element name="add" type="tns:add"></xs:element>
- <xs:element name="addArray" type="tns:addArray"></xs:element>
-
- <xs:element name="addArrayResponse" type="tns:addArrayResponse"></xs:element>
-
- <xs:element name="addList" type="tns:addList"></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>
<xs:element name="addOperandsResponse"
type="tns:addOperandsResponse"></xs:element>
@@ -52,73 +40,48 @@
<xs:element name="subtractResponse" type="tns:subtractResponse"></xs:element>
- <xs:complexType name="add">
+ <xs:complexType name="divide">
<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="addResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:int"></xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="addArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="arg0"
type="xs:int"></xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="addArrayResponse">
+ <xs:complexType name="divideResponse">
<xs:sequence>
<xs:element name="return" type="xs:int"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="subtract">
+ <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="subtractResponse">
+ <xs:complexType name="addResponse">
<xs:sequence>
<xs:element name="return" type="xs:int"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="divide">
+ <xs:complexType name="subtract">
<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: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:complexType name="subtractResponse">
<xs:sequence>
<xs:element name="return" type="xs:int"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="addNumberAndOperands">
+ <xs:complexType name="addOperands">
<xs:sequence>
- <xs:element name="arg0" type="xs:int"></xs:element>
- <xs:element minOccurs="0" name="arg1" type="tns:operands"></xs:element>
+ <xs:element minOccurs="0" name="arg0" type="tns:operands"></xs:element>
</xs:sequence>
</xs:complexType>
@@ -129,18 +92,6 @@
</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>
@@ -169,42 +120,6 @@
</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>
@@ -229,45 +144,39 @@
<wsdl:part element="tns:divideResponse" name="parameters">
</wsdl:part>
</wsdl:message>
- <wsdl:message name="addArrayResponse">
- <wsdl:part element="tns:addArrayResponse" name="parameters">
+ <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:part>
</wsdl:message>
<wsdl:portType name="CalculatorService">
- <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:operation name="add">
+ <wsdl:input message="tns:add" name="add">
</wsdl:input>
- <wsdl:output message="tns:addListResponse" name="addListResponse">
+ <wsdl:output message="tns:addResponse" name="addResponse">
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="addNumberAndOperands">
- <wsdl:input message="tns:addNumberAndOperands"
name="addNumberAndOperands">
+ <wsdl:operation name="subtract">
+ <wsdl:input message="tns:subtract" name="subtract">
</wsdl:input>
- <wsdl:output message="tns:addNumberAndOperandsResponse"
name="addNumberAndOperandsResponse">
+ <wsdl:output message="tns:subtractResponse" name="subtractResponse">
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addOperands">
@@ -285,33 +194,6 @@
</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="add">
- <soap:operation soapAction="" style="document"></soap:operation>
- <wsdl:input name="add">
- <soap:body use="literal"></soap:body>
- </wsdl:input>
- <wsdl:output name="addResponse">
- <soap:body use="literal"></soap:body>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="addArray">
- <soap:operation soapAction="" style="document"></soap:operation>
- <wsdl:input name="addArray">
- <soap:body use="literal"></soap:body>
- </wsdl:input>
- <wsdl:output name="addArrayResponse">
- <soap:body use="literal"></soap:body>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="subtract">
- <soap:operation soapAction="" style="document"></soap:operation>
- <wsdl:input name="subtract">
- <soap:body use="literal"></soap:body>
- </wsdl:input>
- <wsdl:output name="subtractResponse">
- <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">
@@ -321,21 +203,21 @@
<soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="addList">
+ <wsdl:operation name="add">
<soap:operation soapAction="" style="document"></soap:operation>
- <wsdl:input name="addList">
+ <wsdl:input name="add">
<soap:body use="literal"></soap:body>
</wsdl:input>
- <wsdl:output name="addListResponse">
+ <wsdl:output name="addResponse">
<soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="addNumberAndOperands">
+ <wsdl:operation name="subtract">
<soap:operation soapAction="" style="document"></soap:operation>
- <wsdl:input name="addNumberAndOperands">
+ <wsdl:input name="subtract">
<soap:body use="literal"></soap:body>
</wsdl:input>
- <wsdl:output name="addNumberAndOperandsResponse">
+ <wsdl:output name="subtractResponse">
<soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
@@ -360,7 +242,7 @@
</wsdl:binding>
<wsdl:service name="CalculatorService">
<wsdl:port binding="tns:CalculatorServiceSoapBinding" name="Calculator">
- <soap:address
location="http://172.17.0.2:8080/calculator-ws/CalculatorService";></soap:address>
+ <soap:address
location="http://172.17.0.4: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 97947954a4..d08c0b4822 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("12"));
+ .body(equalTo("3"));
}
@ParameterizedTest
diff --git
a/integration-tests/salesforce/src/test/resources/mappings/oauth2.json
b/integration-tests/salesforce/src/test/resources/mappings/oauth2.json
index 0623ea6f0f..dd35c6feec 100644
--- a/integration-tests/salesforce/src/test/resources/mappings/oauth2.json
+++ b/integration-tests/salesforce/src/test/resources/mappings/oauth2.json
@@ -7,7 +7,7 @@
},
"response": {
"status": 200,
- "body":
"{\"instance_url\":\"{{request.baseUrl}}\",\"access_token\":\"token\"}",
+ "body":
"{\"instance_url\":\"{{request.baseUrl}}\",\"access_token\":\"token\",\"id\":\"id/00D123123123123123\"}",
"transformers": ["response-template"],
"headers": {
"Content-Type": "application/json; charset=UTF-8"
