You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/11/16 12:27:00 UTC
[camel-quarkus] branch 2.13.x updated (8ef56e9fd4 -> 25682d779c)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 8ef56e9fd4 Fixed website build
new 052d4b05b0 Cover endpoint URI based CXF definitions
new 9456c5cde5 Fix #4258 make xml integration tests working in Quarkus Platform (#4275)
new 49474de93e Remove camel-quarkus-support-xstream from salesforce extension issue #4272 .
new 25682d779c Regenerate platform-http docs
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../pages/reference/extensions/platform-http.adoc | 6 ++++--
extensions/salesforce/deployment/pom.xml | 4 ----
extensions/salesforce/runtime/pom.xml | 4 ----
.../cxf/soap/client/it/CxfSoapClientResource.java | 5 +++--
.../cxf/soap/client/it/CxfSoapClientRoutes.java | 18 +++++++++++++++---
.../cxf/soap/client/it/CxfSoapClientTest.java | 9 ++++++---
.../component/cxf/soap/server/it/CxfSoapRoutes.java | 6 +++++-
.../cxf/soap/server/it/CxfSoapServiceTest.java | 9 ++++++---
integration-tests/xml/pom.xml | 4 ----
.../camel/quarkus/component/xml/it/XmlResource.java | 17 ++++++++++++++---
.../quarkus/component/xml/it/XmlRouteBuilder.java | 5 ++---
integration-tests/xml/src/test/resources/data1.xml | 20 --------------------
integration-tests/xml/src/test/resources/data2.xml | 20 --------------------
integration-tests/xml/src/test/resources/data3.xml | 20 --------------------
14 files changed, 55 insertions(+), 92 deletions(-)
delete mode 100644 integration-tests/xml/src/test/resources/data1.xml
delete mode 100644 integration-tests/xml/src/test/resources/data2.xml
delete mode 100644 integration-tests/xml/src/test/resources/data3.xml
[camel-quarkus] 04/04: Regenerate platform-http docs
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 25682d779caad14287731bd4da69eb2064b54fb0
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Nov 16 09:07:16 2022 +0100
Regenerate platform-http docs
---
docs/modules/ROOT/pages/reference/extensions/platform-http.adoc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/platform-http.adoc b/docs/modules/ROOT/pages/reference/extensions/platform-http.adoc
index 6b7c93202b..25be1753e9 100644
--- a/docs/modules/ROOT/pages/reference/extensions/platform-http.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/platform-http.adoc
@@ -144,11 +144,13 @@ Platform HTTP component can act as a reverse proxy, in that case `Exchange.HTTP_
Here's an example of a HTTP proxy that simply redirects the Exchange to the origin server.
[source,java]
-----
+------------------------------------------------------------------------------------------
from("platform-http:proxy")
.toD("http://"
+ "${headers." + Exchange.HTTP_HOST + "}");
-----
+
+-------------------------------------------------------------------------------------
+
[id="extensions-platform-http-additional-camel-quarkus-configuration"]
== Additional Camel Quarkus configuration
[camel-quarkus] 02/04: Fix #4258 make xml integration tests working in Quarkus Platform (#4275)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9456c5cde5b1d1db1294d0b620ffd47ee53a9de8
Author: Zheng Feng <zh...@gmail.com>
AuthorDate: Mon Nov 14 17:58:03 2022 +0800
Fix #4258 make xml integration tests working in Quarkus Platform (#4275)
* Copy xslt files to tmp directory
* Send the xml contents to a aggregate route directly
---
integration-tests/xml/pom.xml | 4 ----
.../camel/quarkus/component/xml/it/XmlResource.java | 17 ++++++++++++++---
.../quarkus/component/xml/it/XmlRouteBuilder.java | 5 ++---
integration-tests/xml/src/test/resources/data1.xml | 20 --------------------
integration-tests/xml/src/test/resources/data2.xml | 20 --------------------
integration-tests/xml/src/test/resources/data3.xml | 20 --------------------
6 files changed, 16 insertions(+), 70 deletions(-)
diff --git a/integration-tests/xml/pom.xml b/integration-tests/xml/pom.xml
index 6a3f013469..656a099c3d 100644
--- a/integration-tests/xml/pom.xml
+++ b/integration-tests/xml/pom.xml
@@ -55,10 +55,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-file</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-mock</artifactId>
diff --git a/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlResource.java b/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlResource.java
index cb70629924..21b9da6b3d 100644
--- a/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlResource.java
+++ b/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlResource.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.quarkus.component.xml.it;
+import java.io.File;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
import java.util.StringJoiner;
import javax.enterprise.context.ApplicationScoped;
@@ -111,8 +115,12 @@ public class XmlResource {
@Path("/xslt-file")
@POST
@Produces(MediaType.TEXT_PLAIN)
- public String xsltFile(String body) {
- return producerTemplate.requestBody("xslt:file:src/main/resources/xslt/classpath-transform.xsl", body, String.class);
+ public String xsltFile(String body) throws Exception {
+ try (InputStream in = getClass().getClassLoader().getResourceAsStream("xslt/classpath-transform.xsl")) {
+ File file = File.createTempFile("xslt", ".xsl");
+ Files.copy(in, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ return producerTemplate.requestBody("xslt:file:" + file, body, String.class);
+ }
}
@Path("/xslt-http")
@@ -131,7 +139,10 @@ public class XmlResource {
public String aggregate() throws Exception {
MockEndpoint mock = camelContext.getEndpoint("mock:transformed", MockEndpoint.class);
mock.expectedMessageCount(1);
- camelContext.getRouteController().startRoute("aggregate");
+
+ producerTemplate.sendBody("direct:aggregate", "<item>A</item>");
+ producerTemplate.sendBody("direct:aggregate", "<item>B</item>");
+ producerTemplate.sendBody("direct:aggregate", "<item>C</item>");
mock.assertIsSatisfied();
return mock.getExchanges().get(0).getIn().getBody(String.class);
diff --git a/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlRouteBuilder.java b/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlRouteBuilder.java
index 160efcc5cb..b018598291 100644
--- a/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlRouteBuilder.java
+++ b/integration-tests/xml/src/main/java/org/apache/camel/quarkus/component/xml/it/XmlRouteBuilder.java
@@ -58,11 +58,10 @@ public class XmlRouteBuilder extends RouteBuilder {
.xtokenize("//C:child", new Namespaces("C", "urn:c"))
.to("seda:xtokenize-result");
- from("file:src/test/resources?noop=true&sortBy=file:name&antInclude=*.xml")
- .routeId("aggregate").noAutoStartup()
+ from("direct:aggregate")
.aggregate(new XsltSaxonAggregationStrategy("xslt/aggregate.xsl"))
.constant(true)
- .completionFromBatchConsumer()
+ .completionSize(3)
.log("after aggregate body: ${body}")
.to("mock:transformed");
}
diff --git a/integration-tests/xml/src/test/resources/data1.xml b/integration-tests/xml/src/test/resources/data1.xml
deleted file mode 100644
index ab271eff66..0000000000
--- a/integration-tests/xml/src/test/resources/data1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- 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.
-
--->
-<item>A</item>
\ No newline at end of file
diff --git a/integration-tests/xml/src/test/resources/data2.xml b/integration-tests/xml/src/test/resources/data2.xml
deleted file mode 100644
index ff5eca1e90..0000000000
--- a/integration-tests/xml/src/test/resources/data2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- 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.
-
--->
-<item>B</item>
diff --git a/integration-tests/xml/src/test/resources/data3.xml b/integration-tests/xml/src/test/resources/data3.xml
deleted file mode 100644
index b447fb9edd..0000000000
--- a/integration-tests/xml/src/test/resources/data3.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- 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.
-
--->
-<item>C</item>
[camel-quarkus] 01/04: Cover endpoint URI based CXF definitions
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 052d4b05b0a561d3ad73bec6cd756bb1b1491d19
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Wed Nov 9 17:54:03 2022 +0100
Cover endpoint URI based CXF definitions
---
.../cxf/soap/client/it/CxfSoapClientResource.java | 5 +++--
.../cxf/soap/client/it/CxfSoapClientRoutes.java | 18 +++++++++++++++---
.../cxf/soap/client/it/CxfSoapClientTest.java | 9 ++++++---
.../component/cxf/soap/server/it/CxfSoapRoutes.java | 6 +++++-
.../cxf/soap/server/it/CxfSoapServiceTest.java | 9 ++++++---
5 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientResource.java b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientResource.java
index f56f3ee3e1..7485357953 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientResource.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientResource.java
@@ -44,8 +44,9 @@ public class CxfSoapClientResource {
@Consumes(MediaType.WILDCARD)
@Produces(MediaType.TEXT_PLAIN)
public Response sendSimpleRequest(@QueryParam("a") int a,
- @QueryParam("b") int b) throws Exception {
- final String response = producerTemplate.requestBody("direct:simple", new int[] { a, b }, String.class);
+ @QueryParam("b") int b, @QueryParam("endpointUri") String endpointUri) throws Exception {
+ final String response = producerTemplate.requestBody(String.format("direct:%s", endpointUri), new int[] { a, b },
+ String.class);
return Response
.created(new URI("https://camel.apache.org/"))
.entity(response)
diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientRoutes.java b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientRoutes.java
index b79f75575e..c2f5d97823 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientRoutes.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientRoutes.java
@@ -41,9 +41,13 @@ public class CxfSoapClientRoutes extends RouteBuilder {
@Override
public void configure() {
- from("direct:simple")
+ from("direct:simpleUriBean")
.to("cxf:bean:soapClientEndpoint?dataFormat=PAYLOAD");
+ from("direct:simpleUriAddress")
+ .to(String.format("cxf://%s?wsdlURL=%s&dataFormat=POJO&serviceClass=%s", calculatorServiceAddress(),
+ calculatorServiceWsdlUrl(), CalculatorService.class.getName()));
+
from("direct:operandsAdd")
.setHeader(CxfConstants.OPERATION_NAME).constant("addOperands")
.to("cxf:bean:soapClientEndpoint?dataFormat=POJO");
@@ -64,10 +68,18 @@ public class CxfSoapClientRoutes extends RouteBuilder {
CxfEndpoint soapClientEndpoint() {
final CxfEndpoint result = new CxfEndpoint();
result.setServiceClass(CalculatorService.class);
- result.setAddress(serviceBaseUri + "/calculator-ws/CalculatorService");
- result.setWsdlURL("wsdl/CalculatorService.wsdl");
+ result.setAddress(calculatorServiceAddress());
+ result.setWsdlURL(calculatorServiceWsdlUrl());
result.getFeatures().add(loggingFeature);
return result;
}
+ private String calculatorServiceAddress() {
+ return serviceBaseUri + "/calculator-ws/CalculatorService";
+ }
+
+ private String calculatorServiceWsdlUrl() {
+ return "wsdl/CalculatorService.wsdl";
+ }
+
}
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 88f7684ee4..d5f41a787b 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
@@ -29,20 +29,23 @@ import io.restassured.RestAssured;
import org.eclipse.microprofile.config.ConfigProvider;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
@QuarkusTest
@QuarkusTestResource(CxfClientTestResource.class)
class CxfSoapClientTest {
- @Test
- public void simpleSoapClient() {
+ @ParameterizedTest
+ @ValueSource(strings = { "simpleUriBean", "simpleUriAddress" })
+ public void simpleSoapClient(String endpointUri) {
//first operation is "divide"
RestAssured.given()
.queryParam("a", "9")
.queryParam("b", "3")
+ .queryParam("endpointUri", endpointUri)
.post("/cxf-soap/client/simple")
.then()
.statusCode(201)
diff --git a/integration-test-groups/cxf-soap/cxf-soap-server/src/main/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapRoutes.java b/integration-test-groups/cxf-soap/cxf-soap-server/src/main/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapRoutes.java
index 200a84e42c..42a515ce8b 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-server/src/main/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapRoutes.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-server/src/main/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapRoutes.java
@@ -40,6 +40,10 @@ public class CxfSoapRoutes extends RouteBuilder {
from("cxf:bean:soapServiceEndpoint")
.setBody().simple("Hello ${body} from CXF service");
+ from(String.format("cxf:///hello-uri-address?wsdlURL=wsdl/HelloService.wsdl&serviceClass=%s",
+ HelloPortType.class.getName()))
+ .setBody().simple("Hello ${body} from CXF service");
+
from("cxf:bean:codeFirstServiceEndpoint")
.setBody().constant("Hello CamelQuarkusCXF");
@@ -66,7 +70,7 @@ public class CxfSoapRoutes extends RouteBuilder {
CxfEndpoint soapServiceEndpoint() {
final CxfEndpoint result = new CxfEndpoint();
result.setServiceClass(HelloPortType.class);
- result.setAddress("/hello");
+ result.setAddress("/hello-uri-bean");
result.setWsdlURL("wsdl/HelloService.wsdl");
result.getFeatures().add(loggingFeature);
return result;
diff --git a/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapServiceTest.java b/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapServiceTest.java
index 90b91a0a10..b397ac2446 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapServiceTest.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-server/src/test/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapServiceTest.java
@@ -29,15 +29,18 @@ import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
@QuarkusTest
class CxfSoapServiceTest {
- @Test
- public void simpleSoapService() {
+ @ParameterizedTest
+ @ValueSource(strings = { "uri-bean", "uri-address" })
+ public void simpleSoapService(String uriEndpoint) {
final HelloService service = new HelloService();
final HelloPortType helloPort = service.getHelloPort();
- String endpointURL = getServerUrl() + "/soapservice/hello";
+ String endpointURL = getServerUrl() + "/soapservice/hello-" + uriEndpoint;
((BindingProvider) helloPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL);
Assertions.assertEquals(helloPort.hello("World"), "Hello World from CXF service");
}
[camel-quarkus] 03/04: Remove camel-quarkus-support-xstream from salesforce extension issue #4272 .
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 49474de93e192a34278eb33b88df807e54f3a172
Author: svkcemk <so...@gmail.com>
AuthorDate: Mon Nov 14 20:59:06 2022 +0530
Remove camel-quarkus-support-xstream from salesforce extension issue #4272 .
---
extensions/salesforce/deployment/pom.xml | 4 ----
extensions/salesforce/runtime/pom.xml | 4 ----
2 files changed, 8 deletions(-)
diff --git a/extensions/salesforce/deployment/pom.xml b/extensions/salesforce/deployment/pom.xml
index b795c3325c..964da937d7 100644
--- a/extensions/salesforce/deployment/pom.xml
+++ b/extensions/salesforce/deployment/pom.xml
@@ -45,10 +45,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-jetty-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-support-xstream-deployment</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-salesforce</artifactId>
diff --git a/extensions/salesforce/runtime/pom.xml b/extensions/salesforce/runtime/pom.xml
index ab8b9704db..34d0d262a6 100644
--- a/extensions/salesforce/runtime/pom.xml
+++ b/extensions/salesforce/runtime/pom.xml
@@ -50,10 +50,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-jetty</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-support-xstream</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-salesforce</artifactId>