[GitHub] [camel-quarkus] jamesnetherton opened a new pull request #643: Remove PlatformHttpSpanDecorator from OpenTracing extension
jamesnetherton opened a new pull request #643: Remove PlatformHttpSpanDecorator from OpenTracing extension URL: https://github.com/apache/camel-quarkus/pull/643 fixes #605 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] oscerd commented on issue #642: java.lang.NoClassDefFoundError with JDK 11+
oscerd commented on issue #642: java.lang.NoClassDefFoundError with JDK 11+ URL: https://github.com/apache/camel-quarkus/issues/642#issuecomment-576552128 Leave this one open, so we can remember about document this :-) Thanks This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] NFI-Chase commented on issue #642: java.lang.NoClassDefFoundError with JDK 11+
NFI-Chase commented on issue #642: java.lang.NoClassDefFoundError with JDK 11+ URL: https://github.com/apache/camel-quarkus/issues/642#issuecomment-576551964 cool, no problem. should I close the issue? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] oscerd commented on issue #642: java.lang.NoClassDefFoundError with JDK 11+
oscerd commented on issue #642: java.lang.NoClassDefFoundError with JDK 11+ URL: https://github.com/apache/camel-quarkus/issues/642#issuecomment-576550122 We can document this for sure. Thanks for spotting this. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] oscerd commented on issue #642: java.lang.NoClassDefFoundError with JDK 11+
oscerd commented on issue #642: java.lang.NoClassDefFoundError with JDK 11+ URL: https://github.com/apache/camel-quarkus/issues/642#issuecomment-576550063 You need to add that dependency explicitly. This is something changed with JDK 11. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] Hotstuff4u opened a new issue #642: java.lang.NoClassDefFoundError with JDK 11+
Hotstuff4u opened a new issue #642: java.lang.NoClassDefFoundError with JDK 11+ URL: https://github.com/apache/camel-quarkus/issues/642 When starting up the quarkus server in dev mode it gives java.lang.NoClassDefFoundError: javax/xml/bind/annotation/XmlElement. I'm running open jdk 12. The fix for this is attached, but if you have a better fix please assist: [fixXMLBindIssue.txt](https://github.com/apache/camel-quarkus/files/4089664/fixXMLBindIssue.txt) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] oscerd commented on issue #636: Determine the Camel version at build time
oscerd commented on issue #636: Determine the Camel version at build time URL: https://github.com/apache/camel-quarkus/pull/636#issuecomment-576548831 Can you please rebase? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-spring-boot] branch master updated: CAMEL-14417 [camel-jslt] Create spring-boot starter for camel-jslt
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 6408c4b CAMEL-14417 [camel-jslt] Create spring-boot starter for
camel-jslt
new 294a014 Merge pull request #1 from
JiriOndrusek/CAMEL-14417_camel-jstl-starter
6408c4b is described below
commit 6408c4b1921ce6d9ac27aa038a4dfb39dd3e224e
Author: JiriOndrusek
AuthorDate: Fri Jan 17 15:28:03 2020 +0100
CAMEL-14417 [camel-jslt] Create spring-boot starter for camel-jslt
---
.../camel/springboot/catalog/components.properties | 1 +
.../camel/springboot/catalog/components/jslt.json | 35 ++
.../camel/itest/springboot/CamelJsltTest.java | 48
components-starter/camel-jslt-starter/pom.xml | 53 +
.../springboot/JsltComponentAutoConfiguration.java | 128 +
.../springboot/JsltComponentConfiguration.java | 86 ++
components-starter/pom.xml | 1 +
tooling/camel-spring-boot-dependencies/pom.xml | 5 +
8 files changed, 357 insertions(+)
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index 2b55883..74f764c 100644
---
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -168,6 +168,7 @@ jmx
jolt
jooq
jpa
+jslt
json-validator
jt400
kafka
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jslt.json
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jslt.json
new file mode 100644
index 000..3320f58
--- /dev/null
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jslt.json
@@ -0,0 +1,35 @@
+{
+ "component": {
+"kind": "component",
+"scheme": "jslt",
+"syntax": "jslt:resourceUri",
+"title": "JSLT",
+"description": "The jslt component allows you to process a JSON messages
using an JSLT transformations.",
+"label": "transformation",
+"deprecated": false,
+"deprecationNote": "",
+"async": false,
+"consumerOnly": false,
+"producerOnly": true,
+"lenientProperties": false,
+"javaType": "org.apache.camel.component.jslt.JsltComponent",
+"firstVersion": "3.1.0",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-jslt-starter",
+"version": "3.1.0-SNAPSHOT"
+ },
+ "componentProperties": {
+"functions": { "kind": "property", "displayName": "Functions", "group":
"advanced", "label": "advanced", "required": false, "type": "array",
"javaType": "java.util.Collection",
"deprecated": false, "secret": false, "description": "JSLT can be extended by
plugging in functions written in Java." },
+"basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
+"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "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 r [...]
+ },
+ "properties": {
+"resourceUri": { "kind": "path", "displayName": "Resource Uri", "group":
"producer", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "description": "Path to the resource. You
can prefix with: classpath, file, http, ref, or bean. classpath, file and http
loads the resource using these protocols (classpath is default). ref will
lookup the resource in the registry. bean will call a method on a bean to be
used as the resource. For [...]
+"prettyPrint": { "kind": "parameter", "displayName": "Pretty Print",
"group": "common", "label": "common", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "description": "If true, JSON in output message is pretty printed." },
+"contentCache":
[camel] branch master updated (cf1ee3a -> f8af5df)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from cf1ee3a camel-grape: Convert GrapeComponentTest from Groovy to Java new aca13af CAMEL-14354: Optimize core new f8af5df 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: .../src/main/docs/pulsar-component.adoc| 4 +-- .../camel/processor/CamelInternalProcessor.java| 2 +- .../endpoint/dsl/PulsarEndpointBuilderFactory.java | 39 ++ .../modules/ROOT/pages/pulsar-component.adoc | 3 +- .../modules/ROOT/pages/timer-component.adoc| 3 +- 5 files changed, 46 insertions(+), 5 deletions(-)
[camel] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f8af5dfb40c09800920c80ed4f136ef448dd993a
Author: Claus Ibsen
AuthorDate: Tue Jan 21 06:51:37 2020 +0100
Regen
---
.../src/main/docs/pulsar-component.adoc| 4 +--
.../endpoint/dsl/PulsarEndpointBuilderFactory.java | 39 ++
.../modules/ROOT/pages/pulsar-component.adoc | 3 +-
.../modules/ROOT/pages/timer-component.adoc| 3 +-
4 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/components/camel-pulsar/src/main/docs/pulsar-component.adoc
b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
index d7e2d9a..1701a16 100644
--- a/components/camel-pulsar/src/main/docs/pulsar-component.adoc
+++ b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
@@ -78,7 +78,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (27 parameters):
+=== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -92,10 +92,10 @@ with the following path and query parameters:
| *consumerNamePrefix* (consumer) | Prefix to add to consumer names when a
SHARED or FAILOVER subscription is used | cons | String
| *consumerQueueSize* (consumer) | Size of the consumer queue - defaults to 10
| 10 | int
| *numberOfConsumers* (consumer) | Number of consumers - defaults to 1 | 1 |
int
+| *subscriptionInitialPosition* (consumer) | Control the initial position in
the topic of a newly created subscription. Default is latest message. | LATEST
| SubscriptionInitialPosition
| *subscriptionName* (consumer) | Name of the subscription to use | subs |
String
| *subscriptionType* (consumer) | Type of the subscription
EXCLUSIVESHAREDFAILOVER, defaults to EXCLUSIVE | EXCLUSIVE | SubscriptionType
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
-| *subscriptionInitialPosition* (consumer) | Controls the position of the
cursor within the topic when a new subscription is created. Defaults to LATEST
message. | LATEST | SubscriptionInitialPosition
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. | | ExchangePattern
| *batchingEnabled* (producer) | Control whether automatic batching of
messages is enabled for the producer. Default is true. | true | boolean
| *batchingMaxMessages* (producer) | Set the maximum number of messages
permitted in a batch. Default 1,000. | 1000 | int
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
index 4b8d21b..5f01d4c 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
@@ -250,6 +250,36 @@ public interface PulsarEndpointBuilderFactory {
return this;
}
/**
+ * Control the initial position in the topic of a newly created
+ * subscription. Default is latest message.
+ *
+ * The option is a:
+ *
org.apache.camel.component.pulsar.utils.consumers.SubscriptionInitialPosition
type.
+ *
+ * Default: LATEST
+ * Group: consumer
+ */
+default PulsarEndpointConsumerBuilder subscriptionInitialPosition(
+SubscriptionInitialPosition subscriptionInitialPosition) {
+doSetProperty("subscriptionInitialPosition",
subscriptionInitialPosition);
+return this;
+}
+/**
+ * Control the initial position in the topic of a newly created
+ * subscription. Default is latest message.
+ *
+ * The option will be converted to a
+ *
org.apache.camel.component.pulsar.utils.consumers.SubscriptionInitialPosition
type.
+ *
+ * Default: LATEST
+ * Group: consumer
+ */
+default PulsarEndpointConsumerBuilder subscriptionInitialPosition(
+String subscriptionInitialPosition) {
+doSetProperty("subscriptionInitialPosition",
subscriptionInitialPosition);
+return this;
+}
+/**
* Name of the subscription to use.
*
* The option is a: java.lang.String type.
@@ -942,6 +972,15 @@ public interface PulsarEndpointBuilderFactory {
/**
* Proxy enum for
+ *
org.apache.camel.component.pulsar.utils.consumers.SubscriptionInitialPosition
enum.
+
[camel] 01/02: CAMEL-14354: Optimize core
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aca13af8cfb72b02a989b1f0ce5dc91ea57fe682
Author: Claus Ibsen
AuthorDate: Tue Jan 21 06:51:27 2020 +0100
CAMEL-14354: Optimize core
---
.../main/java/org/apache/camel/processor/CamelInternalProcessor.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 46cc50e..8da55df 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -231,7 +231,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
// do uow before processing and if a value is returned the the uow
wants to be processed after
// was well in the same thread
AsyncCallback async = callback;
-boolean beforeAndAfter = uow.isBeforeAfterProcess();
+boolean beforeAndAfter = uow != null && uow.isBeforeAfterProcess();
if (beforeAndAfter) {
async = uow.beforeProcess(processor, exchange, async);
}
[camel] branch master updated: camel-grape: Convert GrapeComponentTest from Groovy to Java
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher 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 cf1ee3a camel-grape: Convert GrapeComponentTest from Groovy to Java
cf1ee3a is described below
commit cf1ee3af8b954b4997346185a59f981a1cc21575
Author: Pascal Schumacher
AuthorDate: Mon Jan 20 23:35:45 2020 +0100
camel-grape: Convert GrapeComponentTest from Groovy to Java
Disable it because it does not pass. I guess it has to be updated for Camel
3.
---
.../component/grape/GrapeComponentTest.groovy | 127 -
.../camel/component/grape/GrapeComponentTest.java | 108 ++
2 files changed, 108 insertions(+), 127 deletions(-)
diff --git
a/components/camel-grape/src/test/groovy/org/apache/camel/component/grape/GrapeComponentTest.groovy
b/components/camel-grape/src/test/groovy/org/apache/camel/component/grape/GrapeComponentTest.groovy
deleted file mode 100644
index 92fabe4..000
---
a/components/camel-grape/src/test/groovy/org/apache/camel/component/grape/GrapeComponentTest.groovy
+++ /dev/null
@@ -1,127 +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.grape
-
-import org.apache.camel.ServiceStatus
-import org.apache.camel.builder.RouteBuilder
-import org.apache.camel.impl.DefaultCamelContext
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-
-import static org.apache.camel.component.grape.GrapeComponent.grapeCamelContext
-import static org.apache.camel.component.grape.GrapeEndpoint.loadPatches
-import static org.apache.camel.ServiceStatus.Stopped
-
-class GrapeComponentTest extends Assert {
-
-def pathesRepository = new FilePatchesRepository()
-
-def camelContext = new DefaultCamelContext()
-
-static boolean canTest() {
-// we cannot test on CI
-System.getenv("BUILD_ID") == null;
-}
-
-@Before
-void before() {
-if (canTest()) {
-grapeCamelContext(camelContext)
-}
-}
-
-@Test
-void shouldLoadStreamComponent() {
-if (!canTest()) {
-return;
-}
-
-pathesRepository.clear()
-camelContext.start()
-
camelContext.createProducerTemplate().sendBody('grape:org.apache.camel/camel-stream/'
+ camelContext.getVersion(), 'msg')
-camelContext.createProducerTemplate().sendBody('stream:out', 'msg')
-}
-
-@Test
-void shouldLoadStreamComponentViaBodyRequest() {
-if (!canTest()) {
-return;
-}
-
-pathesRepository.clear()
-camelContext.start()
-camelContext.createProducerTemplate().sendBody('grape:grape',
'org.apache.camel/camel-stream/2.15.2')
-camelContext.createProducerTemplate().sendBody('stream:out', 'msg')
-}
-
-@Test
-void shouldLoadBeanAtRuntime() {
-if (!canTest()) {
-return;
-}
-
-pathesRepository.clear()
-camelContext.start()
-camelContext.createProducerTemplate().sendBody('grape:grape',
'org.apache.camel/camel-stream/2.15.2')
-def status =
camelContext.createProducerTemplate().requestBody('bean:org.apache.camel.component.stream.StreamComponent?method=getStatus',
null, ServiceStatus.class)
-assertEquals(Stopped, status)
-}
-
-@Test
-void shouldLoadPatchesAtStartup() {
-if (!canTest()) {
-return;
-}
-
-// Given
-pathesRepository.clear()
-camelContext.start()
-camelContext.createProducerTemplate().sendBody('grape:grape',
'org.apache.camel/camel-stream/2.15.2')
-camelContext.stop()
-
-camelContext = new DefaultCamelContext()
-camelContext.setApplicationContextClassLoader(new GroovyClassLoader())
-camelContext.addRoutes(new RouteBuilder() {
-@Override
-void configure() {
-loadPatches(camelContext)
-}
-})
-
-// When
-camelContext.start()
-def status =
[GitHub] [camel-quarkus] lburgazzoli commented on issue #638: Fix #635 Dependency parity check
lburgazzoli commented on issue #638: Fix #635 Dependency parity check URL: https://github.com/apache/camel-quarkus/pull/638#issuecomment-576437612 looks like there is a dependency issue This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[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) {
[GitHub] [camel-quarkus] lburgazzoli merged pull request #641: Fix #640 Lower the level of "Could not find a non-optional class for …
lburgazzoli merged pull request #641: Fix #640 Lower the level of "Could not find a non-optional class for … URL: https://github.com/apache/camel-quarkus/pull/641 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] lburgazzoli closed issue #640: Lower the level of "Could not find a non-optional class for key ..." message
lburgazzoli closed issue #640: Lower the level of "Could not find a non-optional class for key ..." message URL: https://github.com/apache/camel-quarkus/issues/640 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] oscerd commented on issue #636: Determine the Camel version at build time
oscerd commented on issue #636: Determine the Camel version at build time URL: https://github.com/apache/camel-quarkus/pull/636#issuecomment-576435207 Ok to test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] ppalaga opened a new pull request #641: Fix #640 Lower the level of "Could not find a non-optional class for …
ppalaga opened a new pull request #641: Fix #640 Lower the level of "Could not find a non-optional class for … URL: https://github.com/apache/camel-quarkus/pull/641 …key ..." message This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[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)));
+
+camelConfig.service.registry.excludePatterns.ifPresent(list ->
services.produce(new
[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 we can
reduce the
-// operations done by the standard resolver by looking them up
directly from the
-
[GitHub] [camel-quarkus] lburgazzoli merged pull request #618: Fix #617 Registerable and discoverable Camel services
lburgazzoli merged pull request #618: Fix #617 Registerable and discoverable Camel services URL: https://github.com/apache/camel-quarkus/pull/618 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[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
[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
[GitHub] [camel-quarkus] lburgazzoli closed issue #617: Registerable and discoverable Camel services
lburgazzoli closed issue #617: Registerable and discoverable Camel services URL: https://github.com/apache/camel-quarkus/issues/617 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[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) {
try (InputStream is = Files.newInputStream(p)) {
[GitHub] [camel-quarkus] ppalaga opened a new issue #640: Lower the level of "Could not find a non-optional class for key ..." message
ppalaga opened a new issue #640: Lower the level of "Could not find a non-optional class for key ..." message URL: https://github.com/apache/camel-quarkus/issues/640 ... in FastFactoryFinderResolver This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: Upgrade jSMPP to version 2.3.8
This is an automated email from the ASF dual-hosted git repository. pascalschumacher 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 58a5664 Upgrade jSMPP to version 2.3.8 58a5664 is described below commit 58a56640bdc9bacbc9b76b8bd5e52976266fd25c Author: Pascal Schumacher AuthorDate: Mon Jan 20 21:12:40 2020 +0100 Upgrade jSMPP to version 2.3.8 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8c1d386..966c405 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -377,7 +377,7 @@ 1.5_5 2.1.1 0.1.8 -2.3.7 +2.3.8 0.1.55 0.1.55_1 1.2
[GitHub] [camel-k] astefanutti edited a comment on issue #1209: Integration builds takes lots of time
astefanutti edited a comment on issue #1209: Integration builds takes lots of time URL: https://github.com/apache/camel-k/issues/1209#issuecomment-576388205 I had a quick look at it and it seems a significant portion of the build time is taken to push the built image to the internal registry deployed on Minikube. Still need to be confirmed and properly analysed... This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] astefanutti commented on issue #1209: Integration builds takes lots of time
astefanutti commented on issue #1209: Integration builds takes lots of time URL: https://github.com/apache/camel-k/issues/1209#issuecomment-576388205 I had a quick look at it and it seems a significant portion of the build time is taken to push the built image to the internal registry. Still need to be confirmed and properly analysed... This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] ppalaga commented on issue #599: Produce NativeImageEnableAllCharsetsBuildItem where appropriate
ppalaga commented on issue #599: Produce NativeImageEnableAllCharsetsBuildItem where appropriate URL: https://github.com/apache/camel-quarkus/issues/599#issuecomment-576368973 > It looks to me a generic quarkus issue than a camel one so we should probably let the developers choose. I was about to say that we are letting the 80% of devs to learn the hard way but then tried to find some data about the usage of the individual encodings. Found only https://w3techs.com/technologies/overview/character_encoding that is perhaps a bit Western/US-centric because it is considering just 10M most popular sites, popularity being defined by data from Alexa. But anyway, UTF-8 is most probably dominating nowadays. For the record, the encodings available by default are: Charset.defaultCharset(), US-ASCII, ISO-8859-1, UTF-8, UTF-16BE, UTF-16LE, UTF-16 https://github.com/oracle/graal/blob/79d85a3f0a41bb264dd396f6ff335da29525bcd1/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/LocalizationFeature.java#L116-L128 Let's just document on the individual extension pages that the users may need to set `quarkus.native.enable-all-charsets = true` if that set is not enough for them This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] lburgazzoli commented on issue #618: Fix #617 Registerable and discoverable Camel services
lburgazzoli commented on issue #618: Fix #617 Registerable and discoverable Camel services URL: https://github.com/apache/camel-quarkus/pull/618#issuecomment-576366372 ok to test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] oscerd merged pull request #639: Removed the Apache repositories since now the situation should be ok …
oscerd merged pull request #639: Removed the Apache repositories since now the situation should be ok … URL: https://github.com/apache/camel-quarkus/pull/639 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-quarkus] branch master updated (7468067 -> 1c428cb)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 7468067 Update to Apache Camel 3.0.1 add f109e42 Removed the Apache repositories since now the situation should be ok in central add 1c428cb Merge pull request #639 from apache/camel-3.0.1 No new revisions were added by this update. Summary of changes: pom.xml | 22 -- 1 file changed, 22 deletions(-)
[GitHub] [camel-quarkus] ppalaga commented on issue #618: Fix #617 Registerable and discoverable Camel services
ppalaga commented on issue #618: Fix #617 Registerable and discoverable Camel services URL: https://github.com/apache/camel-quarkus/pull/618#issuecomment-576346597 869af41 rebased and fixed a subtle bug that prevented the Dozer tests from passing This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] ppalaga commented on issue #618: Fix #617 Registerable and discoverable Camel services
ppalaga commented on issue #618: Fix #617 Registerable and discoverable Camel services URL: https://github.com/apache/camel-quarkus/pull/618#issuecomment-576346706 ok to test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] 01/06: CAMEL-14354: Optimize core
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d7952e5b2be84b94b78e414dc6477e3d8167e678
Author: Claus Ibsen
AuthorDate: Sun Jan 19 22:36:32 2020 +0100
CAMEL-14354: Optimize core
---
.../main/java/org/apache/camel/spi/UnitOfWork.java | 13 +++--
.../camel/impl/engine/DefaultUnitOfWork.java | 6
.../apache/camel/impl/engine/MDCUnitOfWork.java| 5
.../camel/processor/CamelInternalProcessor.java| 34 +-
.../processor/SharedCamelInternalProcessor.java| 34 --
.../camel/impl/CustomUnitOfWorkFactoryTest.java| 5
6 files changed, 66 insertions(+), 31 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/UnitOfWork.java
b/core/camel-api/src/main/java/org/apache/camel/spi/UnitOfWork.java
index 42bac62..e7efd1e 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/UnitOfWork.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/UnitOfWork.java
@@ -188,11 +188,18 @@ public interface UnitOfWork extends Service {
RouteContext popRouteContext();
/**
- * Strategy for optional work to be execute before processing
+ * Whether the unit of work should call the before/after process methods
or not.
+ */
+boolean isBeforeAfterProcess();
+
+/**
+ * Strategy for work to be execute before processing.
*
* For example the MDCUnitOfWork leverages this
* to ensure MDC is handled correctly during routing exchanges using the
* asynchronous routing engine.
+ *
+ * This requires {@link #isBeforeAfterProcess()} returns true to
be enabled.
*
* @param processor the processor to be executed
* @param exchange the current exchange
@@ -202,7 +209,9 @@ public interface UnitOfWork extends Service {
AsyncCallback beforeProcess(Processor processor, Exchange exchange,
AsyncCallback callback);
/**
- * Strategy for optional work to be executed after the processing
+ * Strategy for work to be executed after the processing
+ *
+ * This requires {@link #isBeforeAfterProcess()} returns true to
be enabled.
*
* @param processor the processor executed
* @param exchange the current exchange
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index a96df0b..42e70fd 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -292,6 +292,11 @@ public class DefaultUnitOfWork implements UnitOfWork,
Service {
}
@Override
+public boolean isBeforeAfterProcess() {
+return false;
+}
+
+@Override
public AsyncCallback beforeProcess(Processor processor, Exchange exchange,
AsyncCallback callback) {
// no wrapping needed
return callback;
@@ -299,6 +304,7 @@ public class DefaultUnitOfWork implements UnitOfWork,
Service {
@Override
public void afterProcess(Processor processor, Exchange exchange,
AsyncCallback callback, boolean doneSync) {
+// noop
}
private Set getTransactedBy() {
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
index 30812db..006f579 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
@@ -127,6 +127,11 @@ public class MDCUnitOfWork extends DefaultUnitOfWork {
}
@Override
+public boolean isBeforeAfterProcess() {
+return true;
+}
+
+@Override
public AsyncCallback beforeProcess(Processor processor, Exchange exchange,
AsyncCallback callback) {
// add optional step id
String stepId = exchange.getProperty(Exchange.STEP_ID, String.class);
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 9c9164f..46cc50e 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -134,6 +134,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
}
@Override
+@SuppressWarnings("unchecked")
public boolean process(Exchange exchange, AsyncCallback originalCallback) {
// --
// CAMEL END USER - READ ME FOR DEBUGGING TIPS
@@ -193,7 +194,9 @@ public class
[camel] 05/06: CAMEL-14419: Enrich EIP - Should wrap in UoW
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c8e37b117e2d16e074c2f8a4092d53647ca7a6d3
Author: Claus Ibsen
AuthorDate: Mon Jan 20 16:03:37 2020 +0100
CAMEL-14419: Enrich EIP - Should wrap in UoW
---
.../src/main/java/org/apache/camel/reifier/EnrichReifier.java | 6 --
1 file changed, 6 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
index bd58305..f72cfd7 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
@@ -22,7 +22,6 @@ import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.model.EnrichDefinition;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.processor.CamelInternalProcessor;
import org.apache.camel.processor.Enricher;
import org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter;
import org.apache.camel.spi.RouteContext;
@@ -51,11 +50,6 @@ public class EnrichReifier extends
ExpressionReifier {
}
return enricher;
-
-// and wrap in unit of work
-//CamelInternalProcessor internal = new
CamelInternalProcessor(enricher);
-//internal.addAdvice(new
CamelInternalProcessor.UnitOfWorkProcessorAdvice(routeContext));
-//return internal;
}
private AggregationStrategy createAggregationStrategy(RouteContext
routeContext) {
[camel] 04/06: CAMEL-14419: Enrich EIP - Should wrap in UoW
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5845e5de2d72844f62c52ba9ced9e6ffb44c6499
Author: Claus Ibsen
AuthorDate: Mon Jan 20 15:15:02 2020 +0100
CAMEL-14419: Enrich EIP - Should wrap in UoW
---
.../TransactedInterceptUsingAdviceWithSendToEndpointTest.java | 2 +-
.../src/main/java/org/apache/camel/processor/Enricher.java| 4 +++-
.../src/main/java/org/apache/camel/reifier/EnrichReifier.java | 8 +++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
index 47e4579..46a3248 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactedInterceptUsingAdviceWithSendToEndpointTest.java
@@ -56,7 +56,7 @@ public class
TransactedInterceptUsingAdviceWithSendToEndpointTest extends Transa
}
private void addInterceptor(String routeId) throws Exception {
-RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context,
new AdviceWithRouteBuilder() {
+RouteReifier.adviceWith(context.getRouteDefinition(routeId), context,
new AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
interceptSendToEndpoint("direct:(foo|bar)")
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
b/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
index 411b36a..f484d0a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
@@ -197,7 +197,9 @@ public class Enricher extends AsyncProcessorSupport
implements IdAware, RouteIdA
}
// record timing for sending the exchange using the producer
final StopWatch watch = sw;
-AsyncProcessor ap = AsyncProcessorConverterHelper.convert(producer);
+// make sure to wrap producer in unit of work
+AsyncProcessor ap = AsyncProcessorConverterHelper.convert(new
UnitOfWorkProducer(producer));
+// wrap in UoW
boolean sync = ap.process(resourceExchange, new AsyncCallback() {
public void done(boolean doneSync) {
// we only have to handle async completion of the routing slip
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
index 98f4bc4..bd58305 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/EnrichReifier.java
@@ -22,6 +22,7 @@ import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.model.EnrichDefinition;
import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.processor.CamelInternalProcessor;
import org.apache.camel.processor.Enricher;
import org.apache.camel.processor.aggregate.AggregationStrategyBeanAdapter;
import org.apache.camel.spi.RouteContext;
@@ -34,7 +35,6 @@ public class EnrichReifier extends
ExpressionReifier {
@Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
-
Expression exp =
definition.getExpression().createExpression(routeContext);
boolean isShareUnitOfWork = definition.getShareUnitOfWork() != null &&
Boolean.parseBoolean(definition.getShareUnitOfWork());
boolean isIgnoreInvalidEndpoint =
definition.getIgnoreInvalidEndpoint() != null &&
Boolean.parseBoolean(definition.getIgnoreInvalidEndpoint());
@@ -49,7 +49,13 @@ public class EnrichReifier extends
ExpressionReifier {
if (definition.getAggregateOnException() != null) {
enricher.setAggregateOnException(Boolean.parseBoolean(definition.getAggregateOnException()));
}
+
return enricher;
+
+// and wrap in unit of work
+//CamelInternalProcessor internal = new
CamelInternalProcessor(enricher);
+//internal.addAdvice(new
CamelInternalProcessor.UnitOfWorkProcessorAdvice(routeContext));
+//return internal;
}
private AggregationStrategy createAggregationStrategy(RouteContext
routeContext) {
[camel] 03/06: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit c41fc982d0f77cf239ea46346304ab15e3bc7d5e Author: Claus Ibsen AuthorDate: Mon Jan 20 14:55:43 2020 +0100 Polished --- .../main/java/org/apache/camel/reifier/RecipientListReifier.java | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RecipientListReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RecipientListReifier.java index a2fe5d2..6d9a566 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RecipientListReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RecipientListReifier.java @@ -109,12 +109,7 @@ public class RecipientListReifier extends ProcessorReifier
[camel] 06/06: CAMEL-14354: Optimize core
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 60f78f51e06f776ea051b5c5d5b8faeedd0794f2 Author: Claus Ibsen AuthorDate: Mon Jan 20 16:03:48 2020 +0100 CAMEL-14354: Optimize core --- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 5 + 1 file changed, 5 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc index acec046..2c8eb66 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc @@ -131,6 +131,11 @@ You can use these methods by adapting to the extended exchange as shown below: exchange.adapt(ExtendedExchange.class).addOnCompletion(...); + UnitOfWork + +For advanced Camel users whom implement custom `UnitOfWork` should implement the new `isBeforeAfterProcess()' method and return true of false, +whether Camel should invoke the before and after processor methods. + Cookies Cookies from `camel-http-common` has been moved into a new `camel-http-base` JAR.
[camel] branch master updated (0c05eba -> 60f78f5)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 0c05eba Support subscriptionInitialPosition in camel-pulsar new d7952e5 CAMEL-14354: Optimize core new 37252db CAMEL-14418: camel-timer - Add option to turn on/off metadata new c41fc98 Polished new 5845e5d CAMEL-14419: Enrich EIP - Should wrap in UoW new c8e37b1 CAMEL-14419: Enrich EIP - Should wrap in UoW new 60f78f5 CAMEL-14354: Optimize core The 6 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: ...InterceptUsingAdviceWithSendToEndpointTest.java | 2 +- .../camel-timer/src/main/docs/timer-component.adoc | 3 +- .../camel/component/timer/TimerConsumer.java | 21 +++-- .../camel/component/timer/TimerEndpoint.java | 16 ++ .../main/java/org/apache/camel/spi/UnitOfWork.java | 13 +++-- .../camel/impl/engine/DefaultUnitOfWork.java | 6 .../apache/camel/impl/engine/MDCUnitOfWork.java| 5 .../camel/processor/CamelInternalProcessor.java| 34 +- .../java/org/apache/camel/processor/Enricher.java | 4 ++- .../processor/SharedCamelInternalProcessor.java| 34 -- .../org/apache/camel/reifier/EnrichReifier.java| 2 +- .../apache/camel/reifier/RecipientListReifier.java | 7 + .../camel/impl/CustomUnitOfWorkFactoryTest.java| 5 .../endpoint/dsl/TimerEndpointBuilderFactory.java | 26 + .../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 5 15 files changed, 133 insertions(+), 50 deletions(-)
[camel] 02/06: CAMEL-14418: camel-timer - Add option to turn on/off metadata
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 37252db0e679c56b96d4027122592f50ff05f332
Author: Claus Ibsen
AuthorDate: Mon Jan 20 13:54:59 2020 +0100
CAMEL-14418: camel-timer - Add option to turn on/off metadata
---
.../camel-timer/src/main/docs/timer-component.adoc | 3 ++-
.../camel/component/timer/TimerConsumer.java | 21 +
.../camel/component/timer/TimerEndpoint.java | 16 +
.../endpoint/dsl/TimerEndpointBuilderFactory.java | 26 ++
4 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/components/camel-timer/src/main/docs/timer-component.adoc
b/components/camel-timer/src/main/docs/timer-component.adoc
index 67331c0..6d0ba5a 100644
--- a/components/camel-timer/src/main/docs/timer-component.adoc
+++ b/components/camel-timer/src/main/docs/timer-component.adoc
@@ -80,7 +80,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (13 parameters):
+=== Query Parameters (14 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -89,6 +89,7 @@ with the following path and query parameters:
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by the routing Error Handler. By default the
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with
exceptions, that will be logged at WARN or ERROR level and ignored. | false |
boolean
| *delay* (consumer) | The number of milliseconds to wait before the first
event is generated. Should not be used in conjunction with the time option. The
default value is 1000. You can also specify time values using units, such as
60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 |
long
| *fixedRate* (consumer) | Events take place at approximately regular
intervals, separated by the specified period. | false | boolean
+| *includeMetadata* (consumer) | Whether to include metadata in the exchange
such as fired time, timer name, timer count etc. This information is default
included. | true | boolean
| *period* (consumer) | If greater than 0, generate periodic events every
period milliseconds. The default value is 1000. You can also specify time
values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds),
and 1h (1 hour). | 1000 | long
| *repeatCount* (consumer) | Specifies a maximum limit of number of fires. So
if you set it to 1, the timer will only fire once. If you set it to 5, it will
only fire five times. A value of zero or negative means fire forever. | 0 | long
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
diff --git
a/components/camel-timer/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
b/components/camel-timer/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
index 695ad11..5170dd9 100644
---
a/components/camel-timer/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
+++
b/components/camel-timer/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
@@ -175,15 +175,18 @@ public class TimerConsumer extends DefaultConsumer
implements StartupListener, S
protected void sendTimerExchange(long counter) {
final Exchange exchange = endpoint.createExchange();
-exchange.setProperty(Exchange.TIMER_COUNTER, counter);
-exchange.setProperty(Exchange.TIMER_NAME, endpoint.getTimerName());
-exchange.setProperty(Exchange.TIMER_TIME, endpoint.getTime());
-exchange.setProperty(Exchange.TIMER_PERIOD, endpoint.getPeriod());
-
-Date now = new Date();
-exchange.setProperty(Exchange.TIMER_FIRED_TIME, now);
-// also set now on in header with same key as quartz to be consistent
-exchange.getIn().setHeader("firedTime", now);
+
+if (endpoint.isIncludeMetadata()) {
+exchange.setProperty(Exchange.TIMER_COUNTER, counter);
+exchange.setProperty(Exchange.TIMER_NAME, endpoint.getTimerName());
+exchange.setProperty(Exchange.TIMER_TIME, endpoint.getTime());
+exchange.setProperty(Exchange.TIMER_PERIOD, endpoint.getPeriod());
+
+Date now = new Date();
+exchange.setProperty(Exchange.TIMER_FIRED_TIME, now);
+// also set now on in header with same key as quartz to be
consistent
+exchange.getIn().setHeader("firedTime", now);
+}
if (log.isTraceEnabled()) {
[GitHub] [camel-k] nicolaferraro opened a new pull request #1216: chore(build): add verbose flag for Kaniko builds
nicolaferraro opened a new pull request #1216: chore(build): add verbose flag for Kaniko builds URL: https://github.com/apache/camel-k/pull/1216 **Release Note** ```release-note NONE ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] lburgazzoli commented on issue #599: Produce NativeImageEnableAllCharsetsBuildItem where appropriate
lburgazzoli commented on issue #599: Produce NativeImageEnableAllCharsetsBuildItem where appropriate URL: https://github.com/apache/camel-quarkus/issues/599#issuecomment-576298798 Having component specific property is misleading i.e. you can set one it true for one component and fase for another but the result won’t be that one component support all the charset and the other one not. It looks to me a generic quarkus issue than a camel one so we should probably let the developers choose. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-spring-boot] branch master updated (5ae6e6e -> 2119167)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 5ae6e6e Update README.adoc add 2119167 Update README.adoc No new revisions were added by this update. Summary of changes: components-starter/README.adoc | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
[camel-spring-boot] branch master updated (4b716f3 -> 5ae6e6e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 4b716f3 Set the version to 3.1.0-SNAPSHOT in the template starter add 5ae6e6e Update README.adoc No new revisions were added by this update. Summary of changes: components-starter/README.adoc | 7 --- 1 file changed, 7 deletions(-)
[GitHub] [camel-k] aldettinger closed issue #255: add unit tests for traits
aldettinger closed issue #255: add unit tests for traits URL: https://github.com/apache/camel-k/issues/255 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] oscerd commented on issue #639: Removed the Apache repositories since now the situation should be ok …
oscerd commented on issue #639: Removed the Apache repositories since now the situation should be ok … URL: https://github.com/apache/camel-quarkus/pull/639#issuecomment-576246860 ok to test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-quarkus] 01/01: Removed the Apache repositories since now the situation should be ok in central
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-3.0.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f109e42de85db1a609086808c8f0d4b158e74fe0 Author: Andrea Cosentino AuthorDate: Mon Jan 20 13:00:07 2020 +0100 Removed the Apache repositories since now the situation should be ok in central --- pom.xml | 22 -- 1 file changed, 22 deletions(-) diff --git a/pom.xml b/pom.xml index 9f0cc69..314c23d 100644 --- a/pom.xml +++ b/pom.xml @@ -161,17 +161,6 @@ -apache.releases -https://repository.apache.org/content/groups/public -Apache Releases Repo - -false - - -true - - - apache.snapshots https://repository.apache.org/snapshots/ Apache Snapshot Repo @@ -186,17 +175,6 @@ -apache.releases -https://repository.apache.org/content/groups/public -Apache Releases Repo - -false - - -true - - - apache.snapshots https://repository.apache.org/snapshots/
[GitHub] [camel-quarkus] oscerd opened a new pull request #639: Removed the Apache repositories since now the situation should be ok …
oscerd opened a new pull request #639: Removed the Apache repositories since now the situation should be ok … URL: https://github.com/apache/camel-quarkus/pull/639 …in central Lets try to build This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-quarkus] branch camel-3.0.1 created (now f109e42)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch camel-3.0.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. at f109e42 Removed the Apache repositories since now the situation should be ok in central This branch includes the following new commits: new f109e42 Removed the Apache repositories since now the situation should be ok in central The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch master updated (28a5c8b -> 0c05eba)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 28a5c8b Regen
add 0c05eba Support subscriptionInitialPosition in camel-pulsar
No new revisions were added by this update.
Summary of changes:
.../camel-pulsar/src/main/docs/pulsar-component.adoc | 1 +
.../pulsar/configuration/PulsarConfiguration.java | 15 +++
.../utils/consumers/CommonCreationStrategyImpl.java | 1 +
...tionStrategy.java => SubscriptionInitialPosition.java} | 15 ++-
4 files changed, 27 insertions(+), 5 deletions(-)
copy
components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/{ConsumerCreationStrategy.java
=> SubscriptionInitialPosition.java} (58%)
[camel] 02/04: Removed @author
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e992103a2dc713d94484b61a5c94c59d495e86f5
Author: Andrea Cosentino
AuthorDate: Mon Jan 20 12:35:38 2020 +0100
Removed @author
---
.../main/java/org/apache/camel/component/elytron/ElytronComponent.java | 1 -
.../main/java/org/apache/camel/component/elytron/ElytronConsumer.java| 1 -
2 files changed, 2 deletions(-)
diff --git
a/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronComponent.java
b/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronComponent.java
index da40433..1a9d146 100644
---
a/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronComponent.java
+++
b/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronComponent.java
@@ -58,7 +58,6 @@ import
org.wildfly.security.http.util.SecurityProviderServerMechanismFactory;
*
* Example: to use bearer_token, mechanism name has to be "BEARER_TOKEN" and
realm has to be TokenSecurityRealm.
*
- * @author JiriOndrusek
*/
@Metadata(label = "verifiers", enums = "parameters,connectivity")
@Component("elytron")
diff --git
a/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronConsumer.java
b/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronConsumer.java
index bece847..9454fd8 100644
---
a/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronConsumer.java
+++
b/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronConsumer.java
@@ -33,7 +33,6 @@ import org.wildfly.security.authz.Roles;
/**
* Consumer contains decides if request contains required roles (which are
defined for endpoint)
*
- * @author JiriOndrusek
*/
public class ElytronConsumer extends UndertowConsumer {
[camel] branch master updated (6c656ec -> 28a5c8b)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 6c656ec Regen new 5e49dea Fixed Elytron Endpoint description new e992103 Removed @author new fe21ac5 Regen new 28a5c8b Regen 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: .../org/apache/camel/component/elytron/ElytronComponent.java | 1 - .../java/org/apache/camel/component/elytron/ElytronConsumer.java | 1 - .../java/org/apache/camel/component/elytron/ElytronEndpoint.java | 3 +-- .../builder/endpoint/dsl/ElytronEndpointBuilderFactory.java | 9 ++--- docs/components/modules/ROOT/pages/index.adoc| 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
[camel] 03/04: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fe21ac58c5651cc45e23b88cb2773c384c9c362c
Author: Andrea Cosentino
AuthorDate: Mon Jan 20 12:37:15 2020 +0100
Regen
---
.../builder/endpoint/dsl/ElytronEndpointBuilderFactory.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
index 6c26134..1ba553a 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
@@ -27,7 +27,8 @@ import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.HeaderFilterStrategy;
/**
- * Endpoint
+ * The elytron component is allows you to work with the Elytron Security
+ * Framework
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -1380,7 +1381,8 @@ public interface ElytronEndpointBuilderFactory {
public interface ElytronBuilders {
/**
* Elytron (camel-elytron)
- * Endpoint
+ * The elytron component is allows you to work with the Elytron
Security
+ * Framework
*
* Category: http
* Since: 3.1
@@ -1397,7 +1399,8 @@ public interface ElytronEndpointBuilderFactory {
}
/**
* Elytron (camel-elytron)
- * Endpoint
+ * The elytron component is allows you to work with the Elytron Security
+ * Framework
*
* Category: http
* Since: 3.1
[camel] 04/04: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 28a5c8bc235dcd3e55940ccf1b952dca08ee3255 Author: Andrea Cosentino AuthorDate: Mon Jan 20 12:47:54 2020 +0100 Regen --- docs/components/modules/ROOT/pages/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc index d32a28a..b051f23 100644 --- a/docs/components/modules/ROOT/pages/index.adoc +++ b/docs/components/modules/ROOT/pages/index.adoc @@ -184,7 +184,7 @@ Number of Components: 310 in 248 JAR artifacts (1 deprecated) | xref:elsql-component.adoc[ElSQL] (camel-elsql) | 2.16 | The elsql component is an extension to the existing SQL Component that uses ElSql to define the SQL queries. -| xref:elytron-component.adoc[Elytron] (camel-elytron) | 3.1 | Endpoint +| xref:elytron-component.adoc[Elytron] (camel-elytron) | 3.1 | The elytron component is allows you to work with the Elytron Security Framework | xref:etcd-component.adoc[Etcd] (camel-etcd) | 2.18 | The camel etcd component allows you to work with Etcd, a distributed reliable key-value store.
[camel] 01/04: Fixed Elytron Endpoint description
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 5e49dea6435b4018b441ba6cd0428aa558383af6 Author: Andrea Cosentino AuthorDate: Mon Jan 20 12:35:10 2020 +0100 Fixed Elytron Endpoint description --- .../main/java/org/apache/camel/component/elytron/ElytronEndpoint.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronEndpoint.java b/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronEndpoint.java index 4893c40..fc17047 100644 --- a/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronEndpoint.java +++ b/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronEndpoint.java @@ -32,9 +32,8 @@ import org.apache.camel.spi.UriParam; import org.wildfly.security.auth.server.SecurityIdentity; /** - * Endpoint + * The elytron component is allows you to work with the Elytron Security Framework * - * @author JiriOndrusek */ @UriEndpoint(firstVersion = "3.1.0", scheme = "elytron", title = "Elytron", syntax = "elytron:httpURI", label = "http", lenientProperties = true, extendsScheme = "undertow")
[camel] 03/03: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 6c656ece1c8dff116e966b3540181a71f152b4a5 Author: Andrea Cosentino AuthorDate: Mon Jan 20 12:02:06 2020 +0100 Regen --- docs/components/modules/ROOT/pages/telegram-component.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/components/modules/ROOT/pages/telegram-component.adoc b/docs/components/modules/ROOT/pages/telegram-component.adoc index 72bd9f2..327d81c 100644 --- a/docs/components/modules/ROOT/pages/telegram-component.adoc +++ b/docs/components/modules/ROOT/pages/telegram-component.adoc @@ -231,6 +231,7 @@ The following message bodies are allowed for a producer endpoint (messages of ty | `OutgoingVideoMessage` | To send a mp4 video to a chat | `OutgoingDocumentMessage` | To send a file to a chat (any media type) | `OutgoingStickerMessage` | To send a sticker to a chat (WEBP) +| `OutgoingAnswerInlineQuery` | To send answers to an inline query | `EditMessageTextMessage` | To edit text and game messages (editMessageText) | `EditMessageCaptionMessage` | To edit captions of messages (editMessageCaption) | `EditMessageMediaMessage` | To edit animation, audio, document, photo, or video messages. (editMessageMedia)
[camel] 01/03: Fix "Boxed variable is never null" warnings reported by lgtm.com.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 73a7ef7b74b41bcc4d8bb7f41b915ede5f84f6a2
Author: Pascal Schumacher
AuthorDate: Sun Jan 19 11:24:00 2020 +0100
Fix "Boxed variable is never null" warnings reported by lgtm.com.
---
.../apache/camel/parser/helper/CamelJavaParserHelper.java| 12 ++--
.../camel/parser/helper/CamelJavaRestDslParserHelper.java| 12 ++--
.../camel/parser/helper/CamelJavaTreeParserHelper.java | 12 ++--
.../camel/cdi/transaction/TransactionErrorHandler.java | 6 ++
.../org/apache/camel/spring/spi/TransactionErrorHandler.java | 3 +--
.../org/apache/camel/management/mbean/ManagedChoice.java | 4 ++--
.../camel/management/mbean/ManagedPerformanceCounter.java| 6 ++
.../management/mbean/ManagedRuntimeEndpointRegistry.java | 4 ++--
8 files changed, 27 insertions(+), 32 deletions(-)
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
index c69f8a0..fe830ef 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
@@ -681,9 +681,9 @@ public final class CamelJavaParserHelper {
// if numeric then we plus the values, otherwise we string
concat
boolean numeric = isNumericOperator(clazz, block,
ie.getLeftOperand()) && isNumericOperator(clazz, block, ie.getRightOperand());
if (numeric) {
-Long num1 = val1 != null ? Long.valueOf(val1) : 0;
-Long num2 = val2 != null ? Long.valueOf(val2) : 0;
-answer = "" + (num1 + num2);
+long num1 = val1 != null ? Long.parseLong(val1) : 0;
+long num2 = val2 != null ? Long.parseLong(val2) : 0;
+answer = Long.toString(num1 + num2);
} else {
answer = (val1 != null ? val1 : "") + (val2 != null ? val2
: "");
}
@@ -695,9 +695,9 @@ public final class CamelJavaParserHelper {
for (Object ext : extended) {
String val3 = getLiteralValue(clazz, block,
(Expression) ext);
if (numeric) {
-Long num3 = val3 != null ? Long.valueOf(val3)
: 0;
-Long num = Long.valueOf(answer);
-answer = "" + (num + num3);
+long num3 = val3 != null ?
Long.parseLong(val3) : 0;
+long num = Long.parseLong(answer);
+answer = Long.toString(num + num3);
} else {
answer += val3 != null ? val3 : "";
}
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
index da6658f..1504be6 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
@@ -609,9 +609,9 @@ public final class CamelJavaRestDslParserHelper {
// if numeric then we plus the values, otherwise we string
concat
boolean numeric = isNumericOperator(clazz, block,
ie.getLeftOperand()) && isNumericOperator(clazz, block, ie.getRightOperand());
if (numeric) {
-Long num1 = val1 != null ? Long.valueOf(val1) : 0;
-Long num2 = val2 != null ? Long.valueOf(val2) : 0;
-answer = "" + (num1 + num2);
+long num1 = val1 != null ? Long.parseLong(val1) : 0;
+long num2 = val2 != null ? Long.parseLong(val2) : 0;
+answer = Long.toString(num1 + num2);
} else {
answer = (val1 != null ? val1 : "") + (val2 != null ? val2
: "");
}
@@ -623,9 +623,9 @@ public final class CamelJavaRestDslParserHelper {
for (Object ext : extended) {
String val3 = getLiteralValue(clazz, block,
(Expression) ext);
if (numeric) {
-Long num3 = val3 != null ? Long.valueOf(val3)
: 0;
-Long num = Long.valueOf(answer);
-answer = "" + (num + num3);
+
[camel] branch master updated (8c62825 -> 6c656ec)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 8c62825 CAMEL-14354: Optimize core new 73a7ef7 Fix "Boxed variable is never null" warnings reported by lgtm.com. new 1a78600 Close InputStreams as reported by lgtm.com. new 6c656ec Regen 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: .../java/org/apache/camel/maven/GenerateMojo.java | 3 +- .../camel/parser/helper/CamelJavaParserHelper.java | 12 ++-- .../helper/CamelJavaRestDslParserHelper.java | 12 ++-- .../parser/helper/CamelJavaTreeParserHelper.java | 12 ++-- .../cdi/transaction/TransactionErrorHandler.java | 6 +- .../camel/component/cm/CMSenderOneMessageImpl.java | 64 +++--- .../pubsub/GooglePubsubConnectionFactory.java | 12 ++-- .../camel/spring/spi/TransactionErrorHandler.java | 3 +- .../camel/management/mbean/ManagedChoice.java | 4 +- .../mbean/ManagedPerformanceCounter.java | 6 +- .../mbean/ManagedRuntimeEndpointRegistry.java | 4 +- .../modules/ROOT/pages/telegram-component.adoc | 1 + .../maven/packaging/PrepareCatalogKarafMojo.java | 6 +- 13 files changed, 70 insertions(+), 75 deletions(-)
[camel] 02/03: Close InputStreams as reported by lgtm.com.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1a7860070d970f65b7c005752021312097095216
Author: Pascal Schumacher
AuthorDate: Sun Jan 19 12:26:28 2020 +0100
Close InputStreams as reported by lgtm.com.
---
.../java/org/apache/camel/maven/GenerateMojo.java | 3 +-
.../camel/component/cm/CMSenderOneMessageImpl.java | 64 +++---
.../pubsub/GooglePubsubConnectionFactory.java | 12 ++--
.../maven/packaging/PrepareCatalogKarafMojo.java | 6 +-
4 files changed, 42 insertions(+), 43 deletions(-)
diff --git
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
index a6946ff..346554b 100644
---
a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
+++
b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
@@ -413,8 +413,7 @@ public class GenerateMojo extends AbstractMainMojo {
protected Properties loadMappingsFile() throws MojoFailureException {
Properties mappings = new OrderedProperties();
if (mappingsFile.exists() && mappingsFile.isFile()) {
-try {
-InputStream is = new FileInputStream(mappingsFile);
+try (InputStream is = new FileInputStream(mappingsFile)) {
mappings.load(is);
} catch (IOException e) {
throw new MojoFailureException("Cannot load file: " +
mappingsFile);
diff --git
a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
index 820fa7c..d753edc 100644
---
a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
+++
b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
@@ -205,47 +205,47 @@ public class CMSenderOneMessageImpl implements CMSender {
// result of the request processing.
// We obtaing the result text
-final BufferedReader rd = new BufferedReader(new
InputStreamReader(response.getEntity().getContent()));
-
-final StringBuffer result = new StringBuffer();
-String line = null;
-while ((line = rd.readLine()) != null) {
-result.append(line);
-}
+try (BufferedReader rd = new BufferedReader(new
InputStreamReader(response.getEntity().getContent( {
+final StringBuffer result = new StringBuffer();
+String line = null;
+while ((line = rd.readLine()) != null) {
+result.append(line);
+}
-// ... and process it
+// ... and process it
-line = result.toString();
-if (!line.isEmpty()) {
+line = result.toString();
+if (!line.isEmpty()) {
-// Line is not empty = error
-LOG.debug("Result of the request processing: FAILED\n{}",
line);
+// Line is not empty = error
+LOG.debug("Result of the request processing: FAILED\n{}",
line);
-// The response text contains the error description. We will
-// throw a custom exception for each.
+// The response text contains the error description. We
will
+// throw a custom exception for each.
-if (line.contains(CMConstants.ERROR_UNKNOWN)) {
-throw new UnknownErrorException();
-} else if (line.contains(CMConstants.ERROR_NO_ACCOUNT)) {
-throw new NoAccountFoundForProductTokenException();
-} else if
(line.contains(CMConstants.ERROR_INSUFICIENT_BALANCE)) {
-throw new InsufficientBalanceException();
-} else if
(line.contains(CMConstants.ERROR_UNROUTABLE_MESSAGE)) {
-throw new UnroutableMessageException();
-} else if
(line.contains(CMConstants.ERROR_INVALID_PRODUCT_TOKEN)) {
-throw new InvalidProductTokenException();
-} else {
+if (line.contains(CMConstants.ERROR_UNKNOWN)) {
+throw new UnknownErrorException();
+} else if (line.contains(CMConstants.ERROR_NO_ACCOUNT)) {
+throw new NoAccountFoundForProductTokenException();
+} else if
(line.contains(CMConstants.ERROR_INSUFICIENT_BALANCE)) {
+throw new InsufficientBalanceException();
+} else if
(line.contains(CMConstants.ERROR_UNROUTABLE_MESSAGE)) {
+
[camel] branch master updated: CAMEL-14354: Optimize core
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 8c62825 CAMEL-14354: Optimize core
8c62825 is described below
commit 8c6282555956e0ffbd83289ecec2c36a12e0c79b
Author: Claus Ibsen
AuthorDate: Sun Jan 19 12:02:18 2020 +0100
CAMEL-14354: Optimize core
---
.../java/org/apache/camel/processor/Pipeline.java | 22 ++
.../org/apache/camel/processor/PipelineHelper.java | 4 +++-
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
index 8e2f5f3..6b94f5f 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
@@ -82,16 +82,16 @@ public class Pipeline extends AsyncProcessorSupport
implements Navigate
Pipeline.this.doProcess(exchange, callback, processors, 0, true));
+camelContext.getReactiveExecutor().scheduleSync(() ->
Pipeline.this.doProcess(exchange, callback, processors, 0));
} else {
-camelContext.getReactiveExecutor().scheduleMain(() ->
Pipeline.this.doProcess(exchange, callback, processors, 0, true));
+camelContext.getReactiveExecutor().scheduleMain(() ->
Pipeline.this.doProcess(exchange, callback, processors, 0));
}
return false;
}
-protected void doProcess(Exchange exchange, AsyncCallback callback,
List processors, int index, boolean first) {
+protected void doProcess(Exchange exchange, AsyncCallback callback,
List processors, int index) {
if (continueRouting(processors, index, exchange)
-&& (first || continueProcessing(exchange, "so breaking out of
pipeline", log))) {
+&& (index == 0 || continueProcessing(exchange, "so breaking
out of pipeline", log))) {
// prepare for next run
ExchangeHelper.prepareOutToIn(exchange);
@@ -101,14 +101,16 @@ public class Pipeline extends AsyncProcessorSupport
implements Navigate
-camelContext.getReactiveExecutor().schedule(() ->
doProcess(exchange, callback, processors, idx, false)));
+camelContext.getReactiveExecutor().schedule(() ->
doProcess(exchange, callback, processors, idx)));
} else {
ExchangeHelper.copyResults(exchange, exchange);
// logging nextExchange as it contains the exchange that might
have altered the payload and since
// we are logging the completion if will be confusing if we log
the original instead
// we could also consider logging the original and the
nextExchange then we have *before* and *after* snapshots
-log.trace("Processing complete for exchangeId: {} >>> {}",
exchange.getExchangeId(), exchange);
+if (log.isTraceEnabled()) {
+log.trace("Processing complete for exchangeId: {} >>> {}",
exchange.getExchangeId(), exchange);
+}
camelContext.getReactiveExecutor().schedule(callback);
}
@@ -119,13 +121,17 @@ public class Pipeline extends AsyncProcessorSupport
implements Navigate
[GitHub] [camel-quarkus] ppalaga opened a new pull request #638: Fix #635 Dependency parity check
ppalaga opened a new pull request #638: Fix #635 Dependency parity check URL: https://github.com/apache/camel-quarkus/pull/638 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated (50eb70b -> b2c4540)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 50eb70b Upgrade Spring to version 5.2.3.RELEASE add 417b7fb CAMEL-13224: telegram inline mode add b2c4540 CAMEL-13224: set InlineQueryResult setter methods public No new revisions were added by this update. Summary of changes: .../src/main/docs/telegram-component.adoc | 1 + .../model/EditMessageReplyMarkupMessage.java | 4 + .../telegram/model/IncomingInlineQuery.java| 108 + .../telegram/model/InlineQueryResult.java | 66 ++ .../telegram/model/InlineQueryResultArticle.java | 207 .../telegram/model/InlineQueryResultAudio.java | 189 +++ .../model/InlineQueryResultCachedAudio.java| 137 +++ .../model/InlineQueryResultCachedDocument.java | 171 ++ .../telegram/model/InlineQueryResultCachedGif.java | 154 .../model/InlineQueryResultCachedMpeg4Gif.java | 154 .../model/InlineQueryResultCachedPhoto.java| 171 ++ .../model/InlineQueryResultCachedSticker.java | 102 .../model/InlineQueryResultCachedVideo.java| 171 ++ .../model/InlineQueryResultCachedVoice.java| 154 .../telegram/model/InlineQueryResultContact.java | 209 + .../telegram/model/InlineQueryResultDocument.java | 243 +++ .../telegram/model/InlineQueryResultGame.java | 100 .../telegram/model/InlineQueryResultGif.java | 226 ++ .../telegram/model/InlineQueryResultLocation.java | 207 .../telegram/model/InlineQueryResultMpeg4Gif.java | 226 ++ .../telegram/model/InlineQueryResultPhoto.java | 225 ++ .../telegram/model/InlineQueryResultVenue.java | 242 +++ .../telegram/model/InlineQueryResultVideo.java | 261 + .../telegram/model/InlineQueryResultVoice.java | 172 ++ .../telegram/model/InputContactMessageContent.java | 119 ++ .../model/InputLocationMessageContent.java | 100 .../telegram/model/InputMessageContent.java| 26 ++ .../telegram/model/InputTextMessageContent.java| 108 + .../telegram/model/InputVenueMessageContent.java | 162 + .../telegram/model/OutgoingAnswerInlineQuery.java | 191 +++ .../camel/component/telegram/model/Update.java | 12 + .../service/TelegramServiceRestBotAPIAdapter.java | 3 + .../telegram/util/TelegramMessageHelper.java | 2 + .../TelegramConsumerIncomingInlineQueryTest.java | 84 +++ .../telegram/integration/TelegramServiceTest.java | 2 +- .../messages/updates-inline-query-message.json | 17 ++ 36 files changed, 4725 insertions(+), 1 deletion(-) create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/IncomingInlineQuery.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResult.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultArticle.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultAudio.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultCachedAudio.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultCachedDocument.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultCachedGif.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultCachedMpeg4Gif.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultCachedPhoto.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultCachedSticker.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultCachedVideo.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultCachedVoice.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultContact.java create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineQueryResultDocument.java create mode 100644
[GitHub] [camel-quarkus] ppalaga commented on issue #618: Fix #617 Registerable and discoverable Camel services
ppalaga commented on issue #618: Fix #617 Registerable and discoverable Camel services URL: https://github.com/apache/camel-quarkus/pull/618#issuecomment-576209625 This should be fixed by the `Do not register languages and dataformats ...` commit of https://github.com/apache/camel-quarkus/pull/618 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-spring-boot] branch master updated: Set the version to 3.1.0-SNAPSHOT in the template starter
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new 4b716f3 Set the version to 3.1.0-SNAPSHOT in the template starter 4b716f3 is described below commit 4b716f35b452a1d32860461518b2ebec87401f55 Author: Andrea Cosentino AuthorDate: Mon Jan 20 11:28:07 2020 +0100 Set the version to 3.1.0-SNAPSHOT in the template starter --- tooling/camel-spring-boot-starter-generator/template-starter-pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/camel-spring-boot-starter-generator/template-starter-pom.xml b/tooling/camel-spring-boot-starter-generator/template-starter-pom.xml index 1466b7f..5c8918b 100644 --- a/tooling/camel-spring-boot-starter-generator/template-starter-pom.xml +++ b/tooling/camel-spring-boot-starter-generator/template-starter-pom.xml @@ -22,7 +22,7 @@ org.apache.camel.springboot components-starter -1.0.0-SNAPSHOT +3.1.0-SNAPSHOT camel-%NAME%-starter jar
[camel-spring-boot] 05/05: Added a Integration test for Camel-Cron
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 4f3b4087b842b633e85748489438962987b1ebac
Author: Andrea Cosentino
AuthorDate: Mon Jan 20 11:27:24 2020 +0100
Added a Integration test for Camel-Cron
---
.../camel/itest/springboot/CamelCronTest.java | 48 ++
1 file changed, 48 insertions(+)
diff --git
a/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCronTest.java
b/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCronTest.java
new file mode 100644
index 000..10d1396
--- /dev/null
+++
b/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCronTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.itest.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelCronTest extends AbstractSpringBootTestSupport {
+
+@Deployment
+public static Archive createSpringBootPackage() throws Exception {
+return ArquillianPackager.springBootPackage(createTestConfig());
+}
+
+public static ITestConfig createTestConfig() {
+return new ITestConfigBuilder()
+.module(inferModuleName(CamelCronTest.class))
+.build();
+}
+
+@Test
+public void componentTests() throws Exception {
+this.runComponentTest(config);
+this.runModuleUnitTestsIfEnabled(config);
+}
+
+
+}
[camel-spring-boot] 04/05: Regen catalog
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit d37bdc2e9f64c8d6eaefff0c7c2537af74e352e9
Author: Andrea Cosentino
AuthorDate: Mon Jan 20 11:26:49 2020 +0100
Regen catalog
---
.../resources/org/apache/camel/springboot/catalog/components/cron.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cron.json
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cron.json
index fdba653..585fd91 100644
---
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cron.json
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cron.json
@@ -16,7 +16,7 @@
"firstVersion": "3.1.0",
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-cron-starter",
-"version": "1.0.0-SNAPSHOT"
+"version": "3.1.0-SNAPSHOT"
},
"componentProperties": {
"cronService": { "kind": "property", "displayName": "Cron Service",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "The id of the CamelCronService to use when multiple
implementations are provided" },
[camel-spring-boot] 03/05: Camel-Cron-starter: Set to version 3.1.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 3a6d807186ae432992046936b0009acd4b002aa9 Author: Andrea Cosentino AuthorDate: Mon Jan 20 11:23:34 2020 +0100 Camel-Cron-starter: Set to version 3.1.0-SNAPSHOT --- components-starter/camel-cron-starter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components-starter/camel-cron-starter/pom.xml b/components-starter/camel-cron-starter/pom.xml index c278e0f..9322aed 100644 --- a/components-starter/camel-cron-starter/pom.xml +++ b/components-starter/camel-cron-starter/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.springboot components-starter -1.0.0-SNAPSHOT +3.1.0-SNAPSHOT camel-cron-starter jar
[camel-spring-boot] branch master updated (c3dbaa0 -> 4f3b408)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
from c3dbaa0 Fixed starter-create command in README
new a6f140f Added camel-cron starter
new 6d5d303 Regen
new 3a6d807 Camel-Cron-starter: Set to version 3.1.0-SNAPSHOT
new d37bdc2 Regen catalog
new 4f3b408 Added a Integration test for Camel-Cron
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:
.../camel/springboot/catalog/components.properties | 1 +
.../catalog/components/{service.json => cron.json} | 24
.../{CamelCoapTest.java => CamelCronTest.java} | 4 +--
.../pom.xml| 8 +++---
.../CronComponentAutoConfiguration.java} | 32 +++---
.../springboot/CronComponentConfiguration.java}| 23
.../src/main/resources/META-INF/LICENSE.txt| 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/META-INF/spring.provides| 2 +-
components-starter/pom.xml | 1 +
tooling/camel-spring-boot-dependencies/pom.xml | 5
12 files changed, 61 insertions(+), 41 deletions(-)
copy
camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/{service.json
=> cron.json} (74%)
copy
camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelCoapTest.java
=> CamelCronTest.java} (92%)
copy components-starter/{camel-any23-starter => camel-cron-starter}/pom.xml
(87%)
copy
components-starter/{camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
=>
camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentAutoConfiguration.java}
(85%)
copy
components-starter/{camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentConfiguration.java
=>
camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentConfiguration.java}
(81%)
copy {examples/camel-example-spring-boot-zipkin/service2 =>
components-starter/camel-cron-starter}/src/main/resources/META-INF/LICENSE.txt
(100%)
copy {examples/camel-example-spring-boot-zipkin/service2 =>
components-starter/camel-cron-starter}/src/main/resources/META-INF/NOTICE.txt
(100%)
copy components-starter/{camel-aws-cw-starter =>
camel-cron-starter}/src/main/resources/META-INF/spring.factories (94%)
copy components-starter/{camel-ahc-starter =>
camel-cron-starter}/src/main/resources/META-INF/spring.provides (97%)
[camel-spring-boot] 02/05: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 6d5d303362681798accadd26634081771517cd2e
Author: Andrea Cosentino
AuthorDate: Mon Jan 20 11:15:00 2020 +0100
Regen
---
tooling/camel-spring-boot-dependencies/pom.xml | 5 +
1 file changed, 5 insertions(+)
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 33553b9..dc991b4 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -563,6 +563,11 @@
org.apache.camel.springboot
+camel-cron-starter
+${project.version}
+
+
+org.apache.camel.springboot
camel-crypto-cms-starter
${project.version}
[camel-spring-boot] 01/05: Added camel-cron starter
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit a6f140f6c37fbb81df25de645a899c036966287e
Author: Andrea Cosentino
AuthorDate: Mon Jan 20 10:55:40 2020 +0100
Added camel-cron starter
---
.../camel/springboot/catalog/components.properties | 1 +
.../camel/springboot/catalog/components/cron.json | 36
components-starter/camel-cron-starter/pom.xml | 53 ++
.../springboot/CronComponentAutoConfiguration.java | 128 +
.../springboot/CronComponentConfiguration.java | 82 +
.../src/main/resources/META-INF/LICENSE.txt| 203 +
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
.../src/main/resources/META-INF/spring.factories | 19 ++
.../src/main/resources/META-INF/spring.provides| 17 ++
components-starter/pom.xml | 1 +
10 files changed, 551 insertions(+)
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index ad5c8f7..2b55883 100644
---
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -65,6 +65,7 @@ corda
couchbase
couchdb
cql
+cron
crypto
crypto-cms
cxf
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cron.json
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cron.json
new file mode 100644
index 000..fdba653
--- /dev/null
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cron.json
@@ -0,0 +1,36 @@
+{
+ "component": {
+"kind": "component",
+"scheme": "cron",
+"syntax": "cron:name",
+"title": "Cron",
+"description": "Camel Cron Component",
+"label": "scheduling",
+"deprecated": false,
+"deprecationNote": "",
+"async": false,
+"consumerOnly": true,
+"producerOnly": false,
+"lenientProperties": false,
+"javaType": "org.apache.camel.component.cron.CronComponent",
+"firstVersion": "3.1.0",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-cron-starter",
+"version": "1.0.0-SNAPSHOT"
+ },
+ "componentProperties": {
+"cronService": { "kind": "property", "displayName": "Cron Service",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "The id of the CamelCronService to use when multiple
implementations are provided" },
+"basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
+"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by [...]
+ },
+ "properties": {
+"name": { "kind": "path", "displayName": "Name", "group": "consumer",
"required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "description": "The name of the cron
trigger" },
+"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled b [...]
+"schedule": { "kind": "parameter", "displayName": "Schedule", "group":
"consumer", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.cron.api.CamelCronConfiguration",
"configurationField": "configuration", "description": "A cron
[GitHub] [camel-quarkus] philschaller commented on issue #637: Unmarshalling with Jackson in multiple routes with different classes
philschaller commented on issue #637: Unmarshalling with Jackson in multiple routes with different classes URL: https://github.com/apache/camel-quarkus/issues/637#issuecomment-576207454 Ahhh, then I'm relieved :-) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] lburgazzoli commented on issue #637: Unmarshalling with Jackson in multiple routes with different classes
lburgazzoli commented on issue #637: Unmarshalling with Jackson in multiple routes with different classes URL: https://github.com/apache/camel-quarkus/issues/637#issuecomment-576203768 no worries it did not appear as an issue but pop up while discussing another topic :) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] philschaller commented on issue #637: Unmarshalling with Jackson in multiple routes with different classes
philschaller commented on issue #637: Unmarshalling with Jackson in multiple routes with different classes URL: https://github.com/apache/camel-quarkus/issues/637#issuecomment-576203310 Sorry Missed it in the open/closed issues. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] lburgazzoli commented on issue #618: Fix #617 Registerable and discoverable Camel services
lburgazzoli commented on issue #618: Fix #617 Registerable and discoverable Camel services URL: https://github.com/apache/camel-quarkus/pull/618#issuecomment-576202868 The build seems to be running https://builds.apache.org/view/C/view/Apache%20Camel/job/camel-quarkus-pr/538/ even if it does not show up here This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] lburgazzoli commented on issue #637: Unmarshalling with Jackson in multiple routes with different classes
lburgazzoli commented on issue #637: Unmarshalling with Jackson in multiple routes with different classes URL: https://github.com/apache/camel-quarkus/issues/637#issuecomment-576201641 That’s a know issue that should be fixed in the next milestone This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-quarkus] philschaller opened a new issue #637: Unmarshalling with Jackson in multiple routes with different classes
philschaller opened a new issue #637: Unmarshalling with Jackson in multiple
routes with different classes
URL: https://github.com/apache/camel-quarkus/issues/637
**Describe the bug**
Camel unmarshalling uses only one class for all routes instead of the
programmatically configured ones as used in the following line:
`unmarshal().json(JsonLibrary.Jackson, POJO_1.class)`
Calling unmarhal() in a different route (same RouteBuilder or not does not
matter) with POJO_2 leads to Jackson exceptions because it expects POJO_1.
**Expected behavior**
Isolated unmarshalling for all routes and invocations. Works with Camel 2.x
(without Quarkus).
**Workaround**
Manually unmarshalling with Jackson ObjectMapper.
`process((exchange) -> {
POJO body = new
ObjectMapper().readValue(exchange.getIn().getBody(String.class), POJO.class);
});`
**Environment**
Camel Quarkus 1.0.0-M2
JDK 11
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[camel-spring-boot] branch master updated: Fixed starter-create command in README
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/master by this push: new c3dbaa0 Fixed starter-create command in README c3dbaa0 is described below commit c3dbaa0c188d98060d795cb2b8644a9489954ba2 Author: Andrea Cosentino AuthorDate: Mon Jan 20 10:52:47 2020 +0100 Fixed starter-create command in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c9d9836..e3e0209 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This project provides Spring Boot support for Apache Camel. To create a starter for the `zoot` component, run the following command: ``` -./starter-add zoot +./starter-create zoot ``` Similarly, to delete the starter for the `zoot` component, run the following command:
[camel-spring-boot] branch master updated: Added AWS2-Translate component starter and test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new e378746 Added AWS2-Translate component starter and test
e378746 is described below
commit e3787466c3eb3e4c2da143539d74eb1901a52ae2
Author: Andrea Cosentino
AuthorDate: Mon Jan 20 10:46:18 2020 +0100
Added AWS2-Translate component starter and test
---
.../camel/springboot/catalog/components.properties | 1 +
.../catalog/components/aws2-translate.json | 47
.../itest/springboot/CamelAws2TranslateTest.java | 48
.../pom.xml| 16 +-
.../Translate2ComponentAutoConfiguration.java | 128 ++
.../Translate2ComponentConfiguration.java | 262 +
.../src/main/resources/META-INF/LICENSE.txt| 203
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/META-INF/spring.factories | 19 ++
.../src/main/resources/META-INF/spring.provides| 17 ++
components-starter/camel-corda-starter/pom.xml | 12 +
components-starter/pom.xml | 1 +
tooling/camel-spring-boot-dependencies/pom.xml | 15 +-
13 files changed, 771 insertions(+), 9 deletions(-)
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index ddaf5e5..ad5c8f7 100644
---
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -36,6 +36,7 @@ aws-sns
aws-sqs
aws-swf
aws-translate
+aws2-translate
azure-blob
azure-queue
bean
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-translate.json
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-translate.json
new file mode 100644
index 000..ab37951
--- /dev/null
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-translate.json
@@ -0,0 +1,47 @@
+{
+ "component": {
+"kind": "component",
+"scheme": "aws2-translate",
+"syntax": "aws2-translate:label",
+"title": "AWS 2 Translate",
+"description": "The aws2-translate component is used for managing Amazon
Translate",
+"label": "cloud,management",
+"deprecated": false,
+"deprecationNote": "",
+"async": false,
+"consumerOnly": false,
+"producerOnly": true,
+"lenientProperties": false,
+"javaType":
"org.apache.camel.component.aws2.translate.Translate2Component",
+"firstVersion": "3.1.0",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-aws2-translate-starter",
+"version": "1.0.0-SNAPSHOT"
+ },
+ "componentProperties": {
+"configuration": { "kind": "property", "displayName": "Configuration",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.translate.Translate2Configuration",
"deprecated": false, "secret": false, "description": "The AWS Translate default
configuration" },
+"accessKey": { "kind": "property", "displayName": "Access Key", "group":
"producer", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"Amazon AWS Access Key" },
+"secretKey": { "kind": "property", "displayName": "Secret Key", "group":
"producer", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"Amazon AWS Secret Key" },
+"region": { "kind": "property", "displayName": "Region", "group":
"producer", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "The
region in which Translate client needs to work" },
+"basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
+"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be
[camel-spring-boot] 01/02: [CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 28486bea0558ae4aaefcac4279d4f15ae2891a80
Author: Guillaume Nodet
AuthorDate: Mon Jan 20 10:23:12 2020 +0100
[CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT
---
camel-spring-boot/pom.xml | 13 +
pom.xml| 2 +-
.../pom.xml| 5 +
.../maven/AbstractSpringBootGenerator.java | 11 +-
.../maven/PrepareCatalogSpringBootMojo.java| 2 -
.../maven/SpringBootAutoConfigurationMojo.java | 245 ++---
...pdateSpringBootAutoConfigurationReadmeMojo.java | 402 +
7 files changed, 542 insertions(+), 138 deletions(-)
diff --git a/camel-spring-boot/pom.xml b/camel-spring-boot/pom.xml
index 3087d69..e7401cd 100644
--- a/camel-spring-boot/pom.xml
+++ b/camel-spring-boot/pom.xml
@@ -172,6 +172,19 @@
process-classes
+
+
+
+org.apache.camel.springboot
+
camel-spring-boot-generator-maven-plugin
+${project.version}
+
+
+true
+
+true
+
+
readme
diff --git a/pom.xml b/pom.xml
index c660115..d128e1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
2.2.3.RELEASE
-3.0.0
+3.1.0-SNAPSHOT
1.0.2.v20150114
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
index 515ac25..f8e4c5a 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
+++ b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
@@ -54,6 +54,11 @@
org.apache.camel
+camel-tooling-util
+${camel-version}
+
+
+org.apache.camel
bom-generator-maven-plugin
${camel-version}
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
index b9a2bc1..8b5524c 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
@@ -17,35 +17,28 @@
package org.apache.camel.springboot.maven;
import java.io.File;
-import java.io.FileFilter;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOError;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.function.Supplier;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
+import org.apache.camel.tooling.util.PackageHelper;
import org.apache.commons.io.IOUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-
public abstract class AbstractSpringBootGenerator extends AbstractMojo {
/**
@@ -144,7 +137,7 @@ public abstract class AbstractSpringBootGenerator extends
AbstractMojo {
protected static String loadJson(JarFile jar, JarEntry je) {
try (InputStream is = jar.getInputStream(je)) {
-return loadText(is);
+return PackageHelper.loadText(is);
} catch (IOException e) {
throw new IOError(e);
}
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
index d8b9fb4..0889287 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
+++
[camel-spring-boot] branch master updated (20d6b1b -> 2b2ec44)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. discard 20d6b1b [CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT new 28486be [CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT new 2b2ec44 Regen 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 (20d6b1b) \ N -- N -- N refs/heads/master (2b2ec44) 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: .../springboot/catalog/components/activemq.json|2 + .../springboot/catalog/components/ahc-ws.json |5 +- .../springboot/catalog/components/ahc-wss.json |5 +- .../camel/springboot/catalog/components/ahc.json |5 +- .../camel/springboot/catalog/components/amqp.json |2 + .../camel/springboot/catalog/components/as2.json |2 +- .../catalog/components/atmosphere-websocket.json |1 - .../camel/springboot/catalog/components/atom.json |1 - .../catalog/components/atomix-multimap.json| 37 +- .../springboot/catalog/components/aws-cw.json |3 +- .../springboot/catalog/components/aws-ddb.json |3 +- .../catalog/components/aws-ddbstream.json |1 - .../springboot/catalog/components/aws-ec2.json |3 +- .../springboot/catalog/components/aws-ecs.json |3 +- .../springboot/catalog/components/aws-eks.json |3 +- .../springboot/catalog/components/aws-iam.json |3 +- .../catalog/components/aws-kinesis-firehose.json |3 +- .../springboot/catalog/components/aws-kms.json |3 +- .../springboot/catalog/components/aws-lambda.json |7 +- .../springboot/catalog/components/aws-mq.json |3 +- .../springboot/catalog/components/aws-msk.json |3 +- .../springboot/catalog/components/aws-sdb.json |3 +- .../springboot/catalog/components/aws-ses.json |3 +- .../springboot/catalog/components/aws-sns.json |3 +- .../catalog/components/aws-translate.json |7 +- .../catalog/components/bean-validator.json |3 +- .../camel/springboot/catalog/components/bean.json | 11 +- .../springboot/catalog/components/bonita.json | 19 +- .../springboot/catalog/components/braintree.json |2 + .../catalog/components/caffeine-cache.json | 12 +- .../catalog/components/caffeine-loadcache.json | 12 +- .../springboot/catalog/components/chatscript.json |3 +- .../camel/springboot/catalog/components/chunk.json |3 +- .../camel/springboot/catalog/components/class.json | 13 +- .../springboot/catalog/components/cm-sms.json |3 +- .../springboot/catalog/components/coap+tcp.json|1 + .../camel/springboot/catalog/components/coap.json |1 + .../springboot/catalog/components/coaps+tcp.json |1 + .../camel/springboot/catalog/components/coaps.json |1 + .../springboot/catalog/components/consul.json | 23 +- .../springboot/catalog/components/controlbus.json |3 +- .../camel/springboot/catalog/components/corda.json | 13 +- .../camel/springboot/catalog/components/cql.json |2 +- .../springboot/catalog/components/crypto-cms.json |5 +- .../springboot/catalog/components/crypto.json |3 +- .../camel/springboot/catalog/components/cxf.json |2 +- .../camel/springboot/catalog/components/cxfrs.json |2 +- .../springboot/catalog/components/dataformat.json |3 +- .../catalog/components/dataset-test.json |3 +- .../springboot/catalog/components/dataset.json |3 +- .../catalog/components/debezium-mongodb.json |1 - .../catalog/components/debezium-mysql.json |1 - .../catalog/components/debezium-postgres.json |2 +- .../catalog/components/debezium-sqlserver.json |7 +- .../catalog/components/digitalocean.json |3 +- .../camel/springboot/catalog/components/dns.json |3 +- .../camel/springboot/catalog/components/dozer.json |3 +- .../camel/springboot/catalog/components/drill.json |3 +- .../springboot/catalog/components/ehcache.json |2 +- .../catalog/components/elasticsearch-rest.json |6 +-
[camel-spring-boot] branch master updated: [CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 20d6b1b [CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT
20d6b1b is described below
commit 20d6b1b43a0ad838cd6b5c849dc24d4a90298b04
Author: Guillaume Nodet
AuthorDate: Mon Jan 20 10:23:12 2020 +0100
[CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT
---
pom.xml| 2 +-
.../pom.xml| 5 +
.../maven/AbstractSpringBootGenerator.java | 11 +-
.../maven/PrepareCatalogSpringBootMojo.java| 2 -
.../maven/SpringBootAutoConfigurationMojo.java | 245 ++---
...pdateSpringBootAutoConfigurationReadmeMojo.java | 402 +
6 files changed, 529 insertions(+), 138 deletions(-)
diff --git a/pom.xml b/pom.xml
index c660115..d128e1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
2.2.3.RELEASE
-3.0.0
+3.1.0-SNAPSHOT
1.0.2.v20150114
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
index 515ac25..f8e4c5a 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
+++ b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
@@ -54,6 +54,11 @@
org.apache.camel
+camel-tooling-util
+${camel-version}
+
+
+org.apache.camel
bom-generator-maven-plugin
${camel-version}
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
index b9a2bc1..8b5524c 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
@@ -17,35 +17,28 @@
package org.apache.camel.springboot.maven;
import java.io.File;
-import java.io.FileFilter;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOError;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.function.Supplier;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
+import org.apache.camel.tooling.util.PackageHelper;
import org.apache.commons.io.IOUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-
public abstract class AbstractSpringBootGenerator extends AbstractMojo {
/**
@@ -144,7 +137,7 @@ public abstract class AbstractSpringBootGenerator extends
AbstractMojo {
protected static String loadJson(JarFile jar, JarEntry je) {
try (InputStream is = jar.getInputStream(je)) {
-return loadText(is);
+return PackageHelper.loadText(is);
} catch (IOException e) {
throw new IOError(e);
}
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
index d8b9fb4..0889287 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
@@ -37,8 +37,6 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-
/**
* Prepares the Spring Boot provider camel catalog to include component it
supports
*/
diff --git
[camel] branch master updated: Upgrade Spring to version 5.2.3.RELEASE
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 50eb70b Upgrade Spring to version 5.2.3.RELEASE
50eb70b is described below
commit 50eb70b8fd8f2371f415205cbc893a29620e34b8
Author: Andrea Cosentino
AuthorDate: Mon Jan 20 10:12:28 2020 +0100
Upgrade Spring to version 5.2.3.RELEASE
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4921279..8c1d386 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -598,7 +598,7 @@
2.3.2.RELEASE_1
[5,6)
${spring5-version}
-5.2.2.RELEASE
+5.2.3.RELEASE
5.2.1.RELEASE
3.0.7.RELEASE
3.0.7.RELEASE_1
[camel-spring-boot] branch master updated (3df5a03 -> ac348b4)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 3df5a03 CAMEL-14412 - Maven central now requires HTTPS new 1273b34 Upgrade Spring-boot to version 2.2.3.RELEASE new 6adf92c Removed duplicated Spring Boot version property placeholder new ac348b4 Regen 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: .../springboot/catalog/components/activemq.json| 2 - .../camel/springboot/catalog/components/amqp.json | 2 - .../catalog/components/atomix-multimap.json| 34 +- .../catalog/components/aws-translate.json | 4 +- .../springboot/catalog/components/bonita.json | 16 +- .../catalog/components/caffeine-cache.json | 9 +- .../catalog/components/caffeine-loadcache.json | 9 +- .../springboot/catalog/components/consul.json | 23 +- .../camel/springboot/catalog/components/corda.json | 13 +- .../camel/springboot/catalog/components/cql.json | 2 +- .../springboot/catalog/components/crypto-cms.json | 2 +- .../springboot/catalog/components/ehcache.json | 2 +- .../catalog/components/elasticsearch-rest.json | 3 - .../camel/springboot/catalog/components/elsql.json | 2 +- .../springboot/catalog/components/ganglia.json | 2 +- .../catalog/components/hazelcast-set.json | 2 +- .../camel/springboot/catalog/components/http.json | 1 - .../camel/springboot/catalog/components/https.json | 1 - .../camel/springboot/catalog/components/ipfs.json | 8 +- .../springboot/catalog/components/jcache.json | 5 +- .../camel/springboot/catalog/components/jdbc.json | 2 +- .../camel/springboot/catalog/components/jira.json | 2 +- .../camel/springboot/catalog/components/jms.json | 2 - .../catalog/components/kubernetes-services.json| 2 +- .../camel/springboot/catalog/components/log.json | 4 +- .../springboot/catalog/components/mongodb.json | 6 +- .../springboot/catalog/components/nagios.json | 1 + .../camel/springboot/catalog/components/nats.json | 20 +- .../springboot/catalog/components/netty-http.json | 8 +- .../camel/springboot/catalog/components/netty.json | 8 +- .../camel/springboot/catalog/components/nsq.json | 7 +- .../springboot/catalog/components/quartz.json | 3 +- .../catalog/components/rest-swagger.json | 3 +- .../springboot/catalog/components/salesforce.json | 2 +- .../camel/springboot/catalog/components/seda.json | 2 - .../camel/springboot/catalog/components/sftp.json | 4 +- .../camel/springboot/catalog/components/stomp.json | 2 - .../camel/springboot/catalog/components/stub.json | 2 - .../springboot/catalog/components/telegram.json| 6 - .../camel/springboot/catalog/components/vm.json| 2 - .../camel/springboot/catalog/components/web3j.json | 6 +- .../springboot/catalog/components/xchange.json | 2 +- .../catalog/others/spring-cloud-consul.json| 2 +- .../catalog/others/spring-cloud-netflix.json | 2 +- .../catalog/others/spring-cloud-zookeeper.json | 2 +- .../springboot/catalog/others/spring-cloud.json| 2 +- .../springboot/ActiveMQComponentConfiguration.java | 32 - .../springboot/AMQPComponentConfiguration.java | 32 - .../springboot/LambdaComponentConfiguration.java | 12 + .../TranslateComponentConfiguration.java | 26 +- .../CassandraComponentConfiguration.java | 2 +- .../springboot/ConsulComponentConfiguration.java | 57 +- components-starter/camel-corda-starter/pom.xml | 12 + .../springboot/CordaComponentConfiguration.java| 25 +- .../HystrixConfigurationDefinitionCommon.java | 168 ++-- .../springboot/EhcacheComponentConfiguration.java | 9 +- .../HazelcastSetComponentConfiguration.java| 2 +- .../springboot/JCacheComponentConfiguration.java | 25 +- .../springboot/JiraComponentConfiguration.java | 2 +- .../jms/springboot/JmsComponentConfiguration.java | 32 - .../KubernetesServicesComponentConfiguration.java | 4 +- .../springboot/MongoDbComponentConfiguration.java | 2 +- .../springboot/NagiosComponentConfiguration.java | 18 + .../springboot/NatsComponentConfiguration.java | 13 - .../NettyHttpComponentConfiguration.java | 12 +- .../springboot/NettyComponentConfiguration.java| 18 +- .../nsq/springboot/NsqComponentConfiguration.java | 13 - .../springboot/QuartzComponentConfiguration.java | 23 +- .../camel-rest-swagger-starter/pom.xml | 8 - .../SalesforceComponentConfiguration.java | 2 +- .../springboot/SedaComponentConfiguration.java | 15 -
[camel-spring-boot] 02/03: Removed duplicated Spring Boot version property placeholder
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 6adf92c52f903bd5cc320711cba67bcf69af2139 Author: Andrea Cosentino AuthorDate: Mon Jan 20 10:04:08 2020 +0100 Removed duplicated Spring Boot version property placeholder --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9af414a..c660115 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,6 @@ 1.3.8 3.1.3 1.2.6 -2.2.2.RELEASE 2.2.1.RELEASE 2.2.1.RELEASE 2.2.1.RELEASE
[camel-spring-boot] 01/03: Upgrade Spring-boot to version 2.2.3.RELEASE
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 1273b346a07f3c8d7bcc54adff9c432ac74bf43d Author: Andrea Cosentino AuthorDate: Mon Jan 20 10:03:38 2020 +0100 Upgrade Spring-boot to version 2.2.3.RELEASE --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05f7cd6..9af414a 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ false -2.2.2.RELEASE +2.2.3.RELEASE 3.0.0
[GitHub] [camel-quarkus] oscerd commented on issue #618: Fix #617 Registerable and discoverable Camel services
oscerd commented on issue #618: Fix #617 Registerable and discoverable Camel services URL: https://github.com/apache/camel-quarkus/pull/618#issuecomment-576179119 ok to test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: Upgrade Spring-boot to version 2.2.3.RELEASE
This is an automated email from the ASF dual-hosted git repository. acosentino 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 9124b7e Upgrade Spring-boot to version 2.2.3.RELEASE 9124b7e is described below commit 9124b7ef7c559cb524c1619b3f4c228dcd3a3097 Author: Andrea Cosentino AuthorDate: Mon Jan 20 10:02:25 2020 +0100 Upgrade Spring-boot to version 2.2.3.RELEASE --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 07ede9e..4921279 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -588,7 +588,7 @@ 1.6.5.0_1 4.1.2.RELEASE 4.1.2.RELEASE_1 -2.2.2.RELEASE +2.2.3.RELEASE 2.1.10.RELEASE_1 2.1.10.RELEASE_1 2.1.10.RELEASE
[GitHub] [camel-k] nicolaferraro merged pull request #1213: chore(olm): set empty spec in CSV to pass courier validation
nicolaferraro merged pull request #1213: chore(olm): set empty spec in CSV to pass courier validation URL: https://github.com/apache/camel-k/pull/1213 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-k] branch master updated: chore(olm): set empty spec in CSV to pass courier validation
This is an automated email from the ASF dual-hosted git repository.
nferraro 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 3155e77 chore(olm): set empty spec in CSV to pass courier validation
3155e77 is described below
commit 3155e77c3c792c313e3cef3a41184907ec59f736
Author: Nicola Ferraro
AuthorDate: Fri Jan 17 14:34:16 2020 +0100
chore(olm): set empty spec in CSV to pass courier validation
---
assets/json-schema/CamelCatalog.json | 6 ++
.../1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml | 12
.../camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml | 12
3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/assets/json-schema/CamelCatalog.json
b/assets/json-schema/CamelCatalog.json
index 87aab60..341c999 100644
--- a/assets/json-schema/CamelCatalog.json
+++ b/assets/json-schema/CamelCatalog.json
@@ -33,6 +33,12 @@
"groupId": {
"type": "string"
},
+"javaTypes": {
+ "items": {
+"type": "string"
+ },
+ "type": "array"
+},
"languages": {
"items": {
"type": "string"
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
index 543eb5d..70a09f3 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
@@ -25,7 +25,8 @@ metadata:
"kind": "IntegrationPlatform",
"metadata": {
"name": "example"
-}
+},
+"spec": {}
},
{
"apiVersion": "camel.apache.org/v1",
@@ -47,21 +48,24 @@ metadata:
"kind": "IntegrationKit",
"metadata": {
"name": "example"
-}
+},
+"spec": {}
},
{
"apiVersion": "camel.apache.org/v1",
"kind": "CamelCatalog",
"metadata": {
"name": "example"
-}
+},
+"spec": {}
},
{
"apiVersion": "camel.apache.org/v1",
"kind": "Build",
"metadata": {
"name": "example"
-}
+},
+"spec": {}
}]
capabilities: Basic Install
categories: Integration & Delivery
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
index 97e04fb..8e24d3c 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-rc2-snapshot/camel-k.v1.0.0-rc2-snapshot.clusterserviceversion.yaml
@@ -25,7 +25,8 @@ metadata:
"kind": "IntegrationPlatform",
"metadata": {
"name": "example"
-}
+},
+"spec": {}
},
{
"apiVersion": "camel.apache.org/v1",
@@ -47,21 +48,24 @@ metadata:
"kind": "IntegrationKit",
"metadata": {
"name": "example"
-}
+},
+"spec": {}
},
{
"apiVersion": "camel.apache.org/v1",
"kind": "CamelCatalog",
"metadata": {
"name": "example"
-}
+},
+"spec": {}
},
{
"apiVersion": "camel.apache.org/v1",
"kind": "Build",
"metadata": {
"name": "example"
-}
+},
+"spec": {}
}]
capabilities: Basic Install
categories: Integration & Delivery
[GitHub] [camel-k] nicolaferraro closed issue #1183: Exiting dev mode returns non zero exit code
nicolaferraro closed issue #1183: Exiting dev mode returns non zero exit code URL: https://github.com/apache/camel-k/issues/1183 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] nicolaferraro merged pull request #1214: fix: Exiting dev mode returns non zero exit code
nicolaferraro merged pull request #1214: fix: Exiting dev mode returns non zero exit code URL: https://github.com/apache/camel-k/pull/1214 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-k] branch master updated: fix: Exiting dev mode returns non zero exit code
This is an automated email from the ASF dual-hosted git repository.
nferraro 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 a711871 fix: Exiting dev mode returns non zero exit code
a711871 is described below
commit a7118715eef21d50ae4550137bfa0ec508832050
Author: James Netherton
AuthorDate: Fri Jan 17 13:37:01 2020 +
fix: Exiting dev mode returns non zero exit code
fixes #1183
---
pkg/cmd/run.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 10fe7df..3df33fa 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -189,8 +189,9 @@ func (o *runCmdOptions) run(cmd *cobra.Command, args
[]string) error {
err := DeleteIntegration(o.Context, c,
integration.Name, integration.Namespace)
if err != nil {
fmt.Println(err)
+ os.Exit(1)
}
- os.Exit(1)
+ os.Exit(0)
}()
}
[camel] branch master updated: Upgrade Atmosphere to version 2.5.13
This is an automated email from the ASF dual-hosted git repository. acosentino 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 588a85a Upgrade Atmosphere to version 2.5.13 588a85a is described below commit 588a85a60010a44b7a8c947457d49f967feae9d6 Author: Andrea Cosentino AuthorDate: Mon Jan 20 09:42:20 2020 +0100 Upgrade Atmosphere to version 2.5.13 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4a75caf..07ede9e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -71,7 +71,7 @@ 1.0.0-final_1 3.0.0 3.1.0 -2.5.12 +2.5.13 [2.5,3.0) 1.0.8 1.2.1
[GitHub] [camel-quarkus] ppalaga opened a new pull request #636: Determine the Camel version at build time
ppalaga opened a new pull request #636: Determine the Camel version at build time URL: https://github.com/apache/camel-quarkus/pull/636 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] 03/03: CAMEL-13699 - Added Karaf feature Itest
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ddb5b6694d98c72ade19cc7d8d56c7c15a3d45a7
Author: Andrea Cosentino
AuthorDate: Mon Jan 20 09:12:19 2020 +0100
CAMEL-13699 - Added Karaf feature Itest
---
.../apache/camel/itest/karaf/CamelJsltTest.java| 37 ++
1 file changed, 37 insertions(+)
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsltTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsltTest.java
new file mode 100644
index 000..9fd909a
--- /dev/null
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsltTest.java
@@ -0,0 +1,37 @@
+/*
+ * 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.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelJsltTest extends BaseKarafTest {
+
+public static final String COMPONENT = extractName(CamelJsltTest.class);
+
+@Test
+public void test() throws Exception {
+testComponent(COMPONENT);
+}
+
+
+}
[camel] 02/03: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 009ff58897ab07890d330f9294040794e6dafb35 Author: Andrea Cosentino AuthorDate: Mon Jan 20 09:08:28 2020 +0100 Regen --- .../java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java | 1 + .../main/java/org/apache/camel/builder/endpoint/EndpointBuilders.java| 1 + docs/components/modules/ROOT/pages/index.adoc| 1 - 3 files changed, 2 insertions(+), 1 deletion(-) 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 677a528..1c138cd 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 @@ -181,6 +181,7 @@ public interface EndpointBuilderFactory org.apache.camel.builder.endpoint.dsl.JoltEndpointBuilderFactory.JoltBuilders, org.apache.camel.builder.endpoint.dsl.JooqEndpointBuilderFactory.JooqBuilders, org.apache.camel.builder.endpoint.dsl.JpaEndpointBuilderFactory.JpaBuilders, + org.apache.camel.builder.endpoint.dsl.JsltEndpointBuilderFactory.JsltBuilders, org.apache.camel.builder.endpoint.dsl.JsonValidatorEndpointBuilderFactory.JsonValidatorBuilders, org.apache.camel.builder.endpoint.dsl.Jt400EndpointBuilderFactory.Jt400Builders, org.apache.camel.builder.endpoint.dsl.KMSEndpointBuilderFactory.KMSBuilders, 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 f57427d..5bf800e 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 @@ -178,6 +178,7 @@ public interface EndpointBuilders org.apache.camel.builder.endpoint.dsl.JoltEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.JooqEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.JpaEndpointBuilderFactory, +org.apache.camel.builder.endpoint.dsl.JsltEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.JsonValidatorEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.Jt400EndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.KMSEndpointBuilderFactory, diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc index f038038..d32a28a 100644 --- a/docs/components/modules/ROOT/pages/index.adoc +++ b/docs/components/modules/ROOT/pages/index.adoc @@ -6,7 +6,6 @@ The following Apache Camel artifacts are provided: == Components // components: START -=== Number of Components: 310 in 248 JAR artifacts (1 deprecated) [width="100%",cols="4,1,5",options="header"]
[camel] branch master updated (aaaf838 -> ddb5b66)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from aaaf838 Upgrade Arquillian to version 1.6.0.Final new e8d45f1 CAMEL-13699 Add Json to Json transformation using JSLT new 009ff58 Regen new ddb5b66 CAMEL-13699 - Added Karaf feature Itest 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: apache-camel/pom.xml | 5 + apache-camel/src/main/descriptors/common-bin.xml | 1 + bom/camel-bom/pom.xml | 5 + components/camel-jslt/pom.xml | 75 +++ .../camel-jslt/src/main/docs/jslt-component.adoc | 169 ++ .../apache/camel/component/jslt/JsltComponent.java | 64 ++ .../apache/camel/component/jslt/JsltConstants.java | 26 +++ .../apache/camel/component/jslt/JsltEndpoint.java | 147 .../apache/camel/component/jslt/JsltBasicTest.java | 111 ++ .../camel/component/jslt/JsltFunctionsTest.java| 73 ++ .../apache/camel/component/jslt/JsltQueryTest.java | 61 + .../src/test/resources/log4j2.properties | 28 +++ .../camel/component/jslt/demoPlayground/input.json | 8 + .../component/jslt/demoPlayground/output.json | 1 + .../jslt/demoPlayground/outputPrettyPrint.json | 8 + .../jslt/demoPlayground/transformation.json| 8 + components/pom.xml | 1 + .../builder/endpoint/EndpointBuilderFactory.java | 1 + .../camel/builder/endpoint/EndpointBuilders.java | 1 + .../endpoint/dsl/JsltEndpointBuilderFactory.java | 246 + docs/components/modules/ROOT/nav.adoc | 1 + docs/components/modules/ROOT/pages/index.adoc | 4 +- .../modules/ROOT/pages/jslt-component.adoc | 170 ++ parent/pom.xml | 6 + .../karaf/features/src/main/resources/features.xml | 8 + .../apache/camel/itest/karaf/CamelJsltTest.java| 37 26 files changed, 1264 insertions(+), 1 deletion(-) create mode 100644 components/camel-jslt/pom.xml create mode 100644 components/camel-jslt/src/main/docs/jslt-component.adoc create mode 100644 components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltComponent.java create mode 100644 components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltConstants.java create mode 100644 components/camel-jslt/src/main/java/org/apache/camel/component/jslt/JsltEndpoint.java create mode 100644 components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltBasicTest.java create mode 100644 components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltFunctionsTest.java create mode 100644 components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java create mode 100644 components/camel-jslt/src/test/resources/log4j2.properties create mode 100644 components/camel-jslt/src/test/resources/org/apache/camel/component/jslt/demoPlayground/input.json create mode 100644 components/camel-jslt/src/test/resources/org/apache/camel/component/jslt/demoPlayground/output.json create mode 100644 components/camel-jslt/src/test/resources/org/apache/camel/component/jslt/demoPlayground/outputPrettyPrint.json create mode 100644 components/camel-jslt/src/test/resources/org/apache/camel/component/jslt/demoPlayground/transformation.json create mode 100644 core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JsltEndpointBuilderFactory.java create mode 100644 docs/components/modules/ROOT/pages/jslt-component.adoc create mode 100644 tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsltTest.java
[camel] 01/03: CAMEL-13699 Add Json to Json transformation using JSLT
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e8d45f1aaa9e49e71bf49368714b55d0362e94aa
Author: JiriOndrusek
AuthorDate: Wed Jan 15 16:45:36 2020 +0100
CAMEL-13699 Add Json to Json transformation using JSLT
---
apache-camel/pom.xml | 5 +
apache-camel/src/main/descriptors/common-bin.xml | 1 +
bom/camel-bom/pom.xml | 5 +
components/camel-jslt/pom.xml | 75 +++
.../camel-jslt/src/main/docs/jslt-component.adoc | 169 ++
.../apache/camel/component/jslt/JsltComponent.java | 64 ++
.../apache/camel/component/jslt/JsltConstants.java | 26 +++
.../apache/camel/component/jslt/JsltEndpoint.java | 147
.../apache/camel/component/jslt/JsltBasicTest.java | 111 ++
.../camel/component/jslt/JsltFunctionsTest.java| 73 ++
.../apache/camel/component/jslt/JsltQueryTest.java | 61 +
.../src/test/resources/log4j2.properties | 28 +++
.../camel/component/jslt/demoPlayground/input.json | 8 +
.../component/jslt/demoPlayground/output.json | 1 +
.../jslt/demoPlayground/outputPrettyPrint.json | 8 +
.../jslt/demoPlayground/transformation.json| 8 +
components/pom.xml | 1 +
.../endpoint/dsl/JsltEndpointBuilderFactory.java | 246 +
docs/components/modules/ROOT/nav.adoc | 1 +
docs/components/modules/ROOT/pages/index.adoc | 5 +-
.../modules/ROOT/pages/jslt-component.adoc | 170 ++
parent/pom.xml | 6 +
.../karaf/features/src/main/resources/features.xml | 8 +
23 files changed, 1226 insertions(+), 1 deletion(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 8789a03..3d48ab8 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -928,6 +928,11 @@
org.apache.camel
+ camel-jslt
+ ${project.version}
+
+
+ org.apache.camel
camel-json-validator
${project.version}
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 34b676be..d91b01b 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -206,6 +206,7 @@
org.apache.camel:camel-jooq
org.apache.camel:camel-jpa
org.apache.camel:camel-jsch
+org.apache.camel:camel-jslt
org.apache.camel:camel-json-validator
org.apache.camel:camel-jsonapi
org.apache.camel:camel-jsonpath
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index bd58384..a8a5525 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -964,6 +964,11 @@
org.apache.camel
+camel-jslt
+${project.version}
+
+
+org.apache.camel
camel-json-validator
${project.version}
diff --git a/components/camel-jslt/pom.xml b/components/camel-jslt/pom.xml
new file mode 100644
index 000..dd6c871
--- /dev/null
+++ b/components/camel-jslt/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/maven-v4_0_0.xsd;>
+
+4.0.0
+
+
+components
+org.apache.camel
+3.1.0-SNAPSHOT
+
+
+camel-jslt
+jar
+Camel :: Jslt
+Camel Jslt Support
+
+
+
+
+
+
+org.apache.camel
+camel-support
+
+
+
+com.schibsted.spt.data
+jslt
+${jslt-version}
+
+
+
+
+org.apache.logging.log4j
+log4j-api
+test
+
+
+org.apache.logging.log4j
+log4j-core
+test
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+test
+
+
+
+
+org.apache.camel
+camel-test
+test
+
+
+
+
diff --git a/components/camel-jslt/src/main/docs/jslt-component.adoc
b/components/camel-jslt/src/main/docs/jslt-component.adoc
new file mode 100644
index 000..827ce2a
--- /dev/null
+++ b/components/camel-jslt/src/main/docs/jslt-component.adoc
@@ -0,0 +1,169 @@
+[[jslt-component]]
+= JSLT Component
+
+*Since Camel 3.1*
+
+// HEADER START
+*Only producer is supported*
+// HEADER END
+
+The Jslt component allows you to process a JSON messages using an
+https://github.com/schibsted/jslt[JSLT] expression. This can be
+ideal when doing JSON to JSON transformation or querying data.
+
+Maven users will need to add the following dependency to
+their `pom.xml` for this component:
+
