[camel-k-runtime] branch master updated (c758d5b -> 8a1162d)
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 c758d5b Refactor extensions class names new 758cda8 Fixes #544: Kamelet component - optimize as we did for direct component new 8a1162d Fixed PMD issue 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: .../kamelet/KameletEndpointConfigurer.java | 5 ++ .../apache/camel/component/kamelet/kamelet.json| 3 +- .../camel/component/kamelet/KameletComponent.java | 74 +++--- .../camel/component/kamelet/KameletConsumer.java | 19 +++-- .../KameletConsumerNotAvailableException.java | 13 ++-- .../camel/component/kamelet/KameletEndpoint.java | 89 +++--- .../camel/component/kamelet/KameletProducer.java | 70 +++-- 7 files changed, 163 insertions(+), 110 deletions(-) copy camel-k-loader-js/impl/src/main/java/org/apache/camel/k/loader/js/dsl/ProcessorSupport.java => components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletConsumerNotAvailableException.java (74%)
[camel-k-runtime] 02/02: Fixed PMD issue
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 8a1162d62892d3f122a0307a20680a951f912f38 Author: Claus Ibsen AuthorDate: Thu Nov 12 21:11:33 2020 +0100 Fixed PMD issue --- .../main/java/org/apache/camel/component/kamelet/KameletComponent.java | 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java index 271b261..ea4767c 100644 --- a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java +++ b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.camel.AfterPropertiesConfigured;
[camel-k-runtime] 01/02: Fixes #544: Kamelet component - optimize as we did for direct component
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 758cda80af3cd1ccf719bb03540c669ee88b0090
Author: Claus Ibsen
AuthorDate: Thu Nov 12 19:06:41 2020 +0100
Fixes #544: Kamelet component - optimize as we did for direct component
---
.../kamelet/KameletEndpointConfigurer.java | 5 ++
.../apache/camel/component/kamelet/kamelet.json| 3 +-
.../camel/component/kamelet/KameletComponent.java | 73 +++---
.../camel/component/kamelet/KameletConsumer.java | 19 +++--
.../KameletConsumerNotAvailableException.java | 27 +++
.../camel/component/kamelet/KameletEndpoint.java | 89 +++---
.../camel/component/kamelet/KameletProducer.java | 70 +++--
7 files changed, 184 insertions(+), 102 deletions(-)
diff --git
a/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java
b/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java
index dc0964d..cdbc56e 100644
---
a/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java
+++
b/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java
@@ -24,6 +24,7 @@ public class KameletEndpointConfigurer extends
PropertyConfigurerSupport impleme
map.put("exceptionHandler",
org.apache.camel.spi.ExceptionHandler.class);
map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
map.put("block", boolean.class);
+map.put("failIfNoConsumers", boolean.class);
map.put("kameletProperties", java.util.Map.class);
map.put("lazyStartProducer", boolean.class);
map.put("timeout", long.class);
@@ -45,6 +46,8 @@ public class KameletEndpointConfigurer extends
PropertyConfigurerSupport impleme
case "exceptionHandler":
target.setExceptionHandler(property(camelContext,
org.apache.camel.spi.ExceptionHandler.class, value)); return true;
case "exchangepattern":
case "exchangePattern":
target.setExchangePattern(property(camelContext,
org.apache.camel.ExchangePattern.class, value)); return true;
+case "failifnoconsumers":
+case "failIfNoConsumers":
target.setFailIfNoConsumers(property(camelContext, boolean.class, value));
return true;
case "kameletproperties":
case "kameletProperties":
target.setKameletProperties(property(camelContext, java.util.Map.class,
value)); return true;
case "lazystartproducer":
@@ -73,6 +76,8 @@ public class KameletEndpointConfigurer extends
PropertyConfigurerSupport impleme
case "exceptionHandler": return target.getExceptionHandler();
case "exchangepattern":
case "exchangePattern": return target.getExchangePattern();
+case "failifnoconsumers":
+case "failIfNoConsumers": return target.isFailIfNoConsumers();
case "kameletproperties":
case "kameletProperties": return target.getKameletProperties();
case "lazystartproducer":
diff --git
a/components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
b/components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
index eff6911..91854be 100644
---
a/components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
+++
b/components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
@@ -35,7 +35,8 @@
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "secret": false, "description": "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 [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.Ex
[camel] 02/05: CAMEL-14389: add support for Endpoint DSL to FluentProducerTemplate
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
commit bafe7a518017a9a0e1dcbe1089f8198f50d3c706
Author: lburgazzoli
AuthorDate: Tue Jan 14 16:14:01 2020 +0100
CAMEL-14389: add support for Endpoint DSL to FluentProducerTemplate
---
.../apache/camel/EndpointConsumerResolver.java}| 29 +++---
.../apache/camel/EndpointProducerResolver.java}| 29 +++---
.../org/apache/camel/FluentProducerTemplate.java | 14 ++-
.../camel/builder/EndpointConsumerBuilder.java | 16 ++--
.../camel/builder/EndpointProducerBuilder.java | 15 ++-
.../endpoint/LanguageEndpointScriptRouteTest.java | 14 +++
.../endpoint/LanguageEndpointStaticTest.java | 12 +
7 files changed, 49 insertions(+), 80 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
b/core/camel-api/src/main/java/org/apache/camel/EndpointConsumerResolver.java
similarity index 61%
copy from
core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
copy to
core/camel-api/src/main/java/org/apache/camel/EndpointConsumerResolver.java
index 9d40fc3..8786d9e 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
+++
b/core/camel-api/src/main/java/org/apache/camel/EndpointConsumerResolver.java
@@ -14,38 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.NoSuchEndpointException;
-
-/**
- * Type-safe endpoint DSL for building consumer endpoints.
- *
- * @see EndpointProducerBuilder
- */
-public interface EndpointConsumerBuilder {
+package org.apache.camel;
+public interface EndpointConsumerResolver {
/**
- * Builds and resolves this endpoint DSL as an endpoint.
+ * Resolves this object as an endpoint.
*
* @param context the camel context
* @return a built {@link Endpoint}
* @throws NoSuchEndpointException is thrown if the endpoint
*/
Endpoint resolve(CamelContext context) throws NoSuchEndpointException;
-
-/**
- * Builds the url of this endpoint. This API is only intended for Camel
- * internally.
- */
-String getUri();
-
-/**
- * Adds an option to this endpoint. This API is only intended for Camel
- * internally.
- */
-void doSetProperty(String name, Object value);
-
}
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
b/core/camel-api/src/main/java/org/apache/camel/EndpointProducerResolver.java
similarity index 61%
copy from
core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
copy to
core/camel-api/src/main/java/org/apache/camel/EndpointProducerResolver.java
index 9d40fc3..669c218 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
+++
b/core/camel-api/src/main/java/org/apache/camel/EndpointProducerResolver.java
@@ -14,38 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.NoSuchEndpointException;
-
-/**
- * Type-safe endpoint DSL for building consumer endpoints.
- *
- * @see EndpointProducerBuilder
- */
-public interface EndpointConsumerBuilder {
+package org.apache.camel;
+public interface EndpointProducerResolver {
/**
- * Builds and resolves this endpoint DSL as an endpoint.
+ * Resolves this object as an endpoint.
*
* @param context the camel context
* @return a built {@link Endpoint}
* @throws NoSuchEndpointException is thrown if the endpoint
*/
Endpoint resolve(CamelContext context) throws NoSuchEndpointException;
-
-/**
- * Builds the url of this endpoint. This API is only intended for Camel
- * internally.
- */
-String getUri();
-
-/**
- * Adds an option to this endpoint. This API is only intended for Camel
- * internally.
- */
-void doSetProperty(String name, Object value);
-
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java
b/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java
index af19126..87a00ab 100644
--- a/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java
+++ b/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java
@@ -260,7 +260,7 @@ public interface FluentProducerTemplate extends Service {
}
/**
- * Endpoint to send to
[camel] 04/05: CAMEL-14389: fix findings
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
commit 73506e65fe1f9c439db8639024b64ae3b0ce6ab2
Author: lburgazzoli
AuthorDate: Wed Jan 15 13:56:18 2020 +0100
CAMEL-14389: fix findings
---
.../org/apache/camel/EndpointConsumerResolver.java | 4 ++
.../org/apache/camel/EndpointProducerResolver.java | 4 ++
.../builder/endpoint/EndpointBuilderFactory.java | 18 -
.../builder/endpoint/EndpointBuilderSupport.java | 44 --
.../camel/builder/endpoint/EndpointBuilders.java | 1 +
.../camel/maven/packaging/EndpointDslMojo.java | 30 ++-
6 files changed, 55 insertions(+), 46 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/EndpointConsumerResolver.java
b/core/camel-api/src/main/java/org/apache/camel/EndpointConsumerResolver.java
index 8786d9e..9ce2c22 100644
---
a/core/camel-api/src/main/java/org/apache/camel/EndpointConsumerResolver.java
+++
b/core/camel-api/src/main/java/org/apache/camel/EndpointConsumerResolver.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel;
+/**
+ * An interface to represent an object that can be resolved as a consumer
{@link Endpoint}
+ */
+@FunctionalInterface
public interface EndpointConsumerResolver {
/**
* Resolves this object as an endpoint.
diff --git
a/core/camel-api/src/main/java/org/apache/camel/EndpointProducerResolver.java
b/core/camel-api/src/main/java/org/apache/camel/EndpointProducerResolver.java
index 669c218..7e55401 100644
---
a/core/camel-api/src/main/java/org/apache/camel/EndpointProducerResolver.java
+++
b/core/camel-api/src/main/java/org/apache/camel/EndpointProducerResolver.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel;
+/**
+ * An interface to represent an object that can be resolved as a producer
{@link Endpoint}
+ */
+@FunctionalInterface
public interface EndpointProducerResolver {
/**
* Resolves this object as an endpoint.
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index a922368..e08bd65 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -16,6 +16,13 @@
*/
package org.apache.camel.builder.endpoint;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+import org.apache.camel.builder.EndpointProducerBuilder;
+import org.apache.camel.support.ExpressionAdapter;
import javax.annotation.Generated;
/**
@@ -25,7 +32,15 @@ import javax.annotation.Generated;
public interface EndpointBuilderFactory {
default org.apache.camel.Expression
endpoints(org.apache.camel.builder.EndpointProducerBuilder... endpoints) {
-return EndpointBuilderSupport.endpoints(endpoints);
+return new ExpressionAdapter() {
+
+List expressions =
Stream.of(endpoints).map(EndpointProducerBuilder::expr).collect(Collectors.toList());
+
+@Override
+public Object evaluate(Exchange exchange) {
+return expressions.stream().map(e -> e.evaluate(exchange,
Object.class)).collect(Collectors.toList());
+}
+};
}
/**
@@ -989,6 +1004,7 @@ public interface EndpointBuilderFactory {
* different signer/verifier/encryptor/decryptor endpoints within the camel
* context.
*/
+@Deprecated
default
org.apache.camel.builder.endpoint.dsl.CryptoCmsEndpointBuilderFactory.CryptoCmsEndpointBuilder
cryptoCms(String path) {
return
org.apache.camel.builder.endpoint.dsl.CryptoCmsEndpointBuilderFactory.cryptoCms(path);
}
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderSupport.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderSupport.java
deleted file mode 100644
index 14bf45f..000
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderSupport.java
+++ /dev/null
@@ -1,44 +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 writ
[camel] branch master updated (d86740c -> 042d996)
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.git. from d86740c Polished new 94ecbb7 CAMEL-14389: Make entrypoint for 'endpoint dsl' static new bafe7a51 CAMEL-14389: add support for Endpoint DSL to FluentProducerTemplate new 6b6d7ef CAMEL-14389: add uberclass to expose all the static endpoint factories from a single class new 73506e6 CAMEL-14389: fix findings new 042d996 CAMEL-14389: fix CS The 5 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: ...nFactory.java => EndpointConsumerResolver.java} | 15 +- ...nFactory.java => EndpointProducerResolver.java} | 15 +- .../org/apache/camel/FluentProducerTemplate.java | 14 +- .../camel/builder/EndpointConsumerBuilder.java | 16 +- .../camel/builder/EndpointProducerBuilder.java | 15 +- .../builder/endpoint/EndpointBuilderFactory.java | 6900 +++- .../camel/builder/endpoint/EndpointBuilders.java | 6584 +++ .../endpoint/dsl/AMQPEndpointBuilderFactory.java |2 +- .../endpoint/dsl/AS2EndpointBuilderFactory.java|2 +- .../dsl/ActiveMQEndpointBuilderFactory.java|2 +- .../endpoint/dsl/AhcEndpointBuilderFactory.java|2 +- .../endpoint/dsl/ApnsEndpointBuilderFactory.java |2 +- .../dsl/AsteriskEndpointBuilderFactory.java|2 +- .../endpoint/dsl/AtmosEndpointBuilderFactory.java |2 +- .../AtmosphereWebsocketEndpointBuilderFactory.java |2 +- .../endpoint/dsl/AtomEndpointBuilderFactory.java |2 +- .../dsl/AtomixMapEndpointBuilderFactory.java |2 +- .../dsl/AtomixMessagingEndpointBuilderFactory.java |2 +- .../dsl/AtomixMultiMapEndpointBuilderFactory.java |2 +- .../dsl/AtomixQueueEndpointBuilderFactory.java |2 +- .../dsl/AtomixSetEndpointBuilderFactory.java |2 +- .../dsl/AtomixValueEndpointBuilderFactory.java |2 +- .../endpoint/dsl/AvroEndpointBuilderFactory.java |2 +- .../endpoint/dsl/BeanEndpointBuilderFactory.java |2 +- .../dsl/BeanValidatorEndpointBuilderFactory.java |2 +- .../dsl/BeanstalkEndpointBuilderFactory.java |2 +- .../dsl/BlobServiceEndpointBuilderFactory.java |2 +- .../endpoint/dsl/BonitaEndpointBuilderFactory.java |2 +- .../endpoint/dsl/BoxEndpointBuilderFactory.java|2 +- .../dsl/BraintreeEndpointBuilderFactory.java |2 +- .../endpoint/dsl/BrowseEndpointBuilderFactory.java |2 +- .../endpoint/dsl/CMEndpointBuilderFactory.java |2 +- .../endpoint/dsl/CMISEndpointBuilderFactory.java |2 +- .../dsl/CaffeineCacheEndpointBuilderFactory.java |2 +- .../CaffeineLoadCacheEndpointBuilderFactory.java |2 +- .../dsl/CassandraEndpointBuilderFactory.java |2 +- .../dsl/ChatScriptEndpointBuilderFactory.java |2 +- .../endpoint/dsl/ChunkEndpointBuilderFactory.java |2 +- .../endpoint/dsl/CinderEndpointBuilderFactory.java |2 +- .../endpoint/dsl/ClassEndpointBuilderFactory.java |2 +- .../endpoint/dsl/ClientEndpointBuilderFactory.java |2 +- .../endpoint/dsl/CoAPEndpointBuilderFactory.java | 10 +- .../endpoint/dsl/CometdEndpointBuilderFactory.java |6 +- .../endpoint/dsl/ConsulEndpointBuilderFactory.java |2 +- .../dsl/ControlBusEndpointBuilderFactory.java |2 +- .../endpoint/dsl/CordaEndpointBuilderFactory.java |2 +- .../dsl/CouchDbEndpointBuilderFactory.java |2 +- .../dsl/CouchbaseEndpointBuilderFactory.java |2 +- .../endpoint/dsl/CronEndpointBuilderFactory.java |2 +- .../dsl/CryptoCmsEndpointBuilderFactory.java |2 +- .../endpoint/dsl/CwEndpointBuilderFactory.java |2 +- .../endpoint/dsl/CxfEndpointBuilderFactory.java|2 +- .../endpoint/dsl/CxfRsEndpointBuilderFactory.java |2 +- .../dsl/DataFormatEndpointBuilderFactory.java |2 +- .../dsl/DataSetEndpointBuilderFactory.java |2 +- .../dsl/DataSetTestEndpointBuilderFactory.java |2 +- .../endpoint/dsl/DdbEndpointBuilderFactory.java|2 +- .../dsl/DdbStreamEndpointBuilderFactory.java |2 +- .../dsl/DebeziumMongodbEndpointBuilderFactory.java |2 +- .../dsl/DebeziumMySqlEndpointBuilderFactory.java |2 +- .../DebeziumPostgresEndpointBuilderFactory.java|2 +- .../DebeziumSqlserverEndpointBuilderFactory.java |2 +- .../dsl/DigitalOceanEndpointBuilderFactory.java|2 +- .../DigitalSignatureEndpointBuilderFactory.java|2 +- .../endpoint/dsl/DirectEndpointBuilderFactory.java |2 +- .../dsl/DirectVmEndpointBuilderFactory.java|2 +- .../dsl/DisruptorEndp
[camel] 05/05: CAMEL-14389: fix CS
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
commit 042d996629ca28dc19ea3236f2bc0d40760e591d
Author: lburgazzoli
AuthorDate: Wed Jan 15 14:26:46 2020 +0100
CAMEL-14389: fix CS
---
.../builder/endpoint/EndpointBuilderFactory.java | 15 +---
.../camel/builder/endpoint/EndpointBuilders.java | 6 ++---
.../camel/maven/packaging/EndpointDslMojo.java | 28 ++
3 files changed, 27 insertions(+), 22 deletions(-)
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index e08bd65..7954196 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -19,25 +19,21 @@ package org.apache.camel.builder.endpoint;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.builder.EndpointProducerBuilder;
-import org.apache.camel.support.ExpressionAdapter;
-import javax.annotation.Generated;
+// CHECKSTYLE:OFF
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
+@javax.annotation.Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
public interface EndpointBuilderFactory {
default org.apache.camel.Expression
endpoints(org.apache.camel.builder.EndpointProducerBuilder... endpoints) {
-return new ExpressionAdapter() {
+return new org.apache.camel.support.ExpressionAdapter() {
-List expressions =
Stream.of(endpoints).map(EndpointProducerBuilder::expr).collect(Collectors.toList());
+List expressions =
Stream.of(endpoints).map(org.apache.camel.builder.EndpointProducerBuilder::expr).collect(Collectors.toList());
@Override
-public Object evaluate(Exchange exchange) {
+public Object evaluate(org.apache.camel.Exchange exchange) {
return expressions.stream().map(e -> e.evaluate(exchange,
Object.class)).collect(Collectors.toList());
}
};
@@ -6601,3 +6597,4 @@ public interface EndpointBuilderFactory {
return
org.apache.camel.builder.endpoint.dsl.ZooKeeperMasterEndpointBuilderFactory.zookeeperMaster(path);
}
}
+// CHECKSTYLE:ON
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index a769f85..2645359 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -16,12 +16,11 @@
*/
package org.apache.camel.builder.endpoint;
-import javax.annotation.Generated;
-
+// CHECKSTYLE:OFF
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
+@javax.annotation.Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
public interface EndpointBuilders {
/**
@@ -6582,3 +6581,4 @@ public interface EndpointBuilders {
return
org.apache.camel.builder.endpoint.dsl.ZooKeeperMasterEndpointBuilderFactory.zookeeperMaster(path);
}
}
+// CHECKSTYLE:ON
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 88c1574..3cec9ca 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -46,6 +46,7 @@ import com.github.javaparser.ast.PackageDeclaration;
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.body.TypeDeclaration;
+import com.github.javaparser.ast.comments.LineComment;
import com.github.javaparser.ast.stmt.BlockStmt;
import org.apache.camel.maven.packaging.generics.GenericsUtil;
import org.apache.camel.maven.packaging.model.ComponentModel;
@@ -490,27 +491,28 @@ public class EndpointDslMojo extends AbstractMojo {
endpointBuilderUnit.addImport("java.util.List");
endpointBuilderUnit.addImport("java.util.stream.Collectors");
[camel] branch master updated: Improve EndpointDslMojo
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 78b8ebc Improve EndpointDslMojo
78b8ebc is described below
commit 78b8ebcebb3e68909fb0e475d43adfb5a5ad14d3
Author: lburgazzoli
AuthorDate: Wed Jan 15 16:35:10 2020 +0100
Improve EndpointDslMojo
This commit improve a little the performances of EndpointDslMojo by
listing and parsing component specific endpoint factories only once.
In addition, this commit introduces:
- options to control the generation of the endpoint dsl interfaces
- an option to control the package name where to generate component
specific endpoint factories
- an option to control the package name where to generate the endpoint
dsl interfaces
Those changes are needed to use the mojo for component hosted outside
the camel repo and to give a change to at least generate component
specific endpoint factories. Such endpoint factories won't be availabe
in the generic EndpointRouteBuilder but at least developer have a way
to use a fluent endpoint builder even for such components.
---
.../camel/maven/packaging/EndpointDslMojo.java | 250 +
1 file changed, 159 insertions(+), 91 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index badfdd4..cd82235 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -122,10 +123,28 @@ public class EndpointDslMojo extends AbstractMojo {
protected File outputDir;
/**
- * The package name
+ * The package where to generate component Endpoint factories
*/
-@Parameter
-protected String packageName = "org.apache.camel.builder.endpoint.dsl";
+@Parameter(defaultValue = "org.apache.camel.builder.endpoint")
+protected String endpointFactoriesPackageName;
+
+/**
+ * The package where to generate component specific Endpoint factories
+ */
+@Parameter(defaultValue = "org.apache.camel.builder.endpoint.dsl")
+protected String componentsFactoriesPackageName;
+
+/**
+ * Generate or not the EndpointBuilderFactory interface.
+ */
+@Parameter(defaultValue = "true")
+protected Boolean generateEndpointBuilderFactory;
+
+/**
+ * Generate or not the EndpointBuilders interface.
+ */
+@Parameter(defaultValue = "true")
+protected Boolean generateEndpointBuilders;
DynamicClassLoader projectClassLoader;
@@ -147,11 +166,22 @@ public class EndpointDslMojo extends AbstractMojo {
// generate component endpoint DSL files and write them
executeComponent(files);
-// make sure EndpointBuilderFactory is synced
-synchronizeEndpointBuilderFactoryInterface();
-// make sure EndpointBuilders is synced
-synchronizeEndpointBuildersInterface();
+if (generateEndpointBuilderFactory || generateEndpointBuilders) {
+getLog().info("Load components EndpointFactories");
+List units =
loadAllComponentsDslEndpointFactoriesAsCompilationUnit();
+if (generateEndpointBuilderFactory) {
+getLog().info("Regenerate EndpointBuilderFactory");
+// make sure EndpointBuilderFactory is synced
+synchronizeEndpointBuilderFactoryInterface(units);
+}
+
+if (generateEndpointBuilders) {
+getLog().info("Regenerate EndpointBuilders");
+// make sure EndpointBuilders is synced
+synchronizeEndpointBuildersInterface(units);
+}
+}
}
private static String loadJson(File file) {
@@ -208,7 +238,7 @@ public class EndpointDslMojo extends AbstractMojo {
overrideComponentName =
model.getArtifactId().replace("camel-", "");
}
-createEndpointDsl(packageName, model, compModels,
overrideComponentName);
+createEndpointDsl(componentsFactoriesPackageName, model,
compModels, overrideComponentName);
}
}
}
@@ -482,16 +512,12 @@ public class EndpointDslMojo ext
[camel-quarkus] branch master updated (3580c77 -> d26b474)
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-quarkus.git. from 3580c77 Merge pull request #629 from lburgazzoli/sjms2 add d26b474 Fix #622 Encourage users to ask for missing extensions and to help implementing them No new revisions were added by this update. Summary of changes: docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-)
[camel-quarkus] branch master updated: Update to Apache Camel 3.0.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-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 7468067 Update to Apache Camel 3.0.1
7468067 is described below
commit 74680679a4940c5f21a7e7b1bfa30dc5d97a228f
Author: lburgazzoli
AuthorDate: Fri Jan 17 10:31:51 2020 +0100
Update to Apache Camel 3.0.1
---
.../camel/quarkus/core/CamelMainRecorder.java | 4
.../component/dozer/deployment/DozerProcessor.java | 27 --
.../runtime/SubstituteNettyWorkerPoolBuilder.java | 4 +---
.../quarkus/component/pdf/it/PdfResource.java | 21 -
.../camel/quarkus/component/pdf/it/PdfTest.java| 1 -
pom.xml| 24 ++-
6 files changed, 63 insertions(+), 18 deletions(-)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
index 484a300..118d7a0 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
@@ -43,6 +43,10 @@ public class CamelMainRecorder {
main.setCamelContext(runtime.getValue());
main.addMainListener(new CamelMainEventDispatcher());
+// properties are loaded through MicroProfile Config so there's
+// no need to look for sources.
+main.setDefaultPropertyPlaceholderLocation("false");
+
// xml rest/routes should be explicitly configured as an
// additional dependency is required thus, disable auto
// discovery
diff --git
a/extensions/dozer/deployment/src/main/java/org/apache/camel/quarkus/component/dozer/deployment/DozerProcessor.java
b/extensions/dozer/deployment/src/main/java/org/apache/camel/quarkus/component/dozer/deployment/DozerProcessor.java
index b1206d7..9bcf0a5 100644
---
a/extensions/dozer/deployment/src/main/java/org/apache/camel/quarkus/component/dozer/deployment/DozerProcessor.java
+++
b/extensions/dozer/deployment/src/main/java/org/apache/camel/quarkus/component/dozer/deployment/DozerProcessor.java
@@ -35,6 +35,7 @@ import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
+import
io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
@@ -61,7 +62,12 @@ class DozerProcessor {
return new
JaxbFileRootBuildItem("com/github/dozermapper/core/builder/model/jaxb");
}
-@BuildStep(applicationArchiveMarkers = { "com/github/dozermapper/core" })
+@BuildStep
+AdditionalApplicationArchiveMarkerBuildItem dozerArchiveMarker() {
+return new
AdditionalApplicationArchiveMarkerBuildItem("com/github/dozermapper/core");
+}
+
+@BuildStep
void configureCamelDozer(BuildProducer
reflectiveClass,
BuildProducer nativeImage,
CamelDozerConfig camelDozerConfig) {
@@ -112,7 +118,11 @@ class DozerProcessor {
new ReflectiveClassBuildItem(false, false,
"com.sun.org.apache.xerces.internal.impl.dv.xs.SchemaDVFactoryImpl"));
-reflectiveClass.produce(new ReflectiveClassBuildItem(true, false,
DozerConfiguration.class));
+reflectiveClass.produce(new ReflectiveClassBuildItem(
+true,
+false,
+DozerConfiguration.class,
+DozerBeanMapperConfiguration.class));
if (camelDozerConfig.mappingFiles.isPresent()) {
// Register for reflection any classes participating in Dozer
mapping
@@ -157,6 +167,19 @@ class DozerProcessor {
}
}
+/*
+ * Make component/endpoint configurer discoverable in native image.
+ *
+ * TODO: should not be required once
https://github.com/apache/camel-quarkus/pull/618
+ * get merged
+ */
+@BuildStep
+NativeImageResourceBuildItem configurers() {
+return new NativeImageResourceBuildItem(
+
"META-INF/services/org/apache/camel/configurer/dozer-component",
+
"META-INF/services/org/apache/camel/configurer/dozer-endpoint");
+}
+
private URI mappingPathToURI(String mappingPath) {
try {
return new URI(mappingPath);
diff --git
a/extensions/netty/runtime/src/main/java/org/apache/
[camel-quarkus] 02/04: Avoid using field injection in the core NativeImageProcessor
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
commit 06f9625b84353fb0879daa145cf0970b022da7e8
Author: Peter Palaga
AuthorDate: Wed Jan 15 17:28:16 2020 +0100
Avoid using field injection in the core NativeImageProcessor
---
.../core/deployment/NativeImageProcessor.java | 65 +-
1 file changed, 27 insertions(+), 38 deletions(-)
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
index ede3d3f..9c9f346 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
@@ -26,8 +26,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
@@ -52,7 +50,6 @@ import org.jboss.jandex.AnnotationValue;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;
-import org.jboss.jandex.MethodInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,18 +71,13 @@ class NativeImageProcessor {
StreamCachingStrategy.SpoolUsedHeapMemoryLimit.class,
PropertiesComponent.class);
-@Inject
-BuildProducer reflectiveClass;
-@Inject
-BuildProducer reflectiveMethod;
-@Inject
-BuildProducer resource;
-@Inject
-ApplicationArchivesBuildItem applicationArchivesBuildItem;
-
@BuildStep
-void process(CombinedIndexBuildItem combinedIndex) {
-IndexView view = combinedIndex.getIndex();
+void reflectiveItems(
+CombinedIndexBuildItem combinedIndex,
+BuildProducer reflectiveClass,
+BuildProducer reflectiveMethod) {
+
+final IndexView view = combinedIndex.getIndex();
CAMEL_REFLECTIVE_CLASSES.stream()
.map(Class::getName)
@@ -93,7 +85,7 @@ class NativeImageProcessor {
.map(view::getAllKnownImplementors)
.flatMap(Collection::stream)
.filter(CamelSupport::isPublic)
-.forEach(v -> addReflectiveClass(true,
v.name().toString()));
+.forEach(v -> reflectiveClass.produce(new
ReflectiveClassBuildItem(true, false, v.name().toString(;
Logger log = LoggerFactory.getLogger(NativeImageProcessor.class);
DotName converter =
DotName.createSimple(Converter.class.getName());
@@ -120,32 +112,44 @@ class NativeImageProcessor {
.collect(Collectors.toList());
log.debug("Converter classes: " + converterClasses);
-converterClasses.forEach(ci -> addReflectiveClass(false,
ci.name().toString()));
+converterClasses
+.forEach(ci -> reflectiveClass.produce(new
ReflectiveClassBuildItem(false, false, ci.name().toString(;
view.getAnnotations(converter)
.stream()
.filter(ai -> ai.target().kind() == Kind.METHOD)
.filter(ai ->
converterClasses.contains(ai.target().asMethod().declaringClass()))
.map(ai -> ai.target().asMethod())
-.forEach(this::addReflectiveMethod);
+.forEach(mi -> reflectiveMethod.produce(new
ReflectiveMethodBuildItem(mi)));
+
+}
+
+@BuildStep
+void resourcesAndServices(
+ApplicationArchivesBuildItem applicationArchivesBuildItem,
+BuildProducer reflectiveClass,
+BuildProducer resource) {
CamelSupport.resources(applicationArchivesBuildItem,
"META-INF/maven/org.apache.camel/camel-base")
-.forEach(this::addResource);
+.forEach(p -> resource.produce(new
NativeImageResourceBuildItem(p.toString().substring(1;
CamelSupport.resources(applicationArchivesBuildItem,
CamelSupport.CAMEL_SERVICE_BASE_PATH)
-.forEach(this::addCamelService);
+.forEach(path -> addCamelService(path, reflectiveClass,
resource));
}
-protected void addCamelService(Path p) {
+static void addCamelService(
+Path p,
+BuildProducer reflectiveClass,
+BuildProducer resource) {
[camel-quarkus] 04/04: Do not register languages and dataformats so that they can be used in parallel with conflicting configs
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
commit a2e1dc2984c484b817299e8cef0ac27ddd2511d2
Author: Peter Palaga
AuthorDate: Fri Jan 17 17:47:26 2020 +0100
Do not register languages and dataformats so that they can be used in
parallel with conflicting configs
---
.../quarkus/core/deployment/BuildProcessor.java| 8 +++---
.../camel/quarkus/core/FastCamelContext.java | 33 +++---
2 files changed, 8 insertions(+), 33 deletions(-)
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
index 63c6e8d..e4c2c46 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -133,9 +133,7 @@ class BuildProcessor {
services.produce(new CamelServicePatternBuildItem(
CamelServiceDestination.REGISTRY,
true,
-"META-INF/services/org/apache/camel/component/*",
-"META-INF/services/org/apache/camel/language/*",
-"META-INF/services/org/apache/camel/dataformat/*"));
+"META-INF/services/org/apache/camel/component/*"));
services.produce(new CamelServicePatternBuildItem(
CamelServiceDestination.DISCOVERY,
@@ -143,7 +141,9 @@ class BuildProcessor {
"META-INF/services/org/apache/camel/*",
"META-INF/services/org/apache/camel/management/*",
"META-INF/services/org/apache/camel/model/*",
-"META-INF/services/org/apache/camel/configurer/*"));
+"META-INF/services/org/apache/camel/configurer/*",
+"META-INF/services/org/apache/camel/language/*",
+"META-INF/services/org/apache/camel/dataformat/*"));
}
@BuildStep
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index 8e8ff03..1eb3d3d 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -21,10 +21,8 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import org.apache.camel.AsyncProcessor;
-import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
-import org.apache.camel.NoSuchLanguageException;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -41,9 +39,11 @@ import org.apache.camel.impl.engine.DefaultBeanIntrospection;
import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
import org.apache.camel.impl.engine.DefaultCamelContextNameStrategy;
import org.apache.camel.impl.engine.DefaultClassResolver;
+import org.apache.camel.impl.engine.DefaultDataFormatResolver;
import org.apache.camel.impl.engine.DefaultEndpointRegistry;
import org.apache.camel.impl.engine.DefaultInflightRepository;
import org.apache.camel.impl.engine.DefaultInjector;
+import org.apache.camel.impl.engine.DefaultLanguageResolver;
import org.apache.camel.impl.engine.DefaultMessageHistoryFactory;
import org.apache.camel.impl.engine.DefaultNodeIdFactory;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
@@ -74,7 +74,6 @@ import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.CamelContextNameStrategy;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.ComponentResolver;
-import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.EndpointRegistry;
import org.apache.camel.spi.ExecutorServiceManager;
@@ -82,7 +81,6 @@ import org.apache.camel.spi.FactoryFinderResolver;
import org.apache.camel.spi.HeadersMapFactory;
import org.apache.camel.spi.InflightRepository;
import org.apache.camel.spi.Injector;
-import org.apache.camel.spi.Language;
import org.apache.camel.spi.LanguageResolver;
import org.apache.camel.spi.ManagementNameStrategy;
import org.apache.camel.spi.MessageHistoryFactory;
@@ -174,35 +172,12 @@ public class FastCamelContext extends
AbstractCamelContext {
@Override
protected LanguageResolver createLanguageResolver() {
-// languages are automatically discovered by build steps so
[camel-quarkus] 01/04: Revert "Fix #620 Introduce CamelServiceInfo transformers"
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
commit e728940db17a0d5947d8c7fd374322f8804841c7
Author: Peter Palaga
AuthorDate: Thu Jan 16 18:04:30 2020 +0100
Revert "Fix #620 Introduce CamelServiceInfo transformers"
This reverts commit e6920d014fec0ea4ec52ab527fdd0d1ac05ad7ee.
We decided to adopt another approach
---
.../quarkus/core/deployment/BuildProcessor.java| 16 +---
.../quarkus/core/deployment/CamelServiceInfo.java | 14 ++-
.../CamelServiceInfoTransformerBuildItem.java | 42
.../deployment/CamelServiceInfoTransformers.java | 43
.../CamelServiceInfoTransformersTest.java | 46 --
5 files changed, 4 insertions(+), 157 deletions(-)
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
index 4d0d192..594ec28 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -25,7 +25,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.function.Function;
import java.util.stream.Collectors;
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
@@ -126,12 +125,6 @@ class BuildProcessor {
new
CamelServiceFilterBuildItem(CamelServiceFilter.forService("properties-component-factory")));
}
-@BuildStep
-void
serviceInfoTransformers(BuildProducer
mapperBuildItems) {
-mapperBuildItems.produce(
-new
CamelServiceInfoTransformerBuildItem(CamelServiceInfoTransformers::configurer));
-}
-
/*
* Discover {@link TypeConverterLoader}.
*/
@@ -192,8 +185,7 @@ class BuildProcessor {
ApplicationArchivesBuildItem applicationArchives,
ContainerBeansBuildItem containerBeans,
List registryItems,
-List serviceFilters,
-List serviceMappers) {
+List serviceFilters) {
final RuntimeValue registry =
recorder.createRegistry();
@@ -213,12 +205,6 @@ class BuildProcessor {
return !blacklisted;
})
-.map(
-/* apply the CamelServiceInfo transformers */
-serviceMappers.stream()
-
.map(CamelServiceInfoTransformerBuildItem::getTransformer)
-.reduce(Function::andThen)
-.orElse(Function.identity()))
.forEach(si -> {
LOGGER.debug("Binding bean with name: {}, type {}",
si.name, si.type);
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceInfo.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceInfo.java
index 2b6a2cf..8c46e13 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceInfo.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceInfo.java
@@ -30,8 +30,9 @@ public class CamelServiceInfo implements CamelBeanInfo {
public final Path path;
/**
- * The name under which this service will be registered in the Camel
registry.
- * This name may or may not be the same as the last segment of {@link
#path}.
+ * The name of the service entry which is derived from the service path.
As example the
+ * name for a service with path
META-INF/services/org/apache/camel/component/file
+ * will be file
*/
public final String name;
@@ -60,15 +61,6 @@ public class CamelServiceInfo implements CamelBeanInfo {
return this.type;
}
-/**
- * @param newName the overriding name
- * @return a new {@link CamelServiceInfo} having all fields the
same as the current {@link CamelServiceInfo}
- * except for {@link #name} which is set to the given
{@code newName}
- */
-public CamelServiceInfo withName(String newName) {
-return new CamelServiceInfo(path, newName, type);
-}
-
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceInfoTransformerBuildItem.java
b/extensions/core/deployment/src/main/java/org/apa
[camel-quarkus] branch master updated (1c428cb -> a2e1dc2)
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-quarkus.git.
from 1c428cb Merge pull request #639 from apache/camel-3.0.1
new e728940 Revert "Fix #620 Introduce CamelServiceInfo transformers"
new 06f9625 Avoid using field injection in the core NativeImageProcessor
new 30908ac Fix #617 Registerable and discoverable Camel services
new a2e1dc2 Do not register languages and dataformats so that they can be
used in parallel with conflicting configs
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../quarkus/core/deployment/BuildProcessor.java| 123 +---
...va => CamelFactoryFinderResolverBuildItem.java} | 16 +--
...ServiceInfo.java => CamelServiceBuildItem.java} | 66 -
.../core/deployment/CamelServiceFilter.java| 2 +-
.../CamelServiceInfoTransformerBuildItem.java | 42 --
.../deployment/CamelServiceInfoTransformers.java | 43 --
.../deployment/CamelServicePatternBuildItem.java | 84 +++
.../quarkus/core/deployment/CamelSupport.java | 64 ++---
.../core/deployment/NativeImageProcessor.java | 82 ---
.../quarkus/core/deployment/util/PathFilter.java | 156 +
.../CamelServiceInfoTransformersTest.java | 46 --
.../PathFilterTest.java} | 46 +-
.../org/apache/camel/quarkus/core/CamelConfig.java | 87
.../apache/camel/quarkus/core/CamelRecorder.java | 17 ++-
.../camel/quarkus/core/FastCamelContext.java | 41 ++
.../quarkus/core/FastFactoryFinderResolver.java| 147 +++
.../component/file/deployment/FileProcessor.java | 5 +-
.../hystrix/deployment/HystrixProcessor.java | 4 -
.../src/main/resources/application.properties | 2 +
19 files changed, 731 insertions(+), 342 deletions(-)
copy
extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{CamelTypeConverterRegistryBuildItem.java
=> CamelFactoryFinderResolverBuildItem.java} (62%)
rename
extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/{CamelServiceInfo.java
=> CamelServiceBuildItem.java} (54%)
delete mode 100644
extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceInfoTransformerBuildItem.java
delete mode 100644
extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceInfoTransformers.java
create mode 100644
extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServicePatternBuildItem.java
create mode 100644
extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/PathFilter.java
delete mode 100644
extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelServiceInfoTransformersTest.java
rename
extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/{CamelSupportTest.java
=> util/PathFilterTest.java} (55%)
create mode 100644
extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastFactoryFinderResolver.java
[camel-quarkus] 03/04: Fix #617 Registerable and discoverable Camel services
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
commit 30908ac710919c987c382f7aa8896d532324a1d6
Author: Peter Palaga
AuthorDate: Fri Jan 17 16:15:15 2020 +0100
Fix #617 Registerable and discoverable Camel services
---
.../quarkus/core/deployment/BuildProcessor.java| 117 ++--
.../CamelFactoryFinderResolverBuildItem.java} | 27 ++--
...ServiceInfo.java => CamelServiceBuildItem.java} | 62
.../core/deployment/CamelServiceFilter.java| 2 +-
.../deployment/CamelServicePatternBuildItem.java | 84 +++
.../quarkus/core/deployment/CamelSupport.java | 64 ++---
.../core/deployment/NativeImageProcessor.java | 43 ++
.../quarkus/core/deployment/util/PathFilter.java | 156 +
.../PathFilterTest.java} | 46 +-
.../org/apache/camel/quarkus/core/CamelConfig.java | 87
.../apache/camel/quarkus/core/CamelRecorder.java | 17 ++-
.../camel/quarkus/core/FastCamelContext.java | 8 +-
.../quarkus/core/FastFactoryFinderResolver.java| 147 +++
.../component/file/deployment/FileProcessor.java | 5 +-
.../hystrix/deployment/HystrixProcessor.java | 4 -
.../src/main/resources/application.properties | 2 +
16 files changed, 724 insertions(+), 147 deletions(-)
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
index 594ec28..63c6e8d 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -21,7 +21,6 @@ import java.lang.reflect.Modifier;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -54,8 +53,11 @@ import org.apache.camel.quarkus.core.CamelMainRecorder;
import org.apache.camel.quarkus.core.CamelProducers;
import org.apache.camel.quarkus.core.CamelRecorder;
import org.apache.camel.quarkus.core.CoreAttachmentsRecorder;
+import org.apache.camel.quarkus.core.FastFactoryFinderResolver.Builder;
import org.apache.camel.quarkus.core.Flags;
import org.apache.camel.quarkus.core.UploadAttacher;
+import
org.apache.camel.quarkus.core.deployment.CamelServicePatternBuildItem.CamelServiceDestination;
+import org.apache.camel.quarkus.core.deployment.util.PathFilter;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
@@ -125,6 +127,68 @@ class BuildProcessor {
new
CamelServiceFilterBuildItem(CamelServiceFilter.forService("properties-component-factory")));
}
+@BuildStep
+void coreServicePatterns(BuildProducer
services) {
+
+services.produce(new CamelServicePatternBuildItem(
+CamelServiceDestination.REGISTRY,
+true,
+"META-INF/services/org/apache/camel/component/*",
+"META-INF/services/org/apache/camel/language/*",
+"META-INF/services/org/apache/camel/dataformat/*"));
+
+services.produce(new CamelServicePatternBuildItem(
+CamelServiceDestination.DISCOVERY,
+true,
+"META-INF/services/org/apache/camel/*",
+"META-INF/services/org/apache/camel/management/*",
+"META-INF/services/org/apache/camel/model/*",
+"META-INF/services/org/apache/camel/configurer/*"));
+}
+
+@BuildStep
+void userServicePatterns(
+CamelConfig camelConfig,
+BuildProducer services) {
+
+camelConfig.service.discovery.includePatterns.ifPresent(list ->
services.produce(new CamelServicePatternBuildItem(
+CamelServiceDestination.DISCOVERY,
+true,
+list)));
+
+camelConfig.service.discovery.excludePatterns.ifPresent(list ->
services.produce(new CamelServicePatternBuildItem(
+CamelServiceDestination.DISCOVERY,
+false,
+list)));
+
+camelConfig.service.registry.includePatterns.ifPresent(list ->
services.produce(new CamelServicePatternBuildItem(
+CamelServiceDestination.REGISTRY,
+true,
+list)));
+
+
[camel-quarkus] branch master updated: Fix #640 Lower the level of "Could not find a non-optional class for key ..." message
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 2d197c3 Fix #640 Lower the level of "Could not find a non-optional
class for key ..." message
2d197c3 is described below
commit 2d197c340d7b4c9c547ea70c862fc4eef4ecdd97
Author: Peter Palaga
AuthorDate: Mon Jan 20 22:11:04 2020 +0100
Fix #640 Lower the level of "Could not find a non-optional class for key
..." message
---
.../org/apache/camel/quarkus/core/FastFactoryFinderResolver.java | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastFactoryFinderResolver.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastFactoryFinderResolver.java
index 0c8f7db..2b41b3e 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastFactoryFinderResolver.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastFactoryFinderResolver.java
@@ -118,9 +118,7 @@ public class FastFactoryFinderResolver extends
DefaultFactoryFinderResolver {
public Optional> findClass(String key, String propertyPrefix)
{
final String mapKey = mapKey(path, propertyPrefix, key);
final Class cl = classMap.get(mapKey);
-if (cl == null) {
-LOG.warnf("Could not find a non-optional class for key %s",
mapKey);
-}
+LOG.tracef("Found a non-optional class for key %s: %s", mapKey, cl
== null ? "null" : cl.getName());
return Optional.ofNullable(cl);
}
@@ -133,8 +131,9 @@ public class FastFactoryFinderResolver extends
DefaultFactoryFinderResolver {
@Override
public Optional> findOptionalClass(String key, String
propertyPrefix) {
final String mapKey = mapKey(path, propertyPrefix, key);
-LOG.tracef("Found an optional class for key %s: %s", mapKey);
-return Optional.ofNullable(classMap.get(mapKey));
+final Class cl = classMap.get(mapKey);
+LOG.tracef("Found an optional class for key %s: %s", mapKey, cl ==
null ? "null" : cl.getName());
+return Optional.ofNullable(cl);
}
private Object doNewInstance(String key, String propertyPrefix) {
[camel-quarkus] branch master updated (2d197c3 -> f720a00)
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-quarkus.git. from 2d197c3 Fix #640 Lower the level of "Could not find a non-optional class for key ..." message add f720a00 Remove PlatformHttpSpanDecorator from OpenTracing extension No new revisions were added by this update. Summary of changes: .../deployment/OpenTracingProcessor.java | 7 - .../opentracing/PlatformHttpSpanDecorator.java | 30 -- .../org.apache.camel.opentracing.SpanDecorator | 18 - 3 files changed, 55 deletions(-) delete mode 100644 extensions/opentracing/runtime/src/main/java/org/apache/camel/quarkus/component/opentracing/PlatformHttpSpanDecorator.java delete mode 100644 extensions/opentracing/runtime/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator
[camel-quarkus] branch master updated (f720a00 -> de4fffc)
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-quarkus.git.
from f720a00 Remove PlatformHttpSpanDecorator from OpenTracing extension
add 0f5a831 Revert "Create substitutions for jsch"
add d1f9f58 Use the quarkus-jsch extension instead of having substitutions
add 8634da2 Upgrade to Quarkus 1.2.0.CR1
add 813b918 Add the mongodb-driver-legacy artifact and a substitution
add 7c89888 Workaround for https://github.com/oracle/graal/issues/1971
add c50d107 Fix a JAXB dependency to avoid a warning
add de4fffc Temporarily force a locale with a country to work around a
Quarkus issue
No new revisions were added by this update.
Summary of changes:
.github/workflows/pr-build-jvm.yml | 2 +-
.github/workflows/pr-validate.yml | 2 +-
extensions/bean/runtime/pom.xml| 4 ++
.../component/bean/graal/ExcludeMethodList.java| 72 ++
.../component/bean/graal/SubstituteBeanInfo.java} | 12 ++--
extensions/ftp/deployment/pom.xml | 4 ++
.../component/ftp/deployment/FtpProcessor.java | 11
extensions/ftp/runtime/pom.xml | 4 +-
.../component/ftp/graal/AnyLocalAddress.java | 31 --
.../ftp/graal/AnyLocalAddressAccessor.java | 25
.../camel/quarkus/component/ftp/graal/Flags.java | 36 ---
.../ftp/graal/PortWatcherSubstitution.java | 35 ---
extensions/jackson/runtime/pom.xml | 10 +++
extensions/mongodb/runtime/pom.xml | 8 +++
.../graal/SubstituteMongoClientOptions.java} | 25 +---
pom.xml| 2 +-
16 files changed, 126 insertions(+), 157 deletions(-)
create mode 100644
extensions/bean/runtime/src/main/java/org/apache/camel/quarkus/component/bean/graal/ExcludeMethodList.java
copy
extensions/{support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java
=>
bean/runtime/src/main/java/org/apache/camel/quarkus/component/bean/graal/SubstituteBeanInfo.java}
(74%)
delete mode 100644
extensions/ftp/runtime/src/main/java/org/apache/camel/quarkus/component/ftp/graal/AnyLocalAddress.java
delete mode 100644
extensions/ftp/runtime/src/main/java/org/apache/camel/quarkus/component/ftp/graal/AnyLocalAddressAccessor.java
delete mode 100644
extensions/ftp/runtime/src/main/java/org/apache/camel/quarkus/component/ftp/graal/Flags.java
delete mode 100644
extensions/ftp/runtime/src/main/java/org/apache/camel/quarkus/component/ftp/graal/PortWatcherSubstitution.java
copy
extensions/{support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/ExecutorCallAdapterFactorySubstitution.java
=>
mongodb/runtime/src/main/java/org/apache/camel/quarkus/component/mongodb/graal/SubstituteMongoClientOptions.java}
(65%)
[camel-k-runtime] branch master updated (c117db0 -> 572a795)
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 c117db0 [maven-release-plugin] prepare for next development iteration add 572a795 Update junit5 to v5.6.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-quarkus] branch master updated (de4fffc -> 93b8dae)
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-quarkus.git. from de4fffc Temporarily force a locale with a country to work around a Quarkus issue add 93b8dae Removed the now useless alias for DefaultAnnotationExpressionFactory #611 No new revisions were added by this update. Summary of changes: .../Target_DefaultAnnotationExpressionFactory.java | 51 -- 1 file changed, 51 deletions(-) delete mode 100644 extensions/jsonpath/runtime/src/main/java/org/apache/camel/quarkus/component/json/path/Target_DefaultAnnotationExpressionFactory.java
[camel-quarkus] branch master updated (42604f8 -> f068c23)
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-quarkus.git. from 42604f8 Merge pull request #626 from apache/aws-kinesis add 536ad91 Run native tests with GitHub Actions add f068c23 Move Apache snapshot repository activation to a dedicate profile No new revisions were added by this update. Summary of changes: .github/workflows/pr-build-jvm.yml | 37 .github/workflows/pr-build.yaml| 381 + .github/workflows/pr-validate.yml | 16 +- pom.xml| 75 4 files changed, 434 insertions(+), 75 deletions(-) delete mode 100644 .github/workflows/pr-build-jvm.yml create mode 100644 .github/workflows/pr-build.yaml
[camel-quarkus] branch master updated (f068c23 -> cf34564)
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-quarkus.git. from f068c23 Move Apache snapshot repository activation to a dedicate profile add cf34564 chore: move dependencies exlusions to runtime bom No new revisions were added by this update. Summary of changes: integration-tests/fhir/pom.xml | 7 --- poms/bom/pom.xml | 6 ++ 2 files changed, 6 insertions(+), 7 deletions(-)
[camel-quarkus] branch master updated (cf34564 -> 0fbd055)
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-quarkus.git.
from cf34564 chore: move dependencies exlusions to runtime bom
add 2daea0a factory-finder: register singleton languaages
add f10ae1a factory-finder: improve use of Optional
add 0fbd055 factory-finder: add tests for camel factories discovery and
registration
No new revisions were added by this update.
Summary of changes:
.../quarkus/core/deployment/BuildProcessor.java| 6 ++-
.../quarkus/core/FastFactoryFinderResolver.java| 17 ---
.../apache/camel/quarkus/core/CamelServlet.java| 33 -
.../org/apache/camel/quarkus/core/CamelTest.java | 38 +++
.../camel/quarkus/core/CamelTestConditions.java| 54 ++
.../support/core-main/runtime/pom.xml | 12 +
.../support/{MyPair.java => MyDataFormat.java} | 28 +++
.../org/apache/camel/dataformat/my-dataformat} | 2 +-
8 files changed, 171 insertions(+), 19 deletions(-)
create mode 100644
integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CamelTestConditions.java
copy
integration-tests/support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/{MyPair.java
=> MyDataFormat.java} (63%)
copy
integration-tests/support/{testcontainers-support/src/main/resources/testcontainers.properties
=>
core-main/runtime/src/main/resources/META-INF/services/org/apache/camel/dataformat/my-dataformat}
(93%)
[camel-quarkus] branch master updated: fhir: reduce uri options by leveraging component configuration
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 52400e5 fhir: reduce uri options by leveraging component configuration
52400e5 is described below
commit 52400e575c2b49b681945596ba339cafaab10239
Author: lburgazzoli
AuthorDate: Wed Jan 22 18:16:09 2020 +0100
fhir: reduce uri options by leveraging component configuration
---
.../camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java | 2 +-
.../camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java | 2 +-
.../camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java | 2 +-
.../camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java | 2 +-
integration-tests/fhir/src/main/resources/application.properties | 9 +++--
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git
a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java
b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java
index 34bc739..089b3bd 100644
---
a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java
+++
b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java
@@ -54,7 +54,7 @@ public class FhirDstu2RouteBuilder extends RouteBuilder {
.marshal(fhirXmlDataFormat);
from("direct:create-dstu2")
-
.to("fhir://create/resource?log={{fhir.log}}&serverUrl={{camel.fhir.test-url}}&inBody=resourceAsString&fhirVersion=DSTU2&fhirContext=#fhirContext");
+
.to("fhir://create/resource?inBody=resourceAsString&fhirVersion=DSTU2&fhirContext=#fhirContext");
}
}
}
diff --git
a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java
b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java
index cbc8a24..a6496ef 100644
---
a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java
+++
b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java
@@ -54,7 +54,7 @@ public class FhirDstu3RouteBuilder extends RouteBuilder {
.marshal(fhirXmlDataFormat);
from("direct:create-dstu3")
-
.to("fhir://create/resource?log={{fhir.log}}&serverUrl={{camel.fhir.test-url}}&inBody=resourceAsString&fhirVersion=DSTU3&fhirContext=#fhirContext");
+
.to("fhir://create/resource?inBody=resourceAsString&fhirVersion=DSTU3&fhirContext=#fhirContext");
}
}
}
diff --git
a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java
b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java
index a73e85b..422f551 100644
---
a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java
+++
b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java
@@ -54,7 +54,7 @@ public class FhirR4RouteBuilder extends RouteBuilder {
.marshal(fhirXmlDataFormat);
from("direct:create-r4")
-
.to("fhir://create/resource?log={{fhir.log}}&serverUrl={{camel.fhir.test-url}}&inBody=resourceAsString&fhirVersion=R4&fhirContext=#fhirContext");
+
.to("fhir://create/resource?inBody=resourceAsString&fhirVersion=R4&fhirContext=#fhirContext");
}
}
}
diff --git
a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java
b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java
index 90672a5..4ffdab2 100644
---
a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java
+++
b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java
@@ -54,7 +54,7 @@ public class FhirR5RouteBuilder extends RouteBuilder {
.marshal(fhirXmlDataFormat);
from("direct:create-r5")
-
.to("fhir://create/resource?log={{fhir.log}}&serverUrl={{camel.fhir.test-url}}&&inBody=resourceAsString&fhirVersion=R5&fhirContext=#fhirContext");
+
.to("fhir://create/resource?inBody=resourceAsString&fhirVersion=R5&fhirContext=#fh
[camel-quarkus] branch master updated: Add ahc-ws extension
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 694f840 Add ahc-ws extension
694f840 is described below
commit 694f8408c0b8a621d4409411f7b86d58389abd35
Author: James Netherton
AuthorDate: Wed Jan 22 07:26:46 2020 +
Add ahc-ws extension
fixes #619
---
.../pages/list-of-camel-quarkus-extensions.adoc| 5 +-
extensions/ahc-ws/deployment/pom.xml | 83
.../ahc/ws/deployment/AhcWsProcessor.java | 18 +++--
extensions/ahc-ws/pom.xml | 39 ++
extensions/ahc-ws/runtime/pom.xml | 90 ++
.../main/resources/META-INF/quarkus-extension.yaml | 29 +++
.../kinesis/deployment/AwsKinesisProcessor.java| 6 +-
extensions/pom.xml | 1 +
extensions/readme.adoc | 5 +-
integration-tests/http/pom.xml | 12 +++
...{HttpRoute.java => GreetingServerEndpoint.java} | 14 ++--
.../quarkus/component/http/it/HttpResource.java| 22 ++
.../camel/quarkus/component/http/it/HttpRoute.java | 3 +
.../camel/quarkus/component/http/it/HttpTest.java | 12 +++
poms/bom-deployment/pom.xml| 5 ++
poms/bom/pom.xml | 10 +++
16 files changed, 335 insertions(+), 19 deletions(-)
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
index f8d7df5..cdc5eee 100644
--- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
+++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
@@ -15,7 +15,7 @@ TIP: In case you are missing some Camel feature in the list:
== Camel Components
// components: START
-Number of Camel components: 59 in 50 JAR artifacts (0 deprecated)
+Number of Camel components: 60 in 51 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -24,6 +24,9 @@ Number of Camel components: 59 in 50 JAR artifacts (0
deprecated)
| link:https://camel.apache.org/components/latest/ahc-component.html[AHC]
(camel-quarkus-ahc) +
`ahc:httpUri` | 1.2.0 | To call external HTTP services using Async Http Client.
+| link:https://camel.apache.org/components/latest/ahc-ws-component.html[AHC
Websocket] (camel-quarkus-ahc-ws) +
+`ahc-ws:httpUri` | 1.2.0 | To exchange data with external Websocket servers
using Async Http Client.
+
| link:https://camel.apache.org/components/latest/aws-ec2-component.html[AWS
EC2] (camel-quarkus-aws-ec2) +
`aws-ec2:label` | 1.2.0 | The aws-ec2 is used for managing Amazon EC2
instances.
diff --git a/extensions/ahc-ws/deployment/pom.xml
b/extensions/ahc-ws/deployment/pom.xml
new file mode 100644
index 000..81bed5f
--- /dev/null
+++ b/extensions/ahc-ws/deployment/pom.xml
@@ -0,0 +1,83 @@
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.camel.quarkus
+camel-quarkus-ahc-ws-parent
+1.1.0-SNAPSHOT
+../pom.xml
+
+
+camel-quarkus-ahc-ws-deployment
+Camel Quarkus :: AHC-WS :: Deployment
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bom-deployment
+${project.version}
+pom
+import
+
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-core-deployment
+
+
+org.apache.camel.quarkus
+camel-quarkus-http-common-deployment
+
+
+org.apache.camel.quarkus
+camel-quarkus-support-ahc-deployment
+
+
+org.apache.camel.quarkus
+camel-quarkus-ahc-ws
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+
+
+io.quarkus
+
quarkus-extension-processor
+${quarkus.version}
+
+
+
+
+
+
+
+
diff --git
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpRoute.java
b/extensions/ahc-ws/deployment/src/main/java/org/apache/camel/quarkus/component/ahc/ws/deployment/AhcWsProcessor.java
similarity index 69%
copy from
integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpRoute
[camel-quarkus] branch master updated (0223c2b -> 7f9ec9c)
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-quarkus.git. from 0223c2b Determine the Camel version at build time new 6bec185 Use application.properties rather than pom.xml for addAllCharsets new 7f9ec9c Fix #599 Document the need to set quarkus.native.add-all-charsets = true in HTTP extensions 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: docs/modules/ROOT/nav.adoc | 1 + docs/modules/ROOT/pages/extensions/ahc.adoc| 28 ++ docs/modules/ROOT/pages/extensions/http.adoc | 27 + docs/modules/ROOT/pages/extensions/netty-http.adoc | 4 .../ROOT/pages/extensions/platform-http.adoc | 6 + .../pages/list-of-camel-quarkus-extensions.adoc| 4 ++-- docs/modules/ROOT/pages/native-mode.adoc | 25 +++ extensions/readme.adoc | 4 ++-- integration-tests/platform-http/pom.xml| 1 - .../src/main/resources/application.properties | 3 +++ 10 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 docs/modules/ROOT/pages/extensions/ahc.adoc create mode 100644 docs/modules/ROOT/pages/extensions/http.adoc create mode 100644 docs/modules/ROOT/pages/native-mode.adoc
[camel-quarkus] branch master updated: Determine the Camel version at build time
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 0223c2b Determine the Camel version at build time
0223c2b is described below
commit 0223c2b172c8aceeadbae9bdac32446ea55c991d
Author: Peter Palaga
AuthorDate: Mon Jan 20 09:19:18 2020 +0100
Determine the Camel version at build time
---
.../org/apache/camel/quarkus/core/deployment/BuildProcessor.java | 3 ++-
.../org/apache/camel/quarkus/core/deployment/CamelSupport.java | 8
.../main/java/org/apache/camel/quarkus/core/CamelRecorder.java | 5 +++--
.../java/org/apache/camel/quarkus/core/FastCamelContext.java | 9 -
4 files changed, 21 insertions(+), 4 deletions(-)
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
index 380a727..110896f 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -357,7 +357,8 @@ class BuildProcessor {
contextFactory.getContextFactory(),
xmlLoader.getLoader(),
factoryFinderResolverBuildItem.getFactoryFinderResolver(),
-beanContainer.getValue());
+beanContainer.getValue(),
+CamelSupport.getCamelVersion());
return new CamelContextBuildItem(context);
}
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
index 296229d..66897ac 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
@@ -24,12 +24,14 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.AbstractMap;
import java.util.HashSet;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import org.apache.camel.CamelContext;
import org.apache.camel.quarkus.core.deployment.util.PathFilter;
import org.jboss.jandex.ClassInfo;
@@ -87,4 +89,10 @@ public final class CamelSupport {
return Stream.of(items).collect(Collectors.toCollection(HashSet::new));
}
+public static String getCamelVersion() {
+final String result =
CamelContext.class.getPackage().getImplementationVersion();
+Objects.requireNonNull(result, "Could not determine Camel version");
+return result;
+}
+
}
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
index 5a5824d..2dbf2ef 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
@@ -61,8 +61,9 @@ public class CamelRecorder {
RuntimeValue contextFactory,
RuntimeValue xmlLoader,
RuntimeValue factoryFinderResolver,
-BeanContainer beanContainer) {
-FastCamelContext context = new
FastCamelContext(factoryFinderResolver.getValue());
+BeanContainer beanContainer,
+String version) {
+FastCamelContext context = new
FastCamelContext(factoryFinderResolver.getValue(), version);
context.setRegistry(registry.getValue());
context.setTypeConverterRegistry(typeConverterRegistry.getValue());
context.setLoadTypeConverters(false);
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index 1eb3d3d..0d10ed7 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -105,9 +105,11 @@ import org.apache.camel.spi.ValidatorRegistry;
public class FastCamelContext extends AbstractCamelContext {
private Model model;
+private final String version;
-public FastCamelContext(FactoryFinderResolver factoryFinderResolver) {
+public FastCamelContext(FactoryFinderResolver factoryFinderResolver,
Stri
[camel-quarkus] 02/02: Fix #599 Document the need to set quarkus.native.add-all-charsets = true in HTTP extensions
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
commit 7f9ec9cfe1c30765f3d554f561c28deabe0d5dff
Author: Peter Palaga
AuthorDate: Tue Jan 21 11:49:07 2020 +0100
Fix #599 Document the need to set quarkus.native.add-all-charsets = true in
HTTP extensions
---
docs/modules/ROOT/nav.adoc | 1 +
docs/modules/ROOT/pages/extensions/ahc.adoc| 28 ++
docs/modules/ROOT/pages/extensions/http.adoc | 27 +
docs/modules/ROOT/pages/extensions/netty-http.adoc | 4
.../ROOT/pages/extensions/platform-http.adoc | 6 +
.../pages/list-of-camel-quarkus-extensions.adoc| 4 ++--
docs/modules/ROOT/pages/native-mode.adoc | 25 +++
extensions/readme.adoc | 4 ++--
8 files changed, 95 insertions(+), 4 deletions(-)
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 8bf3411..bcb2e35 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -1,6 +1,7 @@
* xref:user-guide.adoc[User guide]
** xref:first-steps.adoc[First steps]
** xref:cdi.adoc[CDI]
+** xref:native-mode.adoc[Native mode]
** xref:examples.adoc[Examples]
* xref:contributor-guide.adoc[Contributor guide]
* xref:list-of-camel-quarkus-extensions.adoc[List of Camel Quarkus extensions]
diff --git a/docs/modules/ROOT/pages/extensions/ahc.adoc
b/docs/modules/ROOT/pages/extensions/ahc.adoc
new file mode 100644
index 000..8ea06a3
--- /dev/null
+++ b/docs/modules/ROOT/pages/extensions/ahc.adoc
@@ -0,0 +1,28 @@
+[[ahc]]
+= Async HTTP Client (AHC) Extension
+
+*Since Camel Quarkus 1.0.0*
+
+The AHC component provides HTTP based endpoints for consuming external HTTP
resources (as a client to call external
+servers using HTTP). It is using the
https://github.com/AsyncHttpClient/async-http-client[Async Http Client library]
+under the hood.
+
+Maven users will need to add the following dependency to their `pom.xml` for
this extension.
+
+[source,xml]
+
+
+org.apache.camel.quarkus
+camel-quarkus-ahc
+
+
+
+== Usage
+
+Please refer to the
https://camel.apache.org/components/latest/ahc-component.html[AHC] component
page.
+
+
+== Configuration
+
+* Check the xref:native-mode.adoc#charsets[Character encodings section] of the
Native mode guide if you expect
+ your application to send or receive requests using non-default encodings.
diff --git a/docs/modules/ROOT/pages/extensions/http.adoc
b/docs/modules/ROOT/pages/extensions/http.adoc
new file mode 100644
index 000..06ac77c
--- /dev/null
+++ b/docs/modules/ROOT/pages/extensions/http.adoc
@@ -0,0 +1,27 @@
+[[http]]
+= HTTP Extension
+
+*Since Camel Quarkus 1.0.0*
+
+The HTTP component provides HTTP based endpoints for calling external HTTP
resources (as a client to call external
+servers using HTTP).
+
+Maven users will need to add the following dependency to their `pom.xml` for
this extension.
+
+[source,xml]
+
+
+org.apache.camel.quarkus
+camel-quarkus-http
+
+
+
+== Usage
+
+Please refer to the
https://camel.apache.org/components/latest/http-component.html[HTTP] component
page.
+
+
+== Configuration
+
+* Check the xref:native-mode.adoc#charsets[Character encodings section] of the
Native mode guide if you expect
+ your application to send or receive requests using non-default encodings.
diff --git a/docs/modules/ROOT/pages/extensions/netty-http.adoc
b/docs/modules/ROOT/pages/extensions/netty-http.adoc
index 23595bb..df899d6 100644
--- a/docs/modules/ROOT/pages/extensions/netty-http.adoc
+++ b/docs/modules/ROOT/pages/extensions/netty-http.adoc
@@ -42,3 +42,7 @@ public class CamelRoute extends RouteBuilder {
}
+== Configuration
+
+* Check the xref:native-mode.adoc#charsets[Character encodings section] of the
Native mode guide if you expect
+ your application to send or receive requests using non-default encodings.
diff --git a/docs/modules/ROOT/pages/extensions/platform-http.adoc
b/docs/modules/ROOT/pages/extensions/platform-http.adoc
index 64e00e4..01b60b0 100644
--- a/docs/modules/ROOT/pages/extensions/platform-http.adoc
+++ b/docs/modules/ROOT/pages/extensions/platform-http.adoc
@@ -97,3 +97,9 @@
from("platform-http:/upload/multipart?fileNameExtWhitelist=adoc,txt&httpMethodRe
Also check the `quarkus.http.body.*` configuration options in
https://quarkus.io/guides/all-config[Quarkus documentation], esp.
`quarkus.http.body.handle-file-uploads`, `quarkus.http.body.uploads-directory`
and `quarkus.http.body.delete-uploaded-files-on-end`.
+
+
+== Configuration
+
+* Check the xref:native-mode.adoc#charsets[Character encodings section] of the
Native mode guide if you expect
+ your application to send or receive requests using non-default encodings.
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
b/doc
[camel-quarkus] 01/02: Use application.properties rather than pom.xml for addAllCharsets
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 commit 6bec1855b28d5c8ea63836090aea80004586dfd4 Author: Peter Palaga AuthorDate: Mon Jan 20 11:51:32 2020 +0100 Use application.properties rather than pom.xml for addAllCharsets --- integration-tests/platform-http/pom.xml| 1 - .../platform-http/src/main/resources/application.properties| 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/integration-tests/platform-http/pom.xml b/integration-tests/platform-http/pom.xml index a966ba5..ae09986 100644 --- a/integration-tests/platform-http/pom.xml +++ b/integration-tests/platform-http/pom.xml @@ -128,7 +128,6 @@ true true true -true diff --git a/integration-tests/platform-http/src/main/resources/application.properties b/integration-tests/platform-http/src/main/resources/application.properties index 33ed67b..f6591cf 100644 --- a/integration-tests/platform-http/src/main/resources/application.properties +++ b/integration-tests/platform-http/src/main/resources/application.properties @@ -22,3 +22,6 @@ quarkus.http.body.uploads-directory=target/uploads quarkus.log.file.enable = false quarkus.log.category."org.apache.camel.quarkus.core.deployment".level = INFO quarkus.log.category."org.apache.camel.quarkus.component.platform.http".level = INFO + +# Required by the encoding() test +quarkus.native.add-all-charsets = true
[camel-quarkus] branch master updated (7f9ec9c -> 5477f3b)
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-quarkus.git. from 7f9ec9c Fix #599 Document the need to set quarkus.native.add-all-charsets = true in HTTP extensions add d7ea504 fast-camel-context: don't lookup for custom Injector add 5477f3b factory-finder: include constant among the list of languages to bound to the rigistry No new revisions were added by this update. Summary of changes: .../apache/camel/quarkus/core/deployment/BuildProcessor.java | 5 +++-- .../java/org/apache/camel/quarkus/core/FastCamelContext.java | 2 +- .../src/test/java/org/apache/camel/quarkus/core/CamelTest.java | 10 ++ 3 files changed, 10 insertions(+), 7 deletions(-)
[camel-quarkus] branch master updated: factory-finder: move reactive-executor filter to core processor as the related service is always programmatically configured
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 9c4a4f1 factory-finder: move reactive-executor filter to core
processor as the related service is always programmatically configured
9c4a4f1 is described below
commit 9c4a4f1348dc4a72d9d46ba4f552a50255aed3b2
Author: lburgazzoli
AuthorDate: Thu Jan 23 09:55:44 2020 +0100
factory-finder: move reactive-executor filter to core processor as the
related service is always programmatically configured
---
.../apache/camel/quarkus/core/deployment/BuildProcessor.java | 6 ++
.../quarkus/reactive/executor/deployment/BuildProcessor.java | 11 ---
.../test/java/org/apache/camel/quarkus/core/CamelTest.java| 5 +
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
index 0797adc..1f27ff7 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -125,6 +125,12 @@ class BuildProcessor {
void coreServiceFilter(BuildProducer
filterBuildItems) {
filterBuildItems.produce(
new
CamelServiceFilterBuildItem(CamelServiceFilter.forService("properties-component-factory")));
+
+// The reactive executor is programmatically configured by an
extension or
+// a default implementation is provided by this processor thus we
can safely
+// prevent loading of this service.
+filterBuildItems.produce(
+new
CamelServiceFilterBuildItem(CamelServiceFilter.forService("reactive-executor")));
}
@BuildStep
diff --git
a/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
b/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
index ebdaf57..77020e9 100644
---
a/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
+++
b/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
@@ -22,20 +22,9 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.vertx.deployment.VertxBuildItem;
import org.apache.camel.quarkus.core.Flags;
import org.apache.camel.quarkus.core.deployment.CamelReactiveExecutorBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilter;
-import org.apache.camel.quarkus.core.deployment.CamelServiceFilterBuildItem;
import org.apache.camel.quarkus.reactive.executor.ReactiveExecutorRecorder;
public class BuildProcessor {
-/*
- * The reactive executor is programmatically configured by the extension
thus
- * we can safely prevent camel-quarkus-core to instantiate a default
instance.
- */
-@BuildStep
-CamelServiceFilterBuildItem serviceFilter() {
-return new
CamelServiceFilterBuildItem(CamelServiceFilter.forService("reactive-executor"));
-}
-
@Record(value = ExecutionTime.RUNTIME_INIT, optional = true)
@BuildStep(onlyIf = Flags.MainEnabled.class)
CamelReactiveExecutorBuildItem reactiveExecutor(ReactiveExecutorRecorder
recorder, VertxBuildItem vertx) {
diff --git
a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
b/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
index 627bbf5..214c35f 100644
---
a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
+++
b/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
@@ -126,6 +126,11 @@ public class CamelTest {
// misc
assertThat(factoryFinderMap)
.hasKeySatisfying(startsWith("META-INF/services/org/apache/camel/configurer/"));
+
+// core
+assertThat(factoryFinderMap)
+
.hasKeySatisfying(doesNotStartWith("META-INF/services/org/apache/camel/properties-component-factory"))
+
.hasKeySatisfying(doesNotStartWith("META-INF/services/org/apache/camel/reactive-executor"));
}
@Test
[camel-quarkus] branch master updated (c6b1b27 -> 011b79f)
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-quarkus.git. from c6b1b27 Merge pull request #658 from lburgazzoli/quarkus-1.2.0.Final add 011b79f The MicroProfile test fails if message history is turned off #650 No new revisions were added by this update. Summary of changes: .../deployment/MicroProfileMetricsProcessor.java | 10 ++ .../runtime/CamelMicroProfileMetricsRecorder.java | 37 +++--- .../src/main/resources/application.properties | 7 +++- 3 files changed, 48 insertions(+), 6 deletions(-)
[camel-quarkus] branch master updated: Create a Camel ReactiveStreams extension #304
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 fc29217 Create a Camel ReactiveStreams extension #304
fc29217 is described below
commit fc29217818caa3d6a477252e5850bf197d05f4ae
Author: lburgazzoli
AuthorDate: Thu Jan 23 11:04:03 2020 +0100
Create a Camel ReactiveStreams extension #304
---
.../pages/list-of-camel-quarkus-extensions.adoc| 5 +-
extensions/pom.xml | 1 +
extensions/reactive-streams/deployment/pom.xml | 75
.../deployment/ReactiveStreamsProcessor.java | 92 +++
.../ReactiveStreamsServiceFactoryBuildItem.java| 36 ++
extensions/reactive-streams/pom.xml| 39 +++
extensions/reactive-streams/runtime/pom.xml| 82 ++
.../reactive/streams/ReactiveStreamsProducers.java | 51 +
.../reactive/streams/ReactiveStreamsRecorder.java | 91 +++
.../main/resources/META-INF/quarkus-extension.yaml | 27 +
extensions/readme.adoc | 5 +-
integration-tests/pom.xml | 1 +
integration-tests/reactive-streams/pom.xml | 126 +
.../streams/it/ReactiveStreamsResource.java| 94 +++
.../reactive/streams/it/ReactiveStreamsRoute.java | 29 +
.../streams/it/support/TestSubscriber.java | 77 +
.../src/main/resources/application.properties | 32 ++
.../reactive/streams/it/ReactiveStreamsIT.java | 24
.../reactive/streams/it/ReactiveStreamsTest.java | 62 ++
poms/bom-deployment/pom.xml| 5 +
poms/bom/pom.xml | 10 ++
21 files changed, 962 insertions(+), 2 deletions(-)
diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
index 7c22ea0..998cb7c 100644
--- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
+++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc
@@ -15,7 +15,7 @@ TIP: In case you are missing some Camel feature in the list:
== Camel Components
// components: START
-Number of Camel components: 60 in 51 JAR artifacts (0 deprecated)
+Number of Camel components: 61 in 52 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -141,6 +141,9 @@ Number of Camel components: 60 in 51 JAR artifacts (0
deprecated)
| xref:extensions/platform-http.adoc[Platform HTTP]
(camel-quarkus-platform-http) +
`platform-http:path` | 0.3.0 | HTTP service leveraging existing runtime
platform HTTP server
+|
link:https://camel.apache.org/components/latest/reactive-streams-component.html[Reactive
Streams] (camel-quarkus-reactive-streams) +
+`reactive-streams:stream` | 1.0.0 | Reactive Camel using reactive streams
+
| link:https://camel.apache.org/components/latest/rest-component.html[REST]
(camel-quarkus-rest) +
`rest:method:path:uriTemplate` | 0.2.0 | The rest component is used for either
hosting REST services (consumer) or calling external REST services (producer).
diff --git a/extensions/pom.xml b/extensions/pom.xml
index f17123b..181534c 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -90,6 +90,7 @@
paho
pdf
platform-http
+reactive-streams
rest
salesforce
scheduler
diff --git a/extensions/reactive-streams/deployment/pom.xml
b/extensions/reactive-streams/deployment/pom.xml
new file mode 100644
index 000..2516630
--- /dev/null
+++ b/extensions/reactive-streams/deployment/pom.xml
@@ -0,0 +1,75 @@
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.camel.quarkus
+camel-quarkus-reactive-streams-parent
+1.1.0-SNAPSHOT
+../pom.xml
+
+
+camel-quarkus-reactive-streams-deployment
+Camel Quarkus :: Reactive Streams :: Deployment
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-bom-deployment
+${project.version}
+pom
+import
+
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-core-deployment
+
+
+org.apache.camel.quarkus
+camel-quarkus-reactive-streams
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+
+
[camel-quarkus] branch master updated (fc29217 -> 8fb71a4)
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-quarkus.git. from fc29217 Create a Camel ReactiveStreams extension #304 add 8fb71a4 Fix #635 Dependency parity check No new revisions were added by this update. Summary of changes: extensions/ahc/deployment/pom.xml| 4 ++ extensions/core-cloud/deployment/pom.xml | 4 ++ extensions/core/runtime/pom.xml | 4 ++ extensions/ftp/runtime/pom.xml | 4 ++ extensions/kotlin/deployment/pom.xml | 4 +- extensions/kotlin/runtime/pom.xml| 4 ++ extensions/servlet/deployment/pom.xml| 4 -- extensions/support/aws/deployment/pom.xml| 4 ++ extensions/support/aws/runtime/pom.xml | 4 +- extensions/support/spring/deployment/pom.xml | 4 ++ extensions/support/xml/deployment/pom.xml| 4 ++ tooling/scripts/validate-dependencies.groovy | 90 ++-- 12 files changed, 122 insertions(+), 12 deletions(-)
[camel-quarkus] branch master updated (8fb71a4 -> b9200ad)
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-quarkus.git. from 8fb71a4 Fix #635 Dependency parity check add b9200ad Disable sftp native tests on Jenkins No new revisions were added by this update. Summary of changes: Jenkinsfile | 1 + Jenkinsfile.quarkus | 1 + .../org/apache/camel/quarkus/component/sftp/it/SftpTest.java | 9 ++--- 3 files changed, 8 insertions(+), 3 deletions(-)
[camel-quarkus] branch master updated: Fix #518 Rely on configurers for Configuration classes instead of using reflection
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 2dfafe3 Fix #518 Rely on configurers for Configuration classes
instead of using reflection
2dfafe3 is described below
commit 2dfafe3ba69fde74d9f63bdac86d903f194f467f
Author: Peter Palaga
AuthorDate: Thu Dec 5 11:57:59 2019 +0100
Fix #518 Rely on configurers for Configuration classes instead of using
reflection
---
.../aws/ec2/deployment/AwsEc2Processor.java| 4 +-
.../aws/ecs/deployment/AwsEcsProcessor.java| 4 +-
.../aws/eks/deployment/AwsEKSProcessor.java| 4 +-
.../aws/iam/deployment/AwsIamProcessor.java| 4 +-
.../kinesis/deployment/AwsKinesisProcessor.java| 6 +-
.../aws/kms/deployment/AwsKmsProcessor.java| 4 +-
.../aws/lambda/deployment/AwsLambdaProcessor.java | 4 +-
.../aws/s3/deployment/AwsS3Processor.java | 4 +-
.../aws/sns/deployment/AwsSNSProcessor.java| 4 +-
.../aws/sqs/deployment/AwsSQSProcessor.java| 4 +-
.../deployment/AwsTranslateProcessor.java | 4 +-
.../core/deployment/NativeImageProcessor.java | 3 +-
.../deployment/UnbannedReflectiveBuildItem.java| 47 +
.../component/dozer/deployment/DozerProcessor.java | 2 -
.../component/ftp/deployment/FtpProcessor.java | 9 --
.../infinispan/deployment/InfinispanProcessor.java | 7 --
.../component/paho/deployment/PahoProcessor.java | 4 +-
extensions/support/policy/deployment/pom.xml | 75 ++
.../support/policy/deployment/PolicyProcessor.java | 112 +
extensions/support/{ => policy}/pom.xml| 29 ++
extensions/support/policy/runtime/pom.xml | 78 ++
extensions/support/pom.xml | 1 +
.../twitter/deployment/TwitterProcessor.java | 4 +-
integration-tests/pom.xml | 7 ++
poms/bom-deployment/pom.xml| 5 +
poms/bom/pom.xml | 5 +
26 files changed, 355 insertions(+), 79 deletions(-)
diff --git
a/extensions/aws-ec2/deployment/src/main/java/org/apache/camel/quarkus/component/aws/ec2/deployment/AwsEc2Processor.java
b/extensions/aws-ec2/deployment/src/main/java/org/apache/camel/quarkus/component/aws/ec2/deployment/AwsEc2Processor.java
index 292e4ef..e3e76d0 100644
---
a/extensions/aws-ec2/deployment/src/main/java/org/apache/camel/quarkus/component/aws/ec2/deployment/AwsEc2Processor.java
+++
b/extensions/aws-ec2/deployment/src/main/java/org/apache/camel/quarkus/component/aws/ec2/deployment/AwsEc2Processor.java
@@ -29,7 +29,6 @@ import
io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.camel.component.aws.ec2.EC2Configuration;
class AwsEc2Processor {
public static final String AWS_EC2_APPLICATION_ARCHIVE_MARKERS =
"com/amazonaws";
@@ -58,8 +57,7 @@ class AwsEc2Processor {
Endpoint.class.getCanonicalName(),
Region.class.getCanonicalName(),
Service.class.getCanonicalName(),
-CredentialScope.class.getCanonicalName(),
-EC2Configuration.class.getCanonicalName()));
+CredentialScope.class.getCanonicalName()));
}
}
diff --git
a/extensions/aws-ecs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/ecs/deployment/AwsEcsProcessor.java
b/extensions/aws-ecs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/ecs/deployment/AwsEcsProcessor.java
index b4f20a6..ba58aae 100644
---
a/extensions/aws-ecs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/ecs/deployment/AwsEcsProcessor.java
+++
b/extensions/aws-ecs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/ecs/deployment/AwsEcsProcessor.java
@@ -29,7 +29,6 @@ import
io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.camel.component.aws.ecs.ECSConfiguration;
class AwsEcsProcessor {
@@ -59,7 +58,6 @@ class AwsEcsProcessor {
Endpoint.class.getCanonicalName(),
Region.class.getCanonicalName(),
Service.class.getCanonicalName(),
-CredentialScope.class.getCanonicalName(),
-ECSConfiguration.class.get
[camel-quarkus] branch master updated: Set firstVersion to 1.0.0 to match the reality
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 0605113 Set firstVersion to 1.0.0 to match the reality 0605113 is described below commit 06051130f7e3479e6b7b9a1c0eb132c6bfccb46e Author: Peter Palaga AuthorDate: Thu Jan 23 20:51:54 2020 +0100 Set firstVersion to 1.0.0 to match the reality --- .../ROOT/pages/list-of-camel-quarkus-extensions.adoc | 14 +++--- extensions/ahc-ws/runtime/pom.xml | 2 +- extensions/ahc/runtime/pom.xml | 2 +- extensions/aws-ec2/runtime/pom.xml | 2 +- extensions/aws-kinesis/runtime/pom.xml | 2 +- extensions/aws-lambda/runtime/pom.xml | 2 +- extensions/aws-translate/runtime/pom.xml | 2 +- extensions/readme.adoc | 14 +++--- extensions/support/aws/runtime/pom.xml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc index 998cb7c..b0871a6 100644 --- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc +++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc @@ -22,13 +22,13 @@ Number of Camel components: 61 in 52 JAR artifacts (0 deprecated) | Component | Since | Description | xref:extensions/ahc.adoc[AHC] (camel-quarkus-ahc) + -`ahc:httpUri` | 1.2.0 | To call external HTTP services using Async Http Client. +`ahc:httpUri` | 1.0.0 | To call external HTTP services using Async Http Client. | link:https://camel.apache.org/components/latest/ahc-ws-component.html[AHC Websocket] (camel-quarkus-ahc-ws) + -`ahc-ws:httpUri` | 1.2.0 | To exchange data with external Websocket servers using Async Http Client. +`ahc-ws:httpUri` | 1.0.0 | To exchange data with external Websocket servers using Async Http Client. | link:https://camel.apache.org/components/latest/aws-ec2-component.html[AWS EC2] (camel-quarkus-aws-ec2) + -`aws-ec2:label` | 1.2.0 | The aws-ec2 is used for managing Amazon EC2 instances. +`aws-ec2:label` | 1.0.0 | The aws-ec2 is used for managing Amazon EC2 instances. | link:https://camel.apache.org/components/latest/aws-ecs-component.html[AWS ECS] (camel-quarkus-aws-ecs) + `aws-ecs:label` | 1.0.0-M1 | The aws-ecs is used for managing Amazon ECS @@ -40,16 +40,16 @@ Number of Camel components: 61 in 52 JAR artifacts (0 deprecated) `aws-iam:label` | 1.1.0 | The aws-iam is used for managing Amazon IAM | link:https://camel.apache.org/components/latest/aws-kinesis-component.html[AWS Kinesis] (camel-quarkus-aws-kinesis) + -`aws-kinesis:streamName` | 1.2.0 | The aws-kinesis component is for consuming and producing records from Amazon Kinesis Streams. +`aws-kinesis:streamName` | 1.0.0 | The aws-kinesis component is for consuming and producing records from Amazon Kinesis Streams. | link:https://camel.apache.org/components/latest/aws-kinesis-firehose-component.html[AWS Kinesis Firehose] (camel-quarkus-aws-kinesis) + -`aws-kinesis-firehose:streamName` | 1.2.0 | The aws-kinesis-firehose component is used for producing Amazon's Kinesis Firehose streams. +`aws-kinesis-firehose:streamName` | 1.0.0 | The aws-kinesis-firehose component is used for producing Amazon's Kinesis Firehose streams. | link:https://camel.apache.org/components/latest/aws-kms-component.html[AWS KMS] (camel-quarkus-aws-kms) + `aws-kms:label` | 1.0.0-M1 | The aws-kms is used for managing Amazon KMS | link:https://camel.apache.org/components/latest/aws-lambda-component.html[AWS Lambda] (camel-quarkus-aws-lambda) + -`aws-lambda:function` | 1.2.0 | The aws-lambda is used for managing and invoking functions from Amazon Lambda. +`aws-lambda:function` | 1.0.0 | The aws-lambda is used for managing and invoking functions from Amazon Lambda. | link:https://camel.apache.org/components/latest/aws-s3-component.html[AWS S3 Storage Service] (camel-quarkus-aws-s3) + `aws-s3://bucketNameOrArn` | 0.2.0 | The aws-s3 component is used for storing and retrieving object from Amazon S3 Storage Service. @@ -61,7 +61,7 @@ Number of Camel components: 61 in 52 JAR artifacts (0 deprecated) `aws-sqs:queueNameOrArn` | 0.2.0 | The aws-sqs component is used for sending and receiving messages to Amazon's SQS service. | link:https://camel.apache.org/components/latest/aws-translate-component.html[AWS Translate] (camel-quarkus-aws-translate) + -`aws-translate:label` | 1.2.0 | The aws-kms is used for managing Amazon Translate +`aws-translate:label` | 1.0.0 | The aws-kms is used for managing Amazon Translate | link:https://camel.apache.org/components/latest/bean-component.htm
[camel] branch master updated (2ae0ad6 -> 629450b)
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.git. from 2ae0ad6 Upgrade AWS Java SDK 2 to version 2.10.56 add 629450b CAMEL-14449: camel-main: duration properties are ignored No new revisions were added by this update. Summary of changes: .../org/apache/camel/main/BaseMainSupport.java | 2 +- .../test/java/org/apache/camel/main/MainTest.java | 29 ++ 2 files changed, 30 insertions(+), 1 deletion(-)
[camel] branch master updated: Add a RouteBuilderLifecycleStrategy to intercept RouteBuilder related events
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 041ebb0 Add a RouteBuilderLifecycleStrategy to intercept RouteBuilder
related events
041ebb0 is described below
commit 041ebb03ed508b7ff32e13ff4ef20f5241b4d00e
Author: lburgazzoli
AuthorDate: Mon Jan 27 19:51:37 2020 +0100
Add a RouteBuilderLifecycleStrategy to intercept RouteBuilder related events
---
.../org/apache/camel/builder/RouteBuilder.java | 30 +--
.../builder/RouteBuilderLifecycleStrategy.java | 34 ++
.../org/apache/camel/builder/RouteBuilderTest.java | 29 ++
3 files changed, 90 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 2d3e5d9..4fc6bef 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -71,6 +71,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
private List transformerBuilders = new ArrayList<>();
private List validatorBuilders = new ArrayList<>();
private RoutesDefinition routeCollection = new RoutesDefinition();
+private final List lifecycleInterceptors =
new ArrayList<>();
public RouteBuilder() {
this(null);
@@ -96,7 +97,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
/**
* Add routes to a context using a lambda expression. It can be used as
* following:
- *
+ *
*
* RouteBuilder.addRoutes(context, rb ->
* rb.from("direct:inbound").bean(ProduceTemplateBean.class)));
@@ -209,7 +210,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
/**
* Create a new {@code TransformerBuilder}.
- *
+ *
* @return the builder
*/
public TransformerBuilder transformer() {
@@ -220,7 +221,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
/**
* Create a new {@code ValidatorBuilder}.
- *
+ *
* @return the builder
*/
public ValidatorBuilder validator() {
@@ -469,6 +470,20 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
getRouteCollection().setErrorHandlerFactory(getErrorHandlerBuilder());
}
+/**
+ * Adds the given {@link RouteBuilderLifecycleStrategy} to be used.
+ */
+public void addLifecycleInterceptor(RouteBuilderLifecycleStrategy
interceptor) {
+lifecycleInterceptors.add(interceptor);
+}
+
+/**
+ * Adds the given {@link RouteBuilderLifecycleStrategy}.
+ */
+public void removeLifecycleInterceptor(RouteBuilderLifecycleStrategy
interceptor) {
+lifecycleInterceptors.remove(interceptor);
+}
+
// Implementation methods
// ---
protected void checkInitialized() throws Exception {
@@ -478,12 +493,21 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
if
(camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory()
instanceof ErrorHandlerBuilder) {
setErrorHandlerBuilder((ErrorHandlerBuilder)camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory());
}
+
+for (RouteBuilderLifecycleStrategy interceptor :
lifecycleInterceptors) {
+interceptor.beforeConfigure(this);
+}
+
configure();
// mark all route definitions as custom prepared because
// a route builder prepares the route definitions correctly already
for (RouteDefinition route : getRouteCollection().getRoutes()) {
route.markPrepared();
}
+
+for (RouteBuilderLifecycleStrategy interceptor :
lifecycleInterceptors) {
+interceptor.afterConfigure(this);
+}
}
}
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderLifecycleStrategy.java
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderLifecycleStrategy.java
new file mode 100644
index 000..dc6b8d4
--- /dev/null
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/RouteBuilderLifecycleStrategy.java
@@ -0,0 +1,34 @@
+/*
+ * 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
[camel] branch camel-3.0.x updated: CAMEL-14449: camel-main: duration properties are ignored
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.0.x by this push:
new 631afbb CAMEL-14449: camel-main: duration properties are ignored
631afbb is described below
commit 631afbb980d5e2bd7f9544d59ce87239a18e5dbe
Author: lburgazzoli
AuthorDate: Tue Jan 28 11:05:03 2020 +0100
CAMEL-14449: camel-main: duration properties are ignored
---
.../java/org/apache/camel/main/BaseMainSupport.java | 18 +-
.../test/java/org/apache/camel/main/MainTest.java| 20
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 04929ed..d8935f1 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -511,15 +511,6 @@ public abstract class BaseMainSupport extends
ServiceSupport {
pc.setOverrideProperties(overrideProperties);
}
-if (mainConfigurationProperties.getDurationMaxMessages() > 0 ||
mainConfigurationProperties.getDurationMaxIdleSeconds() > 0) {
-// register lifecycle so we can trigger to shutdown the JVM when
maximum number of messages has been processed
-EventNotifier notifier = new
MainDurationEventNotifier(camelContext,
mainConfigurationProperties.getDurationMaxMessages(),
-mainConfigurationProperties.getDurationMaxIdleSeconds(),
completed, latch, true);
-// register our event notifier
-ServiceHelper.startService(notifier);
-camelContext.getManagementStrategy().addEventNotifier(notifier);
-}
-
// gathers the properties (key=value) that was auto-configured
final Map autoConfiguredProperties = new
LinkedHashMap<>();
@@ -563,6 +554,15 @@ public abstract class BaseMainSupport extends
ServiceSupport {
});
}
+if (mainConfigurationProperties.getDurationMaxMessages() > 0 ||
mainConfigurationProperties.getDurationMaxIdleSeconds() > 0) {
+// register lifecycle so we can trigger to shutdown the JVM when
maximum number of messages has been processed
+EventNotifier notifier = new
MainDurationEventNotifier(camelContext,
mainConfigurationProperties.getDurationMaxMessages(),
+mainConfigurationProperties.getDurationMaxIdleSeconds(),
completed, latch, true);
+// register our event notifier
+ServiceHelper.startService(notifier);
+camelContext.getManagementStrategy().addEventNotifier(notifier);
+}
+
// try to load the route builders
loadRouteBuilders(camelContext);
// then configure and add the routes
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
index b5e95ae..550f506 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
@@ -16,9 +16,12 @@
*/
package org.apache.camel.main;
+import java.util.Properties;
+
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spi.ManagementStrategy;
import org.junit.Assert;
import org.junit.Test;
@@ -116,6 +119,23 @@ public class MainTest extends Assert {
main.stop();
}
+@Test
+public void testLifecycleConfiguration() throws Exception {
+Properties properties = new Properties();
+properties.setProperty("camel.main.duration-max-messages", "1");
+
+Main main = new Main();
+main.setOverrideProperties(properties);
+main.start();
+
+CamelContext camelContext = main.getCamelContext();
+ManagementStrategy strategy = camelContext.getManagementStrategy();
+
+assertTrue(strategy.getEventNotifiers().stream().anyMatch(n -> n
instanceof MainDurationEventNotifier));
+
+main.stop();
+}
+
public static class MyRouteBuilder extends RouteBuilder {
@Override
public void configure() throws Exception {
[camel-quarkus] branch quarkus-master created (now ae90a26)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch quarkus-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. at ae90a26 Merge pull request #667 from lburgazzoli/cleanup No new revisions were added by this update.
[camel-k-runtime] branch master updated: Update camel-quarkus to v1.0.0-M3
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
The following commit(s) were added to refs/heads/master by this push:
new 0b55008 Update camel-quarkus to v1.0.0-M3
0b55008 is described below
commit 0b55008a1fc53d362c91d4471dd82caad0f43a9b
Author: lburgazzoli
AuthorDate: Mon Feb 3 09:21:52 2020 +0100
Update camel-quarkus to v1.0.0-M3
---
camel-k-loader-js/pom.xml | 1 -
.../knative/KnativeSourceRoutesLoaderTest.java | 2 +-
.../quarkus/deployment/DeploymentProcessor.java| 11 +++
.../camel-k-quarkus-knative/runtime/pom.xml| 1 -
.../quarkus/deployment/DeploymentProcessor.java| 10 ++
.../component/knative/KnativeComponentTest.java| 36 +-
pom.xml| 18 +--
7 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/pom.xml
index 7dbc524..27498e3 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -45,7 +45,6 @@
org.graalvm.js
js
-${graalvm.version}
diff --git
a/camel-k-loader-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java
b/camel-k-loader-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java
index 1e615fc..8138f8a 100644
---
a/camel-k-loader-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java
+++
b/camel-k-loader-knative/src/test/java/org/apache/camel/k/loader/knative/KnativeSourceRoutesLoaderTest.java
@@ -138,7 +138,7 @@ public class KnativeSourceRoutesLoaderTest {
KnativeComponent component = new KnativeComponent();
component.setEnvironment(KnativeEnvironment.on(
-KnativeEnvironment.endpoint(Knative.EndpointKind.source, "sink",
"localhost", port)
+KnativeEnvironment.endpoint(Knative.EndpointKind.sink, "sink",
"localhost", port)
));
TestRuntime runtime = new TestRuntime();
diff --git
a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
index 313aea5..4503b63 100644
---
a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
+++
b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
@@ -27,9 +27,11 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import org.apache.camel.k.Constants;
import org.apache.camel.k.Runtime;
import org.apache.camel.k.core.quarkus.RuntimeRecorder;
import org.apache.camel.quarkus.core.deployment.CamelMainListenerBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelServicePatternBuildItem;
import org.apache.camel.spi.HasId;
import org.apache.camel.spi.StreamCachingStrategy;
import org.jboss.jandex.IndexView;
@@ -38,6 +40,15 @@ import static
org.apache.camel.k.core.quarkus.deployment.DeploymentSupport.getAl
public class DeploymentProcessor {
@BuildStep
+CamelServicePatternBuildItem servicePatterns() {
+return new CamelServicePatternBuildItem(
+CamelServicePatternBuildItem.CamelServiceDestination.REGISTRY,
+true,
+Constants.ROUTES_LOADER_RESOURCE_PATH + "/*",
+Constants.CONTEXT_CUSTOMIZER_RESOURCE_PATH + "/*");
+}
+
+@BuildStep
void registerServices(
BuildProducer serviceProvider,
BuildProducer reflectiveClass,
diff --git a/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml
b/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml
index 1076f2e..b45b5e6 100644
--- a/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml
@@ -51,7 +51,6 @@
com.oracle.substratevm
svm
-${graalvm.version}
diff --git
a/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java
b/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src/main/java/org/apache/camel/k/loader/yaml/quarkus/deployment/DeploymentProcessor.java
index 1ac414a..bfb999e 100644
---
a/camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/src
[camel-k-runtime] 02/02: Bump version to 1.1.0-SNAPSHOT
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 119ec3570380636197b503b121797f1a7fa6c905 Author: lburgazzoli AuthorDate: Fri Jan 31 19:19:01 2020 +0100 Bump version to 1.1.0-SNAPSHOT --- camel-k-loader-groovy/pom.xml | 2 +- camel-k-loader-java/pom.xml | 2 +- camel-k-loader-js/pom.xml | 2 +- camel-k-loader-knative/pom.xml | 2 +- camel-k-loader-kotlin/pom.xml | 2 +- camel-k-loader-xml/pom.xml | 2 +- camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml | 2 +- camel-k-loader-yaml/camel-k-loader-yaml/pom.xml | 2 +- camel-k-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-knative/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/it/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/runtime/pom.xml | 2 +- camel-k-quarkus/pom.xml | 2 +- camel-k-runtime-bom/pom.xml | 2 +- camel-k-runtime-core/pom.xml| 2 +- camel-k-runtime-cron/pom.xml| 2 +- camel-k-runtime-health/pom.xml | 2 +- camel-k-runtime-knative/pom.xml | 2 +- camel-k-runtime-main/pom.xml| 2 +- camel-k-runtime-servlet/pom.xml | 2 +- camel-k-runtime-webhook/pom.xml | 2 +- camel-knative/camel-knative-api/pom.xml | 2 +- camel-knative/camel-knative-http/pom.xml| 2 +- camel-knative/camel-knative/pom.xml | 2 +- camel-knative/pom.xml | 2 +- distribution/pom.xml| 2 +- examples/camel-k-runtime-example-health/pom.xml | 2 +- examples/camel-k
[camel-k-runtime] 01/02: remove support for multiple camel versions #229
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 567c8cba586e6691304c010551f4ecf5a8ea3184
Author: lburgazzoli
AuthorDate: Wed Jan 29 14:21:14 2020 +0100
remove support for multiple camel versions #229
---
camel-k-loader-groovy/pom.xml | 9 +-
camel-k-loader-java/pom.xml| 6 +-
camel-k-loader-js/pom.xml | 7 +-
camel-k-loader-knative/pom.xml | 5 +-
camel-k-loader-kotlin/pom.xml | 6 +-
camel-k-loader-xml/pom.xml | 5 +-
.../camel-k-loader-yaml-common/pom.xml | 5 +-
camel-k-loader-yaml/camel-k-loader-yaml/pom.xml| 5 +-
camel-k-runtime-core/pom.xml | 1 -
camel-k-runtime-cron/pom.xml | 1 -
camel-k-runtime-health/pom.xml | 1 -
camel-k-runtime-knative/pom.xml| 2 +-
camel-k-runtime-main/pom.xml | 2 -
camel-k-runtime-servlet/pom.xml| 2 -
camel-k-runtime-webhook/pom.xml| 1 -
camel-knative/camel-knative-api/pom.xml| 2 -
camel-knative/camel-knative-http/pom.xml | 2 -
camel-knative/camel-knative/pom.xml| 2 -
examples/camel-k-runtime-example-health/pom.xml| 28 +-
examples/camel-k-runtime-example-knative/pom.xml | 35 +-
.../camel-k-runtime-example-quarkus-yaml/pom.xml | 5 -
examples/camel-k-runtime-example-servlet/pom.xml | 21 -
examples/camel-k-runtime-example-yaml/pom.xml | 31 +-
tooling/camel-k-maven-plugin/pom.xml | 9 +-
.../pom.xml| 13 +-
.../verify.groovy | 10 +-
.../pom.xml| 13 +-
.../generate-catalog-quarkus/verify.groovy}| 21 +-
.../camel/k/tooling/maven/GenerateCatalogMojo.java | 237 ---
.../camel/k/tooling/maven/model/Artifact.java | 53 +--
.../camel/k/tooling/maven/model/CamelArtifact.java | 187 ++---
.../CamelCatalogSpec.java => CamelLoader.java} | 42 +-
.../camel/k/tooling/maven/model/CamelScheme.java | 60 +--
.../maven/model/CatalogComponentDefinition.java| 29 +-
.../maven/model/CatalogDataFormatDefinition.java | 29 +-
.../{Artifact.java => CatalogDefinition.java} | 23 +-
.../maven/model/CatalogLanguageDefinition.java | 29 +-
.../k/tooling/maven/model/CatalogProcessor.java| 5 +-
...rkusRuntimeProvider.java => MavenArtifact.java} | 32 +-
.../tooling/maven/model/crd/CamelCatalogSpec.java | 27 +-
.../{CamelCatalogSpec.java => RuntimeSpec.java}| 31 +-
.../maven/processors/CatalogProcessor3x.java | 440 +++--
.../maven/processors/CatalogProcessor3Test.java| 75 ++--
43 files changed, 557 insertions(+), 992 deletions(-)
diff --git a/camel-k-loader-groovy/pom.xml b/camel-k-loader-groovy/pom.xml
index 118ed2f..c9d6052 100644
--- a/camel-k-loader-groovy/pom.xml
+++ b/camel-k-loader-groovy/pom.xml
@@ -35,17 +35,14 @@
org.apache.camel
camel-core-engine
-provided
org.apache.camel
camel-log
-provided
org.apache.camel
camel-endpointdsl
-provided
org.apache.camel
@@ -56,24 +53,22 @@
*
-provided
org.codehaus.groovy
groovy
${groovy.version}
-provided
org.apache.camel.k
camel-k-apt
-true
+provided
org.apache.camel.k
camel-k-annotations
-true
+provided
diff --git a/camel-k-loader-java/pom.xml b/camel-k-loader-java/pom.xml
index 1538901..f063665 100644
--- a/camel-k-loader-java/pom.xml
+++ b/camel-k-loader-java/pom.xml
@@ -35,12 +35,10 @@
org.apache.camel
camel-core-engine
-provided
org.apache.camel
camel-endpointdsl
-provided
org.jooq
@@ -51,12 +49,12 @@
org.apache.camel.k
camel-k-apt
-true
+provided
org.apache.camel.k
camel-k-annotations
-true
+provided
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/pom.xml
index 27498e3..1f65fd9 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -
[camel-k-runtime] branch master updated (0b55008 -> 119ec35)
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 0b55008 Update camel-quarkus to v1.0.0-M3 new 567c8cb remove support for multiple camel versions #229 new 119ec35 Bump version to 1.1.0-SNAPSHOT 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-k-loader-groovy/pom.xml | 11 +- camel-k-loader-java/pom.xml| 8 +- camel-k-loader-js/pom.xml | 9 +- camel-k-loader-knative/pom.xml | 7 +- camel-k-loader-kotlin/pom.xml | 8 +- camel-k-loader-xml/pom.xml | 7 +- .../camel-k-loader-yaml-common/pom.xml | 7 +- camel-k-loader-yaml/camel-k-loader-yaml/pom.xml| 7 +- camel-k-loader-yaml/pom.xml| 2 +- .../camel-k-quarkus-core/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-core/it/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-core/pom.xml | 2 +- .../camel-k-quarkus-core/runtime/pom.xml | 2 +- .../camel-k-quarkus-knative/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/pom.xml| 2 +- .../camel-k-quarkus-knative/runtime/pom.xml| 2 +- .../deployment/pom.xml | 2 +- .../camel-k-quarkus-loader-groovy/pom.xml | 2 +- .../camel-k-quarkus-loader-groovy/runtime/pom.xml | 2 +- .../camel-k-quarkus-loader-java/deployment/pom.xml | 2 +- .../camel-k-quarkus-loader-java/pom.xml| 2 +- .../camel-k-quarkus-loader-java/runtime/pom.xml| 2 +- .../camel-k-quarkus-loader-js/deployment/pom.xml | 2 +- .../camel-k-quarkus-loader-js/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml | 2 +- .../camel-k-quarkus-loader-js/runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../camel-k-quarkus-loader-knative/pom.xml | 2 +- .../camel-k-quarkus-loader-knative/runtime/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../camel-k-quarkus-loader-kotlin/pom.xml | 2 +- .../camel-k-quarkus-loader-kotlin/runtime/pom.xml | 2 +- .../camel-k-quarkus-loader-xml/deployment/pom.xml | 2 +- .../camel-k-quarkus-loader-xml/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml | 2 +- .../camel-k-quarkus-loader-xml/runtime/pom.xml | 2 +- .../camel-k-quarkus-loader-yaml/deployment/pom.xml | 2 +- .../camel-k-quarkus-loader-yaml/it/pom.xml | 2 +- .../camel-k-quarkus-loader-yaml/pom.xml| 2 +- .../camel-k-quarkus-loader-yaml/runtime/pom.xml| 2 +- .../camel-k-runtime-quarkus/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/pom.xml| 2 +- .../camel-k-runtime-quarkus/runtime/pom.xml| 2 +- camel-k-quarkus/pom.xml| 2 +- camel-k-runtime-bom/pom.xml| 2 +- camel-k-runtime-core/pom.xml | 3 +- camel-k-runtime-cron/pom.xml | 3 +- camel-k-runtime-health/pom.xml | 3 +- camel-k-runtime-knative/pom.xml| 4 +- camel-k-runtime-main/pom.xml | 4 +- camel-k-runtime-servlet/pom.xml| 4 +- camel-k-runtime-webhook/pom.xml| 3 +- camel-knative/camel-knative-api/pom.xml| 4 +- camel-knative/camel-knative-http/pom.xml | 4 +- camel-knative/camel-knative/pom.xml| 4 +- camel-knative/pom.xml | 2 +- distribution/pom.xml | 2 +- examples/camel-k-runtime-example-health/pom.xml| 30 +- examples/camel-k-runtime-example-knative/pom.xml | 37 +- .../camel-k-runtime-example-quarkus-groovy/pom.xml | 2 +- .../camel-k-runtime-example-quarkus-java/pom.xml | 2 +- .../camel-k-runtime-example-quarkus-js/pom.xml | 2 +- .../pom.xml| 2 +- .../camel-k-runtime-example-quarkus-yaml/pom.xml | 7 +- examples/camel-k-runtime-example-servlet/pom.xml | 23 +- examples/camel-k-runtime-example-yaml/pom.xml | 33 +- examples/pom.xml | 2 +- pom.xml| 2 +- tooling/camel-k-annotations/pom.xml| 2 +- tooling/camel-k-apt/pom.xml| 2 +- tooling/camel-k-maven-plugin/pom.xml | 11 +- .../pom.xml
[camel-k-runtime] branch master updated: Update status bardge
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 The following commit(s) were added to refs/heads/master by this push: new 5393d4f Update status bardge 5393d4f is described below commit 5393d4fc333152b0d6854922d91b8f25466420dc Author: Luca Burgazzoli AuthorDate: Mon Feb 3 13:32:24 2020 +0100 Update status bardge --- README.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 10d403b..2e3f282 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,5 @@ -image:https://travis-ci.org/apache/camel-k-runtime.svg?branch=master["Build Status", link="https://travis-ci.org/apache/camel-k-runtime";] +image:https://github.com/apache/camel-k-runtime/workflows/Build%20PR/badge.svg["Build Status", link="https://github.com/apache/camel-k-runtime/actions?query=workflow%3A%22Build+PR%22";] + Apache Camel K Runtime ==
[camel-k-runtime] branch master updated: Remove the need of jaxb in camel-k-runtime-core
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
The following commit(s) were added to refs/heads/master by this push:
new 998d8f3 Remove the need of jaxb in camel-k-runtime-core
998d8f3 is described below
commit 998d8f3c07af8c812044548c80eb1025c5916495
Author: lburgazzoli
AuthorDate: Tue Feb 4 10:16:30 2020 +0100
Remove the need of jaxb in camel-k-runtime-core
---
camel-k-loader-xml/pom.xml| 16
.../camel-k-loader-yaml-common/pom.xml| 6 ++
camel-k-runtime-core/pom.xml | 16
.../org/apache/camel/k/listener/RoutesDumper.java | 19 +--
4 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/camel-k-loader-xml/pom.xml b/camel-k-loader-xml/pom.xml
index 0108883..da887f5 100644
--- a/camel-k-loader-xml/pom.xml
+++ b/camel-k-loader-xml/pom.xml
@@ -46,6 +46,22 @@
+javax.xml.bind
+jaxb-api
+${jaxb-api.version}
+
+
+com.sun.xml.bind
+jaxb-core
+${jaxb-core.version}
+
+
+com.sun.xml.bind
+jaxb-impl
+${jaxb-api.version}
+
+
+
org.apache.camel.k
camel-k-apt
provided
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
b/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
index 65d0d61..128aed8 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
+++ b/camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml
@@ -55,6 +55,12 @@
+javax.xml.bind
+jaxb-api
+${jaxb-api.version}
+
+
+
org.apache.camel.k
camel-k-apt
provided
diff --git a/camel-k-runtime-core/pom.xml b/camel-k-runtime-core/pom.xml
index ee2a937..085baad 100644
--- a/camel-k-runtime-core/pom.xml
+++ b/camel-k-runtime-core/pom.xml
@@ -57,22 +57,6 @@
${commons-io.version}
-
-javax.xml.bind
-jaxb-api
-${jaxb-api.version}
-
-
-com.sun.xml.bind
-jaxb-core
-${jaxb-core.version}
-
-
-com.sun.xml.bind
-jaxb-impl
-${jaxb-api.version}
-
-
diff --git
a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesDumper.java
b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesDumper.java
index 33f53ba..0ec2874 100644
---
a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesDumper.java
+++
b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesDumper.java
@@ -16,13 +16,12 @@
*/
package org.apache.camel.k.listener;
-import javax.xml.bind.JAXBException;
-
import org.apache.camel.CamelContext;
import org.apache.camel.k.Runtime;
import org.apache.camel.model.Model;
-import org.apache.camel.model.ModelHelper;
+import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
+import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.RestsDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,15 +43,15 @@ public class RoutesDumper extends AbstractPhaseListener {
RestsDefinition rests = new RestsDefinition();
rests.setRests(context.getExtension(Model.class).getRestDefinitions());
-try {
-if (LOGGER.isDebugEnabled() && !routes.getRoutes().isEmpty()) {
-LOGGER.debug("Routes: \n{}",
ModelHelper.dumpModelAsXml(context, routes));
+if (LOGGER.isDebugEnabled() && !routes.getRoutes().isEmpty()) {
+for (RouteDefinition definition: routes.getRoutes()) {
+LOGGER.debug("Routes: {}", definition);
}
-if (LOGGER.isDebugEnabled() && !rests.getRests().isEmpty()) {
-LOGGER.debug("Rests: \n{}",
ModelHelper.dumpModelAsXml(context, rests));
+}
+if (LOGGER.isDebugEnabled() && !rests.getRests().isEmpty()) {
+for (RestDefinition definition: rests.getRests()) {
+LOGGER.debug("Rest: {}", definition);
}
-} catch (JAXBException e) {
-throw new IllegalArgumentException(e);
}
}
}
[camel-k-runtime] 01/02: Remove deprecated properties and processors in camel-knative
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 95a704f3998239682fa10a3f41ddcc586202970d
Author: lburgazzoli
AuthorDate: Tue Feb 4 12:50:35 2020 +0100
Remove deprecated properties and processors in camel-knative
---
.../camel/component/knative/KnativeComponent.java | 10 -
.../component/knative/KnativeConfiguration.java| 16
.../knative/KnativeConversionProcessor.java| 46 --
.../camel/component/knative/KnativeEndpoint.java | 3 +-
4 files changed, 1 insertion(+), 74 deletions(-)
diff --git
a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java
b/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java
index 987ca63..7056f4c 100644
---
a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java
+++
b/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java
@@ -103,16 +103,6 @@ public class KnativeComponent extends DefaultComponent {
configuration.setEnvironment(environment);
}
-@Deprecated
-public boolean isJsonSerializationEnabled() {
-return configuration.isJsonSerializationEnabled();
-}
-
-@Deprecated
-public void setJsonSerializationEnabled(boolean jsonSerializationEnabled) {
-configuration.setJsonSerializationEnabled(jsonSerializationEnabled);
-}
-
public String getCloudEventsSpecVersion() {
return configuration.getCloudEventsSpecVersion();
}
diff --git
a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java
b/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java
index 1057782..5add382 100644
---
a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java
+++
b/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java
@@ -30,9 +30,6 @@ public class KnativeConfiguration implements Cloneable {
private KnativeEnvironment environment;
@UriParam
private String serviceName;
-@UriParam(defaultValue = "false")
-@Deprecated
-private boolean jsonSerializationEnabled;
@UriParam(defaultValue = "0.3", enums = "0.1,0.2,0.3")
private String cloudEventsSpecVersion = CloudEvents.V03.version();
@UriParam(defaultValue = "org.apache.camel.event")
@@ -98,19 +95,6 @@ public class KnativeConfiguration implements Cloneable {
this.replyWithCloudEvent = replyWithCloudEvent;
}
-@Deprecated
-public boolean isJsonSerializationEnabled() {
-return jsonSerializationEnabled;
-}
-
-/**
- * Enables automatic serialization to JSON of the produced events.
- */
-@Deprecated
-public void setJsonSerializationEnabled(boolean jsonSerializationEnabled) {
-this.jsonSerializationEnabled = jsonSerializationEnabled;
-}
-
public String getCloudEventsSpecVersion() {
return cloudEventsSpecVersion;
}
diff --git
a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConversionProcessor.java
b/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConversionProcessor.java
deleted file mode 100644
index 433fa9e..000
---
a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConversionProcessor.java
+++ /dev/null
@@ -1,46 +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.component.knative;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.knative.spi.Knative;
-
-/**
- * Converts objects prior to serializing them to external endpoints or channels
- */
-@Deprecated
-public class KnativeConversionProcessor implements Processor {
-
-private boolean enabled;
-
-public KnativeConversion
[camel-k-runtime] branch master updated (998d8f3 -> 88ad7c7)
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 998d8f3 Remove the need of jaxb in camel-k-runtime-core new 95a704f Remove deprecated properties and processors in camel-knative new 88ad7c7 Create a KnativeTransportNoop test helper 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/knative/KnativeComponent.java | 10 - .../component/knative/KnativeConfiguration.java| 16 --- .../knative/KnativeConversionProcessor.java| 46 --- .../camel/component/knative/KnativeEndpoint.java | 3 +- .../component/knative/KnativeComponentTest.java| 33 +- .../component/knative/KnativeTransportNoop.java| 52 ++ 6 files changed, 54 insertions(+), 106 deletions(-) delete mode 100644 camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConversionProcessor.java create mode 100644 camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeTransportNoop.java
[camel-k-runtime] 02/02: Create a KnativeTransportNoop test helper
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 88ad7c7897d79eed6cbd2f26034ce839afe34a20
Author: lburgazzoli
AuthorDate: Tue Feb 4 12:50:53 2020 +0100
Create a KnativeTransportNoop test helper
---
.../component/knative/KnativeComponentTest.java| 33 +-
.../component/knative/KnativeTransportNoop.java| 52 ++
2 files changed, 53 insertions(+), 32 deletions(-)
diff --git
a/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
b/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
index 57daf0f..7a1870c 100644
---
a/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
+++
b/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
@@ -17,18 +17,9 @@
package org.apache.camel.component.knative;
import org.apache.camel.CamelContext;
-import org.apache.camel.Consumer;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
import org.apache.camel.component.knative.spi.Knative;
import org.apache.camel.component.knative.spi.KnativeEnvironment;
-import org.apache.camel.component.knative.spi.KnativeTransport;
-import org.apache.camel.component.knative.spi.KnativeTransportConfiguration;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultConsumer;
-import org.apache.camel.support.DefaultProducer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -74,29 +65,7 @@ public class KnativeComponentTest {
KnativeComponent component = new KnativeComponent();
component.setEnvironment(env);
-component.setTransport(new KnativeTransport() {
-@Override
-public void start() {
-}
-
-@Override
-public void stop() {
-}
-
-@Override
-public Producer createProducer(Endpoint endpoint,
KnativeTransportConfiguration configuration,
KnativeEnvironment.KnativeServiceDefinition service) {
-return new DefaultProducer(endpoint) {
-@Override
-public void process(Exchange exchange) throws Exception {
-}
-};
-}
-
-@Override
-public Consumer createConsumer(Endpoint endpoint,
KnativeTransportConfiguration configuration,
KnativeEnvironment.KnativeServiceDefinition service, Processor processor) {
-return new DefaultConsumer(endpoint, processor);
-}
-});
+component.setTransport(new KnativeTransportNoop());
context.addComponent("knative", component);
diff --git
a/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeTransportNoop.java
b/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeTransportNoop.java
new file mode 100644
index 000..784ad7d
--- /dev/null
+++
b/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeTransportNoop.java
@@ -0,0 +1,52 @@
+/*
+ * 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.component.knative;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.component.knative.spi.KnativeEnvironment;
+import org.apache.camel.component.knative.spi.KnativeTransport;
+import org.apache.camel.component.knative.spi.KnativeTransportConfiguration;
+import org.apache.camel.support.DefaultConsumer;
+import org.apache.camel.support.DefaultProducer;
+
+public class KnativeTransportNoop implements KnativeTransport {
+@Override
+public void start() {
+}
+
+@Override
+public void stop() {
+
[camel-quarkus] branch camel-master updated: Upgarde to Camel 3.1.0 - WIP (xml loader/dumper)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-master by this push:
new 49ba9b0 Upgarde to Camel 3.1.0 - WIP (xml loader/dumper)
49ba9b0 is described below
commit 49ba9b0ff5dc0d47e07e26bc53e3ed328caddaae
Author: lburgazzoli
AuthorDate: Tue Feb 4 17:57:53 2020 +0100
Upgarde to Camel 3.1.0 - WIP (xml loader/dumper)
---
.../component/xml/deployment/XmlProcessor.java | 9 -
extensions/core-xml/runtime/pom.xml| 4 +++
.../camel/quarkus/component/xml/XmlRecorder.java | 27 +--
.../quarkus/core/deployment/BuildProcessor.java| 13 ++--
.../CamelModelToXMLDumperBuildItem.java} | 22 +++--
.../deployment/CamelRoutesLoaderBuildItems.java| 10 +++---
.../camel/quarkus/core/CamelMainRecorder.java | 3 +-
.../apache/camel/quarkus/core/CamelRecorder.java | 24 ++
.../camel/quarkus/core/CamelRoutesCollector.java | 17 +++---
.../quarkus/core/DisabledModelToXMLDumper.java}| 23 +
...java => DisabledXMLRoutesDefinitionLoader.java} | 11 +++
.../camel/quarkus/core/FastCamelContext.java | 38 +-
.../org/apache/camel/quarkus/core/FastModel.java | 6 +---
.../apache/camel/quarkus/core/CamelServlet.java| 5 +++
.../org/apache/camel/quarkus/core/CamelTest.java | 5 +++
.../apache/camel/quarkus/core/CamelServlet.java| 2 ++
.../org/apache/camel/quarkus/core/CamelTest.java | 5 ++-
poms/bom/pom.xml | 11 +++
tooling/package-maven-plugin/pom.xml | 10 ++
19 files changed, 168 insertions(+), 77 deletions(-)
diff --git
a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
index 07329c8..19b096b 100644
---
a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
+++
b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
@@ -24,6 +24,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
import org.apache.camel.quarkus.component.xml.XmlRecorder;
import
org.apache.camel.quarkus.core.deployment.CamelModelJAXBContextFactoryBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelModelToXMLDumperBuildItem;
import org.apache.camel.quarkus.core.deployment.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.core.deployment.CamelSupport;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
@@ -56,7 +57,13 @@ class XmlProcessor {
@BuildStep
@Record(value = ExecutionTime.STATIC_INIT, optional = true)
CamelRoutesLoaderBuildItems.Xml xmlLoader(XmlRecorder recorder) {
-return new
CamelRoutesLoaderBuildItems.Xml(recorder.newDefaultXmlLoader());
+return new
CamelRoutesLoaderBuildItems.Xml(recorder.newJaxbXMLRoutesDefinitionLoader());
+}
+
+@BuildStep
+@Record(value = ExecutionTime.STATIC_INIT, optional = true)
+CamelModelToXMLDumperBuildItem xmlModelDumper(XmlRecorder recorder) {
+return new
CamelModelToXMLDumperBuildItem(recorder.newJaxbModelToXMLDumper());
}
@BuildStep
diff --git a/extensions/core-xml/runtime/pom.xml
b/extensions/core-xml/runtime/pom.xml
index aac5cda..f61467d 100644
--- a/extensions/core-xml/runtime/pom.xml
+++ b/extensions/core-xml/runtime/pom.xml
@@ -48,6 +48,10 @@
+org.apache.camel
+camel-xml-jaxb
+
+
org.apache.camel.quarkus
camel-quarkus-core
diff --git
a/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
b/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
index 0170587..1469086 100644
---
a/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
+++
b/extensions/core-xml/runtime/src/main/java/org/apache/camel/quarkus/component/xml/XmlRecorder.java
@@ -24,12 +24,15 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultModelJAXBContextFactory;
import org.apache.camel.model.ValidateDefinition;
import org.apache.camel.model.validator.PredicateValidatorDefinition;
-import org.apache.camel.quarkus.core.XmlRoutesLoader;
import org.apache.camel.reifier.ProcessorReifier;
import org.apache.camel.reifier.ValidateReifier;
import org.apache.camel.reifier.validator.PredicateValidatorReifier;
import org.apache.camel.reifier.validator.ValidatorReifier;
imp
[camel-quarkus] 01/02: Upgarde to Camel 3.1.0 - WIP (xml loader/dumper)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1afd389444aa591961775634d56872623fd6046d
Author: lburgazzoli
AuthorDate: Wed Feb 5 18:06:29 2020 +0100
Upgarde to Camel 3.1.0 - WIP (xml loader/dumper)
---
.../camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
index 1fba95f..c38edc8 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
@@ -19,6 +19,7 @@ package org.apache.camel.quarkus.core;
import java.io.InputStream;
import org.apache.camel.CamelContext;
+import org.apache.camel.NamedNode;
import org.apache.camel.spi.XMLRoutesDefinitionLoader;
public class DisabledXMLRoutesDefinitionLoader implements
XMLRoutesDefinitionLoader {
@@ -31,4 +32,9 @@ public class DisabledXMLRoutesDefinitionLoader implements
XMLRoutesDefinitionLoa
public Object loadRestsDefinition(CamelContext context, InputStream
inputStream) throws Exception {
throw new UnsupportedOperationException("Please add a dependency to
camel-quarkus-core-xml");
}
+
+@Override
+public T createModelFromXml(CamelContext context,
String xml, Class type) throws Exception {
+throw new UnsupportedOperationException("Please add a dependency to
camel-quarkus-core-xml");
+}
}
[camel-quarkus] branch camel-master updated (49ba9b0 -> 049dcd5)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 49ba9b0 Upgarde to Camel 3.1.0 - WIP (xml loader/dumper) new 1afd389 Upgarde to Camel 3.1.0 - WIP (xml loader/dumper) new 049dcd5 Update docs 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: docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc | 2 +- .../camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java | 6 ++ extensions/readme.adoc | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)
[camel-quarkus] 02/02: Update docs
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 049dcd533ddf40b7226e8b891b8e2b38196b7319 Author: lburgazzoli AuthorDate: Wed Feb 5 18:06:38 2020 +0100 Update docs --- docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc | 2 +- extensions/readme.adoc| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc index 75b11fb..d0cb331 100644 --- a/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc +++ b/docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc @@ -258,7 +258,7 @@ Number of Camel languages: 9 in 3 JAR artifacts (0 deprecated) | link:https://camel.apache.org/components/latest/bean-language.html[Bean method] (camel-quarkus-bean) | 0.2.0 | To use a Java bean (aka method call) in Camel expressions or predicates. -| link:https://camel.apache.org/components/latest/constant-language.html[Constant] (camel-quarkus-core) | 0.2.0 | To use a constant value in Camel expressions or predicates. +| link:https://camel.apache.org/components/latest/constant-language.html[Constant] (camel-quarkus-core) | 0.2.0 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing. | link:https://camel.apache.org/components/latest/exchangeProperty-language.html[ExchangeProperty] (camel-quarkus-core) | 0.2.0 | To use a Camel Exchange property in expressions or predicates. diff --git a/extensions/readme.adoc b/extensions/readme.adoc index 1fc42d3..c3d17c5 100644 --- a/extensions/readme.adoc +++ b/extensions/readme.adoc @@ -247,7 +247,7 @@ Number of Camel languages: 9 in 3 JAR artifacts (0 deprecated) | link:https://camel.apache.org/components/latest/bean-language.html[Bean method] (camel-quarkus-bean) | 0.2.0 | To use a Java bean (aka method call) in Camel expressions or predicates. -| link:https://camel.apache.org/components/latest/constant-language.html[Constant] (camel-quarkus-core) | 0.2.0 | To use a constant value in Camel expressions or predicates. +| link:https://camel.apache.org/components/latest/constant-language.html[Constant] (camel-quarkus-core) | 0.2.0 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing. | link:https://camel.apache.org/components/latest/exchangeProperty-language.html[ExchangeProperty] (camel-quarkus-core) | 0.2.0 | To use a Camel Exchange property in expressions or predicates.
[camel-quarkus] branch camel-master updated: Upgarde to Camel 3.1.0 - WIP (catalog)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-master by this push:
new f39eb6e Upgarde to Camel 3.1.0 - WIP (catalog)
f39eb6e is described below
commit f39eb6e9bc9ce165ce04b68489d5a5d8f12135a4
Author: lburgazzoli
AuthorDate: Thu Feb 6 17:02:47 2020 +0100
Upgarde to Camel 3.1.0 - WIP (catalog)
---
catalog/camel-quarkus-catalog/pom.xml | 27 +-
.../catalog/quarkus/QuarkusRuntimeProvider.java| 5 ++--
.../quarkus/QuarkusRuntimeProviderTest.java| 14 +--
extensions/core/runtime/pom.xml| 4
.../camel/quarkus/core/FastCamelContext.java | 7 ++
poms/bom/pom.xml | 10
6 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/catalog/camel-quarkus-catalog/pom.xml
b/catalog/camel-quarkus-catalog/pom.xml
index a234169..eb6e3d0 100644
--- a/catalog/camel-quarkus-catalog/pom.xml
+++ b/catalog/camel-quarkus-catalog/pom.xml
@@ -22,8 +22,9 @@
org.apache.camel.quarkus
-catalog
+camel-quarkus-build-parent
1.1.0-SNAPSHOT
+../../poms/build-parent/pom.xml
camel-catalog-quarkus
@@ -35,33 +36,27 @@
org.apache.camel
camel-catalog
-${camel.version}
-junit
-junit
-4.12
+org.jboss.logging
+jboss-logging
test
-
-
-org.apache.logging.log4j
-log4j-api
-2.12.1
+org.jboss.slf4j
+slf4j-jboss-logging
test
+
-org.apache.logging.log4j
-log4j-core
-2.12.1
+org.junit.jupiter
+junit-jupiter-api
test
-org.apache.logging.log4j
-log4j-slf4j-impl
-2.12.1
+org.junit.jupiter
+junit-jupiter-engine
test
diff --git
a/catalog/camel-quarkus-catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
b/catalog/camel-quarkus-catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
index b1c37c6..d8a72bf 100644
---
a/catalog/camel-quarkus-catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
+++
b/catalog/camel-quarkus-catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
@@ -22,11 +22,12 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.camel.catalog.CamelCatalog;
-import org.apache.camel.catalog.CatalogHelper;
import org.apache.camel.catalog.RuntimeProvider;
+import org.apache.camel.catalog.impl.CatalogHelper;
/**
- * A Quarkus based {@link RuntimeProvider} which only includes the supported
Camel components, data formats, and languages
+ * A Quarkus based {@link RuntimeProvider} which only includes the supported
Camel components, data formats, and
+ * languages
* which can be installed in Quarkus using the Camel extensions.
*/
public class QuarkusRuntimeProvider implements RuntimeProvider {
diff --git
a/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
b/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
index 2c6b1d1..eb0f52d 100644
---
a/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
+++
b/catalog/camel-quarkus-catalog/src/test/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProviderTest.java
@@ -20,19 +20,19 @@ import java.util.List;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class QuarkusRuntimeProviderTest {
static CamelCatalog catalog;
-@BeforeClass
+@BeforeAll
public static void createCamelCatalog() {
catalog = new DefaultCamelCatalog();
catalog.setRuntimeProvider(new QuarkusRuntimeProvider());
diff --git a/extensions/core/runtime/pom.xml b/extensions/core/runtime/pom.xml
index 8f76d32..fc33b8a 100644
--- a
[camel-quarkus] branch master updated: Upgrade to quarkus 1.3.0.Alpha1 #684
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 edb03e1 Upgrade to quarkus 1.3.0.Alpha1 #684
edb03e1 is described below
commit edb03e1aa231f9e00a6f13e17003d9a7d5ed9f1e
Author: lburgazzoli
AuthorDate: Tue Jan 28 17:26:52 2020 +0100
Upgrade to quarkus 1.3.0.Alpha1 #684
---
.github/workflows/pr-validate.yml | 7 ++-
extensions/bean-validator/runtime/pom.xml | 2 +-
extensions/bean/runtime/pom.xml| 2 +-
extensions/core-cloud/runtime/pom.xml | 2 +-
.../quarkus/core/deployment/CamelSupport.java | 60 +++---
.../core/deployment/NativeImageProcessor.java | 11
quarkus.deployment.devmode.HotReplacementSetup | 1 -
extensions/core/runtime/pom.xml| 6 ++-
.../core}/devmode/CamelHotReplacementSetup.java| 6 +--
.../io.quarkus.dev.spi.HotReplacementSetup | 2 +-
.../component/dozer/deployment/DozerProcessor.java | 3 +-
extensions/dozer/runtime/pom.xml | 2 +-
extensions/fhir/runtime/pom.xml| 2 +-
extensions/hystrix/runtime/pom.xml | 2 +-
extensions/infinispan/runtime/pom.xml | 2 +-
extensions/jackson/runtime/pom.xml | 2 +-
extensions/jsonpath/runtime/pom.xml| 2 +-
extensions/mongodb/runtime/pom.xml | 2 +-
extensions/netty/runtime/pom.xml | 2 +-
extensions/support/common/runtime/pom.xml | 2 +-
extensions/support/consul-client/runtime/pom.xml | 2 +-
extensions/support/retrofit/runtime/pom.xml| 2 +-
extensions/support/spring/runtime/pom.xml | 2 +-
extensions/support/xalan/runtime/pom.xml | 2 +-
extensions/xslt/deployment/pom.xml | 2 +-
.../xslt/deployment/BuildTimeUriResolver.java | 2 +-
.../component/xslt/deployment/XsltProcessor.java | 4 +-
integration-tests/core-main/pom.xml| 4 ++
.../src/main/resources/application.properties | 1 +
.../org/apache/camel/quarkus/core/CamelTest.java | 2 +-
integration-tests/fhir/pom.xml | 4 ++
integration-tests/mail/pom.xml | 2 +-
integration-tests/pom.xml | 5 ++
.../support/custom-dataformat}/pom.xml | 40 ++-
.../it/support/dataformat/MyDataformat.java} | 4 +-
.../org/apache/camel/dataformat/my-dataformat | 2 +-
integration-tests/support/pom.xml | 1 +
integration-tests/tagsoup/pom.xml | 10
pom.xml| 3 +-
poms/bom/pom.xml | 10
tooling/scripts/validate-dependencies.groovy | 2 +-
41 files changed, 138 insertions(+), 88 deletions(-)
diff --git a/.github/workflows/pr-validate.yml
b/.github/workflows/pr-validate.yml
index d74fa5e..1b0660b 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -21,6 +21,7 @@ on:
pull_request:
branches:
- master
+ - camel-master
env:
LANG: en_US
@@ -29,6 +30,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
+- name: Set BRANCH_OPTIONS
+ if: github.base_ref == 'camel-master'
+ run: |
+echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
@@ -36,7 +41,7 @@ jobs:
java-version: 1.8
- name: mvn package
run: |
-./mvnw -fae -B \
+./mvnw ${BRANCH_OPTIONS} -fae -B \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
\
-DskipTests \
-Pcheck-format \
diff --git a/extensions/bean-validator/runtime/pom.xml
b/extensions/bean-validator/runtime/pom.xml
index ea49fd5..f9cf692 100644
--- a/extensions/bean-validator/runtime/pom.xml
+++ b/extensions/bean-validator/runtime/pom.xml
@@ -77,7 +77,7 @@
jakarta.el
-com.oracle.substratevm
+org.graalvm.nativeimage
svm
diff --git a/extensions/bean/runtime/pom.xml b/extensions/bean/runtime/pom.xml
index 5935a7e..90f18e0 100644
--- a/extensions/bean/runtime/pom.xml
+++ b/extensions/bean/runtime/pom.xml
@@ -51,7 +51,7 @@
camel-quarkus-core
-com.oracle.substratevm
+org.graalvm.nativeimage
svm
diff --git a/extensions/core-cloud/runtime/pom.xml
b/extensions/core-cloud/runtime/pom.xml
index a200e5e..5589a49 100644
--- a/extensions/core-cloud/runtime/pom.xml
+++ b/extensions/core-cloud/runtime/po
[camel-quarkus] 02/02: GitHUb Actions: include quarkus-master for branches to watch
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
commit e884ccbabeff2e8f50724be4e9ca5517a71723f4
Author: lburgazzoli
AuthorDate: Fri Feb 7 07:41:48 2020 +0100
GitHUb Actions: include quarkus-master for branches to watch
---
.github/workflows/pr-build.yaml | 49 ---
.github/workflows/pr-validate.yml | 5 ++--
2 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index 3a75ae7..f36c6f2 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -22,6 +22,7 @@ on:
branches:
- master
- camel-master
+ - quarkus-master
env:
LANG: en_US
@@ -31,9 +32,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set BRANCH_OPTIONS
-if: github.base_ref == 'camel-master'
+if: github.base_ref == 'camel-master' || github.base_ref ==
'quarkus-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -59,9 +60,9 @@ jobs:
java: [ '11' , '12' ]
steps:
- name: Set BRANCH_OPTIONS
-if: github.base_ref == 'camel-master'
+if: github.base_ref == 'camel-master' || github.base_ref ==
'quarkus-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
@@ -77,9 +78,9 @@ jobs:
needs: build
steps:
- name: Set BRANCH_OPTIONS
-if: github.base_ref == 'camel-master'
+if: github.base_ref == 'camel-master' || github.base_ref ==
'quarkus-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -110,9 +111,9 @@ jobs:
needs: build
steps:
- name: Set BRANCH_OPTIONS
-if: github.base_ref == 'camel-master'
+if: github.base_ref == 'camel-master' || github.base_ref ==
'quarkus-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -146,9 +147,9 @@ jobs:
needs: build
steps:
- name: Set BRANCH_OPTIONS
-if: github.base_ref == 'camel-master'
+if: github.base_ref == 'camel-master' || github.base_ref ==
'quarkus-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -178,9 +179,9 @@ jobs:
needs: build
steps:
- name: Set BRANCH_OPTIONS
-if: github.base_ref == 'camel-master'
+if: github.base_ref == 'camel-master' || github.base_ref ==
'quarkus-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -209,9 +210,9 @@ jobs:
needs: build
steps:
- name: Set BRANCH_OPTIONS
-if: github.base_ref == 'camel-master'
+if: github.base_ref == 'camel-master' || github.base_ref ==
'quarkus-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -245,9 +246,9 @@ jobs:
needs: build
steps:
- name: Set BRANCH_OPTIONS
-if: github.base_ref == 'camel-master'
+if: github.base_ref == 'camel-master' || github.base_ref ==
'quarkus-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set Up Java
@@ -276,9 +277,9 @@ jobs:
nee
[camel-quarkus] branch master updated (edb03e1 -> e884ccb)
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-quarkus.git. from edb03e1 Upgrade to quarkus 1.3.0.Alpha1 #684 new e5cdba6 Activate snapshot repos with a single profile new e884ccb GitHUb Actions: include quarkus-master for branches to watch 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: .github/workflows/pr-build.yaml | 49 --- .github/workflows/pr-validate.yml | 5 ++-- pom.xml | 47 ++--- 3 files changed, 46 insertions(+), 55 deletions(-)
[camel-quarkus] 01/02: Activate snapshot repos with a single profile
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 commit e5cdba6f99405be2032dd3235292e9a2815ee87e Author: lburgazzoli AuthorDate: Fri Feb 7 07:40:50 2020 +0100 Activate snapshot repos with a single profile --- pom.xml | 47 ++- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index b95a786..a865bb0 100644 --- a/pom.xml +++ b/pom.xml @@ -588,24 +588,23 @@ -oss-snapshots +snapshots false -oss-snapshots-repo - https://oss.sonatype.org/content/repositories/snapshots - -false - +apache.snapshots +https://repository.apache.org/snapshots/ +Apache Snapshot Repo true + +false + - - - + oss-snapshots-repo https://oss.sonatype.org/content/repositories/snapshots @@ -614,26 +613,6 @@ true - - - - - -apache-snapshots - -false - - - -apache.snapshots -https://repository.apache.org/snapshots/ -Apache Snapshot Repo - -true - - -false - @@ -647,6 +626,16 @@ false + +oss-snapshots-repo + https://oss.sonatype.org/content/repositories/snapshots + +false + + +true + +
[camel-quarkus] 02/02: Fix MongoDbProcessor according to the latest changes in the mongodb extension
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit df734149a0b80c24c05ffbea9224984f0f165bcd
Author: lburgazzoli
AuthorDate: Fri Feb 7 10:49:27 2020 +0100
Fix MongoDbProcessor according to the latest changes in the mongodb
extension
---
.../component/mongodb/deployment/MongoDbProcessor.java | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git
a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
index f14c0c9..29efc8f 100644
---
a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
+++
b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.quarkus.component.mongodb.deployment;
-import com.mongodb.MongoClient;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
@@ -34,12 +34,20 @@ class MongoDbProcessor {
return new FeatureBuildItem(FEATURE);
}
+// TODO: needs to be reviewed once
https://github.com/quarkusio/quarkus/pull/7063 is merged
@BuildStep
@Record(ExecutionTime.RUNTIME_INIT)
-CamelRuntimeBeanBuildItem
registerCamelMongoClientProducer(MongoClientBuildItem mongoClientBuildItem,
+void registerCamelMongoClientProducer(
+MongoClientBuildItem mongoClient,
+BuildProducer runtimeBeans,
CamelMongoClientRecorder recorder) {
-return new CamelRuntimeBeanBuildItem("camelMongoClient",
MongoClient.class.getName(),
-
recorder.createCamelMongoClient(mongoClientBuildItem.getClient()));
+if (mongoClient != null) {
+runtimeBeans.produce(
+new CamelRuntimeBeanBuildItem(
+"camelMongoClient",
+"com.mongodb.MongoClient",
+
recorder.createCamelMongoClient(mongoClient.getClient(;
+}
}
}
[camel-quarkus] 01/02: Set quarkus.version to 999-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch quarkus-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 982d7ff7404f0e4a634413eb1cc81bd2d9abb1fa Author: lburgazzoli AuthorDate: Fri Feb 7 10:48:54 2020 +0100 Set quarkus.version to 999-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a865bb0..980737b 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 2.10.4 3.0.1 4.1.0 -1.3.0.Alpha1 +999-SNAPSHOT 4.1.3 9.4.18.v20190429 1.4.11
[camel-quarkus] branch quarkus-master updated (ae90a26 -> df73414)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from ae90a26 Merge pull request #667 from lburgazzoli/cleanup
add af59c8f chore: Fix typo
add f7d07bc Added a camel-bindy extension #653
add c026828 fix(rest-json/pom.xml): use quarkus-based dependency
add 82de736 Merge pull request #674 from hanzo2001/patch-1
add ff8ab6d Add GitHub action for automatic testing of camel master branch
add 3ab385a Merge pull request #677 from jamesnetherton/ci-schedule
add 5a2c395 camel-fhir record FHIR context instead of creating it at
runtime. Only one FHIR context per specification is permitted in native mode
add 29ca6b0 Merge pull request #678 from johnpoth/fhir-context-recorder
add a7f3837 Create an enforce profile to disable sanity checks while
building. This can be done by adding -Denforce=false
add ea2b52c Merge pull request #679 from johnpoth/dev-profile
add 8eb4f5d Add stream extension
add edb03e1 Upgrade to quarkus 1.3.0.Alpha1 #684
add e5cdba6 Activate snapshot repos with a single profile
add e884ccb GitHUb Actions: include quarkus-master for branches to watch
new 982d7ff Set quarkus.version to 999-SNAPSHOT
new df73414 Fix MongoDbProcessor according to the latest changes in the
mongodb extension
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:
.github/workflows/pr-build.yaml| 94 +++--
.github/workflows/pr-validate.yml | 8 +-
...-validate.yml => sync-camel-master-branch.yaml} | 36 +-
docs/modules/ROOT/pages/extensions/stream.adoc | 31 ++
.../pages/list-of-camel-quarkus-extensions.adoc| 15 +-
examples/rest-json/pom.xml | 4 +-
extensions/bean-validator/runtime/pom.xml | 2 +-
extensions/bean/runtime/pom.xml| 2 +-
.../bindy/deployment/pom.xml | 16 +-
.../bindy/deployment/BindyProcessor.java} | 6 +-
.../parent-pom.xml => extensions/bindy/pom.xml | 6 +-
extensions/{base64 => bindy}/runtime/pom.xml | 15 +-
.../main/resources/META-INF/quarkus-extension.yaml | 6 +-
extensions/core-cloud/runtime/pom.xml | 2 +-
.../quarkus/core/deployment/CamelSupport.java | 60 +++-
.../core/deployment/NativeImageProcessor.java | 11 -
quarkus.deployment.devmode.HotReplacementSetup | 1 -
extensions/core/runtime/pom.xml| 6 +-
.../core}/devmode/CamelHotReplacementSetup.java| 6 +-
.../io.quarkus.dev.spi.HotReplacementSetup | 2 +-
.../component/dozer/deployment/DozerProcessor.java | 3 +-
extensions/dozer/runtime/pom.xml | 2 +-
extensions/fhir/deployment/pom.xml | 2 +-
.../component/fhir/deployment/FhirProcessor.java | 306 +---
.../component/fhir/deployment/FhirUtil.java| 75
.../deployment/dstu2/Dstu2PropertiesBuildItem.java | 20 +-
.../fhir/deployment/dstu2/FhirDstu2Processor.java | 400 +
.../deployment/dstu3/Dstu3PropertiesBuildItem.java | 20 +-
.../fhir/deployment/dstu3/FhirDstu3Processor.java | 75
.../fhir/deployment/r4/FhirR4Processor.java| 70
.../fhir/deployment/r4/R4PropertiesBuildItem.java | 20 +-
.../fhir/deployment/r5/FhirR5Processor.java| 70
.../fhir/deployment/r5/R5PropertiesBuildItem.java | 20 +-
extensions/fhir/runtime/pom.xml| 12 +-
.../component/fhir/FhirContextProducers.java | 76
.../component/fhir/FhirContextRecorder.java| 64
extensions/hystrix/runtime/pom.xml | 2 +-
extensions/infinispan/runtime/pom.xml | 2 +-
extensions/jackson/runtime/pom.xml | 2 +-
extensions/jsonpath/runtime/pom.xml| 2 +-
.../mongodb/deployment/MongoDbProcessor.java | 16 +-
extensions/mongodb/runtime/pom.xml | 2 +-
extensions/netty/runtime/pom.xml | 2 +-
extensions/pom.xml | 2 +
extensions/readme.adoc | 13 +-
.../stream/deployment/pom.xml | 16 +-
.../stream/deployment/StreamProcessor.java}| 6 +-
.../parent-pom.xml => extensions/stream/pom.xml| 6 +-
extensions/{base64 => stream}/runtime/pom.xml | 14 +-
.../main/resources/META-INF/quarkus-extension.yaml | 8 +-
extensions/support/common/runtime/pom.xml | 2 +-
extensions/support/consul-client/runtime/pom.xml | 2 +-
extensions/support/retrofit/runtime/
[camel-quarkus] branch camel-master updated: cleanup core extension pom
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/camel-master by this push: new d39d209 cleanup core extension pom d39d209 is described below commit d39d209736780fb3ed90bb0fc1bba8dad0df533c Author: lburgazzoli AuthorDate: Fri Feb 7 12:51:33 2020 +0100 cleanup core extension pom --- extensions/core/runtime/pom.xml | 6 -- 1 file changed, 6 deletions(-) diff --git a/extensions/core/runtime/pom.xml b/extensions/core/runtime/pom.xml index ca32303..6e5f490 100644 --- a/extensions/core/runtime/pom.xml +++ b/extensions/core/runtime/pom.xml @@ -73,12 +73,6 @@ org.apache.camel camel-core-engine - - -org.apache.camel -camel-xml-jaxp - - org.apache.camel
[camel-k-runtime] 02/02: Fix checkstyle issue
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 bf98bff1b93c4fd620d750e9c6ddb41a8a65e9e0 Author: Tom Cunningham AuthorDate: Tue Feb 4 11:54:43 2020 -0500 Fix checkstyle issue --- distribution/src/main/assemblies/repository.xml | 30 - 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/distribution/src/main/assemblies/repository.xml b/distribution/src/main/assemblies/repository.xml index 9432df2..3a53033 100644 --- a/distribution/src/main/assemblies/repository.xml +++ b/distribution/src/main/assemblies/repository.xml @@ -1,23 +1,23 @@ - + -http://maven.apache.org/ASSEMBLY/2.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd";> +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. +--> + m2 zip
[camel-k-runtime] branch master updated (8df8094 -> bf98bff)
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 8df8094 Upgrade groovy new 918b191 Add a repository distribution new bf98bff Fix checkstyle issue 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: distribution/pom.xml | 12 +++ .../src/main/assemblies/repository.xml | 25 -- 2 files changed, 30 insertions(+), 7 deletions(-) copy camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/resources/routes.xml => distribution/src/main/assemblies/repository.xml (65%)
[camel-k-runtime] 01/02: Add a repository distribution
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 918b191993de6ba2e74b059de39a8f879351ac6b
Author: Tom Cunningham
AuthorDate: Tue Feb 4 11:04:40 2020 -0500
Add a repository distribution
---
distribution/pom.xml| 12 +
distribution/src/main/assemblies/repository.xml | 36 +
2 files changed, 48 insertions(+)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a0ebb2c..a51383f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -50,6 +50,18 @@
+
+maven-repository
+package
+
+ single
+
+
+
+src/main/assemblies/repository.xml
+
+
+
diff --git a/distribution/src/main/assemblies/repository.xml
b/distribution/src/main/assemblies/repository.xml
new file mode 100644
index 000..9432df2
--- /dev/null
+++ b/distribution/src/main/assemblies/repository.xml
@@ -0,0 +1,36 @@
+
+
+http://maven.apache.org/ASSEMBLY/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd";>
+
+ m2
+
+zip
+
+
+ false
+
+
+ ./
+ ${settings.localRepository}
+
+org/apache/camel/k/**
+
+
+
+
[camel-quarkus] branch camel-master updated: Upgarde to Camel 3.1.0 - WIP (tooling)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-master by this push:
new e412d92 Upgarde to Camel 3.1.0 - WIP (tooling)
e412d92 is described below
commit e412d921fa578587abc9c771460829518a1af48b
Author: lburgazzoli
AuthorDate: Tue Feb 11 12:04:58 2020 +0100
Upgarde to Camel 3.1.0 - WIP (tooling)
---
.../main/java/org/apache/camel/quarkus/maven/ExtMvelHelper.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/ExtMvelHelper.java
b/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/ExtMvelHelper.java
index c70271c..e55f9be 100644
---
a/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/ExtMvelHelper.java
+++
b/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/ExtMvelHelper.java
@@ -19,11 +19,13 @@ package org.apache.camel.quarkus.maven;
import java.nio.file.Path;
import org.apache.camel.maven.packaging.MvelHelper;
-import org.apache.camel.tooling.util.Strings;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.DataFormatModel;
import org.apache.camel.tooling.model.LanguageModel;
+import static org.apache.camel.tooling.model.Strings.cutLastZeroDigit;
+import static org.apache.camel.tooling.util.Strings.after;
+
public class ExtMvelHelper {
private final Path extensionsDocPath;
@@ -37,7 +39,7 @@ public class ExtMvelHelper {
}
public String getFirstVersionShort(Object model) {
-return Strings.cutLastZeroDigit((String) invokeGetter(model,
"getFirstVersion"));
+return cutLastZeroDigit((String) invokeGetter(model,
"getFirstVersion"));
}
public String getDocLink(Object model) {
@@ -76,6 +78,6 @@ public class ExtMvelHelper {
}
private String getExtensionDocName(Object model) {
-return Strings.after((String) invokeGetter(model, "getArtifactId"),
"camel-quarkus-") + ".adoc";
+return after((String) invokeGetter(model, "getArtifactId"),
"camel-quarkus-") + ".adoc";
}
}
[camel-k] branch master updated: Allow to inject data from externally crafted secrets #1261 (camel-k bits)
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.git
The following commit(s) were added to refs/heads/master by this push:
new ddcc1b6 Allow to inject data from externally crafted secrets #1261
(camel-k bits)
ddcc1b6 is described below
commit ddcc1b66a5a8cfc51d099a7a5a7e65f70b10ec41
Author: lburgazzoli
AuthorDate: Tue Feb 11 13:20:48 2020 +0100
Allow to inject data from externally crafted secrets #1261 (camel-k bits)
---
pkg/trait/environment.go | 11 +++
pkg/trait/environment_test.go | 10 ++
pkg/trait/trait_test.go | 5 +++--
pkg/trait/trait_types.go | 38 +-
4 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/pkg/trait/environment.go b/pkg/trait/environment.go
index aca2bee..a0670ca 100644
--- a/pkg/trait/environment.go
+++ b/pkg/trait/environment.go
@@ -37,6 +37,15 @@ const (
envVarPodName = "POD_NAME"
envVarCamelKVersion= "CAMEL_K_VERSION"
envVarCamelKRuntimeVersion = "CAMEL_K_RUNTIME_VERSION"
+ envVarMountPathConfigMaps = "CAMEL_K_MOUNT_PATH_CONFIGMAPS"
+
+ // Disabling gosec linter as it may triggers:
+ //
+ // pkg/trait/environment.go:41: G101: Potential hardcoded credentials
(gosec)
+ // envVarMountPathSecrets = "CAMEL_K_MOUNT_PATH_SECRETS"
+ //
+ // nolint: gosec
+ envVarMountPathSecrets = "CAMEL_K_MOUNT_PATH_SECRETS"
)
func newEnvironmentTrait() *environmentTrait {
@@ -58,6 +67,8 @@ func (t *environmentTrait) Configure(e *Environment) (bool,
error) {
func (t *environmentTrait) Apply(e *Environment) error {
envvar.SetVal(&e.EnvVars, envVarCamelKVersion, defaults.Version)
envvar.SetVal(&e.EnvVars, envVarCamelKRuntimeVersion, e.RuntimeVersion)
+ envvar.SetVal(&e.EnvVars, envVarMountPathConfigMaps,
ConfigMapsMountPath)
+ envvar.SetVal(&e.EnvVars, envVarMountPathSecrets, SecretsMountPath)
if t.ContainerMeta {
envvar.SetValFrom(&e.EnvVars, envVarNamespace,
"metadata.namespace")
diff --git a/pkg/trait/environment_test.go b/pkg/trait/environment_test.go
index fbcbfc9..016fb60 100644
--- a/pkg/trait/environment_test.go
+++ b/pkg/trait/environment_test.go
@@ -73,6 +73,8 @@ func TestDefaultEnvironment(t *testing.T) {
ns := false
name := false
ck := false
+ cms := false
+ secrets := false
env.Resources.VisitDeployment(func(deployment *appsv1.Deployment) {
for _, e := range
deployment.Spec.Template.Spec.Containers[0].Env {
@@ -85,12 +87,20 @@ func TestDefaultEnvironment(t *testing.T) {
if e.Name == envVarCamelKVersion {
ck = true
}
+ if e.Name == envVarMountPathConfigMaps {
+ cms = true
+ }
+ if e.Name == envVarMountPathSecrets {
+ secrets = true
+ }
}
})
assert.True(t, ns)
assert.True(t, name)
assert.True(t, ck)
+ assert.True(t, cms)
+ assert.True(t, secrets)
}
func TestEnabledContainerMetaDataEnvVars(t *testing.T) {
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index 72a8da0..d1ba501 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -19,6 +19,7 @@ package trait
import (
"context"
+ "path"
"testing"
"github.com/stretchr/testify/assert"
@@ -339,7 +340,7 @@ func TestConfigureVolumesAndMounts(t *testing.T) {
m = findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return
m.Name == "test-configmap" })
assert.NotNil(t, m)
- assert.Equal(t, "/etc/camel/conf.d/integration-cm-test-configmap",
m.MountPath)
+ assert.Equal(t, path.Join(ConfigMapsMountPath, "test-configmap"),
m.MountPath)
v = findVolume(vols, func(v corev1.Volume) bool { return v.Name ==
"test-secret" })
assert.NotNil(t, v)
@@ -348,7 +349,7 @@ func TestConfigureVolumesAndMounts(t *testing.T) {
m = findVVolumeMount(mnts, func(m corev1.VolumeMount) bool { return
m.Name == "test-secret" })
assert.NotNil(t, m)
- assert.Equal(t, "/etc/camel/conf.d/integration-secret-test-secret",
m.MountPath)
+ assert.Equal(t, path.Join(SecretsMountPath, "test-secret"), m.MountPath)
v = findVolume(vols, func(v corev1.Volume) bool { return v.Name ==
"testvolume-data" })
assert.NotNil(t, v)
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
[camel-k-runtime] branch master updated: Allow to load generic secrets and reference entries from integrations #239
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
The following commit(s) were added to refs/heads/master by this push:
new 31e0522 Allow to load generic secrets and reference entries from
integrations #239
31e0522 is described below
commit 31e0522dbe3819d4be50e55a15db863bd5001c2f
Author: lburgazzoli
AuthorDate: Tue Feb 11 15:50:24 2020 +0100
Allow to load generic secrets and reference entries from integrations #239
---
camel-k-runtime-core/pom.xml | 2 +
.../main/java/org/apache/camel/k/Constants.java| 6 ++
.../k/listener/PropertiesFunctionsConfigurer.java | 64 +
.../k/support/KubernetesPropertiesFunction.java| 66 ++
.../services/org.apache.camel.k.Runtime$Listener | 1 +
.../PropertiesFunctionsConfigurerTest.java | 47 +++
.../test/resources/configmaps/my-cm/my-property| 1 +
.../test/resources/secrets/my-secret/my-property | 1 +
8 files changed, 188 insertions(+)
diff --git a/camel-k-runtime-core/pom.xml b/camel-k-runtime-core/pom.xml
index 085baad..592bd15 100644
--- a/camel-k-runtime-core/pom.xml
+++ b/camel-k-runtime-core/pom.xml
@@ -110,6 +110,8 @@
${project.basedir}
+
${project.basedir}/src/test/resources/configmaps
+
${project.basedir}/src/test/resources/secrets
diff --git
a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java
b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java
index 785dc57..619408a 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java
+++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Constants.java
@@ -29,6 +29,12 @@ public final class Constants {
public static final String ENV_CAMEL_K_CUSTOMIZERS = "CAMEL_K_CUSTOMIZERS";
public static final String PROPERTY_CAMEL_K_CUSTOMIZER =
"camel.k.customizer";
+public static final String ENV_CAMEL_K_MOUNT_PATH_CONFIGMAPS =
"CAMEL_K_MOUNT_PATH_CONFIGMAPS";
+public static final String PROPERTY_CAMEL_K_MOUNT_PATH_CONFIGMAPS =
"camel.k.mount-path.configmaps";
+
+public static final String ENV_CAMEL_K_MOUNT_PATH_SECRETS =
"CAMEL_K_MOUNT_PATH_SECRETS";
+public static final String PROPERTY_CAMEL_K_MOUNT_PATH_SECRETS =
"camel.k.mount-path.secrets";
+
public static final String SCHEME_CLASSPATH = "classpath:";
public static final String SCHEME_FILE = "file:";
public static final String LOGGING_LEVEL_PREFIX = "logging.level.";
diff --git
a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/PropertiesFunctionsConfigurer.java
b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/PropertiesFunctionsConfigurer.java
new file mode 100644
index 000..d16002a
--- /dev/null
+++
b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/PropertiesFunctionsConfigurer.java
@@ -0,0 +1,64 @@
+/*
+ * 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.k.listener;
+
+import org.apache.camel.k.Constants;
+import org.apache.camel.k.Runtime;
+import org.apache.camel.k.support.KubernetesPropertiesFunction;
+import org.apache.camel.spi.PropertiesComponent;
+
+public class PropertiesFunctionsConfigurer extends AbstractPhaseListener {
+public PropertiesFunctionsConfigurer() {
+super(Runtime.Phase.Starting);
+}
+
+@Override
+protected void accept(Runtime runtime) {
+//
+// Register properties functions to resolve k8s secrets or config maps
like:
+//
+// {{secret:name/key}}
+// {{configmap:name/key}}
+//
+PropertiesComponent pc =
runtime.getCamelContext().getPropertiesComponent();
+if (pc instanceof
org.apache.camel.component.properties.PropertiesComponent) {
+//
+// ConfigMap
+//
+
[camel] branch master updated: Update groovy to v3.0.0
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 02f85b9 Update groovy to v3.0.0 02f85b9 is described below commit 02f85b9f2d958c79a94d0fbbda4cd4532c81bc05 Author: lburgazzoli AuthorDate: Tue Feb 11 16:37:59 2020 +0100 Update groovy to v3.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8945163..917a92a 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ 2.5 3.0 1.6.2 -2.5.9 +3.0.0
[camel-quarkus] branch master updated: Remove enableJni from integration tests as JNI si always enabled on GraalVM 19.3.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-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new ca39d37 Remove enableJni from integration tests as JNI si always
enabled on GraalVM 19.3.1
ca39d37 is described below
commit ca39d376c5d6c787bd4289fc1212c95355702000
Author: lburgazzoli
AuthorDate: Tue Feb 11 18:40:17 2020 +0100
Remove enableJni from integration tests as JNI si always enabled on GraalVM
19.3.1
---
integration-tests/aws/pom.xml | 1 -
integration-tests/base64/pom.xml| 1 -
integration-tests/bean-validator/pom.xml| 1 -
integration-tests/bean/pom.xml | 1 -
integration-tests/bindy/pom.xml | 1 -
integration-tests/consul/pom.xml| 1 -
integration-tests/controlbus/pom.xml| 1 -
integration-tests/core-impl/pom.xml | 1 -
integration-tests/core-main-xml/pom.xml | 1 -
integration-tests/core-main/pom.xml | 1 -
integration-tests/core/pom.xml | 1 -
integration-tests/csv/pom.xml | 1 -
integration-tests/dataformat/pom.xml| 1 -
integration-tests/dozer/pom.xml | 1 -
integration-tests/exec/pom.xml | 1 -
integration-tests/fhir/pom.xml | 1 -
integration-tests/file/pom.xml | 1 -
integration-tests/ftp/pom.xml | 1 -
integration-tests/http/pom.xml | 1 -
integration-tests/hystrix/pom.xml | 1 -
integration-tests/infinispan/pom.xml| 1 -
integration-tests/jackson/pom.xml | 1 -
integration-tests/jdbc/pom.xml | 1 -
integration-tests/jsonpath/pom.xml | 1 -
integration-tests/kafka/pom.xml | 1 -
integration-tests/mail/pom.xml | 1 -
integration-tests/microprofile/pom.xml | 1 -
integration-tests/mongodb/pom.xml | 1 -
integration-tests/netty/pom.xml | 1 -
integration-tests/olingo4/pom.xml | 1 -
integration-tests/opentracing/pom.xml | 1 -
integration-tests/paho/pom.xml | 1 -
integration-tests/pdf/pom.xml | 1 -
integration-tests/platform-http-engine/pom.xml | 1 -
integration-tests/platform-http/pom.xml | 1 -
integration-tests/salesforce/pom.xml| 1 -
integration-tests/scheduler/pom.xml | 1 -
integration-tests/seda/pom.xml | 1 -
integration-tests/servlet/pom.xml | 1 -
integration-tests/sjms/pom.xml | 1 -
integration-tests/slack/pom.xml | 1 -
integration-tests/snakeyaml/pom.xml | 1 -
integration-tests/sql/pom.xml | 1 -
integration-tests/stream/pom.xml| 1 -
integration-tests/tagsoup/pom.xml | 1 -
integration-tests/tarfile/pom.xml | 1 -
integration-tests/twitter/pom.xml | 1 -
integration-tests/validator/pom.xml | 1 -
integration-tests/xslt/pom.xml | 1 -
integration-tests/zipfile/pom.xml | 1 -
tooling/create-extension-templates/integration-test-pom.xml | 1 -
51 files changed, 51 deletions(-)
diff --git a/integration-tests/aws/pom.xml b/integration-tests/aws/pom.xml
index ed6e34c..19482fe 100644
--- a/integration-tests/aws/pom.xml
+++ b/integration-tests/aws/pom.xml
@@ -156,7 +156,6 @@
true
false
false
-true
true
true
diff --git a/integration-tests/base64/pom.xml b/integration-tests/base64/pom.xml
index c086814..f987b02 100644
--- a/integration-tests/base64/pom.xml
+++ b/integration-tests/base64/pom.xml
@@ -115,7 +115,6 @@
false
false
${graalvmHome}
-true
true
[camel-quarkus] branch master updated (a766a3a -> 53ffbc5)
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-quarkus.git. from a766a3a Use camel-quarkus-support-httpclient in slack extension add 53ffbc5 Cleanup: Declare quarkus-development-mode-spi as a nonExtensionArtifact No new revisions were added by this update. Summary of changes: tooling/scripts/validate-dependencies.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[camel-quarkus] 01/02: Ensure that catalog files are added to the native image #686
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
commit f140b7169649405313d7d86004d524fee98ef3ce
Author: lburgazzoli
AuthorDate: Fri Feb 7 16:14:34 2020 +0100
Ensure that catalog files are added to the native image #686
---
.../quarkus/core/deployment/BuildProcessor.java| 6 +-
.../core/deployment/NativeImageProcessor.java | 86 -
.../org/apache/camel/quarkus/core/CamelConfig.java | 50 ++
.../camel/quarkus/core/CamelMainRecorder.java | 1 -
.../apache/camel/quarkus/core/CamelRecorder.java | 6 +-
.../camel/quarkus/core/CamelRuntimeCatalog.java| 66 +
.../camel/quarkus/core/FastCamelContext.java | 107 -
.../java/org/apache/camel/quarkus/core/Flags.java | 7 ++
.../apache/camel/quarkus/core/CamelServlet.java| 23 +
.../core/src/main/resources/application.properties | 5 +-
.../org/apache/camel/quarkus/core/CamelTest.java | 8 ++
11 files changed, 354 insertions(+), 11 deletions(-)
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
index 1f27ff7..2672806 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -356,7 +356,8 @@ class BuildProcessor {
CamelModelJAXBContextFactoryBuildItem contextFactory,
CamelRoutesLoaderBuildItems.Xml xmlLoader,
CamelFactoryFinderResolverBuildItem
factoryFinderResolverBuildItem,
-BeanContainerBuildItem beanContainer) {
+BeanContainerBuildItem beanContainer,
+CamelConfig config) {
RuntimeValue context = recorder.createContext(
registry.getRegistry(),
@@ -365,7 +366,8 @@ class BuildProcessor {
xmlLoader.getLoader(),
factoryFinderResolverBuildItem.getFactoryFinderResolver(),
beanContainer.getValue(),
-CamelSupport.getCamelVersion());
+CamelSupport.getCamelVersion(),
+config);
return new CamelContextBuildItem(context);
}
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
index ee075d8..f8f1d04 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
@@ -16,14 +16,20 @@
*/
package org.apache.camel.quarkus.core.deployment;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
+import io.quarkus.deployment.ApplicationArchive;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
import org.apache.camel.CamelContext;
@@ -33,12 +39,18 @@ import org.apache.camel.Converter;
import org.apache.camel.Endpoint;
import org.apache.camel.Producer;
import org.apache.camel.TypeConverter;
+import org.apache.camel.impl.engine.DefaultComponentResolver;
+import org.apache.camel.impl.engine.DefaultDataFormatResolver;
+import org.apache.camel.impl.engine.DefaultLanguageResolver;
+import org.apache.camel.quarkus.core.CamelConfig;
import org.apache.camel.quarkus.core.Flags;
+import org.apache.camel.quarkus.core.deployment.util.PathFilter;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.ExchangeFormatter;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.ScheduledPollConsumerScheduler;
import org.apache.camel.spi.StreamCachingStrategy;
+import org.apache.camel.support.CamelContextHelper;
import org.jboss.jandex.AnnotationTarget.Kind;
import org.jboss.jandex.AnnotationValue;
import org.jboss.jandex.ClassInfo;
@@ -47,7 +59,11 @@ import org.jboss.jandex.IndexView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static
[camel-quarkus] branch master updated (4deda38 -> 95a081e)
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-quarkus.git. from 4deda38 Merge pull request #707 from ffang/issue670 new f140b71 Ensure that catalog files are added to the native image #686 new 95a081e Ensure that catalog files are added to the native image #686 (fix findings) 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: .../quarkus/core/deployment/BuildProcessor.java| 6 +- .../core/deployment/NativeImageProcessor.java | 86 - .../org/apache/camel/quarkus/core/CamelConfig.java | 48 + .../camel/quarkus/core/CamelMainRecorder.java | 1 - .../apache/camel/quarkus/core/CamelRecorder.java | 6 +- .../camel/quarkus/core/CamelRuntimeCatalog.java| 66 + .../camel/quarkus/core/FastCamelContext.java | 107 - .../java/org/apache/camel/quarkus/core/Flags.java | 10 ++ .../apache/camel/quarkus/core/CamelServlet.java| 23 + .../core/src/main/resources/application.properties | 5 +- .../org/apache/camel/quarkus/core/CamelTest.java | 8 ++ 11 files changed, 355 insertions(+), 11 deletions(-) create mode 100644 extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
[camel-quarkus] 02/02: Ensure that catalog files are added to the native image #686 (fix findings)
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
commit 95a081e05cc86f81b51acddfe5cf17c6634847b8
Author: lburgazzoli
AuthorDate: Wed Feb 12 10:53:15 2020 +0100
Ensure that catalog files are added to the native image #686 (fix findings)
---
.../org/apache/camel/quarkus/core/CamelConfig.java | 20 +---
.../camel/quarkus/core/CamelRuntimeCatalog.java | 8
.../java/org/apache/camel/quarkus/core/Flags.java| 5 -
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
index 4873c5e..1b2c75c 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
@@ -39,7 +39,7 @@ public class CamelConfig {
public ServiceConfig service;
/**
- * Build time configuration options for CamelRuntimeCatalog.
+ * Build time configuration options for {@link
org.apache.camel.runtimecatalog.RuntimeCamelCatalog}.
*/
@ConfigItem
public RuntimeCatalogConfig runtimeCatalog;
@@ -183,16 +183,11 @@ public class CamelConfig {
@ConfigGroup
public static class RuntimeCatalogConfig {
/**
- * Enable {@link CamelRuntimeCatalog} functionaries.
- */
-@ConfigItem(defaultValue = "true")
-public boolean enabled;
-
-/**
* Used to control the resolution of components catalog info.
*
* Note that when building native images, this flag determine if the
json metadata files related to components
- * discovered at build time have to be included in the final binary.
+ * discovered at build time have to be included in the final binary.
In JVM mode there is no real benefit of
+ * setting this flag to {@code false} if not to make the behavior
consistent with native mode.
*/
@ConfigItem(defaultValue = "true")
public boolean components;
@@ -201,7 +196,8 @@ public class CamelConfig {
* Used to control the resolution of languages catalog info.
*
* Note that when building native images, this flag determine if the
json metadata files related to languages
- * discovered at build time have to be included in the final binary.
+ * discovered at build time have to be included in the final binary.
In JVM mode there is no real benefit of
+ * setting this flag to {@code false} if not to make the behavior
consistent with native mode.
*/
@ConfigItem(defaultValue = "true")
public boolean languages;
@@ -210,7 +206,8 @@ public class CamelConfig {
* Used to control the resolution of dataformats catalog info.
*
* Note that when building native images, this flag determine if the
json metadata files related to dataformats
- * discovered at build time have to be included in the final binary.
+ * discovered at build time have to be included in the final binary.
In JVM mode there is no real benefit of
+ * setting this flag to {@code false} if not to make the behavior
consistent with native mode.
*/
@ConfigItem(defaultValue = "true")
public boolean dataformats;
@@ -219,7 +216,8 @@ public class CamelConfig {
* Used to control the resolution of model catalog info.
*
* Note that when building native images, this flag determine if the
json metadata files related to models
- * has to be included in the final binary.
+ * has to be included in the final binary. In JVM mode there is no
real benefit of setting this flag to
+ * {@code false} if not to make the behavior consistent with native
mode.
*/
@ConfigItem(defaultValue = "true")
public boolean models;
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
index 2f82322..5b56b9c 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
@@ -30,7 +30,7 @@ public class CamelRuntimeCatalog extends
DefaultRuntimeCamelCatalog {
@Override
public String modelJSonSchema(String name) {
-if (!config.enabled || !config.models) {
+if (!config.models) {
return null;
}
@@ -39,7 +39,7 @@ public class CamelRuntimeCatalog extends
DefaultRuntime
[camel] branch master updated (16e1fc1 -> 308faef)
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.git. from 16e1fc1 [CAMEL-14559] Use String in definition fields to be able to leverage property placeholders add 308faef CAMEL-14558: Execute camel-kafak tests with testcontainers No new revisions were added by this update. Summary of changes: components/camel-kafka/pom.xml | 76 + .../component/kafka/BaseEmbeddedKafkaTest.java | 41 +++ .../component/kafka/KafkaProducerFullTest.java | 2 +- .../kafka/embedded/EmbeddedKafkaBroker.java| 125 - .../kafka/embedded/EmbeddedZookeeper.java | 97 .../camel/component/kafka/embedded/SystemTime.java | 53 - .../camel/component/kafka/embedded/TestUtils.java | 56 - .../kafka/KafkaIdempotentRepositoryEagerTest.java | 16 +-- .../KafkaIdempotentRepositoryNonEagerTest.java | 16 +-- 9 files changed, 96 insertions(+), 386 deletions(-) delete mode 100644 components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaBroker.java delete mode 100644 components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedZookeeper.java delete mode 100644 components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java delete mode 100644 components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/TestUtils.java
[camel] branch master updated: CAMEL-14543: Execute camel-etcd tests with testcontainers
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 639ad83 CAMEL-14543: Execute camel-etcd tests with testcontainers
639ad83 is described below
commit 639ad830b955ae3c85413f008f248cb5e31542c9
Author: lburgazzoli
AuthorDate: Wed Feb 12 16:35:49 2020 +0100
CAMEL-14543: Execute camel-etcd tests with testcontainers
---
components/camel-etcd/pom.xml | 40 +++--
.../apache/camel/component/etcd/EtcdKeysTest.java | 15 ++--
.../apache/camel/component/etcd/EtcdStatsTest.java | 3 +-
.../camel/component/etcd/EtcdTestSupport.java | 46 ---
.../apache/camel/component/etcd/EtcdWatchTest.java | 5 +-
.../etcd/cloud/EtcdServiceCallRouteTest.java | 11 ++-
.../etcd/cloud/EtcdServiceDiscoveryTest.java | 30 ---
.../SpringEtcdServiceCallDefaultRouteTest.java | 29 +++
.../etcd/cloud/SpringEtcdServiceCallRouteTest.java | 33 +++-
.../component/etcd/policy/EtcdRoutePolicyMain.java | 2 +-
.../component/etcd/support/EtcdTestSupport.java| 95 ++
.../etcd/support/SpringEtcdTestSupport.java| 74 +
.../src/test/resources/log4j2.properties | 2 +-
.../SpringEtcdServiceCallDefaultRouteTest.xml | 2 +-
.../etcd/cloud/SpringEtcdServiceCallRouteTest.xml | 12 ++-
parent/pom.xml | 2 +-
16 files changed, 279 insertions(+), 122 deletions(-)
diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml
index 7979a35..a91a738 100644
--- a/components/camel-etcd/pom.xml
+++ b/components/camel-etcd/pom.xml
@@ -71,12 +71,12 @@
org.apache.camel
-camel-test
+camel-testcontainers-spring-junit5
test
org.apache.camel
-camel-test-spring
+camel-testcontainers-junit5
test
@@ -109,17 +109,47 @@
+
+
+
+etcd-tests-docker-file
+
+
+/var/run/docker.sock
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+
+
+
+
+
+
+
-etcd-tests
+etcd-tests-docker-env
-false
+
+env.DOCKER_HOST
+
maven-surefire-plugin
-false
+${skipTests}
+
+
true
+
diff --git
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
index 3e0ac31..9ca98fa 100644
---
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
+++
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
@@ -26,12 +26,17 @@ import mousio.etcd4j.responses.EtcdKeysResponse;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.etcd.support.EtcdTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
public class EtcdKeysTest extends EtcdTestSupport {
-@Test(expected = EtcdException.class)
+@Test
public void testKeys() throws Exception {
final String path = "/camel/" + UUID.randomUUID().toString();
final String value = UUID.randomUUID().toString();
@@ -102,9 +107,9 @@ public class EtcdKeysTest extends EtcdTestSupport {
// VALIDATION
// ***
-client.get(path).send().get();
-
-fail("EtcdException should have been thrown");
+assertThrows(EtcdException.class, () -> {
+client.get(path).send().get();
+});
}
@Override
diff --git
a/components/camel-etcd/src/test/java/org/apache/camel/component/
[camel-quarkus] 01/03: Set -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
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 commit 08201feb558a0312d78678ab6d9564dfd7c1b313 Author: Peter Palaga AuthorDate: Wed Feb 12 17:46:24 2020 +0100 Set -Dmaven.wagon.http.retryHandler.requestSentEnabled=true This is to enable retries even on dependency downloads where the request was sent successfully --- .mvn/maven.config | 1 + 1 file changed, 1 insertion(+) diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 000..3b3d7bc --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dmaven.wagon.http.retryHandler.requestSentEnabled=true
[camel-quarkus] branch master updated (95a081e -> cd5d161)
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-quarkus.git. from 95a081e Ensure that catalog files are added to the native image #686 (fix findings) new 08201fe Set -Dmaven.wagon.http.retryHandler.requestSentEnabled=true new 559fbdb Update via -Pformat new cd5d161 Update mvnd.builder.rules by running mvn process-resources -Pformat The 3 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: .mvn/maven.config | 1 + examples/file-split-log-xml/pom.xml| 10 ++ examples/observability/pom.xml | 10 ++ examples/rest-json/pom.xml | 10 ++ examples/timer-log-cdi/pom.xml | 10 ++ examples/timer-log-kotlin/pom.xml | 7 ++ examples/timer-log-spring/pom.xml | 10 ++ examples/timer-log-xml/pom.xml | 10 ++ examples/timer-log/pom.xml | 10 ++ integration-tests/aws/pom.xml | 10 ++ integration-tests/base64/pom.xml | 10 ++ integration-tests/bean-validator/pom.xml | 10 ++ integration-tests/bean/pom.xml | 10 ++ integration-tests/bindy/pom.xml| 10 ++ integration-tests/consul/pom.xml | 10 ++ integration-tests/controlbus/pom.xml | 10 ++ integration-tests/core-impl/pom.xml| 10 ++ integration-tests/core-main-collector/pom.xml | 10 ++ integration-tests/core-main-xml/pom.xml| 10 ++ integration-tests/core-main/pom.xml| 10 ++ integration-tests/core/pom.xml | 10 ++ integration-tests/csv/pom.xml | 10 ++ integration-tests/dataformat/pom.xml | 10 ++ integration-tests/dozer/pom.xml| 10 ++ integration-tests/exec/pom.xml | 10 ++ integration-tests/fhir/pom.xml | 10 ++ integration-tests/file/pom.xml | 10 ++ integration-tests/ftp/pom.xml | 10 ++ integration-tests/http/pom.xml | 10 ++ integration-tests/hystrix/pom.xml | 10 ++ integration-tests/infinispan/pom.xml | 10 ++ integration-tests/jackson/pom.xml | 10 ++ integration-tests/jdbc/pom.xml | 10 ++ integration-tests/jsonpath/pom.xml | 10 ++ integration-tests/kafka/pom.xml| 1 + integration-tests/mail/pom.xml | 10 ++ integration-tests/microprofile/pom.xml | 10 ++ integration-tests/mongodb/pom.xml | 10 ++ integration-tests/netty/pom.xml| 10 ++ integration-tests/olingo4/pom.xml | 10 ++ integration-tests/opentracing/pom.xml | 10 ++ integration-tests/paho/pom.xml | 10 ++ integration-tests/pdf/pom.xml | 10 ++ integration-tests/platform-http-engine/pom.xml | 10 ++ integration-tests/platform-http/pom.xml| 10 ++ integration-tests/reactive-streams/pom.xml | 10 ++ integration-tests/salesforce/pom.xml | 10 ++ integration-tests/scheduler/pom.xml| 10 ++ integration-tests/seda/pom.xml | 10 ++ integration-tests/servlet/pom.xml | 10 ++ integration-tests/sjms/pom.xml | 10 ++ integration-tests/slack/pom.xml| 10 ++ integration-tests/snakeyaml/pom.xml| 10 ++ integration-tests/sql/pom.xml | 10 ++ integration-tests/stream/pom.xml | 10 ++ integration-tests/tagsoup/pom.xml | 10 ++ integration-tests/tarfile/pom.xml | 10 ++ integration-tests/twitter/pom.xml | 10 ++ integration-tests/validator/pom.xml| 10 ++ integration-tests/xslt/pom.xml | 10 ++ integration-tests/zipfile/pom.xml | 10 ++ pom.xml| 1 + tooling/scripts/sort-poms.groovy | 122 + 63 files changed, 712 insertions(+) create mode 100644 .mvn/maven.config
[camel-quarkus] 03/03: Update mvnd.builder.rules by running mvn process-resources -Pformat
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 commit cd5d161fe471fb9712f3932b1b4592038bb455be Author: Peter Palaga AuthorDate: Thu Feb 13 09:23:31 2020 +0100 Update mvnd.builder.rules by running mvn process-resources -Pformat --- examples/file-split-log-xml/pom.xml| 10 ++ examples/observability/pom.xml | 10 ++ examples/rest-json/pom.xml | 10 ++ examples/timer-log-cdi/pom.xml | 10 ++ examples/timer-log-kotlin/pom.xml | 7 +++ examples/timer-log-spring/pom.xml | 10 ++ examples/timer-log-xml/pom.xml | 10 ++ examples/timer-log/pom.xml | 10 ++ integration-tests/aws/pom.xml | 10 ++ integration-tests/base64/pom.xml | 10 ++ integration-tests/bean-validator/pom.xml | 10 ++ integration-tests/bean/pom.xml | 10 ++ integration-tests/bindy/pom.xml| 10 ++ integration-tests/consul/pom.xml | 10 ++ integration-tests/controlbus/pom.xml | 10 ++ integration-tests/core-impl/pom.xml| 10 ++ integration-tests/core-main-collector/pom.xml | 10 ++ integration-tests/core-main-xml/pom.xml| 10 ++ integration-tests/core-main/pom.xml| 10 ++ integration-tests/core/pom.xml | 10 ++ integration-tests/csv/pom.xml | 10 ++ integration-tests/dataformat/pom.xml | 10 ++ integration-tests/dozer/pom.xml| 10 ++ integration-tests/exec/pom.xml | 10 ++ integration-tests/fhir/pom.xml | 10 ++ integration-tests/file/pom.xml | 10 ++ integration-tests/ftp/pom.xml | 10 ++ integration-tests/http/pom.xml | 10 ++ integration-tests/hystrix/pom.xml | 10 ++ integration-tests/infinispan/pom.xml | 10 ++ integration-tests/jackson/pom.xml | 10 ++ integration-tests/jdbc/pom.xml | 10 ++ integration-tests/jsonpath/pom.xml | 10 ++ integration-tests/kafka/pom.xml| 1 + integration-tests/mail/pom.xml | 10 ++ integration-tests/microprofile/pom.xml | 10 ++ integration-tests/mongodb/pom.xml | 10 ++ integration-tests/netty/pom.xml| 10 ++ integration-tests/olingo4/pom.xml | 10 ++ integration-tests/opentracing/pom.xml | 10 ++ integration-tests/paho/pom.xml | 10 ++ integration-tests/pdf/pom.xml | 10 ++ integration-tests/platform-http-engine/pom.xml | 10 ++ integration-tests/platform-http/pom.xml| 10 ++ integration-tests/reactive-streams/pom.xml | 10 ++ integration-tests/salesforce/pom.xml | 10 ++ integration-tests/scheduler/pom.xml| 10 ++ integration-tests/seda/pom.xml | 10 ++ integration-tests/servlet/pom.xml | 10 ++ integration-tests/sjms/pom.xml | 10 ++ integration-tests/slack/pom.xml| 10 ++ integration-tests/snakeyaml/pom.xml| 10 ++ integration-tests/sql/pom.xml | 10 ++ integration-tests/stream/pom.xml | 10 ++ integration-tests/tagsoup/pom.xml | 10 ++ integration-tests/tarfile/pom.xml | 10 ++ integration-tests/twitter/pom.xml | 10 ++ integration-tests/validator/pom.xml| 10 ++ integration-tests/xslt/pom.xml | 10 ++ integration-tests/zipfile/pom.xml | 10 ++ 60 files changed, 588 insertions(+) diff --git a/examples/file-split-log-xml/pom.xml b/examples/file-split-log-xml/pom.xml index e8fb1c0..7230aa3 100644 --- a/examples/file-split-log-xml/pom.xml +++ b/examples/file-split-log-xml/pom.xml @@ -35,6 +35,16 @@ + + + + + + + + camel-quarkus-core-xml-deployment,camel-quarkus-file-deployment,camel-quarkus-log-deployment,camel-quarkus-support-policy-deployment,camel-quarkus-timer-deployment + + org.apache.camel.quarkus diff --git a/examples/observability/pom.xml b/examples/observability/pom.xml index bcdebb3..4184857 100644 --- a/examples/observability/pom.xml +++ b/examples/observability/pom.xml @@ -31,6 +31,16 @@ Camel Quarkus
[camel-quarkus] 02/03: Update via -Pformat
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
commit 559fbdb74f511208335b205f1be159d2062d2544
Author: Peter Palaga
AuthorDate: Wed Feb 12 09:14:03 2020 +0100
Update via -Pformat
---
pom.xml | 1 +
tooling/scripts/sort-poms.groovy | 122 +++
2 files changed, 123 insertions(+)
diff --git a/pom.xml b/pom.xml
index 191a8b4..aa66c18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,6 +426,7 @@
extensions/pom.xml,integration-tests/pom.xml
poms/bom/pom.xml,poms/bom-deployment/pom.xml
+
examples,integration-tests
file:///${project.basedir}/tooling/scripts/sort-poms.groovy
diff --git a/tooling/scripts/sort-poms.groovy b/tooling/scripts/sort-poms.groovy
index 0b63cd1..a4a3919 100644
--- a/tooling/scripts/sort-poms.groovy
+++ b/tooling/scripts/sort-poms.groovy
@@ -26,6 +26,8 @@ import java.nio.file.Files
import java.util.regex.Matcher
import java.util.regex.Pattern
+import groovy.util.NodeList
+
@groovy.transform.Field
final Path baseDir = basedir.toPath()
@@ -35,6 +37,9 @@ sortDependencyManagement(sortDepManagementPaths)
final String[] sortModulesPaths = properties['sortModulesPaths'].split(',')
sortModules(sortModulesPaths)
+final String[] updateMvndRuleDirs = properties['updateMvndRuleDirs'].split(',')
+updateMvndRules(updateMvndRuleDirs)
+
void sortDependencyManagement(String[] pomPaths) {
for (pomPath in pomPaths) {
final Path pomXmlPath = baseDir.resolve(pomPath.trim())
@@ -179,3 +184,120 @@ void sortModules(String[] sortModulesPaths) {
}
}
}
+
+void updateMvndRules(String[] updateMvndRuleDirs) {
+final Set extensionArtifactIds = [] as TreeSet
+Files.list(baseDir.resolve('extensions'))
+.filter { p -> Files.isDirectory(p) &&
Files.exists(p.resolve('pom.xml')) && Files.exists(p.resolve('runtime')) }
+.map { p -> p.getFileName().toString() }
+.filter { dirName -> !dirName.equals('support') }
+.map { dirName -> 'camel-quarkus-' + dirName }
+.forEach { aid -> extensionArtifactIds << aid }
+
+Files.list(baseDir.resolve('extensions/support'))
+.filter { p -> Files.isDirectory(p) &&
Files.exists(p.resolve('pom.xml')) && Files.exists(p.resolve('runtime')) }
+.map { p -> p.getFileName().toString() }
+.map { dirName -> 'camel-quarkus-support-' + dirName }
+.forEach { aid -> extensionArtifactIds << aid }
+
+Files.list(baseDir.resolve('integration-tests/support'))
+.filter { p -> Files.isDirectory(p) &&
Files.exists(p.resolve('pom.xml')) && Files.exists(p.resolve('runtime')) }
+.map { p -> p.getFileName().toString() }
+.map { dirName -> 'camel-quarkus-integration-test-support-' +
dirName + '-ext' }
+.forEach { aid -> extensionArtifactIds << aid }
+
+/* Policy may disappear at some point */
+final boolean policyExtensionExists =
extensionArtifactIds.contains('camel-quarkus-support-policy')
+
+final Pattern dependenciesPattern = Pattern.compile('([^\n<]*)')
+final Pattern rulePattern =
Pattern.compile('[^<]*')
+
+for (updateMvndRuleDir in updateMvndRuleDirs) {
+Files.list(baseDir.resolve(updateMvndRuleDir))
+.filter { p -> Files.isDirectory(p) &&
!'support'.equals(p.getFileName().toString()) }
+.map { p -> p.resolve('pom.xml') }
+.filter { p -> Files.exists(p) }
+.forEach { pomXmlPath ->
+
+final Path relativePomPath =
baseDir.relativize(pomXmlPath)
+
+String pomXmlText =
pomXmlPath.toFile().getText('UTF-8')
+
+Node pomXmlProject = null
+try {
+pomXmlProject = new
XmlParser().parseText(pomXmlText)
+} catch (Exception e) {
+throw new RuntimeException('Could not parse ' +
relativePomPath, e)
+}
+final List extensionDependencies =
pomXmlProject.dependencies.dependency
+.findAll { dep ->
"org.apache.camel.quarkus&qu
[camel] branch master updated: Fix CS
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 d443bb7 Fix CS
d443bb7 is described below
commit d443bb7029b679dc1036cb450e4555024973ee26
Author: lburgazzoli
AuthorDate: Thu Feb 13 14:40:51 2020 +0100
Fix CS
---
.../apache/camel/jsonpath/JsonPathExpression.java | 30 ++
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
index 9e51e48..4069924 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
@@ -27,9 +27,6 @@ import org.apache.camel.ExpressionEvaluationException;
import org.apache.camel.ExpressionIllegalSyntaxException;
import org.apache.camel.jsonpath.easypredicate.EasyPredicateParser;
import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.PropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerAware;
import org.apache.camel.support.ExpressionAdapter;
import org.apache.camel.support.component.PropertyConfigurerSupport;
import org.slf4j.Logger;
@@ -62,18 +59,31 @@ public class JsonPathExpression extends ExpressionAdapter
implements AfterProper
}
switch (ignoreCase ? name.toLowerCase() : name) {
case "resulttype":
-case "resultType":
setResultType(PropertyConfigurerSupport.property(camelContext, Class.class,
value)); return true;
+case "resultType":
+setResultType(PropertyConfigurerSupport.property(camelContext,
Class.class, value));
+return true;
case "suppressexceptions":
-case "suppressExceptions":
setSuppressExceptions(PropertyConfigurerSupport.property(camelContext,
Boolean.class, value)); return true;
+case "suppressExceptions":
+
setSuppressExceptions(PropertyConfigurerSupport.property(camelContext,
Boolean.class, value));
+return true;
case "allowsimple":
-case "allowSimple":
setAllowSimple(PropertyConfigurerSupport.property(camelContext, Boolean.class,
value)); return true;
+case "allowSimple":
+setAllowSimple(PropertyConfigurerSupport.property(camelContext,
Boolean.class, value));
+return true;
case "alloweasypredicate":
-case "allowEasyPredicate":
setAllowEasyPredicate(PropertyConfigurerSupport.property(camelContext,
Boolean.class, value)); return true;
+case "allowEasyPredicate":
+
setAllowEasyPredicate(PropertyConfigurerSupport.property(camelContext,
Boolean.class, value));
+return true;
case "writeasstring":
-case "writeAsString":
setWriteAsString(PropertyConfigurerSupport.property(camelContext,
Boolean.class, value)); return true;
+case "writeAsString":
+setWriteAsString(PropertyConfigurerSupport.property(camelContext,
Boolean.class, value));
+return true;
case "headername":
-case "headerName":
setHeaderName(PropertyConfigurerSupport.property(camelContext, String.class,
value)); return true;
-default: return false;
+case "headerName":
+setHeaderName(PropertyConfigurerSupport.property(camelContext,
String.class, value));
+return true;
+default:
+return false;
}
}
[camel] 01/02: Fix CS
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
commit 1de91a070ffcfc13e8378d5bb7dd4a9a1c1877c9
Author: lburgazzoli
AuthorDate: Thu Feb 13 15:06:52 2020 +0100
Fix CS
---
.../src/main/java/org/apache/camel/model/ThreadsDefinition.java | 2 +-
.../main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
index 3fe8f29..b01ca61 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadsDefinition.java
@@ -63,7 +63,7 @@ public class ThreadsDefinition extends
NoOutputDefinition imp
@Metadata(defaultValue = "Threads")
private String threadName;
@XmlAttribute
-@Metadata(javaType =
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy",
enums="Abort,CallerRuns,DiscardOldest,Discard")
+@Metadata(javaType =
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", enums =
"Abort,CallerRuns,DiscardOldest,Discard")
private String rejectedPolicy;
@XmlAttribute
@Metadata(defaultValue = "true")
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
index ef273c8..7eb2015 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
@@ -57,10 +57,10 @@ public class YAMLDataFormat extends DataFormatDefinition {
private String useApplicationContextClassLoader = Boolean.toString(true);
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean", defaultValue = "false")
-protected String prettyFlow = Boolean.toString(false);
+private String prettyFlow = Boolean.toString(false);
@XmlAttribute
@Metadata(javaType = "java.lang.Boolean", defaultValue = "false")
-protected String allowAnyType = Boolean.toString(false);
+private String allowAnyType = Boolean.toString(false);
@XmlElement(name = "typeFilter")
private List typeFilters;
[camel] branch master updated (b8c5d3b -> 120d7f9)
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.git.
from b8c5d3b CAMEL-14551 - Create an AWS-SES component based on SDK v2,
Fixed CS
new 1de91a0 Fix CS
new 120d7f9 Regen
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:
.../component/ComponentsBuilderFactory.java| 11 ++
...ava => XmlsecurityComponentBuilderFactory.java} | 41 +++---
.../src/generated/resources/metadata.json | 20 +++
.../org/apache/camel/model/ThreadsDefinition.java | 2 +-
.../camel/model/dataformat/YAMLDataFormat.java | 4 +--
5 files changed, 62 insertions(+), 16 deletions(-)
copy
core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/{XmlsecuritySignComponentBuilderFactory.java
=> XmlsecurityComponentBuilderFactory.java} (74%)
[camel] 02/02: Regen
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
commit 120d7f96d8b1b3b5df3dcbc2f0f28ab9868db70d
Author: lburgazzoli
AuthorDate: Thu Feb 13 15:08:31 2020 +0100
Regen
---
.../component/ComponentsBuilderFactory.java| 11 ++
.../dsl/XmlsecurityComponentBuilderFactory.java| 139 +
.../src/generated/resources/metadata.json | 20 +++
3 files changed, 170 insertions(+)
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index a79beec..cc828a0 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -3905,6 +3905,17 @@ public interface ComponentsBuilderFactory {
return
org.apache.camel.builder.component.dsl.XjComponentBuilderFactory.xj();
}
/**
+ * XML Security (camel-xmlsecurity)
+ * Used to sign and verify exchanges using the XML signature specification.
+ *
+ * Category: security,transformation
+ * Since: 2.12
+ * Maven coordinates: org.apache.camel:camel-xmlsecurity
+ */
+static
org.apache.camel.builder.component.dsl.XmlsecurityComponentBuilderFactory.XmlsecurityComponentBuilder
xmlsecurity() {
+return
org.apache.camel.builder.component.dsl.XmlsecurityComponentBuilderFactory.xmlsecurity();
+}
+/**
* XML Security Sign (camel-xmlsecurity)
* Used to sign exchanges using the XML signature specification.
*
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityComponentBuilderFactory.java
new file mode 100644
index 000..61e4572
--- /dev/null
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityComponentBuilderFactory.java
@@ -0,0 +1,139 @@
+/*
+ * 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.builder.component.dsl;
+
+import javax.annotation.Generated;
+import org.apache.camel.Component;
+import org.apache.camel.builder.component.AbstractComponentBuilder;
+import org.apache.camel.builder.component.ComponentBuilder;
+import org.apache.camel.component.xmlsecurity.XmlSignatureComponent;
+
+/**
+ * Used to sign and verify exchanges using the XML signature specification.
+ *
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.ComponentDslMojo")
+public interface XmlsecurityComponentBuilderFactory {
+
+/**
+ * XML Security (camel-xmlsecurity)
+ * Used to sign and verify exchanges using the XML signature specification.
+ *
+ * Category: security,transformation
+ * Since: 2.12
+ * Maven coordinates: org.apache.camel:camel-xmlsecurity
+ */
+static XmlsecurityComponentBuilder xmlsecurity() {
+return new XmlsecurityComponentBuilderImpl();
+}
+
+/**
+ * Builder for the XML Security component.
+ */
+interface XmlsecurityComponentBuilder
+extends
+ComponentBuilder {
+/**
+ * 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 starting the
+ * producer may take a little time and prolong the total processing
[camel] branch master updated: Revert "Regen"
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 fcd27f4 Revert "Regen"
fcd27f4 is described below
commit fcd27f4e6777a3d9461078b993101163eca1e509
Author: lburgazzoli
AuthorDate: Thu Feb 13 15:51:15 2020 +0100
Revert "Regen"
This reverts commit 120d7f96d8b1b3b5df3dcbc2f0f28ab9868db70d.
---
.../component/ComponentsBuilderFactory.java| 11 --
.../dsl/XmlsecurityComponentBuilderFactory.java| 139 -
.../src/generated/resources/metadata.json | 20 ---
3 files changed, 170 deletions(-)
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 94a2a9d..a0c69a2 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -3905,17 +3905,6 @@ public interface ComponentsBuilderFactory {
return
org.apache.camel.builder.component.dsl.XjComponentBuilderFactory.xj();
}
/**
- * XML Security (camel-xmlsecurity)
- * Used to sign and verify exchanges using the XML signature specification.
- *
- * Category: security,transformation
- * Since: 2.12
- * Maven coordinates: org.apache.camel:camel-xmlsecurity
- */
-static
org.apache.camel.builder.component.dsl.XmlsecurityComponentBuilderFactory.XmlsecurityComponentBuilder
xmlsecurity() {
-return
org.apache.camel.builder.component.dsl.XmlsecurityComponentBuilderFactory.xmlsecurity();
-}
-/**
* XML Security Sign (camel-xmlsecurity)
* Used to sign exchanges using the XML signature specification.
*
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityComponentBuilderFactory.java
deleted file mode 100644
index 61e4572..000
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityComponentBuilderFactory.java
+++ /dev/null
@@ -1,139 +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.builder.component.dsl;
-
-import javax.annotation.Generated;
-import org.apache.camel.Component;
-import org.apache.camel.builder.component.AbstractComponentBuilder;
-import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.xmlsecurity.XmlSignatureComponent;
-
-/**
- * Used to sign and verify exchanges using the XML signature specification.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.ComponentDslMojo")
-public interface XmlsecurityComponentBuilderFactory {
-
-/**
- * XML Security (camel-xmlsecurity)
- * Used to sign and verify exchanges using the XML signature specification.
- *
- * Category: security,transformation
- * Since: 2.12
- * Maven coordinates: org.apache.camel:camel-xmlsecurity
- */
-static XmlsecurityComponentBuilder xmlsecurity() {
-return new XmlsecurityComponentBuilderImpl();
-}
-
-/**
- * Builder for the XML Security component.
- */
-interface XmlsecurityComponentBuilder
-extends
-ComponentBuilder {
-/**
- * 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
- * r
[camel-quarkus] 02/02: Fix #694 quarkus-maven-plugin generate application.properties file for IT tests
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 commit a2c8b41de7c6db195de8621185b55d5dab03c917 Author: Peter Palaga AuthorDate: Thu Feb 13 15:14:16 2020 +0100 Fix #694 quarkus-maven-plugin generate application.properties file for IT tests --- .../integration-test-application.properties | 16 1 file changed, 16 insertions(+) diff --git a/tooling/create-extension-templates/integration-test-application.properties b/tooling/create-extension-templates/integration-test-application.properties new file mode 100644 index 000..fa7a54b --- /dev/null +++ b/tooling/create-extension-templates/integration-test-application.properties @@ -0,0 +1,16 @@ +## --- +## 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. +## ---
[camel-quarkus] 01/02: Fix #688 Create extension mojo not working after Quarkus 1.3.0.Alpha1 upgrade
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
commit c9a5ddd3c259f57b3a7198dba956e15db5a38fb0
Author: Peter Palaga
AuthorDate: Thu Feb 13 15:01:15 2020 +0100
Fix #688 Create extension mojo not working after Quarkus 1.3.0.Alpha1
upgrade
---
extensions/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 373a23d..289a289 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -157,7 +157,7 @@
Camel Quarkus ::
::
component
-
file:///${project.basedir}/../tooling/create-extension-templates
+
file://../tooling/create-extension-templates
../poms/bom/pom.xml
../poms/bom-deployment/pom.xml
@{camel-quarkus.version}
[camel-quarkus] branch master updated (cd5d161 -> a2c8b41)
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-quarkus.git.
from cd5d161 Update mvnd.builder.rules by running mvn process-resources
-Pformat
new c9a5ddd Fix #688 Create extension mojo not working after Quarkus
1.3.0.Alpha1 upgrade
new a2c8b41 Fix #694 quarkus-maven-plugin generate application.properties
file for IT 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:
extensions/pom.xml | 2 +-
.../integration-test-application.properties}| 0
2 files changed, 1 insertion(+), 1 deletion(-)
copy
tooling/{package-maven-plugin/src/main/resources/camel-quarkus-package-maven-plugin.properties
=> create-extension-templates/integration-test-application.properties} (100%)
[camel-quarkus] 01/02: Set quarkus.version to 999-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch quarkus-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit e435e652ddf1d7110f356709a7600053550bbc6e Author: lburgazzoli AuthorDate: Fri Feb 7 10:48:54 2020 +0100 Set quarkus.version to 999-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa66c18..7ab93e7 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 2.10.4 3.0.1 4.1.0 -1.3.0.Alpha1 +999-SNAPSHOT 4.1.3 9.4.18.v20190429 1.4.11
[camel-quarkus] branch quarkus-master updated (df73414 -> a3d0fbd)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard df73414 Fix MongoDbProcessor according to the latest changes in the
mongodb extension
discard 982d7ff Set quarkus.version to 999-SNAPSHOT
add 68f9774 Add olingo4 extension
add 74c51b1 chore: Remove redundant note related to fileWatcher param in
stream extension docs
add 6e759cd Add olingo4 itest to project list
add ca39d37 Remove enableJni from integration tests as JNI si always
enabled on GraalVM 19.3.1
add a766a3a Use camel-quarkus-support-httpclient in slack extension
add 53ffbc5 Cleanup: Declare quarkus-development-mode-spi as a
nonExtensionArtifact
add 7634cc0 Fix #696 Test HTTPS with the HTTP clients
add d5c59e1 Re-use the cached local Maven repo even in
build-alternative-jvm job
add 73afcd2 Merge pull request #697 from ppalaga/i696
add 95ecf8f #670 fix PDF itests in native mode
add 4deda38 Merge pull request #707 from ffang/issue670
add f140b71 Ensure that catalog files are added to the native image #686
add 95a081e Ensure that catalog files are added to the native image #686
(fix findings)
add 08201fe Set -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
add 559fbdb Update via -Pformat
add cd5d161 Update mvnd.builder.rules by running mvn process-resources
-Pformat
add c9a5ddd Fix #688 Create extension mojo not working after Quarkus
1.3.0.Alpha1 upgrade
add a2c8b41 Fix #694 quarkus-maven-plugin generate application.properties
file for IT tests
new e435e65 Set quarkus.version to 999-SNAPSHOT
new a3d0fbd Fix MongoDbProcessor according to the latest changes in the
mongodb extension
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 (df73414)
\
N -- N -- N refs/heads/quarkus-master (a3d0fbd)
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:
.github/workflows/pr-build.yaml| 9 ++
.mvn/maven.config | 1 +
docs/modules/ROOT/pages/extensions/stream.adoc | 4 -
.../pages/list-of-camel-quarkus-extensions.adoc| 5 +-
examples/file-split-log-xml/pom.xml| 10 ++
examples/observability/pom.xml | 10 ++
examples/rest-json/pom.xml | 10 ++
examples/timer-log-cdi/pom.xml | 10 ++
examples/timer-log-kotlin/pom.xml | 7 ++
examples/timer-log-spring/pom.xml | 10 ++
examples/timer-log-xml/pom.xml | 10 ++
examples/timer-log/pom.xml | 10 ++
.../quarkus/core/deployment/BuildProcessor.java| 6 +-
.../core/deployment/NativeImageProcessor.java | 86 ++-
.../org/apache/camel/quarkus/core/CamelConfig.java | 48
.../camel/quarkus/core/CamelMainRecorder.java | 1 -
.../apache/camel/quarkus/core/CamelRecorder.java | 6 +-
.../camel/quarkus/core/CamelRuntimeCatalog.java| 66 +++
.../camel/quarkus/core/FastCamelContext.java | 107 +-
.../java/org/apache/camel/quarkus/core/Flags.java | 10 ++
.../mongodb/deployment/MongoDbProcessor.java | 22 ++--
.../{aws-kinesis => olingo4}/deployment/pom.xml| 22 ++--
.../olingo4/deployment/Olingo4Processor.java | 72
extensions/{bindy => olingo4}/pom.xml | 4 +-
extensions/{sql => olingo4}/runtime/pom.xml| 32 +++---
.../olingo4/graal/ODataImplSubstitutions.java} | 16 ++-
.../main/resources/META-INF/quarkus-extension.yaml | 9 +-
extensions/pdf/deployment/pom.xml | 4 +
.../component/pdf/deployment/PdfProcessor.java | 10 +-
extensions/pdf/runtime/pom.xml | 10 ++
extensions/pom.xml | 3 +-
extensions/readme.adoc | 5 +-
extensions/slack/deployment/pom.xml| 4 +
.../component/slack/deployment/SlackProcessor.java | 8 --
extensi
[camel-quarkus] 02/02: Fix MongoDbProcessor according to the latest changes in the mongodb extension
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a3d0fbdc26aa47741f3c3e94455248f42d0f69e3
Author: lburgazzoli
AuthorDate: Fri Feb 7 10:49:27 2020 +0100
Fix MongoDbProcessor according to the latest changes in the mongodb
extension
---
.../mongodb/deployment/MongoDbProcessor.java | 22 ++
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git
a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
index f14c0c9..00abff7 100644
---
a/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
+++
b/extensions/mongodb/deployment/src/main/java/org/apache/camel/quarkus/component/mongodb/deployment/MongoDbProcessor.java
@@ -16,12 +16,15 @@
*/
package org.apache.camel.quarkus.component.mongodb.deployment;
-import com.mongodb.MongoClient;
+import java.util.List;
+
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.mongodb.deployment.MongoClientBuildItem;
+import io.quarkus.mongodb.runtime.MongoClientRecorder;
import org.apache.camel.quarkus.component.mongodb.CamelMongoClientRecorder;
import org.apache.camel.quarkus.core.deployment.CamelRuntimeBeanBuildItem;
@@ -36,10 +39,21 @@ class MongoDbProcessor {
@BuildStep
@Record(ExecutionTime.RUNTIME_INIT)
-CamelRuntimeBeanBuildItem
registerCamelMongoClientProducer(MongoClientBuildItem mongoClientBuildItem,
+void registerCamelMongoClientProducer(
+List mongoClients,
+BuildProducer runtimeBeans,
CamelMongoClientRecorder recorder) {
-return new CamelRuntimeBeanBuildItem("camelMongoClient",
MongoClient.class.getName(),
-
recorder.createCamelMongoClient(mongoClientBuildItem.getClient()));
+for (MongoClientBuildItem mongoClient : mongoClients) {
+// If there is a default mongo client instance, then bind it to
the camel registry
+// with the default mongo client name used by the camel-mongodb
component
+if
(MongoClientRecorder.DEFAULT_MONGOCLIENT_NAME.equals(mongoClient.getName())) {
+runtimeBeans.produce(
+new CamelRuntimeBeanBuildItem(
+"camelMongoClient",
+"com.mongodb.MongoClient",
+
recorder.createCamelMongoClient(mongoClients.get(0).getClient(;
+}
+}
}
}
[camel-k-runtime] branch master updated: Fix #241: add master helper component
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
The following commit(s) were added to refs/heads/master by this push:
new a7fa2dd Fix #241: add master helper component
a7fa2dd is described below
commit a7fa2ddf43f0f1177da3dbdc0e93be5e36051c93
Author: Nicola Ferraro
AuthorDate: Fri Feb 14 01:09:49 2020 +0100
Fix #241: add master helper component
---
camel-k-runtime-bom/pom.xml| 5 +
camel-k-runtime-master/pom.xml | 134 +
.../camel/k/master/MasterContextCustomizer.java| 78
.../services/org/apache/camel/k/customizer/master | 18 +++
.../camel/k/master/MasterCustomizerTest.java | 37 ++
.../src/test/resources/log4j2-test.xml | 37 ++
pom.xml| 6 +-
7 files changed, 313 insertions(+), 2 deletions(-)
diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml
index 1b0c878..cbff077 100644
--- a/camel-k-runtime-bom/pom.xml
+++ b/camel-k-runtime-bom/pom.xml
@@ -153,6 +153,11 @@
camel-k-runtime-cron
${project.version}
+
+org.apache.camel.k
+camel-k-runtime-master
+${project.version}
+
diff --git a/camel-k-runtime-master/pom.xml b/camel-k-runtime-master/pom.xml
new file mode 100644
index 000..befd5e9
--- /dev/null
+++ b/camel-k-runtime-master/pom.xml
@@ -0,0 +1,134 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+org.apache.camel.k
+camel-k-runtime-parent
+1.1.0-SNAPSHOT
+
+4.0.0
+
+camel-k-runtime-master
+
+
+
+
+
+
+
+
+
+
+org.apache.camel
+camel-core-engine
+
+
+org.apache.camel
+camel-kubernetes
+
+
+org.apache.camel.k
+camel-k-runtime-core
+
+
+
+
+
+
+
+
+
+org.apache.camel
+camel-test
+test
+
+
+org.apache.camel
+camel-master
+test
+
+
+org.apache.camel
+camel-main
+test
+
+
+org.apache.camel.k
+camel-k-runtime-main
+test
+
+
+
+org.junit.jupiter
+junit-jupiter-api
+${junit.version}
+test
+
+
+org.junit.jupiter
+junit-jupiter-engine
+${junit.version}
+test
+
+
+org.assertj
+assertj-core
+${assertj.version}
+test
+
+
+org.junit.jupiter
+junit-jupiter-params
+${junit.version}
+test
+
+
+
+org.apache.logging.log4j
+log4j-core
+${log4j2.version}
+test
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+${log4j2.version}
+test
+
+
+
+
+
+
+org.jboss.jandex
+jandex-maven-plugin
+
+
+make-index
+
+jandex
+
+
+
+
+
+
+
+
diff --git
a/camel-k-runtime-master/src/main/java/org/apache/camel/k/master/MasterContextCustomizer.java
b/camel-k-runtime-master/src/main/java/org/apache/camel/k/master/MasterContextCustomizer.java
new file mode 100644
index 000..4669b75
--- /dev/null
+++
b/camel-k-runtime-master/src/main/java/org/apache/camel/k/master/MasterContextCustomizer.java
@@ -0,0 +1,78 @@
+/*
+ * 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
[camel] branch master updated: CAMEL-14562: camel-elastichsearch - Use testcontainers for testing
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 cd90652 CAMEL-14562: camel-elastichsearch - Use testcontainers for
testing
cd90652 is described below
commit cd90652425588d79fc6214951e60927320e25381
Author: lburgazzoli
AuthorDate: Fri Feb 14 11:55:53 2020 +0100
CAMEL-14562: camel-elastichsearch - Use testcontainers for testing
---
components/camel-elasticsearch-rest/pom.xml| 72 +++-
.../elasticsearch/ElasticsearchBaseTest.java | 78 ++---
.../elasticsearch/ElasticsearchBulkTest.java | 6 +-
.../ElasticsearchClusterBaseTest.java | 125 -
.../ElasticsearchClusterIndexTest.java | 11 +-
...asticsearchGetSearchDeleteExistsUpdateTest.java | 48
.../elasticsearch/ElasticsearchIndexTest.java | 12 +-
.../elasticsearch/ElasticsearchPingTest.java | 3 +-
...icsearchRestComponentVerifierExtensionTest.java | 4 -
.../ElasticsearchScrollSearchTest.java | 8 +-
.../elasticsearch/ElasticsearchSizeLimitTest.java | 8 +-
11 files changed, 161 insertions(+), 214 deletions(-)
diff --git a/components/camel-elasticsearch-rest/pom.xml
b/components/camel-elasticsearch-rest/pom.xml
index e2e11d7..8e4134f 100644
--- a/components/camel-elasticsearch-rest/pom.xml
+++ b/components/camel-elasticsearch-rest/pom.xml
@@ -73,10 +73,10 @@
${elasticsearch-rest-version}
test
+
-org.codelibs
-elasticsearch-cluster-runner
-${elasticsearch-rest-cluster-runner-version}
+org.apache.camel
+camel-testcontainers
test
@@ -113,4 +113,70 @@
+
+
+
+
+elasticsearch-skip-tests
+
+true
+
+
+
+
+maven-surefire-plugin
+
+true
+
+
+
+
+
+
+
+
+elasticsearch-tests-docker-file
+
+
+/var/run/docker.sock
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+
+
+
+
+
+
+
+
+elasticsearch-tests-docker-env
+
+
+env.DOCKER_HOST
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+
+
+
+
+
+
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 605981f..fd56991 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
@@ -17,56 +17,49 @@
package org.apache.camel.component.elasticsearch;
import java.io.IOException;
-import java.net.InetAddress;
+import java.net.HttpURLConnection;
+import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.http.HttpHost;
-import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner;
import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestHighLevelClient;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.Base58;
-import static
org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
public class ElasticsearchBaseTest extends CamelTestSupport {
+public static final String ELASTICSEARCH_IMAGE = "elasticsearch:7.3.2";
+public st
[camel] branch master updated (49f9a75 -> d1f189c)
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.git. from 49f9a75 Camel-aws2-sns: Fixed CS add d1f189c Fix CS No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/component/etcd/AbstractEtcdEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-quarkus] 01/02: Re-indent integration-tests/pdf/pom.xml with 4 spaces
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
commit 2ef5da4bfdba2e0cb76ac17ed21c1c6b7de0b8da
Author: Peter Palaga
AuthorDate: Fri Feb 14 10:47:09 2020 +0100
Re-indent integration-tests/pdf/pom.xml with 4 spaces
I would not bother but I am about to perform a couple of find & replace
ops and I do not want the PDF itest pom.xml to escape.
---
integration-tests/pdf/pom.xml | 209 +-
1 file changed, 105 insertions(+), 104 deletions(-)
diff --git a/integration-tests/pdf/pom.xml b/integration-tests/pdf/pom.xml
index 486ed62..96905cc 100644
--- a/integration-tests/pdf/pom.xml
+++ b/integration-tests/pdf/pom.xml
@@ -17,111 +17,112 @@
limitations under the License.
-->
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- 4.0.0
-
-org.apache.camel.quarkus
-camel-quarkus-integration-tests
-1.1.0-SNAPSHOT
-
- camel-quarkus-integration-test-pdf
- Camel Quarkus :: Integration Tests :: PDF
- Integration tests for Camel Quarkus PDF extension
-
-
-
-
-
-
-
-
camel-quarkus-pdf-deployment,camel-quarkus-support-policy-deployment
-
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.camel.quarkus
+camel-quarkus-integration-tests
+1.1.0-SNAPSHOT
+
+camel-quarkus-integration-test-pdf
+Camel Quarkus :: Integration Tests :: PDF
+Integration tests for Camel Quarkus PDF
extension
+
+
+
+
+
+
+
+
camel-quarkus-pdf-deployment,camel-quarkus-support-policy-deployment
+
-
-
- org.apache.camel.quarkus
- camel-quarkus-pdf
-
-
- io.quarkus
- quarkus-resteasy
-
-
- io.quarkus
- quarkus-junit5
- test
-
-
- io.rest-assured
- rest-assured
- test
-
-
-
-
-
-io.quarkus
-quarkus-maven-plugin
-
-
-
- build
-
-
-
-
-
-
-
-
- native
-
-
- native
-
-
-
-
-
-maven-failsafe-plugin
-
-
-
- integration-test
- verify
-
-
-
-
${project.build.directory}/${project.build.finalName}-runner
-
-
-
-
-
-
+
+
+org.apache.camel.quarkus
+camel-quarkus-pdf
+
+
+io.quarkus
+quarkus-resteasy
+
+
io.quarkus
-quarkus-maven-plugin
-
-
-native-image
-
- native-image
-
-
- false
- true
- true
- false
- false
- ${graalvmHome}
- true
- true
-
-
-
-
+quarkus-junit5
+test
+
+
+io.rest-assured
+rest-assured
+test
+
+
+
+
+
+io.quarkus
+quarkus-maven-plugin
+
+
+
+build
+
+
+
+
-
-
-
+
+
+
+native
+
+
+native
+
+
+
+
+
+maven-failsafe-plugin
+
+
+
+integration-test
+verify
+
+
+
+
${project.build.directory}/${project.build.finalName}-runner
+
+
+
+
+
+
+
[camel-quarkus] branch master updated (e0cfce2 -> 4241a4b)
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-quarkus.git. from e0cfce2 Fix #713 Revisit the Quarkus native image mojo options generated by create-extension new 2ef5da4 Re-indent integration-tests/pdf/pom.xml with 4 spaces new 4241a4b Fix #598 Use quarkus.package.type=native instead of the native-image mojo 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: examples/file-split-log-xml/pom.xml| 24 +--- examples/observability/pom.xml | 21 +-- examples/rest-json/pom.xml | 21 +-- examples/timer-log-cdi/pom.xml | 24 +--- examples/timer-log-kotlin/pom.xml | 24 +--- examples/timer-log-spring/pom.xml | 24 +--- examples/timer-log-xml/pom.xml | 24 +--- examples/timer-log/pom.xml | 24 +--- integration-tests/aws/pom.xml | 23 +-- integration-tests/base64/pom.xml | 25 +--- integration-tests/bean-validator/pom.xml | 25 +--- integration-tests/bean/pom.xml | 22 +-- integration-tests/bindy/pom.xml| 25 +--- integration-tests/consul/pom.xml | 23 +-- integration-tests/controlbus/pom.xml | 25 +--- integration-tests/core-impl/pom.xml| 22 +-- integration-tests/core-main-xml/pom.xml| 22 +-- integration-tests/core-main/pom.xml| 22 +-- integration-tests/core/pom.xml | 22 +-- integration-tests/csv/pom.xml | 23 +-- integration-tests/dataformat/pom.xml | 25 +--- integration-tests/dozer/pom.xml| 25 +--- integration-tests/exec/pom.xml | 25 +--- integration-tests/fhir/pom.xml | 26 +--- integration-tests/file/pom.xml | 25 +--- integration-tests/ftp/pom.xml | 25 +--- integration-tests/http/pom.xml | 25 +--- integration-tests/hystrix/pom.xml | 25 +--- integration-tests/infinispan/pom.xml | 22 +-- integration-tests/jackson/pom.xml | 22 +-- integration-tests/jdbc/pom.xml | 21 +-- integration-tests/jsonpath/pom.xml | 25 +--- integration-tests/kafka/pom.xml| 25 +--- integration-tests/mail/pom.xml | 22 +-- integration-tests/microprofile/pom.xml | 23 +-- integration-tests/mongodb/pom.xml | 25 +--- integration-tests/netty/pom.xml| 25 +--- integration-tests/olingo4/pom.xml | 25 +--- integration-tests/opentracing/pom.xml | 25 +--- integration-tests/paho/pom.xml | 23 +-- integration-tests/pdf/pom.xml | 190 +++-- integration-tests/platform-http-engine/pom.xml | 26 +--- integration-tests/platform-http/pom.xml| 26 +--- integration-tests/reactive-streams/pom.xml | 3 + integration-tests/salesforce/pom.xml | 22 +-- integration-tests/scheduler/pom.xml| 25 +--- integration-tests/seda/pom.xml | 25 +--- integration-tests/servlet/pom.xml | 21 +-- integration-tests/sjms/pom.xml | 25 +--- integration-tests/slack/pom.xml| 25 +--- integration-tests/snakeyaml/pom.xml| 25 +--- integration-tests/sql/pom.xml | 25 +--- integration-tests/stream/pom.xml | 25 +--- integration-tests/tagsoup/pom.xml | 23 +-- integration-tests/tarfile/pom.xml | 23 +-- integration-tests/twitter/pom.xml | 23 +-- integration-tests/validator/pom.xml| 3 + integration-tests/xslt/pom.xml | 25 +--- integration-tests/zipfile/pom.xml | 23 +-- pom.xml| 4 +- 60 files changed, 262 insertions(+), 1274 deletions(-)
[camel-quarkus] 02/02: Fix #598 Use quarkus.package.type=native instead of the native-image mojo
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 commit 4241a4b03c31d5ffc886e8cbfa84d6b444f106aa Author: Peter Palaga AuthorDate: Fri Feb 14 11:29:59 2020 +0100 Fix #598 Use quarkus.package.type=native instead of the native-image mojo --- examples/file-split-log-xml/pom.xml| 24 +++- examples/observability/pom.xml | 21 +++-- examples/rest-json/pom.xml | 21 +++-- examples/timer-log-cdi/pom.xml | 24 +++- examples/timer-log-kotlin/pom.xml | 24 +++- examples/timer-log-spring/pom.xml | 24 +++- examples/timer-log-xml/pom.xml | 24 +++- examples/timer-log/pom.xml | 24 +++- integration-tests/aws/pom.xml | 23 +++ integration-tests/base64/pom.xml | 25 +++-- integration-tests/bean-validator/pom.xml | 25 +++-- integration-tests/bean/pom.xml | 22 +++--- integration-tests/bindy/pom.xml| 25 +++-- integration-tests/consul/pom.xml | 23 +++ integration-tests/controlbus/pom.xml | 25 +++-- integration-tests/core-impl/pom.xml| 22 +++--- integration-tests/core-main-xml/pom.xml| 22 +++--- integration-tests/core-main/pom.xml| 22 +++--- integration-tests/core/pom.xml | 22 +++--- integration-tests/csv/pom.xml | 23 +++ integration-tests/dataformat/pom.xml | 25 +++-- integration-tests/dozer/pom.xml| 25 +++-- integration-tests/exec/pom.xml | 25 +++-- integration-tests/fhir/pom.xml | 26 +++--- integration-tests/file/pom.xml | 25 +++-- integration-tests/ftp/pom.xml | 25 +++-- integration-tests/http/pom.xml | 25 +++-- integration-tests/hystrix/pom.xml | 25 +++-- integration-tests/infinispan/pom.xml | 22 +++--- integration-tests/jackson/pom.xml | 22 +++--- integration-tests/jdbc/pom.xml | 21 +++-- integration-tests/jsonpath/pom.xml | 25 +++-- integration-tests/kafka/pom.xml| 25 +++-- integration-tests/mail/pom.xml | 22 +++--- integration-tests/microprofile/pom.xml | 23 +++ integration-tests/mongodb/pom.xml | 25 +++-- integration-tests/netty/pom.xml| 25 +++-- integration-tests/olingo4/pom.xml | 25 +++-- integration-tests/opentracing/pom.xml | 25 +++-- integration-tests/paho/pom.xml | 23 +++ integration-tests/pdf/pom.xml | 25 +++-- integration-tests/platform-http-engine/pom.xml | 26 +++--- integration-tests/platform-http/pom.xml| 26 +++--- integration-tests/reactive-streams/pom.xml | 3 +++ integration-tests/salesforce/pom.xml | 22 +++--- integration-tests/scheduler/pom.xml| 25 +++-- integration-tests/seda/pom.xml | 25 +++-- integration-tests/servlet/pom.xml | 21 +++-- integration-tests/sjms/pom.xml | 25 +++-- integration-tests/slack/pom.xml| 25 +++-- integration-tests/snakeyaml/pom.xml| 25 +++-- integration-tests/sql/pom.xml | 25 +++-- integration-tests/stream/pom.xml | 25 +++-- integration-tests/tagsoup/pom.xml | 23 +++ integration-tests/tarfile/pom.xml | 23 +++ integration-tests/twitter/pom.xml | 23 +++ integration-tests/validator/pom.xml| 3 +++ integration-tests/xslt/pom.xml | 25 +++-- integration-tests/zipfile/pom.xml | 23 +++ pom.xml| 4 ++-- 60
[camel] branch master updated: CAMEL-14570: camel-zookeeper-master - Use testcontainers for testing
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 1ad92f0 CAMEL-14570: camel-zookeeper-master - Use testcontainers for
testing
1ad92f0 is described below
commit 1ad92f06b880995f2266fa40842cb50d8f8b00a0
Author: lburgazzoli
AuthorDate: Mon Feb 17 12:07:17 2020 +0100
CAMEL-14570: camel-zookeeper-master - Use testcontainers for testing
---
components/camel-zookeeper-master/pom.xml | 93 +-
.../MasterEndpointFailoverTest.java| 16 +-
.../zookeepermaster/MasterEndpointTest.java| 36 --
.../zookeepermaster/MasterQuartzEndpointTest.java | 35 --
.../component/zookeepermaster/ZKContainer.java | 65
.../zookeepermaster/ZKServerFactoryBean.java | 230 -
.../component/zookeepermaster/group/GroupTest.java | 370 -
.../zookeepermaster/MasterEndpointTest-context.xml | 20 +-
.../MasterQuartzEndpointTest-context.xml | 20 +-
9 files changed, 395 insertions(+), 490 deletions(-)
diff --git a/components/camel-zookeeper-master/pom.xml
b/components/camel-zookeeper-master/pom.xml
index 3e35c2d..bf629f9 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -115,11 +115,13 @@
test
+
org.apache.camel
-camel-test-spring
+camel-testcontainers-spring
test
+
org.apache.logging.log4j
log4j-api
@@ -138,20 +140,81 @@
-
-
-
-maven-surefire-plugin
-
-false
-true
-1
-true
-
600
-
-
-
-
+
+
+zookeeper-master-skip-tests
+
+true
+
+
+
+
+maven-surefire-plugin
+
+true
+
+
+
+
+
+
+
+
+zookeeper-master-tests-docker-file
+
+
+/var/run/docker.sock
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+false
+true
+1
+true
+
600
+
+
+
+
+
+
+
+
+zookeeper-master-tests-docker-env
+
+
+env.DOCKER_HOST
+
+
+
+
+
+maven-surefire-plugin
+
+${skipTests}
+
+
true
+
+false
+true
+1
+true
+
600
+
+
+
+
+
+
+
diff --git
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
index 85366fb..0fbefa7 100644
---
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
+++
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
@@ -42,17 +42,15 @@ public class MasterEndpointFailoverTest {
protected MockEndpoint result1Endpoint;
protected MockEndpoint result2Endpoint;
protected AtomicInteger messageCounter = new AtomicInteger(1);
-protected ZKServerFactoryBean serverFactoryBean = new
ZKServerFactoryBean();
+protected ZKContainer zkContainer = new ZKContainer();
protected CuratorFactoryBean zkClientBean = new CuratorFactoryBean();
@Before
public void beforeRun() throws Exception {
-System.out.println("Starting ZK server!");
-serverFactoryBean.setPort(9004);
-serverFactoryBean.afterPropertiesSet();
+zkConta
[camel-quarkus] branch master updated: chore: fix javadoc
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 72d1082 chore: fix javadoc
72d1082 is described below
commit 72d1082cebe93d4d52e9cabea5a8cb7eb2cbfc93
Author: lburgazzoli
AuthorDate: Mon Oct 7 10:49:37 2019 +0200
chore: fix javadoc
---
.../camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java
index af6255c..c6193ce 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java
@@ -19,11 +19,10 @@ package org.apache.camel.quarkus.core.deployment;
import io.quarkus.builder.item.MultiBuildItem;
import io.quarkus.runtime.RuntimeValue;
-import org.apache.camel.quarkus.core.CamelMain;
import org.apache.camel.spi.ReactiveExecutor;
/**
- * Holds the {@link CamelMain} {@link RuntimeValue}.
+ * Holds the {@link ReactiveExecutor} {@link RuntimeValue}.
*
* TODO: should extend SimpleBuildItem when moving to quarkus snapshots or 0.24
* as we can then use the @Overridable annotation which allow to provide
