buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/36048 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel] 02/02: CAMEL-13853: fix tests
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a commit to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 091c4b442a158e58fef8133903264335a6f362ac
Author: Jan Bednář
AuthorDate: Wed Aug 14 00:55:19 2019 +0200
CAMEL-13853: fix tests
---
.../camel/component/elasticsearch/ElasticsearchBaseTest.java | 7 ++-
.../component/elasticsearch/ElasticsearchClusterBaseTest.java | 8 ++--
.../resources/org/apache/camel/component/jetty/jetty-https.xml| 5 -
.../camel/component/jetty/jetty-noconnection-redelivery.xml | 5 -
.../org/apache/camel/component/jetty/jetty-noconnection.xml | 5 -
.../org/apache/camel/component/netty4/http/BaseNettyTest.java | 2 +-
.../camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml | 5 -
.../apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml | 5 -
.../java/org/apache/camel/component/netty4/BaseNettyTest.java | 2 +-
components/camel-undertow/src/test/resources/SpringTest.xml | 5 -
10 files changed, 14 insertions(+), 35 deletions(-)
diff --git
a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
index a715284..605981f 100644
---
a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
+++
b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
@@ -46,9 +46,13 @@ public class ElasticsearchBaseTest extends CamelTestSupport {
@BeforeClass
public static void cleanupOnce() throws Exception {
deleteDirectory("target/testcluster/");
+
clusterName = "es-cl-run-" + System.currentTimeMillis();
runner = new ElasticsearchClusterRunner();
+runner.setMaxHttpPort(-1);
+runner.setMaxTransportPort(-1);
+
// create ES nodes
runner.onBuild((number, settingsBuilder) -> {
settingsBuilder.put("http.cors.enabled", true);
@@ -56,7 +60,8 @@ public class ElasticsearchBaseTest extends CamelTestSupport {
}).build(newConfigs()
.clusterName(clusterName)
.numOfNode(1)
-.baseHttpPort(ES_BASE_TRANSPORT_PORT)
+.baseHttpPort(ES_BASE_HTTP_PORT - 1) // ElasticsearchClusterRunner
add node id to port, so set it to ES_BASE_HTTP_PORT-1 to start node 1 exactly
on ES_BASE_HTTP_PORT
+.baseTransportPort(ES_BASE_TRANSPORT_PORT - 1) //
ElasticsearchClusterRunner add node id to port, so set it to
ES_BASE_TRANSPORT_PORT-1 to start node 1 exactly on ES_BASE_TRANSPORT_PORT
.basePath("target/testcluster/"));
// wait for green status
diff --git
a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
index 9a74519..6a3705a 100644
---
a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
+++
b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchClusterBaseTest.java
@@ -51,6 +51,9 @@ public class ElasticsearchClusterBaseTest extends
CamelTestSupport {
// create runner instance
runner = new ElasticsearchClusterRunner();
+runner.setMaxHttpPort(-1);
+runner.setMaxTransportPort(-1);
+
// create ES nodes
runner.onBuild((number, settingsBuilder) -> {
settingsBuilder.put("http.cors.enabled", true);
@@ -58,12 +61,13 @@ public class ElasticsearchClusterBaseTest extends
CamelTestSupport {
}).build(newConfigs()
.clusterName(clusterName)
.numOfNode(1)
- .baseHttpPort(ES_BASE_HTTP_PORT)
+ .baseHttpPort(ES_BASE_HTTP_PORT - 1) //
ElasticsearchClusterRunner add node id to port, so set it to
ES_BASE_HTTP_PORT-1 to start node 1 exactly on ES_BASE_HTTP_PORT
+ .baseTransportPort(ES_FIRST_NODE_TRANSPORT_PORT - 1) //
ElasticsearchClusterRunner add node id to port, so set it to
ES_FIRST_NODE_TRANSPORT_PORT-1 to start node 1 exactly on
ES_FIRST_NODE_TRANSPORT_PORT
.basePath("target/testcluster/"));
// wait for green status
runner.ensureGreen();
-restclientbuilder = RestClient.builder(new
HttpHost(InetAddress.getByName("127.0.0.1"), ES_FIRST_NODE_TRANSPORT_PORT));
+restclientbuilder = RestClient.builder(new
HttpHost(InetAddress.getByName("127.0.0.1"), ES_BASE_HTTP_PORT));
client = new RestHighLevelClient(restclientbuilder);
restClient =
[camel] branch CAMEL-13853 updated (65e2582 -> 091c4b4)
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a change to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 65e2582 CAMEL-13853: AvailablePortFinder now delegates the port
selection to OS
add 74fab44 cleanups for camel-http4 to camel-http component renaming
add d17bdf2 update migration guide and correct typos
add fabfa0f CAMEL-13841: Add the ability to do manual Pulsar message
acknowledgements.
add 860b654 Update Javadocs.
add 53f415b CAMEL-13861: Fixes missing logic producing empty messages
add 7b3eb70 CAMEL-13814 Inline EIP images
add ea03405 camel-microprofile-config: fix filtered loading
add 597f256 upgrade to CXF 3.3.3, and this will fix CAMEL-12957
add ab594f3 fix the failing tests on the ci-server
new cda1d1a Merge branch 'master' of https://github.com/apache/camel into
CAMEL-13853
new 091c4b4 CAMEL-13853: fix tests
The 2 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:
MIGRATION.md | 4 +-
README.md | 1 -
.../org/apache/camel/catalog/CamelCatalogTest.java | 4 +-
.../elasticsearch/ElasticsearchBaseTest.java | 7 +-
.../ElasticsearchClusterBaseTest.java | 8 +-
.../camel/http/common/HttpSendDynamicAware.java| 2 +-
.../camel-http/src/main/docs/http-component.adoc | 16 +-
.../BasicAuthenticationHttpClientConfigurer.java | 4 +-
.../{http4 => http}/CompositeHttpConfigurer.java | 2 +-
.../{http4 => http}/HttpClientConfigurer.java | 2 +-
.../component/{http4 => http}/HttpComponent.java | 36 ++--
.../HttpComponentVerifierExtension.java| 2 +-
.../component/{http4 => http}/HttpConstants.java | 2 +-
.../{http4 => http}/HttpDeleteWithBodyMethod.java | 2 +-
.../component/{http4 => http}/HttpEndpoint.java| 2 +-
.../{http4 => http}/HttpEntityConverter.java | 2 +-
.../component/{http4 => http}/HttpMethods.java | 4 +-
.../{http4 => http}/HttpPollingConsumer.java | 14 +-
.../component/{http4 => http}/HttpProducer.java| 10 +-
.../{http4 => http}/HttpSendDynamicAware.java | 2 +-
.../camel/component/{http4 => http}/HttpUtil.java | 2 +-
.../component/{http4 => http}/NoopCookieStore.java | 2 +-
.../{http4 => http}/PreemptiveAuthInterceptor.java | 4 +-
.../{http4 => http}/ProxyHttpClientConfigurer.java | 4 +-
.../cloud/HttpServiceExpression.java} | 8 +-
.../cloud/HttpServiceExpressionFactory.java} | 6 +-
.../{http4 => http}/helper/HttpMethodHelper.java | 8 +-
.../camel/component/{http4 => http}/package.html | 0
.../component/{http4 => http}/BaseHttpTest.java| 4 +-
.../component/{http4 => http}/BaseHttpsTest.java | 4 +-
.../CamelComponentVerifierExtensionTest.java | 8 +-
.../CamelComponentVerifierTest.java| 8 +-
.../{http4 => http}/GoogleUrlRewrite.java | 2 +-
.../{http4 => http}/HeaderFilteringTest.java | 2 +-
.../{http4 => http}/HttpAuthenticationTest.java| 22 +--
.../component/{http4 => http}/HttpBodyTest.java| 18 +-
.../HttpBodyWithOtherProtocalNameTest.java | 6 +-
.../{http4 => http}/HttpBridgeEndpointTest.java| 12 +-
.../HttpCamelHeadersNotCopiedTest.java | 4 +-
.../{http4 => http}/HttpCamelHeadersTest.java | 4 +-
.../component/{http4 => http}/HttpCharsetTest.java | 10 +-
.../{http4 => http}/HttpClientConfigurerTest.java | 4 +-
.../{http4 => http}/HttpCompressionTest.java | 10 +-
.../{http4 => http}/HttpConcurrentTest.java| 4 +-
.../HttpCustomComponentNameTest.java | 2 +-
.../{http4 => http}/HttpDefaultPortNumberTest.java | 10 +-
.../HttpDisableStreamCacheTest.java| 10 +-
.../HttpEndpointOptionsNotChangeComponentTest.java | 6 +-
.../{http4 => http}/HttpEndpointURLTest.java | 14 +-
.../HttpInvalidConfigurationTest.java | 6 +-
.../HttpInvalidHttpClientConfigurationTest.java| 6 +-
.../component/{http4 => http}/HttpMethodsTest.java | 14 +-
.../{http4 => http}/HttpNoCamelHeaderTest.java | 2 +-
.../HttpNoConnectionRedeliveryTest.java| 10 +-
.../{http4 => http}/HttpNoConnectionTest.java | 8 +-
.../component/{http4 => http}/HttpPathTest.java| 10 +-
.../{http4 => http}/HttpPollingConsumerTest.java | 26 +--
.../HttpProducerConnectionCloseTest.java | 14 +-
.../HttpProducerContentLengthTest.java | 34 ++--
.../HttpProducerContentTypeTest.java | 22 +--
.../HttpProducerContentTypeWithSemiColomnTest.java | 22 +--
[camel] 01/02: Merge branch 'master' of https://github.com/apache/camel into CAMEL-13853
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a commit to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cda1d1aadbf9ba9cdd1a8856632e42e685a268ca
Merge: 65e2582 ab594f3
Author: Jan Bednář
AuthorDate: Wed Aug 14 00:53:47 2019 +0200
Merge branch 'master' of https://github.com/apache/camel into CAMEL-13853
# Conflicts:
#
tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
MIGRATION.md | 4 +-
README.md | 1 -
.../org/apache/camel/catalog/CamelCatalogTest.java | 4 +-
.../camel/http/common/HttpSendDynamicAware.java| 2 +-
.../camel-http/src/main/docs/http-component.adoc | 16 +-
.../BasicAuthenticationHttpClientConfigurer.java | 4 +-
.../{http4 => http}/CompositeHttpConfigurer.java | 2 +-
.../{http4 => http}/HttpClientConfigurer.java | 2 +-
.../component/{http4 => http}/HttpComponent.java | 36 ++--
.../HttpComponentVerifierExtension.java| 2 +-
.../component/{http4 => http}/HttpConstants.java | 2 +-
.../{http4 => http}/HttpDeleteWithBodyMethod.java | 2 +-
.../component/{http4 => http}/HttpEndpoint.java| 2 +-
.../{http4 => http}/HttpEntityConverter.java | 2 +-
.../component/{http4 => http}/HttpMethods.java | 4 +-
.../{http4 => http}/HttpPollingConsumer.java | 14 +-
.../component/{http4 => http}/HttpProducer.java| 10 +-
.../{http4 => http}/HttpSendDynamicAware.java | 2 +-
.../camel/component/{http4 => http}/HttpUtil.java | 2 +-
.../component/{http4 => http}/NoopCookieStore.java | 2 +-
.../{http4 => http}/PreemptiveAuthInterceptor.java | 4 +-
.../{http4 => http}/ProxyHttpClientConfigurer.java | 4 +-
.../cloud/HttpServiceExpression.java} | 8 +-
.../cloud/HttpServiceExpressionFactory.java} | 6 +-
.../{http4 => http}/helper/HttpMethodHelper.java | 8 +-
.../camel/component/{http4 => http}/package.html | 0
.../component/{http4 => http}/BaseHttpTest.java| 4 +-
.../component/{http4 => http}/BaseHttpsTest.java | 4 +-
.../CamelComponentVerifierExtensionTest.java | 8 +-
.../CamelComponentVerifierTest.java| 8 +-
.../{http4 => http}/GoogleUrlRewrite.java | 2 +-
.../{http4 => http}/HeaderFilteringTest.java | 2 +-
.../{http4 => http}/HttpAuthenticationTest.java| 22 +--
.../component/{http4 => http}/HttpBodyTest.java| 18 +-
.../HttpBodyWithOtherProtocalNameTest.java | 6 +-
.../{http4 => http}/HttpBridgeEndpointTest.java| 12 +-
.../HttpCamelHeadersNotCopiedTest.java | 4 +-
.../{http4 => http}/HttpCamelHeadersTest.java | 4 +-
.../component/{http4 => http}/HttpCharsetTest.java | 10 +-
.../{http4 => http}/HttpClientConfigurerTest.java | 4 +-
.../{http4 => http}/HttpCompressionTest.java | 10 +-
.../{http4 => http}/HttpConcurrentTest.java| 4 +-
.../HttpCustomComponentNameTest.java | 2 +-
.../{http4 => http}/HttpDefaultPortNumberTest.java | 10 +-
.../HttpDisableStreamCacheTest.java| 10 +-
.../HttpEndpointOptionsNotChangeComponentTest.java | 6 +-
.../{http4 => http}/HttpEndpointURLTest.java | 14 +-
.../HttpInvalidConfigurationTest.java | 6 +-
.../HttpInvalidHttpClientConfigurationTest.java| 6 +-
.../component/{http4 => http}/HttpMethodsTest.java | 14 +-
.../{http4 => http}/HttpNoCamelHeaderTest.java | 2 +-
.../HttpNoConnectionRedeliveryTest.java| 10 +-
.../{http4 => http}/HttpNoConnectionTest.java | 8 +-
.../component/{http4 => http}/HttpPathTest.java| 10 +-
.../{http4 => http}/HttpPollingConsumerTest.java | 26 +--
.../HttpProducerConnectionCloseTest.java | 14 +-
.../HttpProducerContentLengthTest.java | 34 ++--
.../HttpProducerContentTypeTest.java | 22 +--
.../HttpProducerContentTypeWithSemiColomnTest.java | 22 +--
.../HttpProducerExplicitConnectionCloseTest.java | 12 +-
.../HttpProducerSelectMethodTest.java | 18 +-
.../{http4 => http}/HttpProducerSessionTest.java | 10 +-
.../HttpProducerTwoHeadersWithSameKeyTest.java | 6 +-
.../HttpProducerTwoParametersWithSameKeyTest.java | 6 +-
.../HttpProducerWithSystemPropertiesTest.java | 4 +-
.../{http4 => http}/HttpProxyServerTest.java | 6 +-
.../component/{http4 => http}/HttpQueryTest.java | 14 +-
.../{http4 => http}/HttpRedirectTest.java | 8 +-
.../HttpReferenceParameterTest.java| 8 +-
.../{http4 => http}/HttpSNIHostNameTest.java | 4 +-
.../{http4 => http}/HttpSOTimeoutTest.java | 10 +-
.../{http4 => http}/HttpSendDynamicAwareTest.java | 6 +-
.../{http4 => http}/HttpServerTestSupport.java | 4 +-
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/36047 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel-k-runtime] 02/09: chore(deps): update junit to v5.5.1
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 84071b7e176538d7d379b75b0523e31e3521066c
Author: lburgazzoli
AuthorDate: Tue Aug 13 18:55:32 2019 +0200
chore(deps): update junit to v5.5.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ae365be..ca203ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
1.8
3.0.0-M4
${camel.version}
-5.5.0
+5.5.1
0.9.12
2.6
3.9
[camel-k-runtime] 05/09: chore(deps): update groovy to v2.5.8
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit ae2d3ff1743538aac92cf91becb587b7f130f5ec Author: lburgazzoli AuthorDate: Tue Aug 13 18:57:48 2019 +0200 chore(deps): update groovy to v2.5.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e1d503..da8a914 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 3.13.2 2.12.0 1.7.26 -2.5.7 +2.5.8 1.3.41 1.24 1.3-groovy-2.5
[camel-k-runtime] 09/09: chore(build): migrate deprecate classes
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 91920914e2e6a65704ad7765bd29c01d36c4785a
Author: lburgazzoli
AuthorDate: Tue Aug 13 19:03:43 2019 +0200
chore(build): migrate deprecate classes
---
.../src/test/java/org/apache/camel/k/main/RuntimeTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
index 8333955..b5eca85 100644
---
a/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
+++
b/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/RuntimeTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class RuntimeTest {
@Disabled
[camel-k-runtime] 07/09: chore(deps): update slf4j to v1.7.28
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit f6944927145e3ff01eff94c8fdeace8559b615b1 Author: lburgazzoli AuthorDate: Tue Aug 13 18:59:02 2019 +0200 chore(deps): update slf4j to v1.7.28 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1cfd4cd..4997c28 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 4.4 3.13.2 2.12.0 -1.7.26 +1.7.28 2.5.8 1.3.41 1.24
[camel-k-runtime] 08/09: chore(deps): update log4j to v2.12.1
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 2de43f22d102dc3e1a08e585f2bb351e081aeab9 Author: lburgazzoli AuthorDate: Tue Aug 13 18:59:45 2019 +0200 chore(deps): update log4j to v2.12.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4997c28..21a7a89 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 3.9 4.4 3.13.2 -2.12.0 +2.12.1 1.7.28 2.5.8 1.3.41
[camel-k-runtime] 01/09: chore: restructure repository
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit daa0d1102b690d33d7af27d9808a838ca7be4e64
Author: lburgazzoli
AuthorDate: Tue Aug 13 18:54:34 2019 +0200
chore: restructure repository
---
camel-k-loader-js/pom.xml | 4
.../camel-k-runtime-example-health/README.adoc | 0
.../camel-k-runtime-example-health/pom.xml | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy| 0
.../camel-k-runtime-example-servlet/README.adoc | 0
.../camel-k-runtime-example-servlet/pom.xml | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy| 0
.../camel-k-runtime-example-yaml/pom.xml| 0
.../src/main/java/org/apache/camel/k/example/Event.java | 0
.../src/main/resources/application.properties | 0
.../camel-k-runtime-example-yaml/src/main/resources/routes.yaml | 0
{camel-k-runtime-examples => examples}/pom.xml | 0
pom.xml | 5 +++--
{camel-k-maven-plugin => tooling/camel-k-maven-plugin}/pom.xml | 2 +-
.../java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 0
.../apache/camel/k/tooling/maven/GenerateDependencyListMojo.java| 0
.../main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java | 0
.../main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java | 0
.../main/java/org/apache/camel/k/tooling/maven/model/Artifact.java | 0
.../java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java | 0
.../java/org/apache/camel/k/tooling/maven/model/CamelScheme.java| 0
.../camel/k/tooling/maven/model/CatalogComponentDefinition.java | 0
.../camel/k/tooling/maven/model/CatalogDataFormatDefinition.java| 0
.../camel/k/tooling/maven/model/CatalogLanguageDefinition.java | 0
.../org/apache/camel/k/tooling/maven/model/CatalogProcessor.java| 0
.../java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java | 0
.../org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java| 0
.../apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java| 0
.../java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java | 0
.../java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java | 0
.../apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java | 0
.../org.apache.camel.k.tooling.maven.model.CatalogProcessor | 0
.../camel-k-maven-plugin}/src/main/resources/catalog-license.txt| 0
.../k/tooling/maven/processors/AbstractCataloProcessorTest.java | 0
.../camel/k/tooling/maven/processors/CatalogProcessor3Test.java | 0
{camel-k-runtime-examples => tooling}/pom.xml | 6 ++
38 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/pom.xml
index 99d2cb7..2a5dac2 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -132,10 +132,6 @@
${log4j2.version}
test
-
-org.apache.camel
-camel-endpointdsl
-
diff --git
a/camel-k-runtime-examples/camel-k-runtime-example-health/README.adoc
b/examples/camel-k-runtime-example-health/README.adoc
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/README.adoc
rename to examples/camel-k-runtime-example-health/README.adoc
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml
b/examples/camel-k-runtime-example-health/pom.xml
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml
rename to examples/camel-k-runtime-example-health/pom.xml
diff --git
a/camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/application.properties
b/examples/camel-k-runtime-example-health/src/main/resources/application.properties
similarity index 100%
rename from
camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/application.properties
rename to
examples/camel-k-runtime-example-health/src/main/resources/application.properties
diff --git
a/camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy
b/examples/camel-k-runtime-example-health/src/main/resources/routes.groovy
similarity index 100%
rename from
camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy
rename to
examples/camel-k-runtime-example-health/src/main/resources/routes.groovy
diff --git
a/camel-k-runtime-examples/camel-k-runtime-example-servlet/README.adoc
[camel-k-runtime] branch master updated (34db63b -> 9192091)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.
from 34db63b knative: true knative-http component
new daa0d11 chore: restructure repository
new 84071b7 chore(deps): update junit to v5.5.1
new 50b18c1 chore(deps): update assertj to v3.13.2
new 998be7d chore(deps): update graalvm to v19.1.1
new ae2d3ff chore(deps): update groovy to v2.5.8
new f8ba6de chore(deps): update common-collections4 to v4.4
new f694492 chore(deps): update slf4j to v1.7.28
new 2de43f2 chore(deps): update log4j to v2.12.1
new 9192091 chore(build): migrate deprecate classes
The 9 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:
camel-k-loader-js/pom.xml | 4
.../java/org/apache/camel/k/main/RuntimeTest.java | 2 +-
.../camel-k-runtime-example-health/README.adoc| 0
.../camel-k-runtime-example-health/pom.xml| 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy | 0
.../camel-k-runtime-example-servlet/README.adoc | 0
.../camel-k-runtime-example-servlet/pom.xml | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy | 0
.../camel-k-runtime-example-yaml/pom.xml | 0
.../main/java/org/apache/camel/k/example/Event.java | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.yaml| 0
{camel-k-runtime-examples => examples}/pom.xml| 0
pom.xml | 19 ++-
.../camel-k-maven-plugin}/pom.xml | 2 +-
.../camel/k/tooling/maven/GenerateCatalogMojo.java| 0
.../k/tooling/maven/GenerateDependencyListMojo.java | 0
.../apache/camel/k/tooling/maven/GenerateRestXML.java | 0
.../apache/camel/k/tooling/maven/GenerateSupport.java | 0
.../apache/camel/k/tooling/maven/model/Artifact.java | 0
.../camel/k/tooling/maven/model/CamelArtifact.java| 0
.../camel/k/tooling/maven/model/CamelScheme.java | 0
.../maven/model/CatalogComponentDefinition.java | 0
.../maven/model/CatalogDataFormatDefinition.java | 0
.../maven/model/CatalogLanguageDefinition.java| 0
.../camel/k/tooling/maven/model/CatalogProcessor.java | 0
.../camel/k/tooling/maven/model/CatalogSupport.java | 0
.../camel/k/tooling/maven/model/crd/CamelCatalog.java | 0
.../k/tooling/maven/model/crd/CamelCatalogSpec.java | 0
.../camel/k/tooling/maven/model/k8s/ObjectMeta.java | 0
.../camel/k/tooling/maven/model/k8s/TypeMeta.java | 0
.../tooling/maven/processors/CatalogProcessor3x.java | 0
...pache.camel.k.tooling.maven.model.CatalogProcessor | 0
.../src/main/resources/catalog-license.txt| 0
.../maven/processors/AbstractCataloProcessorTest.java | 0
.../maven/processors/CatalogProcessor3Test.java | 0
{camel-k-runtime-examples => tooling}/pom.xml | 6 ++
39 files changed, 14 insertions(+), 19 deletions(-)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-health/README.adoc (100%)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-health/pom.xml (100%)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-health/src/main/resources/application.properties
(100%)
rename {camel-k-runtime-examples/camel-k-runtime-example-servlet =>
examples/camel-k-runtime-example-health}/src/main/resources/routes.groovy (100%)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-servlet/README.adoc (100%)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-servlet/pom.xml (100%)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-servlet/src/main/resources/application.properties
(100%)
rename {camel-k-runtime-examples/camel-k-runtime-example-health =>
examples/camel-k-runtime-example-servlet}/src/main/resources/routes.groovy
(100%)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-yaml/pom.xml (100%)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java
(100%)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-yaml/src/main/resources/application.properties
(100%)
rename {camel-k-runtime-examples =>
examples}/camel-k-runtime-example-yaml/src/main/resources/routes.yaml (100%)
copy {camel-k-runtime-examples => examples}/pom.xml (100%)
rename {camel-k-maven-plugin => tooling/camel-k-maven-plugin}/pom.xml (99%)
rename
[camel-k-runtime] 04/09: chore(deps): update graalvm to v19.1.1
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 998be7d9634c14d3aaeb6d0bcf61b081a43e30ae Author: lburgazzoli AuthorDate: Tue Aug 13 18:57:05 2019 +0200 chore(deps): update graalvm to v19.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de8b899..0e1d503 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.7.5 2.2.0 1.4.26.Final -19.0.2 +19.1.1 1.7.1 3.8.1 2.22.2
[camel-k-runtime] 06/09: chore(deps): update common-collections4 to v4.4
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit f8ba6de24fef1d44b606eb9cb463b8fb98103a4b Author: lburgazzoli AuthorDate: Tue Aug 13 18:58:33 2019 +0200 chore(deps): update common-collections4 to v4.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da8a914..1cfd4cd 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 0.9.12 2.6 3.9 -4.3 +4.4 3.13.2 2.12.0 1.7.26
[camel-k-runtime] 03/09: chore(deps): update assertj to v3.13.2
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 50b18c1fc088253880dea414f973b9f4c5ba5f0f Author: lburgazzoli AuthorDate: Tue Aug 13 18:56:12 2019 +0200 chore(deps): update assertj to v3.13.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca203ed..de8b899 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 2.6 3.9 4.3 -3.12.2 +3.13.2 2.12.0 1.7.26 2.5.7
[camel] branch CAMEL-13850 updated (b232d9a -> f11ed09)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13850 in repository https://gitbox.apache.org/repos/asf/camel.git. from b232d9a CAMEL-13850: Source code generate ExchangeConstantProvider so we can do fast lookup of its constant values without reflection add f11ed09 CAMEL-13863: camel3 - Optimize XmlConverterLoader and other loaders as synchronization is not needed as the loader is invoked during bootstrapping. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/support/SimpleTypeConverter.java | 1 + .../org/apache/camel/tools/apt/AbstractTypeConverterGenerator.java | 6 +- 2 files changed, 2 insertions(+), 5 deletions(-)
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/36045 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel] branch master updated: fix the failing tests on the ci-server
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new ab594f3 fix the failing tests on the ci-server
ab594f3 is described below
commit ab594f36fe1606ca7408713b0a4ff55dfabe5cf6
Author: Babak Vahdat
AuthorDate: Tue Aug 13 21:51:35 2019 +0200
fix the failing tests on the ci-server
---
.../camel/component/http/CamelHttp4Context.xml | 79 --
.../camel/itest/http/Http4EndpointTest-context.xml | 55 ---
.../http/Http4MaxConnectionPerHostTest-context.xml | 46 -
.../camel/itest/http/HttpEndpointTest-context.xml | 21 +++---
.../http/HttpMaxConnectionPerHostTest-context.xml | 18 ++---
5 files changed, 18 insertions(+), 201 deletions(-)
diff --git
a/components/camel-http/src/test/resources/org/apache/camel/component/http/CamelHttp4Context.xml
b/components/camel-http/src/test/resources/org/apache/camel/component/http/CamelHttp4Context.xml
deleted file mode 100644
index bb1c7d3..000
---
a/components/camel-http/src/test/resources/org/apache/camel/component/http/CamelHttp4Context.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-http://www.springframework.org/schema/beans;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xmlns:camel="http://camel.apache.org/schema/spring;
-
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
-">
-
-
-
-
-
-
-www.mnot.net
-
-
-
-
-
-
-
-
-
-
-blabla
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- http://camel.apache.org/schema/spring;>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
deleted file mode 100644
index 2ddffc8..000
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-http://www.springframework.org/schema/beans;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
-">
-
-
-
-
-
-http://localhost:${HttpTestServer.Port}/"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-http://camel.apache.org/schema/spring;
trace="true">
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
deleted file mode 100644
index 8b3c66d..000
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-http://www.springframework.org/schema/beans;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
-">
-
-
-
-
-
-
-
-
-
-
-
-http://camel.apache.org/schema/spring;
trace="true">
-
-
-http://localhost:{{HttpTestServer.Port}}/"/>
-
-
-
-
-
\ No newline at end of file
diff --git
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpEndpointTest-context.xml
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpEndpointTest-context.xml
index b6b9dea..2ddffc8 100644
---
a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpEndpointTest-context.xml
+++
b/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/HttpEndpointTest-context.xml
@@ -26,25 +26,30 @@
">
-
-http://www.google.com"/>
-
-
+
+
+
+http://localhost:${HttpTestServer.Port}/"/>
+
+
+
+
-
+
+
+
-
http://camel.apache.org/schema/spring;
trace="true">
-
+
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/36044 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch CAMEL-13826 updated: CAMEL-13826: Migrated camel-ahc-ws tests to camel-test-junit5
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-13826 by this push:
new 2b1b52c CAMEL-13826: Migrated camel-ahc-ws tests to camel-test-junit5
2b1b52c is described below
commit 2b1b52c137c74cdcab7a82e40c1a21cb6b4a9b07
Author: aldettinger
AuthorDate: Tue Aug 13 19:35:58 2019 +0200
CAMEL-13826: Migrated camel-ahc-ws tests to camel-test-junit5
---
components/camel-ahc-ws/pom.xml| 7 +-
.../component/ahc/ws/WsProducerConsumerTest.java | 28 ++
.../camel/component/ahc/ws/WsProducerTestBase.java | 26 +++-
.../camel/component/ahc/ws/WssProducerTest.java| 4 ++--
.../src/main/docs/test-junit5.adoc | 1 +
5 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml
index f38b7e8..a680c8c 100644
--- a/components/camel-ahc-ws/pom.xml
+++ b/components/camel-ahc-ws/pom.xml
@@ -62,12 +62,7 @@
org.apache.camel
-camel-test
-test
-
-
-junit
-junit
+camel-test-junit5
test
diff --git
a/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
b/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
index 3f4f539..e556130 100644
---
a/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
+++
b/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
@@ -20,21 +20,29 @@ import java.util.List;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
*/
public class WsProducerConsumerTest extends CamelTestSupport {
+
protected static final String TEST_MESSAGE = "Hello World!";
protected static final int PORT = AvailablePortFinder.getNextAvailable();
+
+private static final Logger LOG =
LoggerFactory.getLogger(WsProducerConsumerTest.class);
+
protected Server server;
protected List messages;
@@ -52,23 +60,23 @@ public class WsProducerConsumerTest extends
CamelTestSupport {
server.setHandler(ctx);
server.start();
-assertTrue(server.isStarted());
+assertTrue(server.isStarted());
}
-
+
public void stopTestServer() throws Exception {
server.stop();
server.destroy();
}
@Override
-@Before
+@BeforeEach
public void setUp() throws Exception {
startTestServer();
super.setUp();
}
@Override
-@After
+@AfterEach
public void tearDown() throws Exception {
super.tearDown();
stopTestServer();
@@ -95,7 +103,7 @@ public class WsProducerConsumerTest extends CamelTestSupport
{
resetMocks();
-log.info("Restarting bar route");
+LOG.info("Restarting bar route");
context.getRouteController().stopRoute("bar");
Thread.sleep(500);
context.getRouteController().startRoute("bar");
@@ -118,7 +126,7 @@ public class WsProducerConsumerTest extends
CamelTestSupport {
resetMocks();
-log.info("Restarting foo route");
+LOG.info("Restarting foo route");
context.getRouteController().stopRoute("foo");
Thread.sleep(500);
context.getRouteController().startRoute("foo");
diff --git
a/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerTestBase.java
b/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerTestBase.java
index e8f3c26..7f6186a 100644
---
a/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerTestBase.java
+++
b/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerTestBase.java
@@ -31,16 +31,20 @@ import org.apache.camel.test.AvailablePortFinder;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import
[camel] branch CAMEL-13850 updated (67fa83f -> b232d9a)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 67fa83f CAMEL-13850: Remove resolvePropertyPlaceholders on
DefaultComponent as this is already supported via camel main, spring boot and
other means. This avoid reflection overhead on bootstrap.
add 2cb843d CAMEL-13850: Source code generate ExchangeConstantProvider so
we can do fast lookup of its constant values without reflection
add 393fb43 CAMEL-13850: Source code generate ExchangeConstantProvider so
we can do fast lookup of its constant values without reflection
add b232d9a CAMEL-13850: Source code generate ExchangeConstantProvider so
we can do fast lookup of its constant values without reflection
No new revisions were added by this update.
Summary of changes:
core/camel-api/pom.xml | 18 +++
.../src/main/java/org/apache/camel/Exchange.java | 2 +
.../camel/model/ProcessorDefinitionHelper.java | 4 +-
.../camel/tools/apt/ConstantProviderProcessor.java | 130 +
.../tools/apt/PropertyPlaceholderGenerator.java| 5 +-
.../services/javax.annotation.processing.Processor | 1 +
...ubServiceFactory.java => ConstantProvider.java} | 2 +-
7 files changed, 158 insertions(+), 4 deletions(-)
create mode 100644
tooling/apt/src/main/java/org/apache/camel/tools/apt/ConstantProviderProcessor.java
copy
tooling/spi-annotations/src/main/java/org/apache/camel/spi/annotations/{SubServiceFactory.java
=> ConstantProvider.java} (96%)
[camel] branch camel-2.x updated: upgrade to CXF 3.3.3, and this will fix CAMEL-12957
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new 480a50a upgrade to CXF 3.3.3, and this will fix CAMEL-12957 480a50a is described below commit 480a50a8070fa2fd9410e0801294e381c0cfc78d Author: Freeman Fang AuthorDate: Tue Aug 13 11:06:35 2019 -0400 upgrade to CXF 3.3.3, and this will fix CAMEL-12957 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6c923d1..3992e80 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -169,7 +169,7 @@ 1.4.13 1.4.13_1 2.12.0 -3.3.2 +3.3.3 [3.1,4.0) 3.2.0 3.2.0
[camel] branch master updated (ea03405 -> 597f256)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from ea03405 camel-microprofile-config: fix filtered loading add 597f256 upgrade to CXF 3.3.3, and this will fix CAMEL-12957 No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch CAMEL-13850 updated (a8cf53e -> 67fa83f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13850 in repository https://gitbox.apache.org/repos/asf/camel.git. from a8cf53e CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. add 2361da3 CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. add 432a53a CAMEL-13850: Remove resolvePropertyPlaceholders on DefaultComponent as this is already supported via camel main, spring boot and other means. This avoid reflection overhead on bootstrap. add 67fa83f CAMEL-13850: Remove resolvePropertyPlaceholders on DefaultComponent as this is already supported via camel main, spring boot and other means. This avoid reflection overhead on bootstrap. No new revisions were added by this update. Summary of changes: MIGRATION.md | 3 + .../src/main/docs/activemq-component.adoc | 6 +- .../src/main/docs/ahc-ws-component.adoc| 6 +- .../camel-ahc/src/main/docs/ahc-component.adoc | 6 +- .../camel-amqp/src/main/docs/amqp-component.adoc | 6 +- .../camel-apns/src/main/docs/apns-component.adoc | 6 +- .../src/main/docs/as2-component.adoc | 6 +- .../src/main/docs/asterisk-component.adoc | 6 +- .../camel-atmos/src/main/docs/atmos-component.adoc | 6 +- .../main/docs/atmosphere-websocket-component.adoc | 6 +- .../camel-atom/src/main/docs/atom-component.adoc | 6 +- .../src/main/docs/atomix-map-component.adoc| 6 +- .../src/main/docs/atomix-messaging-component.adoc | 6 +- .../src/main/docs/atomix-multimap-component.adoc | 6 +- .../src/main/docs/atomix-queue-component.adoc | 6 +- .../src/main/docs/atomix-set-component.adoc| 6 +- .../src/main/docs/atomix-value-component.adoc | 6 +- .../camel-avro/src/main/docs/avro-component.adoc | 6 +- .../camel-avro/src/main/docs/avro-dataformat.adoc | 3 +- .../src/main/docs/aws-cw-component.adoc| 6 +- .../src/main/docs/aws-ddb-component.adoc | 6 +- .../src/main/docs/aws-ddbstream-component.adoc | 6 +- .../src/main/docs/aws-ec2-component.adoc | 6 +- .../src/main/docs/aws-ecs-component.adoc | 6 +- .../src/main/docs/aws-eks-component.adoc | 6 +- .../src/main/docs/aws-iam-component.adoc | 6 +- .../src/main/docs/aws-kinesis-component.adoc | 6 +- .../main/docs/aws-kinesis-firehose-component.adoc | 6 +- .../src/main/docs/aws-kms-component.adoc | 6 +- .../src/main/docs/aws-lambda-component.adoc| 6 +- .../src/main/docs/aws-mq-component.adoc| 6 +- .../src/main/docs/aws-msk-component.adoc | 6 +- .../src/main/docs/aws-s3-component.adoc| 6 +- .../src/main/docs/aws-sdb-component.adoc | 6 +- .../src/main/docs/aws-ses-component.adoc | 6 +- .../src/main/docs/aws-sns-component.adoc | 6 +- .../src/main/docs/aws-sqs-component.adoc | 6 +- .../src/main/docs/aws-swf-component.adoc | 6 +- .../src/main/docs/azure-blob-component.adoc| 6 +- .../src/main/docs/azure-queue-component.adoc | 6 +- .../src/main/docs/bean-validator-component.adoc| 6 +- .../camel-bean/src/main/docs/bean-component.adoc | 3 +- .../camel-bean/src/main/docs/class-component.adoc | 3 +- .../src/main/docs/beanstalk-component.adoc | 6 +- .../src/main/docs/bonita-component.adoc| 6 +- .../src/main/docs/box-component.adoc | 6 +- .../src/main/docs/braintree-component.adoc | 6 +- .../src/main/docs/browse-component.adoc| 6 +- .../src/main/docs/caffeine-cache-component.adoc| 6 +- .../main/docs/caffeine-loadcache-component.adoc| 6 +- .../src/main/docs/cql-component.adoc | 6 +- .../src/main/docs/chatscript-component.adoc| 6 +- .../camel-chunk/src/main/docs/chunk-component.adoc | 6 +- .../src/main/docs/cm-sms-component.adoc| 6 +- .../camel-cmis/src/main/docs/cmis-component.adoc | 6 +- .../camel-coap/src/main/docs/coap-component.adoc | 6 +- .../src/main/docs/cometd-component.adoc| 6 +- .../src/main/docs/consul-component.adoc| 6 +- .../src/main/docs/controlbus-component.adoc| 6 +- .../camel-corda/src/main/docs/corda-component.adoc | 6 +- .../src/main/docs/couchbase-component.adoc | 6 +- .../src/main/docs/couchdb-component.adoc | 6 +- .../src/main/docs/crypto-cms-component.adoc| 6 +- .../src/main/docs/crypto-component.adoc| 6 +- .../src/main/docs/crypto-dataformat.adoc | 3 +- .../camel-cxf/src/main/docs/cxf-component.adoc | 6 +- .../camel-cxf/src/main/docs/cxfrs-component.adoc |
[camel-k] 02/02: fix: Enable proxy server to be configured for Kaniko builds
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 07e87c38caef957a5e4d43b4b755f7d8685ab902
Author: James Netherton
AuthorDate: Tue Aug 13 09:27:47 2019 +0100
fix: Enable proxy server to be configured for Kaniko builds
fixes #899
---
.../camel/v1alpha1/integrationplatform_types.go| 1 +
pkg/builder/kaniko/publisher.go| 40 ++
pkg/cmd/install.go | 7
3 files changed, 48 insertions(+)
diff --git a/pkg/apis/camel/v1alpha1/integrationplatform_types.go
b/pkg/apis/camel/v1alpha1/integrationplatform_types.go
index 9a1e047..19dbcab 100644
--- a/pkg/apis/camel/v1alpha1/integrationplatform_types.go
+++ b/pkg/apis/camel/v1alpha1/integrationplatform_types.go
@@ -104,6 +104,7 @@ type IntegrationPlatformBuildSpec struct {
Timeout metav1.Duration
`json:"timeout,omitempty"`
PersistentVolumeClaim string
`json:"persistentVolumeClaim,omitempty"`
Maven MavenSpec
`json:"maven,omitempty"`
+ HTTPProxySecret string
`json:"httpProxySecret,omitempty"`
}
// IntegrationPlatformRegistrySpec --
diff --git a/pkg/builder/kaniko/publisher.go b/pkg/builder/kaniko/publisher.go
index 4e798ea..1951f5b 100644
--- a/pkg/builder/kaniko/publisher.go
+++ b/pkg/builder/kaniko/publisher.go
@@ -111,6 +111,46 @@ func publisher(ctx *builder.Context) error {
args = baseArgs
}
+ if ctx.Build.Platform.Build.HTTPProxySecret != "" {
+ optional := true
+ envs = append(envs, corev1.EnvVar{
+ Name: "HTTP_PROXY",
+ ValueFrom: {
+ SecretKeyRef: {
+ LocalObjectReference:
corev1.LocalObjectReference{
+ Name:
ctx.Build.Platform.Build.HTTPProxySecret,
+ },
+ Key: "HTTP_PROXY",
+ Optional: ,
+ },
+ },
+ })
+ envs = append(envs, corev1.EnvVar{
+ Name: "HTTPS_PROXY",
+ ValueFrom: {
+ SecretKeyRef: {
+ LocalObjectReference:
corev1.LocalObjectReference{
+ Name:
ctx.Build.Platform.Build.HTTPProxySecret,
+ },
+ Key: "HTTPS_PROXY",
+ Optional: ,
+ },
+ },
+ })
+ envs = append(envs, corev1.EnvVar{
+ Name: "NO_PROXY",
+ ValueFrom: {
+ SecretKeyRef: {
+ LocalObjectReference:
corev1.LocalObjectReference{
+ Name:
ctx.Build.Platform.Build.HTTPProxySecret,
+ },
+ Key: "NO_PROXY",
+ Optional: ,
+ },
+ },
+ })
+ }
+
pod := corev1.Pod{
TypeMeta: metav1.TypeMeta{
APIVersion: corev1.SchemeGroupVersion.String(),
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 166b862..25e94b3 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -74,6 +74,8 @@ func newCmdInstall(rootCmdOptions *RootCmdOptions)
*cobra.Command {
cmd.Flags().StringVar(, "build-strategy", "", "Set
the build strategy")
cmd.Flags().StringVar(, "build-timeout", "", "Set how
long the build process can last")
cmd.Flags().StringVar(, "trait-profile", "", "The
profile to use for traits")
+ cmd.Flags().StringVar(, "http-proxy-secret", "",
"Configure the source of the secret holding HTTP proxy server details "+
+ "(HTTP_PROXY|HTTPS_PROXY|NO_PROXY)")
// maven settings
cmd.Flags().StringVar(, "local-repository", "",
"Location of the local maven repository")
@@ -114,6 +116,7 @@ type installCmdOptions struct {
kits []string
registry v1alpha1.IntegrationPlatformRegistrySpec
traitProfile string
+ httpProxySecret string
}
// nolint: gocyclo
@@ -228,6 +231,10 @@ func (o *installCmdOptions) install(_ *cobra.Command, _
[]string) error {
platform.Spec.Build.Maven.Settings = mavenSettings
[camel-k] branch master updated (37d688c -> 07e87c3)
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 37d688c Added unit tests for the jolokia trait #255 new 47e60f5 fix: Use restart policy OnFailure for Kaniko cache warmer new 07e87c3 fix: Enable proxy server to be configured for Kaniko builds The 2 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: .../camel/v1alpha1/integrationplatform_types.go| 1 + pkg/builder/kaniko/publisher.go| 40 ++ pkg/cmd/install.go | 7 pkg/controller/integrationplatform/kaniko_cache.go | 2 +- 4 files changed, 49 insertions(+), 1 deletion(-)
[camel-k] 01/02: fix: Use restart policy OnFailure for Kaniko cache warmer
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 47e60f50c5d8f42f04bad86aecb774e1fab78967
Author: James Netherton
AuthorDate: Tue Aug 13 09:25:15 2019 +0100
fix: Use restart policy OnFailure for Kaniko cache warmer
fixes #736
fixes #898
---
pkg/controller/integrationplatform/kaniko_cache.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/controller/integrationplatform/kaniko_cache.go
b/pkg/controller/integrationplatform/kaniko_cache.go
index 49958d1..6b7ba5f 100644
--- a/pkg/controller/integrationplatform/kaniko_cache.go
+++ b/pkg/controller/integrationplatform/kaniko_cache.go
@@ -83,7 +83,7 @@ func createKanikoCacheWarmerPod(ctx context.Context, client
client.Client, platf
},
},
},
- RestartPolicy: corev1.RestartPolicyNever,
+ RestartPolicy: corev1.RestartPolicyOnFailure,
Volumes: []corev1.Volume{
{
Name: "camel-k-builder",
[camel] 01/01: CAMEL-13826: Migrated camel-ahc tests to camel-test-junit5
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 72bc92196333dc47e221b47b84a56a6214b2412f
Author: aldettinger
AuthorDate: Tue Aug 13 16:09:14 2019 +0200
CAMEL-13826: Migrated camel-ahc tests to camel-test-junit5
---
components/camel-ahc/pom.xml | 7 +++--
.../ahc/AhcBridgeEndpointPathWithSpacesTest.java | 6 +++--
.../camel/component/ahc/AhcBridgeEndpointTest.java | 12 ++---
.../component/ahc/AhcClientConfigRealmUriTest.java | 4 ++-
.../component/ahc/AhcClientConfigUriTest.java | 4 ++-
.../ahc/AhcComponentClientConfigTest.java | 2 +-
...entConfigWithClientConfigUriParametersTest.java | 5 +++-
.../ahc/AhcComponentCustomClientConfigTest.java| 2 +-
.../ahc/AhcComponentNettyClientConfigTest.java | 2 +-
.../apache/camel/component/ahc/AhcGoogleTest.java | 8 +++---
.../ahc/AhcOperationFailedExceptionTest.java | 4 +--
.../camel/component/ahc/AhcProduce500Test.java | 7 -
.../component/ahc/AhcProduceClientConfigTest.java | 2 +-
...entConfigWithClientConfigUriParametersTest.java | 5 +++-
.../component/ahc/AhcProduceGetHeadersTest.java| 2 +-
.../ahc/AhcProduceGetNoSlashInUriTest.java | 2 +-
.../camel/component/ahc/AhcProduceGetTest.java | 4 ++-
.../AhcProduceNoThrowExceptionOnFailureTest.java | 2 +-
.../component/ahc/AhcProducePostDoWhileTest.java | 2 +-
.../component/ahc/AhcProducePostHeadersTest.java | 2 +-
.../camel/component/ahc/AhcProducePostTest.java| 4 ++-
.../ahc/AhcProduceTransferExceptionTest.java | 7 -
...hcProduceWithClientConfigUriParametersTest.java | 2 +-
.../ahc/AhcProducerConnectionCloseHeadersTest.java | 2 +-
.../component/ahc/AhcProducerSessionTest.java | 2 +-
.../AhcProducerTwoParametersWithSameKeyTest.java | 10 ---
.../apache/camel/component/ahc/BaseAhcTest.java| 6 ++---
.../camel/component/ahc/HttpEndpointURLTest.java | 6 +++--
.../ahc/HttpHeaderFilterStrategyTest.java | 11 +---
.../ahc/javabody/AhcProduceJavaBodyTest.java | 8 +-
.../src/main/docs/test-junit5.adoc | 31 ++
31 files changed, 124 insertions(+), 49 deletions(-)
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index 8395944..18d4d9b 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -65,7 +65,7 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
@@ -78,10 +78,9 @@
camel-jetty
test
-
-junit
-junit
+org.hamcrest
+java-hamcrest
test
diff --git
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
index a71ddf6..ac4bcde 100644
---
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
+++
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
@@ -21,7 +21,9 @@ import java.io.ByteArrayInputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AhcBridgeEndpointPathWithSpacesTest extends BaseAhcTest {
@@ -32,7 +34,7 @@ public class AhcBridgeEndpointPathWithSpacesTest extends
BaseAhcTest {
public void testBridgeEndpoint() throws Exception {
String response = template.requestBodyAndHeader("http://localhost:; +
port1 + "/test bar/hello",
new ByteArrayInputStream("This is a test".getBytes()),
"Content-Type", "application/xml", String.class);
-assertEquals("Get a wrong response", "/proxy%20bar/hello", response);
+assertEquals("/proxy%20bar/hello", response, "Get a wrong response");
}
@Override
diff --git
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
index 920d0ae..0a15b63 100644
---
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
+++
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
@@ -22,7 +22,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
[camel] branch CAMEL-13826 updated (b286d3d -> 72bc921)
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a change to branch CAMEL-13826 in repository https://gitbox.apache.org/repos/asf/camel.git. discard b286d3d CAMEL-13826: Migrated camel-ahc tests to camel-test-junit5 new 72bc921 CAMEL-13826: Migrated camel-ahc tests to camel-test-junit5 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b286d3d) \ N -- N -- N refs/heads/CAMEL-13826 (72bc921) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: components/camel-test-junit5/src/main/docs/test-junit5.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/36039 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel] branch CAMEL-13826 updated (603665b -> b286d3d)
This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a change to branch CAMEL-13826 in repository https://gitbox.apache.org/repos/asf/camel.git. discard 603665b CAMEL-13826: rough migration of the camel-ahc component. To be polished, squashed and rebased discard 4459363 CAMEL-13826: Moved route coverage to a dedicated class new 587c3a8 CAMEL-13826: Moved route coverage to a dedicated class new b286d3d CAMEL-13826: Migrated camel-ahc tests to camel-test-junit5 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (603665b) \ N -- N -- N refs/heads/CAMEL-13826 (b286d3d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 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: .../camel/component/ahc/AhcProduce500Test.java | 4 ++-- .../ahc/AhcProduceTransferExceptionTest.java | 4 ++-- .../src/main/docs/test-junit5.adoc | 25 -- 3 files changed, 18 insertions(+), 15 deletions(-)
[camel] 02/02: CAMEL-13826: Migrated camel-ahc tests to camel-test-junit5
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b286d3dedb1a2cb37dda3824f754ffd881e03ebf
Author: aldettinger
AuthorDate: Tue Aug 13 16:09:14 2019 +0200
CAMEL-13826: Migrated camel-ahc tests to camel-test-junit5
---
components/camel-ahc/pom.xml | 7 +++--
.../ahc/AhcBridgeEndpointPathWithSpacesTest.java | 6 +++--
.../camel/component/ahc/AhcBridgeEndpointTest.java | 12 ++---
.../component/ahc/AhcClientConfigRealmUriTest.java | 4 ++-
.../component/ahc/AhcClientConfigUriTest.java | 4 ++-
.../ahc/AhcComponentClientConfigTest.java | 2 +-
...entConfigWithClientConfigUriParametersTest.java | 5 +++-
.../ahc/AhcComponentCustomClientConfigTest.java| 2 +-
.../ahc/AhcComponentNettyClientConfigTest.java | 2 +-
.../apache/camel/component/ahc/AhcGoogleTest.java | 8 +++---
.../ahc/AhcOperationFailedExceptionTest.java | 4 +--
.../camel/component/ahc/AhcProduce500Test.java | 7 -
.../component/ahc/AhcProduceClientConfigTest.java | 2 +-
...entConfigWithClientConfigUriParametersTest.java | 5 +++-
.../component/ahc/AhcProduceGetHeadersTest.java| 2 +-
.../ahc/AhcProduceGetNoSlashInUriTest.java | 2 +-
.../camel/component/ahc/AhcProduceGetTest.java | 4 ++-
.../AhcProduceNoThrowExceptionOnFailureTest.java | 2 +-
.../component/ahc/AhcProducePostDoWhileTest.java | 2 +-
.../component/ahc/AhcProducePostHeadersTest.java | 2 +-
.../camel/component/ahc/AhcProducePostTest.java| 4 ++-
.../ahc/AhcProduceTransferExceptionTest.java | 7 -
...hcProduceWithClientConfigUriParametersTest.java | 2 +-
.../ahc/AhcProducerConnectionCloseHeadersTest.java | 2 +-
.../component/ahc/AhcProducerSessionTest.java | 2 +-
.../AhcProducerTwoParametersWithSameKeyTest.java | 10 +---
.../apache/camel/component/ahc/BaseAhcTest.java| 6 ++---
.../camel/component/ahc/HttpEndpointURLTest.java | 6 +++--
.../ahc/HttpHeaderFilterStrategyTest.java | 11 +---
.../ahc/javabody/AhcProduceJavaBodyTest.java | 8 +-
.../src/main/docs/test-junit5.adoc | 30 ++
31 files changed, 123 insertions(+), 49 deletions(-)
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index 8395944..18d4d9b 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -65,7 +65,7 @@
org.apache.camel
-camel-test
+camel-test-junit5
test
@@ -78,10 +78,9 @@
camel-jetty
test
-
-junit
-junit
+org.hamcrest
+java-hamcrest
test
diff --git
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
index a71ddf6..ac4bcde 100644
---
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
+++
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointPathWithSpacesTest.java
@@ -21,7 +21,9 @@ import java.io.ByteArrayInputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AhcBridgeEndpointPathWithSpacesTest extends BaseAhcTest {
@@ -32,7 +34,7 @@ public class AhcBridgeEndpointPathWithSpacesTest extends
BaseAhcTest {
public void testBridgeEndpoint() throws Exception {
String response = template.requestBodyAndHeader("http://localhost:; +
port1 + "/test bar/hello",
new ByteArrayInputStream("This is a test".getBytes()),
"Content-Type", "application/xml", String.class);
-assertEquals("Get a wrong response", "/proxy%20bar/hello", response);
+assertEquals("/proxy%20bar/hello", response, "Get a wrong response");
}
@Override
diff --git
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
index 920d0ae..0a15b63 100644
---
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
+++
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcBridgeEndpointTest.java
@@ -22,7 +22,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
[camel] 01/02: CAMEL-13826: Moved route coverage to a dedicated class
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 587c3a8f97846ea9040a9b2916c37613bce3ee24
Author: aldettinger
AuthorDate: Mon Aug 12 17:52:33 2019 +0200
CAMEL-13826: Moved route coverage to a dedicated class
---
.../camel/test/CamelRouteCoverageDumper.java | 190 +
.../apache/camel/test/junit5/CamelTestSupport.java | 152 +
.../RouteProcessorDumpRouteCoverageTest.java | 20 ++-
3 files changed, 208 insertions(+), 154 deletions(-)
diff --git
a/components/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java
b/components/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java
new file mode 100644
index 000..ff3252a
--- /dev/null
+++
b/components/camel-test-junit5/src/main/java/org/apache/camel/test/CamelRouteCoverageDumper.java
@@ -0,0 +1,190 @@
+/*
+ * 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.
+ */
+package org.apache.camel.test;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+
+import org.apache.camel.Route;
+import org.apache.camel.api.management.ManagedCamelContext;
+import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
+import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
+import org.apache.camel.api.management.mbean.ManagedRouteMBean;
+import org.apache.camel.model.ModelCamelContext;
+import org.apache.camel.util.IOHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A CamelRouteCoverageDumper instance dumps the route coverage of
+ * a given camel test.
+ */
+public class CamelRouteCoverageDumper {
+
+private static final Logger LOG =
LoggerFactory.getLogger(CamelRouteCoverageDumper.class);
+
+public void dump(ManagedCamelContextMBean managedCamelContext,
ModelCamelContext context, String dumpDir, String dumpFilename, String
testClass, String testName,
+ long testTimeTaken)
+throws Exception {
+logCoverageSummary(managedCamelContext, context);
+
+String routeCoverageAsXml =
managedCamelContext.dumpRoutesCoverageAsXml();
+String combined = "\n" +
gatherTestDetailsAsXml(testClass, testName, testTimeTaken) + routeCoverageAsXml
+ "\n";
+
+File dumpFile = new File(dumpDir);
+// ensure dir exists
+dumpFile.mkdirs();
+dumpFile = new File(dumpDir, dumpFilename);
+
+LOG.info("Dumping route coverage to file: {}", dumpFile);
+InputStream is = new ByteArrayInputStream(combined.getBytes());
+OutputStream os = new FileOutputStream(dumpFile, false);
+IOHelper.copyAndCloseInput(is, os);
+IOHelper.close(os);
+}
+
+/**
+ * Groups all processors from Camel context by route id.
+ */
+private Map>
findProcessorsForEachRoute(MBeanServer server, ModelCamelContext context)
+throws MalformedObjectNameException, MBeanException,
AttributeNotFoundException, InstanceNotFoundException, ReflectionException {
+String domain =
context.getManagementStrategy().getManagementAgent().getMBeanServerDefaultDomain();
+
+Map> processorsForRoute = new
HashMap<>();
+
+ObjectName processorsObjectName = new ObjectName(domain + ":context="
+ context.getManagementName() + ",type=processors,name=*");
+Set objectNames = server.queryNames(processorsObjectName,
null);
+
+for (ObjectName objectName : objectNames) {
+String
[camel-quarkus] branch master updated: Fix #129 Properies evaluation broken after the introduction of PropertyBindingSupport
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new be79b58 Fix #129 Properies evaluation broken after the introduction
of PropertyBindingSupport
be79b58 is described below
commit be79b585357be3f2a71b55eabdcf3af43d9a2c2e
Author: Peter Palaga
AuthorDate: Mon Aug 12 17:46:39 2019 +0200
Fix #129 Properies evaluation broken after the introduction of
PropertyBindingSupport
---
.../camel/quarkus/core/deployment/CamelProcessor.java | 5 -
.../quarkus/core/runtime/support/FastCamelContext.java | 2 +-
.../org/apache/camel/quarkus/core/CamelServlet.java | 8
.../core/src/main/resources/application.properties | 2 ++
.../java/org/apache/camel/quarkus/core/CamelTest.java | 17 +
5 files changed, 28 insertions(+), 6 deletions(-)
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index 8200a1d..9bb6468 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -41,6 +41,8 @@ import
io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
import
io.quarkus.deployment.builditem.substrate.SubstrateResourceBundleBuildItem;
import io.quarkus.jaxb.deployment.JaxbEnabledBuildItem;
import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
+
+import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Converter;
import org.apache.camel.Endpoint;
@@ -67,7 +69,8 @@ class CamelProcessor {
Producer.class,
TypeConverter.class,
ExchangeFormatter.class,
-ScheduledPollConsumerScheduler.class);
+ScheduledPollConsumerScheduler.class,
+Component.class);
private static final List>
CAMEL_REFLECTIVE_ANNOTATIONS = Arrays.asList();
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/FastCamelContext.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/FastCamelContext.java
index 2ed5feb..7624de1 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/FastCamelContext.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/FastCamelContext.java
@@ -374,7 +374,7 @@ public class FastCamelContext extends AbstractCamelContext {
this,
result,
new HashMap<>((Map) props),
-CamelRuntime.PFX_CAMEL + type + "." + name);
+CamelRuntime.PFX_CAMEL + type + "." + name + ".");
}
return result;
diff --git
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
index 8bc3a79..1a2e43a 100644
---
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
+++
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
@@ -27,6 +27,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.apache.camel.Route;
+import org.apache.camel.component.timer.TimerComponent;
import org.apache.camel.quarkus.core.runtime.CamelRuntime;
@Path("/")
@@ -51,4 +52,11 @@ public class CamelServlet {
return runtime.getContext().resolvePropertyPlaceholders(prefix + name
+ suffix);
}
+
+@Path("/timer/resolve-property-placeholders")
+@GET
+@Produces(MediaType.TEXT_PLAIN)
+public boolean timerResolvePropertyPlaceholders() throws Exception {
+return runtime.getContext().getComponent("timer",
TimerComponent.class).isResolvePropertyPlaceholders();
+}
}
diff --git a/integration-tests/core/src/main/resources/application.properties
b/integration-tests/core/src/main/resources/application.properties
index df1e64a..5f09557 100644
--- a/integration-tests/core/src/main/resources/application.properties
+++ b/integration-tests/core/src/main/resources/application.properties
@@ -32,6 +32,8 @@ quarkus.camel.defer-init-phase=true
#
camel.context.name=quarkus-camel-example
+# Timer
+camel.component.timer.resolve-property-placeholders = false
#
# Integration
#
diff --git
a/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
index 6764f25..b259d2a 100644
---
[camel] branch master updated: camel-microprofile-config: fix filtered loading
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new ea03405 camel-microprofile-config: fix filtered loading
ea03405 is described below
commit ea03405cc5b3a5361057980a408d8492196ffe1b
Author: lburgazzoli
AuthorDate: Tue Aug 13 15:25:35 2019 +0200
camel-microprofile-config: fix filtered loading
---
.../config/CamelMicroProfilePropertiesSource.java | 13 +++--
.../config/CamelMicroProfilePropertiesSourceTest.java | 10 ++
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git
a/components/camel-microprofile-config/src/main/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSource.java
b/components/camel-microprofile-config/src/main/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSource.java
index 88624e6..cf0a213 100644
---
a/components/camel-microprofile-config/src/main/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSource.java
+++
b/components/camel-microprofile-config/src/main/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSource.java
@@ -32,6 +32,13 @@ public class CamelMicroProfilePropertiesSource extends
ServiceSupport implements
private Config config;
+public CamelMicroProfilePropertiesSource() {
+}
+
+public CamelMicroProfilePropertiesSource(Config config) {
+this.config = config;
+}
+
@Override
public String getName() {
return "CamelMicroProfilePropertiesSource";
@@ -68,7 +75,7 @@ public class CamelMicroProfilePropertiesSource extends
ServiceSupport implements
Properties answer = new Properties();
-for (String name: answer.stringPropertyNames()) {
+for (String name: config.getPropertyNames()) {
if (filter.test(name)) {
config.getOptionalValue(name, String.class).ifPresent(v ->
answer.put(name, v));
}
@@ -79,7 +86,9 @@ public class CamelMicroProfilePropertiesSource extends
ServiceSupport implements
@Override
protected void doInit() throws Exception {
-config = ConfigProvider.getConfig();
+if (config == null) {
+config = ConfigProvider.getConfig();
+}
}
@Override
diff --git
a/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java
b/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java
index 3ac6ff2..d557ade 100644
---
a/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java
+++
b/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java
@@ -80,6 +80,16 @@ public class CamelMicroProfilePropertiesSourceTest extends
CamelTestSupport {
}
@Test
+public void testLoadFiltered() throws Exception {
+PropertiesComponent pc = context.getComponent("properties",
PropertiesComponent.class);
+Properties properties = pc.loadProperties(k -> k.length()> 2);
+
+Assertions.assertThat(properties).hasSize(2);
+
Assertions.assertThat(properties.get("start")).isEqualTo("direct:start");
+Assertions.assertThat(properties.get("my-mock")).isEqualTo("result");
+}
+
+@Test
public void testMicroProfileConfig() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World
from Camel");
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/36038 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch master updated: CAMEL-13814 Inline EIP images
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 7b3eb70 CAMEL-13814 Inline EIP images 7b3eb70 is described below commit 7b3eb706b71124bb52acfbc853f15648dd2e32aa Author: Zoran Regvart AuthorDate: Tue Aug 13 12:16:04 2019 +0200 CAMEL-13814 Inline EIP images --- .../src/main/docs/eips/aggregate-eip.adoc | 2 +- core/camel-core/src/main/docs/eips/choice-eip.adoc | 2 +- .../src/main/docs/eips/claimCheck-eip.adoc | 2 +- .../main/docs/eips/content-based-router-eip.adoc | 2 +- .../src/main/docs/eips/content-filter-eip.adoc | 2 +- .../src/main/docs/eips/dynamic-router.adoc | 2 +- .../src/main/docs/eips/dynamicRouter-eip.adoc | 2 +- core/camel-core/src/main/docs/eips/enrich-eip.adoc | 2 +- .../main/docs/eips/eventDrivenConsumer-eip.adoc| 2 +- core/camel-core/src/main/docs/eips/filter-eip.adoc | 2 +- .../src/main/docs/eips/otherwise-eip.adoc | 2 +- .../src/main/docs/eips/pipeline-eip.adoc | 2 +- .../src/main/docs/eips/recipientList-eip.adoc | 2 +- .../src/main/docs/eips/requestReply-eip.adoc | 2 +- .../src/main/docs/eips/resequence-eip.adoc | 2 +- .../src/main/docs/eips/rollback-eip.adoc | 2 +- .../src/main/docs/eips/routingSlip-eip.adoc| 2 +- core/camel-core/src/main/docs/eips/split-eip.adoc | 2 +- core/camel-core/src/main/docs/eips/step-eip.adoc | 2 +- core/camel-core/src/main/docs/eips/when-eip.adoc | 2 +- .../camel-core/src/main/docs/eips/wireTap-eip.adoc | 2 +- .../modules/ROOT/pages/pulsar-component.adoc | 9 +- .../modules/ROOT/assets/images/eip/Aggregator.gif | Bin 0 -> 2413 bytes .../ROOT/assets/images/eip/AggregatorIcon.gif | Bin 0 -> 392 bytes .../modules/ROOT/assets/images/eip/ChannelIcon.gif | Bin 0 -> 376 bytes .../assets/images/eip/CompetingConsumersIcon.gif | Bin 0 -> 428 bytes .../ROOT/assets/images/eip/ContentBasedRouter.gif | Bin 0 -> 2504 bytes .../assets/images/eip/ContentBasedRouterIcon.gif | Bin 0 -> 356 bytes .../ROOT/assets/images/eip/ContentFilter.gif | Bin 0 -> 1777 bytes .../ROOT/assets/images/eip/ContentFilterIcon.gif | Bin 0 -> 375 bytes .../ROOT/assets/images/eip/ControlBusIcon.gif | Bin 0 -> 764 bytes .../images/eip/CorrelationIdentifierIcon.gif | Bin 0 -> 375 bytes .../images/eip/CorrelationIdentifierSolution.gif | Bin 0 -> 4041 bytes .../ROOT/assets/images/eip/DataEnricher.gif| Bin 0 -> 2703 bytes .../ROOT/assets/images/eip/DataEnricherIcon.gif| Bin 0 -> 372 bytes .../assets/images/eip/DeadLetterChannelIcon.gif| Bin 0 -> 519 bytes .../images/eip/DeadLetterChannelSolution.gif | Bin 0 -> 3557 bytes .../modules/ROOT/assets/images/eip/DetourIcon.gif | Bin 0 -> 678 bytes .../images/eip/DistributionAggregateIcon.gif | Bin 0 -> 491 bytes .../assets/images/eip/DurableSubscriptionIcon.gif | Bin 0 -> 306 bytes .../ROOT/assets/images/eip/DynamicRouter.gif | Bin 0 -> 7122 bytes .../ROOT/assets/images/eip/DynamicRouterIcon.gif | Bin 0 -> 654 bytes .../assets/images/eip/EventDrivenConsumerIcon.gif | Bin 0 -> 388 bytes .../images/eip/EventDrivenConsumerSolution.gif | Bin 0 -> 2077 bytes .../ROOT/assets/images/eip/EventMessageIcon.gif| Bin 0 -> 264 bytes .../assets/images/eip/EventMessageSolution.gif | Bin 0 -> 2843 bytes .../assets/images/eip/GuaranteedMessagingIcon.gif | Bin 0 -> 312 bytes .../images/eip/GuaranteedMessagingSolution.gif | Bin 0 -> 4574 bytes .../ROOT/assets/images/eip/MessageBusIcon.gif | Bin 0 -> 381 bytes .../ROOT/assets/images/eip/MessageBusSolution.gif | Bin 0 -> 2243 bytes .../assets/images/eip/MessageChannelSolution.gif | Bin 0 -> 3343 bytes .../assets/images/eip/MessageDispatcherIcon.gif| Bin 0 -> 431 bytes .../ROOT/assets/images/eip/MessageEndpointIcon.gif | Bin 0 -> 391 bytes .../assets/images/eip/MessageEndpointSolution.gif | Bin 0 -> 3816 bytes .../ROOT/assets/images/eip/MessageFilter.gif | Bin 0 -> 3820 bytes .../ROOT/assets/images/eip/MessageFilterIcon.gif | Bin 0 -> 497 bytes .../modules/ROOT/assets/images/eip/MessageIcon.gif | Bin 0 -> 799 bytes .../ROOT/assets/images/eip/MessageRouter.gif | Bin 0 -> 3340 bytes .../ROOT/assets/images/eip/MessageSelectorIcon.gif | Bin 0 -> 455 bytes .../ROOT/assets/images/eip/MessageSolution.gif | Bin 0 -> 1256 bytes .../ROOT/assets/images/eip/MessageTranslator.gif | Bin 0 -> 2183 bytes .../assets/images/eip/MessageTranslatorIcon.gif| Bin 0 -> 487 bytes .../assets/images/eip/MessagingAdapterIcon.gif | Bin 0 -> 388 bytes .../assets/images/eip/MessagingGatewayIcon.gif | Bin 0 -> 485 bytes .../ROOT/assets/images/eip/NormalizerIcon.gif | Bin 0 -> 401 bytes
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/36034 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/36033 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch CAMEL-13853 updated: CAMEL-13853: AvailablePortFinder now delegates the port selection to OS
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a commit to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-13853 by this push:
new 65e2582 CAMEL-13853: AvailablePortFinder now delegates the port
selection to OS
65e2582 is described below
commit 65e25820f9a8496a7494ac4d974f514deff413a2
Author: Jan Bednář
AuthorDate: Tue Aug 13 09:41:36 2019 +0200
CAMEL-13853: AvailablePortFinder now delegates the port selection to OS
---
.../camel/component/netty4/http/BaseNettyTest.java | 32 +++---
.../http/NettyHttpGetWithInvalidMessageTest.java | 2 +-
.../netty4/http/NettyHttpProducerHeadersTest.java | 2 +-
.../camel/component/netty4/BaseNettyTest.java | 32 +++---
.../camel/itest/cxf/CamelCxfBeanInjectTest.java| 2 +-
5 files changed, 11 insertions(+), 59 deletions(-)
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
index d129005..2342ecc 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
@@ -31,6 +31,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.logging.log4j.core.LogEvent;
import org.junit.AfterClass;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,34 +44,9 @@ public class BaseNettyTest extends CamelTestSupport {
private static volatile int port;
-@BeforeClass
+@Before
public static void initPort() throws Exception {
-File file = new File("target/nettyport.txt");
-
-if (!file.exists()) {
-// start from somewhere in the 26xxx range
-port = AvailablePortFinder.getNextAvailable(26000);
-} else {
-// read port number from file
-String s = IOConverter.toString(file, null);
-port = Integer.parseInt(s);
-// use next free port
-port = AvailablePortFinder.getNextAvailable(port + 1);
-}
-
-}
-
-@AfterClass
-public static void savePort() throws Exception {
-File file = new File("target/nettyport.txt");
-
-// save to file, do not append
-FileOutputStream fos = new FileOutputStream(file, false);
-try {
-fos.write(String.valueOf(port).getBytes());
-} finally {
-fos.close();
-}
+port = AvailablePortFinder.getNextAvailable();
}
@BeforeClass
@@ -115,7 +91,7 @@ public class BaseNettyTest extends CamelTestSupport {
}
protected int getNextPort() {
-port = AvailablePortFinder.getNextAvailable(port + 1);
+port = AvailablePortFinder.getNextAvailable();
return port;
}
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
index 8e5c307..135d0bf 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
@@ -92,7 +92,7 @@ public class NettyHttpGetWithInvalidMessageTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-port1 = AvailablePortFinder.getNextAvailable(8100);
+port1 = AvailablePortFinder.getNextAvailable();
// set up a netty http proxy
from("netty-http:http://localhost:; + port1 + "/test")
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
index a1fc167..9e26098 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
@@ -74,7 +74,7 @@ public class NettyHttpProducerHeadersTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-port = AvailablePortFinder.getNextAvailable(8000);
+port =
[camel] branch CAMEL-13850 updated (e17582d -> a8cf53e)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git.
from e17582d CAMEL-13850: Polished
add 28f014c CAMEL-13850: Optimize model classes to provide changeable
properties that support property placeholders to avoid reflection. Work in
progress.
add a8cf53e CAMEL-13850: Optimize model classes to provide changeable
properties that support property placeholders to avoid reflection. Work in
progress.
No new revisions were added by this update.
Summary of changes:
...are.java => PropertyPlaceholderConfigurer.java} | 31 ++--
.../apache/camel/model/DataFormatDefinition.java | 2 +-
...> DefinitionPropertyPlaceholderConfigurer.java} | 9 +-
.../camel/model/OptionalIdentifiedDefinition.java | 2 +-
.../camel/model/ProcessorDefinitionHelper.java | 7 +-
.../camel/model/language/ExpressionDefinition.java | 4 +-
.../apt/CoreEipAnnotationProcessorHelper.java | 182 +-
.../tools/apt/PropertyPlaceholderGenerator.java| 206 +
8 files changed, 242 insertions(+), 201 deletions(-)
copy core/camel-api/src/main/java/org/apache/camel/spi/{NamespaceAware.java =>
PropertyPlaceholderConfigurer.java} (53%)
rename
core/camel-core/src/main/java/org/apache/camel/model/{DefinitionPropertyPlaceholderConfigurable.java
=> DefinitionPropertyPlaceholderConfigurer.java} (78%)
create mode 100644
tooling/apt/src/main/java/org/apache/camel/tools/apt/PropertyPlaceholderGenerator.java
[camel] branch CAMEL-13850 updated (cac47b0 -> e17582d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13850 in repository https://gitbox.apache.org/repos/asf/camel.git. from cac47b0 CAMEL-13850: Fixed CS add e17582d CAMEL-13850: Polished No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/model/FromDefinition.java | 5 - 1 file changed, 5 deletions(-)
[camel] branch CAMEL-13850 updated (bf0fbee -> cac47b0)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13850 in repository https://gitbox.apache.org/repos/asf/camel.git. from bf0fbee CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. add cac47b0 CAMEL-13850: Fixed CS No new revisions were added by this update. Summary of changes: .../camel/model/DefinitionPropertyPlaceholderConfigurable.java | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-)
[camel] 08/09: CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 94564a5217fb873c34da0a3d759f4bee29730383
Author: Claus Ibsen
AuthorDate: Tue Aug 13 06:12:37 2019 +0200
CAMEL-13850: Optimize model classes to provide changeable properties that
support property placeholders to avoid reflection. Work in progress.
---
.../camel/model/ProcessorDefinitionHelper.java | 81 +++---
.../org/apache/camel/reifier/ChoiceReifier.java| 3 -
.../org/apache/camel/reifier/ProcessorReifier.java | 12
...RouteWithConstantFieldFromExchangeFailTest.java | 1 +
4 files changed, 25 insertions(+), 72 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
index 439ffbe..69e06b3 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
@@ -32,6 +32,7 @@ import java.util.function.Supplier;
import javax.xml.namespace.QName;
import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
import org.apache.camel.NamedNode;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.ExecutorServiceManager;
@@ -40,6 +41,7 @@ import org.apache.camel.spi.RouteContext;
import org.apache.camel.support.IntrospectionSupport;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -668,7 +670,10 @@ public final class ProcessorDefinitionHelper {
* Inspects the given definition and resolves any property placeholders
from its properties.
*
* This implementation will check all the getter/setter pairs on this
instance and for all the values
- * (which is a String type) will be property placeholder resolved. The
definition should implement {@link OtherAttributesAware}
+ * (which is a String type) will be property placeholder resolved.
+ * Additional properties are also resolved if the definition implements
{@link OtherAttributesAware}.
+ * Also known constant fields on {@link Exchange} is replaced with their
actual constant value, eg
+ * Exchange.FILE_NAME is replaced with CamelFileName.
*
* @param camelContext the Camel context
* @param definition the definition which should implement {@link
OtherAttributesAware}
@@ -692,12 +697,12 @@ public final class ProcessorDefinitionHelper {
Map> readProperties =
ppa.getReadPropertyPlaceholderOptions(camelContext);
Map> writeProperties =
ppa.getWritePropertyPlaceholderOptions(camelContext);
-// processor's may have additional placeholder properties (can
typically be used by the XML DSL to
+// definitions may have additional placeholder properties (can
typically be used by the XML DSL to
// allow to configure using placeholders for properties that are not
xs:string types)
-if (definition instanceof ProcessorDefinition) {
-ProcessorDefinition pd = (ProcessorDefinition) definition;
+if (definition instanceof OtherAttributesAware) {
+OtherAttributesAware ooa = (OtherAttributesAware) definition;
-if (pd.getOtherAttributes() != null &&
!pd.getOtherAttributes().isEmpty()) {
+if (ooa.getOtherAttributes() != null &&
!ooa.getOtherAttributes().isEmpty()) {
Map> extraRead = new HashMap<>();
if (readProperties != null && !readProperties.isEmpty()) {
extraRead.putAll(readProperties);
@@ -707,7 +712,7 @@ public final class ProcessorDefinitionHelper {
extraWrite.putAll(writeProperties);
}
-Map other = pd.getOtherAttributes();
+Map other = ooa.getOtherAttributes();
other.forEach((k, v) -> {
if
(Constants.PLACEHOLDER_QNAME.equals(k.getNamespaceURI())) {
if (v instanceof String) {
@@ -757,6 +762,19 @@ public final class ProcessorDefinitionHelper {
String name = entry.getKey();
String value = entry.getValue().get();
String text = camelContext.resolvePropertyPlaceholders(value);
+
+// is the value a known field (currently we only support
constants from Exchange.class)
+if (text != null && text.startsWith("Exchange.")) {
+String field = StringHelper.after(text, "Exchange.");
+// TODO: Avoid reflection via fields
+String constant =
ObjectHelper.lookupConstantFieldValue(Exchange.class, field);
+if
[camel] 05/09: CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dd6f55404c9a92e0157bfde363dde2f93ea24ff5
Author: Claus Ibsen
AuthorDate: Mon Aug 12 22:31:52 2019 +0200
CAMEL-13850: Optimize model classes to provide changeable properties that
support property placeholders to avoid reflection. Work in progress.
---
.../apache/camel/model/DataFormatDefinition.java | 2 +-
.../camel/model/ProcessorDefinitionHelper.java | 6 ++-
.../java/org/apache/camel/model/ToDefinition.java | 51 +-
.../camel/model/language/ExpressionDefinition.java | 3 +-
4 files changed, 8 insertions(+), 54 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
index c7f3452..f36fb68 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
@@ -35,7 +35,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "dataformat,transformation")
@XmlType(name = "dataFormat")
@XmlAccessorType(XmlAccessType.FIELD)
-public class DataFormatDefinition extends IdentifiedType implements
OtherAttributesAware {
+public class DataFormatDefinition extends IdentifiedType implements
OtherAttributesAware, DefinitionPropertyPlaceholderConfigurable {
@XmlTransient
private DataFormat dataFormat;
@XmlTransient
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
index b57f51a..169dc3d 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
@@ -626,7 +626,7 @@ public final class ProcessorDefinitionHelper {
}
private static void addRestoreAction(Map>
writeProperties, final Map properties) {
-if (properties.isEmpty()) {
+if (properties == null || properties.isEmpty()) {
return;
}
@@ -685,7 +685,7 @@ public final class ProcessorDefinitionHelper {
Map> readProperties =
ppa.getReadPropertyPlaceholderOptions(camelContext);
Map> writeProperties =
ppa.getWritePropertyPlaceholderOptions(camelContext);
-if (!readProperties.isEmpty()) {
+if (readProperties != null && !readProperties.isEmpty()) {
if (LOG.isTraceEnabled()) {
LOG.trace("There are {} properties on: {}",
readProperties.size(), definition);
}
@@ -718,6 +718,8 @@ public final class ProcessorDefinitionHelper {
*/
public static void resolveKnownConstantFields(CamelContext camelContext,
Object definition) throws Exception {
LOG.trace("Resolving known fields for: {}", definition);
+
+// TODO: implement this
/*
// find all String getter/setter
Map properties = new HashMap<>();
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
index 10b61d8..4204727 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
@@ -16,21 +16,15 @@
*/
package org.apache.camel.model;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.PropertiesComponent;
/**
* Sends the message to a static endpoint
@@ -38,18 +32,11 @@ import org.apache.camel.spi.PropertiesComponent;
@Metadata(label = "eip,endpoint,routing")
@XmlRootElement(name = "to")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ToDefinition extends SendDefinition implements
DefinitionPropertyPlaceholderConfigurable {
+public class ToDefinition extends SendDefinition {
@XmlAttribute
private ExchangePattern pattern;
-private final Map> readPlaceholders = new
HashMap<>();
-private final Map> writePlaceholders = new
HashMap<>();
-
public ToDefinition() {
-readPlaceholders.put("id", this::getId);
-readPlaceholders.put("uri", this::getUri);
-writePlaceholders.put("id", this::setId);
-writePlaceholders.put("uri", this::setUri);
}
[camel] 09/09: CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bf0fbee471c26c340daf3a94d9e3613ff32d8c8e
Author: Claus Ibsen
AuthorDate: Tue Aug 13 08:24:33 2019 +0200
CAMEL-13850: Optimize model classes to provide changeable properties that
support property placeholders to avoid reflection. Work in progress.
---
.../org/apache/camel/reifier/ProcessorReifier.java | 4 +-
.../apt/CoreEipAnnotationProcessorHelper.java | 51 --
2 files changed, 30 insertions(+), 25 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
b/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index 460443e..5298219 100644
---
a/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++
b/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -113,7 +113,9 @@ public abstract class ProcessorReifier> {
private static final Map, Function,
ProcessorReifier>>> PROCESSORS;
static {
-Map, Function, ProcessorReifier>>> map = new HashMap<>();
+// NOTE: if adding a new class then update the initial capacity of the
HashMap
+Map, Function, ProcessorReifier>>> map
+= new HashMap<>(65);
map.put(AggregateDefinition.class, AggregateReifier::new);
map.put(BeanDefinition.class, BeanReifier::new);
map.put(CatchDefinition.class, CatchReifier::new);
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
index fc00956..6b49614 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
@@ -18,7 +18,6 @@ package org.apache.camel.tools.apt;
import java.io.PrintWriter;
import java.io.Writer;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -46,7 +45,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
-import jdk.nashorn.internal.ir.debug.ClassHistogramElement;
import org.apache.camel.spi.AsPredicate;
import org.apache.camel.spi.Metadata;
import org.apache.camel.tools.apt.helper.IOHelper;
@@ -54,7 +52,6 @@ import org.apache.camel.tools.apt.helper.JsonSchemaHelper;
import org.apache.camel.tools.apt.helper.Strings;
import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.dumpExceptionToErrorFile;
-import static org.apache.camel.tools.apt.AnnotationProcessorHelper.error;
import static org.apache.camel.tools.apt.AnnotationProcessorHelper.findJavaDoc;
import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.findTypeElement;
import static
org.apache.camel.tools.apt.AnnotationProcessorHelper.findTypeElementChildren;
@@ -68,7 +65,9 @@ import static
org.apache.camel.tools.apt.helper.Strings.safeNull;
/**
* Process all camel-core's model classes (EIPs and DSL) and generate json
- * schema documentation
+ * schema documentation and for some models java source code is generated
+ * which allows for faster property placeholder resolution at runtime; without
the
+ * overhead of using reflections.
*/
public class CoreEipAnnotationProcessorHelper {
@@ -130,19 +129,18 @@ public class CoreEipAnnotationProcessorHelper {
}
// write json schema and property placeholder provider
-processFile(processingEnv, packageName, fileName, writer ->
writeJSonSchemeDocumentation(processingEnv, writer,
+processFile(processingEnv, packageName, fileName, writer ->
writeJSonSchemeAndPropertyPlaceholderProvider(processingEnv, writer,
roundEnv, classElement, rootElement, javaTypeName, name,
propertyPlaceholderDefinitions));
-// if last then generate
+// if last then generate source code for helper that contains all the
generated property placeholder providers
+// (this allows fast property placeholders at runtime without
reflection overhead)
if (last) {
-// lets sort themfirst
writePropertyPlaceholderDefinitionsHelper(processingEnv, roundEnv,
propertyPlaceholderDefinitions);
}
}
-// TODO: rename this
-protected void writeJSonSchemeDocumentation(ProcessingEnvironment
processingEnv, PrintWriter writer, RoundEnvironment roundEnv, TypeElement
classElement,
-XmlRootElement rootElement,
String javaTypeName, String modelName, Set
propertyPlaceholderDefinitions) {
+protected void
writeJSonSchemeAndPropertyPlaceholderProvider(ProcessingEnvironment
[camel] branch CAMEL-13850 created (now bf0fbee)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13850 in repository https://gitbox.apache.org/repos/asf/camel.git. at bf0fbee CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. This branch includes the following new commits: new b7071c8 CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. new 568a2d6 CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. new 3ed3172 CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. new 54a77dc CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. new dd6f554 CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. new 758ff0b Regen new 34f2b3d CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. new 94564a5 CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. new bf0fbee CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress. The 9 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.
[camel] 07/09: CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 34f2b3de091fc865678b695276f050616ac23933
Author: Claus Ibsen
AuthorDate: Tue Aug 13 06:03:50 2019 +0200
CAMEL-13850: Optimize model classes to provide changeable properties that
support property placeholders to avoid reflection. Work in progress.
---
.../DefinitionPropertyPlaceholderConfigurable.java | 2 +
.../camel/model/ProcessorDefinitionHelper.java | 62 ++
.../OptionalPropertiesDslInvalidSyntaxTest.java| 7 ++-
3 files changed, 69 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
index 8d5758c..16520e3 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
@@ -16,12 +16,14 @@
*/
package org.apache.camel.model;
+import java.util.HashMap;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Supplier;
import org.apache.camel.CamelContext;
import
org.apache.camel.model.placeholder.DefinitionPropertiesPlaceholderProviderHelper;
+import org.apache.camel.spi.PropertiesComponent;
/**
* To be used for configuring property placeholder options on the EIP models.
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
index 169dc3d..439ffbe 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
@@ -29,10 +29,16 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.function.Consumer;
import java.util.function.Supplier;
+import javax.xml.namespace.QName;
+
import org.apache.camel.CamelContext;
import org.apache.camel.NamedNode;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.ExecutorServiceManager;
+import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.support.IntrospectionSupport;
+import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -670,6 +676,7 @@ public final class ProcessorDefinitionHelper {
* @see org.apache.camel.CamelContext#resolvePropertyPlaceholders(String)
* @see org.apache.camel.component.properties.PropertiesComponent
*/
+@SuppressWarnings("unchecked")
public static void resolvePropertyPlaceholders(CamelContext camelContext,
Object definition) throws Exception {
LOG.trace("Resolving property placeholders for: {}", definition);
@@ -685,6 +692,61 @@ public final class ProcessorDefinitionHelper {
Map> readProperties =
ppa.getReadPropertyPlaceholderOptions(camelContext);
Map> writeProperties =
ppa.getWritePropertyPlaceholderOptions(camelContext);
+// processor's may have additional placeholder properties (can
typically be used by the XML DSL to
+// allow to configure using placeholders for properties that are not
xs:string types)
+if (definition instanceof ProcessorDefinition) {
+ProcessorDefinition pd = (ProcessorDefinition) definition;
+
+if (pd.getOtherAttributes() != null &&
!pd.getOtherAttributes().isEmpty()) {
+Map> extraRead = new HashMap<>();
+if (readProperties != null && !readProperties.isEmpty()) {
+extraRead.putAll(readProperties);
+}
+Map> extraWrite = new HashMap<>();
+if (writeProperties != null && !writeProperties.isEmpty()) {
+extraWrite.putAll(writeProperties);
+}
+
+Map other = pd.getOtherAttributes();
+other.forEach((k, v) -> {
+if
(Constants.PLACEHOLDER_QNAME.equals(k.getNamespaceURI())) {
+if (v instanceof String) {
+// enforce a properties component to be created if
none existed
+camelContext.getPropertiesComponent(true);
+
+// value must be enclosed with placeholder tokens
+String s = (String) v;
+String prefixToken =
PropertiesComponent.PREFIX_TOKEN;
+String suffixToken =
PropertiesComponent.SUFFIX_TOKEN;
+
+if (!s.startsWith(prefixToken)) {
+
[camel] 03/09: CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3ed317216d9de5b1acdda1c81504638c8371e0c2
Author: Claus Ibsen
AuthorDate: Mon Aug 12 18:00:21 2019 +0200
CAMEL-13850: Optimize model classes to provide changeable properties that
support property placeholders to avoid reflection. Work in progress.
---
.../model/DefinitionPropertiesProviderHelper.java | 18 ++-
...DefinitionPropertyPlaceholderConfigurable.java} | 14 +-
.../model/FromDefinitionPropertiesProvider.java| 50 ---
.../model/LogDefinitionPropertiesProvider.java | 56
.../camel/model/OptionalIdentifiedDefinition.java | 2 +-
.../camel/model/ProcessorDefinitionHelper.java | 36 +
.../java/org/apache/camel/model/ToDefinition.java | 3 +-
.../model/ToDefinitionPropertiesProvider.java | 50 ---
.../apt/CoreEipAnnotationProcessorHelper.java | 158 +
9 files changed, 182 insertions(+), 205 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
index 7da3ffd..86cb92e 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
@@ -21,19 +21,23 @@ import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
+import
org.apache.camel.model.placeholder.FromDefinitionPropertyPlaceholderProvider;
+import
org.apache.camel.model.placeholder.LogDefinitionPropertyPlaceholderProvider;
+import
org.apache.camel.model.placeholder.ToDefinitionPropertyPlaceholderProvider;
+
public class DefinitionPropertiesProviderHelper {
-private static final Map> MAP;
+private static final Map> MAP;
static {
-Map> map = new
HashMap<>();
-map.put(FromDefinition.class, FromDefinitionPropertiesProvider::new);
-map.put(LogDefinition.class, LogDefinitionPropertiesProvider::new);
-map.put(ToDefinition.class, ToDefinitionPropertiesProvider::new);
+Map> map = new HashMap<>();
+map.put(FromDefinition.class,
FromDefinitionPropertyPlaceholderProvider::new);
+map.put(LogDefinition.class,
LogDefinitionPropertyPlaceholderProvider::new);
+map.put(ToDefinition.class,
ToDefinitionPropertyPlaceholderProvider::new);
MAP = map;
}
-public static Optional provider(Object
definition) {
-Function func =
MAP.get(definition.getClass());
+public static Optional
provider(Object definition) {
+Function func =
MAP.get(definition.getClass());
if (func != null) {
return Optional.of(func.apply(definition));
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/PropertyPlaceholderAware.java
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
similarity index 75%
rename from
core/camel-core/src/main/java/org/apache/camel/model/PropertyPlaceholderAware.java
rename to
core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
index c4fb8b7..9c82f6b 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/PropertyPlaceholderAware.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
@@ -22,24 +22,28 @@ import java.util.function.Supplier;
import org.apache.camel.CamelContext;
-// TODO: Rename interface
-public interface PropertyPlaceholderAware {
+/**
+ * To be used for configuring property placeholder options on the EIP models.
+ */
+public interface DefinitionPropertyPlaceholderConfigurable {
/**
* Gets the options on the model definition which supports property
placeholders and can be resolved.
+ * This will be all the string based options.
*
* @return key/values of options
*/
default Map>
getReadPropertyPlaceholderOptions(CamelContext camelContext) {
-PropertyPlaceholderAware aware =
DefinitionPropertiesProviderHelper.provider(this).orElse(null);
+DefinitionPropertyPlaceholderConfigurable aware =
DefinitionPropertiesProviderHelper.provider(this).orElse(null);
return aware != null ?
aware.getReadPropertyPlaceholderOptions(camelContext) : null;
}
/**
- * To update an existing property using the function with the ket/value
and returning the changed value
+ * To update an existing property using the function with the key/value
and returning the changed value
+ * This will be all the string based options.
*/
default Map>
getWritePropertyPlaceholderOptions(CamelContext camelContext) {
-PropertyPlaceholderAware aware =
[camel] 02/09: CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 568a2d60a7ebcaab689d83aa52486a474d45b0ea
Author: Claus Ibsen
AuthorDate: Mon Aug 12 15:02:46 2019 +0200
CAMEL-13850: Optimize model classes to provide changeable properties that
support property placeholders to avoid reflection. Work in progress.
---
.../model/DefinitionPropertiesProviderHelper.java | 43 +
.../org/apache/camel/model/FromDefinition.java | 18 +--
.../model/FromDefinitionPropertiesProvider.java| 50 +++
.../java/org/apache/camel/model/LogDefinition.java | 29 +--
.../model/LogDefinitionPropertiesProvider.java | 56 ++
.../camel/model/OptionalIdentifiedDefinition.java | 2 +-
.../camel/model/ProcessorDefinitionHelper.java | 1 +
.../camel/model/PropertyPlaceholderAware.java | 12 -
...re.java => ToDefinitionPropertiesProvider.java} | 34 -
9 files changed, 186 insertions(+), 59 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
new file mode 100644
index 000..7da3ffd
--- /dev/null
+++
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ */
+package org.apache.camel.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
+public class DefinitionPropertiesProviderHelper {
+
+private static final Map> MAP;
+static {
+Map> map = new
HashMap<>();
+map.put(FromDefinition.class, FromDefinitionPropertiesProvider::new);
+map.put(LogDefinition.class, LogDefinitionPropertiesProvider::new);
+map.put(ToDefinition.class, ToDefinitionPropertiesProvider::new);
+MAP = map;
+}
+
+public static Optional provider(Object
definition) {
+Function func =
MAP.get(definition.getClass());
+if (func != null) {
+return Optional.of(func.apply(definition));
+}
+return Optional.empty();
+}
+
+}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
index 6d61c6d..fb4d762 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
@@ -37,7 +37,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "eip,endpoint,routing")
@XmlRootElement(name = "from")
@XmlAccessorType(XmlAccessType.FIELD)
-public class FromDefinition extends
OptionalIdentifiedDefinition implements
PropertyPlaceholderAware, EndpointRequiredDefinition {
+public class FromDefinition extends
OptionalIdentifiedDefinition implements
EndpointRequiredDefinition {
@XmlAttribute @Metadata(required = true)
private String uri;
@XmlTransient
@@ -45,14 +45,7 @@ public class FromDefinition extends
OptionalIdentifiedDefinition
@XmlTransient
private EndpointConsumerBuilder endpointConsumerBuilder;
-private final Map> readPlaceholders = new
HashMap<>();
-private final Map> writePlaceholders = new
HashMap<>();
-
public FromDefinition() {
-readPlaceholders.put("id", this::getId);
-readPlaceholders.put("uri", this::getUri);
-writePlaceholders.put("id", this::setId);
-writePlaceholders.put("uri", this::setUri);
}
public FromDefinition(String uri) {
@@ -150,13 +143,4 @@ public class FromDefinition extends
OptionalIdentifiedDefinition
this.uri = null;
}
-@Override
-public Map>
getReadPropertyPlaceholderOptions(CamelContext camelContext) {
-return readPlaceholders;
-}
-
-@Override
-public Map>
getWritePropertyPlaceholderOptions(CamelContext camelContext) {
-return writePlaceholders;
-}
}
diff --git
[camel] 01/09: CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b7071c82f4ff06dd19779ee295dcf00964fc97ae
Author: Claus Ibsen
AuthorDate: Mon Aug 12 07:18:47 2019 +0200
CAMEL-13850: Optimize model classes to provide changeable properties that
support property placeholders to avoid reflection. Work in progress.
---
.../org/apache/camel/model/FromDefinition.java | 26 -
.../java/org/apache/camel/model/LogDefinition.java | 31 +-
.../camel/model/ProcessorDefinitionHelper.java | 111 ++---
.../camel/model/PropertyPlaceholderAware.java | 38 +++
.../java/org/apache/camel/model/ToDefinition.java | 56 ++-
...ockTest.java => SimpleMockPlaceholderTest.java} | 23 -
.../org/apache/camel/processor/SimpleMockTest.java | 2 -
.../camel/support/PropertyPlaceholdersHelper.java | 2 +
8 files changed, 221 insertions(+), 68 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
index e1faba2..6d61c6d 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
@@ -16,12 +16,17 @@
*/
package org.apache.camel.model;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.spi.Metadata;
@@ -32,7 +37,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "eip,endpoint,routing")
@XmlRootElement(name = "from")
@XmlAccessorType(XmlAccessType.FIELD)
-public class FromDefinition extends
OptionalIdentifiedDefinition implements
EndpointRequiredDefinition {
+public class FromDefinition extends
OptionalIdentifiedDefinition implements
PropertyPlaceholderAware, EndpointRequiredDefinition {
@XmlAttribute @Metadata(required = true)
private String uri;
@XmlTransient
@@ -40,18 +45,28 @@ public class FromDefinition extends
OptionalIdentifiedDefinition
@XmlTransient
private EndpointConsumerBuilder endpointConsumerBuilder;
+private final Map> readPlaceholders = new
HashMap<>();
+private final Map> writePlaceholders = new
HashMap<>();
+
public FromDefinition() {
+readPlaceholders.put("id", this::getId);
+readPlaceholders.put("uri", this::getUri);
+writePlaceholders.put("id", this::setId);
+writePlaceholders.put("uri", this::setUri);
}
public FromDefinition(String uri) {
+this();
setUri(uri);
}
public FromDefinition(Endpoint endpoint) {
+this();
setEndpoint(endpoint);
}
public FromDefinition(EndpointConsumerBuilder endpointConsumerBuilder) {
+this();
setEndpointConsumerBuilder(endpointConsumerBuilder);
}
@@ -135,4 +150,13 @@ public class FromDefinition extends
OptionalIdentifiedDefinition
this.uri = null;
}
+@Override
+public Map>
getReadPropertyPlaceholderOptions(CamelContext camelContext) {
+return readPlaceholders;
+}
+
+@Override
+public Map>
getWritePropertyPlaceholderOptions(CamelContext camelContext) {
+return writePlaceholders;
+}
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
index c8e1b0a..62281e5 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
@@ -16,12 +16,17 @@
*/
package org.apache.camel.model;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
+import org.apache.camel.CamelContext;
import org.apache.camel.LoggingLevel;
import org.apache.camel.spi.Metadata;
import org.slf4j.Logger;
@@ -32,7 +37,7 @@ import org.slf4j.Logger;
@Metadata(label = "eip,configuration")
@XmlRootElement(name = "log")
@XmlAccessorType(XmlAccessType.FIELD)
-public class LogDefinition extends NoOutputDefinition {
+public class LogDefinition extends NoOutputDefinition
implements
[camel] 04/09: CAMEL-13850: Optimize model classes to provide changeable properties that support property placeholders to avoid reflection. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13850
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 54a77dc1196b74f2b97e8d9b93e740baaf1a1473
Author: Claus Ibsen
AuthorDate: Mon Aug 12 22:08:43 2019 +0200
CAMEL-13850: Optimize model classes to provide changeable properties that
support property placeholders to avoid reflection. Work in progress.
---
.../model/DefinitionPropertiesProviderHelper.java | 47 -
.../DefinitionPropertyPlaceholderConfigurable.java | 5 +-
.../apt/CoreEipAnnotationProcessorHelper.java | 77 +++---
.../camel/tools/apt/ModelAnnotationProcessor.java | 62 +
.../tools/apt/SpringAnnotationProcessorHelper.java | 3 +-
5 files changed, 122 insertions(+), 72 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
deleted file mode 100644
index 86cb92e..000
---
a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertiesProviderHelper.java
+++ /dev/null
@@ -1,47 +0,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
- *
- * 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.
- */
-package org.apache.camel.model;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-
-import
org.apache.camel.model.placeholder.FromDefinitionPropertyPlaceholderProvider;
-import
org.apache.camel.model.placeholder.LogDefinitionPropertyPlaceholderProvider;
-import
org.apache.camel.model.placeholder.ToDefinitionPropertyPlaceholderProvider;
-
-public class DefinitionPropertiesProviderHelper {
-
-private static final Map> MAP;
-static {
-Map> map = new HashMap<>();
-map.put(FromDefinition.class,
FromDefinitionPropertyPlaceholderProvider::new);
-map.put(LogDefinition.class,
LogDefinitionPropertyPlaceholderProvider::new);
-map.put(ToDefinition.class,
ToDefinitionPropertyPlaceholderProvider::new);
-MAP = map;
-}
-
-public static Optional
provider(Object definition) {
-Function func =
MAP.get(definition.getClass());
-if (func != null) {
-return Optional.of(func.apply(definition));
-}
-return Optional.empty();
-}
-
-}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
index 9c82f6b..8d5758c 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurable.java
@@ -21,6 +21,7 @@ import java.util.function.Consumer;
import java.util.function.Supplier;
import org.apache.camel.CamelContext;
+import
org.apache.camel.model.placeholder.DefinitionPropertiesPlaceholderProviderHelper;
/**
* To be used for configuring property placeholder options on the EIP models.
@@ -34,7 +35,7 @@ public interface DefinitionPropertyPlaceholderConfigurable {
* @return key/values of options
*/
default Map>
getReadPropertyPlaceholderOptions(CamelContext camelContext) {
-DefinitionPropertyPlaceholderConfigurable aware =
DefinitionPropertiesProviderHelper.provider(this).orElse(null);
+DefinitionPropertyPlaceholderConfigurable aware =
DefinitionPropertiesPlaceholderProviderHelper.provider(this).orElse(null);
return aware != null ?
aware.getReadPropertyPlaceholderOptions(camelContext) : null;
}
@@ -43,7 +44,7 @@ public interface DefinitionPropertyPlaceholderConfigurable {
* This will be all the string based options.
*/
default Map>
getWritePropertyPlaceholderOptions(CamelContext camelContext) {
-DefinitionPropertyPlaceholderConfigurable aware =
DefinitionPropertiesProviderHelper.provider(this).orElse(null);
+DefinitionPropertyPlaceholderConfigurable aware =
DefinitionPropertiesPlaceholderProviderHelper.provider(this).orElse(null);
return aware != null
[camel] 06/09: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-13850 in repository https://gitbox.apache.org/repos/asf/camel.git commit 758ff0bd195aed22ad653be27836e3cd9caf3b9c Author: Claus Ibsen AuthorDate: Tue Aug 13 05:36:37 2019 +0200 Regen --- components/camel-atmos/src/main/docs/atmos-component.adoc | 2 +- docs/components/modules/ROOT/pages/atmos-component.adoc | 12 ++-- docs/components/modules/ROOT/pages/xmpp-component.adoc| 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/components/camel-atmos/src/main/docs/atmos-component.adoc b/components/camel-atmos/src/main/docs/atmos-component.adoc index cf38b30..f145b79 100644 --- a/components/camel-atmos/src/main/docs/atmos-component.adoc +++ b/components/camel-atmos/src/main/docs/atmos-component.adoc @@ -103,7 +103,7 @@ The component supports 7 options, which are listed below. | *camel.component.atmos.enabled* | Enable atmos component | true | Boolean | *camel.component.atmos.full-token-id* | The token id to pass to the Atmos client | | String | *camel.component.atmos.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean -| *camel.component.atmos.secret-key* | The secret key to pass to the Atmos client | | String +| *camel.component.atmos.secret-key* | The secret key to pass to the Atmos client (should be base64 encoded) | | String | *camel.component.atmos.ssl-validation* | Whether the Atmos client should perform SSL validation | false | Boolean | *camel.component.atmos.uri* | The URI of the server for the Atmos client to connect to | | String |=== diff --git a/docs/components/modules/ROOT/pages/atmos-component.adoc b/docs/components/modules/ROOT/pages/atmos-component.adoc index 6593aef..f145b79 100644 --- a/docs/components/modules/ROOT/pages/atmos-component.adoc +++ b/docs/components/modules/ROOT/pages/atmos-component.adoc @@ -24,7 +24,7 @@ The Atmos component supports 6 options, which are listed below. |=== | Name | Description | Default | Type | *fullTokenId* (security) | The token id to pass to the Atmos client | | String -| *secretKey* (security) | The secret key to pass to the Atmos client | | String +| *secretKey* (security) | The secret key to pass to the Atmos client (should be base64 encoded) | | String | *uri* (advanced) | The URI of the server for the Atmos client to connect to | | String | *sslValidation* (security) | Whether the Atmos client should perform SSL validation | false | boolean | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean @@ -60,20 +60,20 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *enableSslValidation* (common) | Atmos SSL validation | false | boolean -| *fullTokenId* (common) | Atmos client fullTokenId | | String | *localPath* (common) | Local path to put files | | String | *newRemotePath* (common) | New path on Atmos when moving files | | String | *query* (common) | Search query on Atmos | | String | *remotePath* (common) | Where to put files on Atmos | | String -| *secretKey* (common) | Atmos shared secret | | String -| *uri* (common) | Atomos server uri | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding*
