[camel-k] 01/04: chore(jolokia): Default to using service signing certificate authority
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c58f9732efe7bb9673adb31cc2e4f2f93468ef50
Author: Antonin Stefanutti
AuthorDate: Mon Jan 13 10:13:59 2020 +0100
chore(jolokia): Default to using service signing certificate authority
---
pkg/trait/jolokia.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index 9972b1a..bc8c37e 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -90,7 +90,7 @@ func (t *jolokiaTrait) Configure(e *Environment) (bool,
error) {
// Configure HTTPS by default for OpenShift
if e.DetermineProfile() == v1.TraitProfileOpenShift {
setDefaultJolokiaOption(options, , "protocol",
"https")
- setDefaultJolokiaOption(options, , "caCert",
"/var/run/secrets/kubernetes.io/serviceaccount/ca.crt")
+ setDefaultJolokiaOption(options, , "caCert",
"/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt")
setDefaultJolokiaOption(options, ,
"extendedClientCheck", true)
setDefaultJolokiaOption(options, ,
"clientPrincipal", "cn=system:master-proxy")
setDefaultJolokiaOption(options, ,
"useSslClientAuthentication", true)
[camel-k] 03/04: feat(jolokia): Automatically add camel-management dependency
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 707b7f4e38b9f4127a10f47360fdc7ce37125915
Author: Antonin Stefanutti
AuthorDate: Mon Jan 13 14:17:48 2020 +0100
feat(jolokia): Automatically add camel-management dependency
---
pkg/trait/jolokia.go | 25 +
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index 1e63040..60f6022 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -22,10 +22,11 @@ import (
"strconv"
"strings"
+ corev1 "k8s.io/api/core/v1"
+
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/envvar"
-
- corev1 "k8s.io/api/core/v1"
)
// The Jolokia trait activates and configures the Jolokia Java agent.
@@ -78,6 +79,10 @@ func newJolokiaTrait() *jolokiaTrait {
}
}
+func (t *jolokiaTrait) isEnabled() bool {
+ return t.Enabled != nil && *t.Enabled
+}
+
func (t *jolokiaTrait) Configure(e *Environment) (bool, error) {
options, err := parseCsvMap(t.Options)
if err != nil {
@@ -95,10 +100,22 @@ func (t *jolokiaTrait) Configure(e *Environment) (bool,
error) {
setDefaultJolokiaOption(options, ,
"useSslClientAuthentication", true)
}
- return e.IntegrationInPhase(v1.IntegrationPhaseDeploying,
v1.IntegrationPhaseRunning), nil
+ return e.IntegrationInPhase(
+ v1.IntegrationPhaseInitialization,
+ v1.IntegrationPhaseDeploying,
+ v1.IntegrationPhaseRunning,
+ ), nil
}
func (t *jolokiaTrait) Apply(e *Environment) (err error) {
+ if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
+ if t.isEnabled() {
+ // Add Camel management dependency
+
util.StringSliceUniqueAdd(,
"mvn:org.apache.camel/camel-management")
+ }
+ return nil
+ }
+
containerName := defaultContainerName
dt := e.Catalog.GetTrait(containerTraitID)
if dt != nil {
@@ -116,7 +133,7 @@ func (t *jolokiaTrait) Apply(e *Environment) (err error) {
return nil
}
- if t.Enabled == nil || !*t.Enabled {
+ if !t.isEnabled() {
// Deactivate the Jolokia Java agent
// Note: the AB_JOLOKIA_OFF environment variable acts as an
option flag
envvar.SetVal(, "AB_JOLOKIA_OFF", "true")
[camel-k] 02/04: feat(jolokia): Add default client principals for OpenShift 4
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f19bd194cd8b3a06ec9aff709b0d3ba894bc5e90
Author: Antonin Stefanutti
AuthorDate: Mon Jan 13 12:43:34 2020 +0100
feat(jolokia): Add default client principals for OpenShift 4
---
pkg/trait/jolokia.go | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index bc8c37e..1e63040 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -92,7 +92,6 @@ func (t *jolokiaTrait) Configure(e *Environment) (bool,
error) {
setDefaultJolokiaOption(options, , "protocol",
"https")
setDefaultJolokiaOption(options, , "caCert",
"/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt")
setDefaultJolokiaOption(options, ,
"extendedClientCheck", true)
- setDefaultJolokiaOption(options, ,
"clientPrincipal", "cn=system:master-proxy")
setDefaultJolokiaOption(options, ,
"useSslClientAuthentication", true)
}
@@ -136,7 +135,16 @@ func (t *jolokiaTrait) Apply(e *Environment) (err error) {
// Then add explicitly set trait configuration properties
addToJolokiaOptions(options, "caCert", t.CaCert)
- addToJolokiaOptions(options, "clientPrincipal", t.ClientPrincipal)
+ if options["clientPrincipal"] == "" && t.ClientPrincipal == nil &&
e.DetermineProfile() == v1.TraitProfileOpenShift {
+ // TODO: simplify when trait array options are supported
+ // Master API proxy for OpenShift 3
+ addToJolokiaOptions(options, "clientPrincipal.1",
"cn=system:master-proxy")
+ // Default Hawtio and Fuse consoles for OpenShift 4
+ addToJolokiaOptions(options, "clientPrincipal.2",
"cn=hawtio-online.hawtio.svc")
+ addToJolokiaOptions(options, "clientPrincipal.3",
"cn=fuse-console.fuse.svc")
+ } else {
+ addToJolokiaOptions(options, "clientPrincipal",
t.ClientPrincipal)
+ }
addToJolokiaOptions(options, "discoveryEnabled", t.DiscoveryEnabled)
addToJolokiaOptions(options, "extendedClientCheck",
t.ExtendedClientCheck)
addToJolokiaOptions(options, "host", t.Host)
@@ -211,5 +219,9 @@ func addToJolokiaOptions(options map[string]string, key
string, value interface{
if v != nil {
options[key] = *v
}
+ case string:
+ if v != "" {
+ options[key] = v
+ }
}
}
[camel-k] 04/04: Fix Jolokia trait unit test
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 1d3881570293c2685a84471e1bcc03d76c457be9 Author: Antonin Stefanutti AuthorDate: Mon Jan 13 14:35:03 2020 +0100 Fix Jolokia trait unit test --- pkg/trait/jolokia_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/trait/jolokia_test.go b/pkg/trait/jolokia_test.go index 858da87..bbaf4e4 100644 --- a/pkg/trait/jolokia_test.go +++ b/pkg/trait/jolokia_test.go @@ -77,9 +77,8 @@ func TestConfigureJolokiaTraitForOpenShiftProfileShouldSetDefaultHttpsJolokiaOpt assert.Nil(t, err) assert.True(t, configured) assert.Equal(t, *trait.Protocol, "https") - assert.Equal(t, *trait.CaCert, "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt") + assert.Equal(t, *trait.CaCert, "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt") assert.Equal(t, *trait.ExtendedClientCheck, true) - assert.Equal(t, *trait.ClientPrincipal, "cn=system:master-proxy") assert.Equal(t, *trait.UseSslClientAuthentication, true) }
[camel-k] branch master updated (8518467 -> 1d38815)
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 8518467 Upgrade Operator SDK to version 0.14.0 new c58f973 chore(jolokia): Default to using service signing certificate authority new f19bd19 feat(jolokia): Add default client principals for OpenShift 4 new 707b7f4 feat(jolokia): Automatically add camel-management dependency new 1d38815 Fix Jolokia trait unit test 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: pkg/trait/jolokia.go | 43 --- pkg/trait/jolokia_test.go | 3 +-- 2 files changed, 37 insertions(+), 9 deletions(-)
[GitHub] [camel-k] astefanutti merged pull request #1193: Jolokia trait improvements
astefanutti merged pull request #1193: Jolokia trait improvements URL: https://github.com/apache/camel-k/pull/1193 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: Polished a bit
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 0789fb0 Polished a bit
0789fb0 is described below
commit 0789fb00d8256bbb6cb86f6c80708930cdefe737
Author: Claus Ibsen
AuthorDate: Tue Jan 14 07:18:47 2020 +0100
Polished a bit
---
.../src/main/java/org/apache/camel/support/PropertyBindingSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index 4a7aca2..66e1b06 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -353,7 +353,7 @@ public final class PropertyBindingSupport {
Object value = entry.getValue();
// skip based on some known names
-if ("basicPropertyBinding".equals(key)) {
+if ("basicPropertyBinding".equals(key) ||
"bridgeErrorHandler".equals(key) || "lazyStartProducer".equals(key)) {
continue;
}
[camel] branch master updated: CAMEL-14354: camel-core - Optimize
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 863ff5a CAMEL-14354: camel-core - Optimize
863ff5a is described below
commit 863ff5ad48061b580e9e6e753e2432179d2cc981
Author: Claus Ibsen
AuthorDate: Tue Jan 14 07:03:57 2020 +0100
CAMEL-14354: camel-core - Optimize
---
.../camel/spi/CamelInternalProcessorAdvice.java| 7 +++
.../camel/processor/CamelInternalProcessor.java| 55 +++---
.../org/apache/camel/processor/ContractAdvice.java | 7 ++-
3 files changed, 61 insertions(+), 8 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/CamelInternalProcessorAdvice.java
b/core/camel-api/src/main/java/org/apache/camel/spi/CamelInternalProcessorAdvice.java
index 85728ee..3572a90 100644
---
a/core/camel-api/src/main/java/org/apache/camel/spi/CamelInternalProcessorAdvice.java
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/CamelInternalProcessorAdvice.java
@@ -47,4 +47,11 @@ public interface CamelInternalProcessorAdvice {
*/
void after(Exchange exchange, T data) throws Exception;
+/**
+ * Whether this advice has state or not.
+ */
+default boolean hasState() {
+return true;
+}
+
}
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 f005d68..9be15bb 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
@@ -90,7 +90,10 @@ import org.slf4j.LoggerFactory;
*/
public class CamelInternalProcessor extends DelegateAsyncProcessor {
+private static final Object[] EMPTY_STATES = new Object[0];
+
private final List> advices = new
ArrayList<>();
+private byte statefulAdvices;
public CamelInternalProcessor() {
}
@@ -108,6 +111,10 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
advices.add(advice);
// ensure advices are sorted so they are in the order we want
advices.sort(OrderedComparator.get());
+
+if (advice.hasState()) {
+statefulAdvices++;
+}
}
/**
@@ -148,14 +155,16 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
return true;
}
-// optimise to use object array for states
-final Object[] states = new Object[advices.size()];
+// optimise to use object array for states, and only for the number of
advices that keep state
+final Object[] states = statefulAdvices > 0 ? new
Object[statefulAdvices] : EMPTY_STATES;
// optimise for loop using index access to avoid creating iterator
object
-for (int i = 0; i < advices.size(); i++) {
+for (int i = 0, j = 0; i < advices.size(); i++) {
CamelInternalProcessorAdvice task = advices.get(i);
try {
Object state = task.before(exchange);
-states[i] = state;
+if (task.hasState()) {
+states[j++] = state;
+}
} catch (Throwable e) {
exchange.setException(e);
originalCallback.done(true);
@@ -166,9 +175,12 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
// create internal callback which will execute the advices in reverse
order when done
AsyncCallback callback = doneSync -> {
try {
-for (int i = advices.size() - 1; i >= 0; i--) {
+for (int i = advices.size() - 1, j = states.length - 1; i >=
0; i--) {
CamelInternalProcessorAdvice task = advices.get(i);
-Object state = states[i];
+Object state = null;
+if (task.hasState()) {
+state = states[j--];
+}
try {
task.after(exchange, state);
} catch (Throwable e) {
@@ -306,6 +318,11 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
uow.afterRoute(exchange, route);
}
}
+
+@Override
+public boolean hasState() {
+return false;
+}
}
/**
@@ -331,6 +348,11 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
public void after(Exchange exchange, Object state) throws Exception {
inflightRepository.remove(exchange, id);
}
+
+@Override
+public boolean hasState() {
+return false;
+}
}
/**
@@ -406,6 +428,11 @@ public class
[camel] 01/02: 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 9f7fcb5e159a0fc5c7f936fd0740b7236654d9b1
Author: Claus Ibsen
AuthorDate: Mon Jan 13 21:47:00 2020 +0100
Polished
---
.../src/main/java/org/apache/camel/support/EventHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
index 8a3e2ef..3f6a937 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
@@ -1371,7 +1371,7 @@ public final class EventHelper {
try {
notifier.notify(event);
} catch (Throwable e) {
-LOG.warn("Error notifying event " + event + ". This exception will
be ignored. ", e);
+LOG.warn("Error notifying event " + event + ". This exception will
be ignored.", e);
}
return true;
[camel] branch master updated (a0462f0 -> 50b33b7)
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 a0462f0 CAMEL-14354: camel-core - Optimize new 9f7fcb5 Polished new 50b33b7 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: .../java/org/apache/camel/support/EventHelper.java | 2 +- .../modules/ROOT/pages/cron-component.adoc | 6 ++--- docs/components/modules/ROOT/pages/spring.adoc | 26 ++ 3 files changed, 30 insertions(+), 4 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 50b33b7e00cc9d5c4da7ebe8b49308633797d4b1 Author: Claus Ibsen AuthorDate: Tue Jan 14 05:31:44 2020 +0100 Regen --- .../modules/ROOT/pages/cron-component.adoc | 6 ++--- docs/components/modules/ROOT/pages/spring.adoc | 26 ++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/docs/components/modules/ROOT/pages/cron-component.adoc b/docs/components/modules/ROOT/pages/cron-component.adoc index 3c5b6cd..1d337b02 100644 --- a/docs/components/modules/ROOT/pages/cron-component.adoc +++ b/docs/components/modules/ROOT/pages/cron-component.adoc @@ -16,7 +16,8 @@ the implementation of their choice. The following standard Camel components support the Cron endpoints: -- Quartz +- Camel-quartz +- Camel-spring The Cron component is also supported in **Camel K**, which can use the Kubernetes scheduler to trigger the routes when required by the cron expression. Camel K does not require additional libraries to be plugged when using cron expressions compatible with Kubernetes cron syntax. @@ -40,7 +41,7 @@ Additional libraries may be needed in order to plug a specific implementation. // component options: START -The Cron component supports 4 options, which are listed below. +The Cron component supports 3 options, which are listed below. @@ -49,7 +50,6 @@ The Cron component supports 4 options, which are listed below. | Name | Description | Default | Type | *cronService* (advanced) | The id of the CamelCronService to use when multiple implementations are provided | | String | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean -| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *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 |=== // component options: END diff --git a/docs/components/modules/ROOT/pages/spring.adoc b/docs/components/modules/ROOT/pages/spring.adoc index 22680a9..65a5e6c 100644 --- a/docs/components/modules/ROOT/pages/spring.adoc +++ b/docs/components/modules/ROOT/pages/spring.adoc @@ -380,3 +380,29 @@ Integration] for further injections. To avoid a hung route when testing using Spring Transactions see the note about Spring Integration Testing under Transactional Client. +== Cron Component Support + +Camel-spring can be used as implementation of the Camel Cron component. + + +Maven users will need to add the following additional dependency to their `pom.xml`: + +[source,xml] + + +org.apache.camel +camel-cron +x.x.x + + + + +Users can then use the cron component inside routes of their Spring or Spring-boot application: + +[source,xml] + + + + + +
[camel] branch master updated: CAMEL-14354: camel-core - Optimize
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 a0462f0 CAMEL-14354: camel-core - Optimize
a0462f0 is described below
commit a0462f0caea149e14cf061df6e9183f1fefaab47
Author: Claus Ibsen
AuthorDate: Mon Jan 13 21:41:55 2020 +0100
CAMEL-14354: camel-core - Optimize
---
.../java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
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 04e41f2..abcdc4a 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
@@ -58,7 +58,7 @@ public class DefaultUnitOfWork implements UnitOfWork, Service
{
// requires API changes and thus is best kept for Camel 3.0
private String id;
-private CamelContext context;
+private final CamelContext context;
private List synchronizations;
private Message originalInMessage;
private Set transactedBy;
@@ -98,7 +98,7 @@ public class DefaultUnitOfWork implements UnitOfWork, Service
{
}
// inject breadcrumb header if enabled
-if (exchange.getContext().isUseBreadcrumb()) {
+if (context.isUseBreadcrumb()) {
// create or use existing breadcrumb
String breadcrumbId =
exchange.getIn().getHeader(Exchange.BREADCRUMB_ID, String.class);
if (breadcrumbId == null) {
@@ -121,16 +121,14 @@ public class DefaultUnitOfWork implements UnitOfWork,
Service {
// fire event
try {
-EventHelper.notifyExchangeCreated(exchange.getContext(), exchange);
+EventHelper.notifyExchangeCreated(context, exchange);
} catch (Throwable e) {
// must catch exceptions to ensure the exchange is not failing due
to notification event failed
log.warn("Exception occurred during event notification. This
exception will be ignored.", e);
}
// register to inflight registry
-if (exchange.getContext() != null) {
-exchange.getContext().getInflightRepository().add(exchange);
-}
+context.getInflightRepository().add(exchange);
}
UnitOfWork newInstance(Exchange exchange) {
@@ -287,7 +285,7 @@ public class DefaultUnitOfWork implements UnitOfWork,
Service {
@Override
public boolean isTransactedBy(Object key) {
-return getTransactedBy().contains(key);
+return transactedBy != null && getTransactedBy().contains(key);
}
@Override
[camel] 02/02: CAMEL-14354: camel-core - Optimize
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 dd972bfddf080ae30ba1634949350e8d92364586
Author: Claus Ibsen
AuthorDate: Mon Jan 13 21:10:46 2020 +0100
CAMEL-14354: camel-core - Optimize
---
.../camel/processor/CamelInternalProcessor.java | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
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 a685085..f005d68 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
@@ -50,6 +50,7 @@ import org.apache.camel.spi.Synchronization;
import org.apache.camel.spi.Tracer;
import org.apache.camel.spi.Transformer;
import org.apache.camel.spi.UnitOfWork;
+import org.apache.camel.spi.UnitOfWorkFactory;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.MessageHelper;
import org.apache.camel.support.OrderedComparator;
@@ -544,11 +545,13 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
private final RouteContext routeContext;
private String routeId;
+private UnitOfWorkFactory uowFactory;
public UnitOfWorkProcessorAdvice(RouteContext routeContext) {
this.routeContext = routeContext;
if (routeContext != null) {
this.routeId = routeContext.getRouteId();
+this.uowFactory =
routeContext.getCamelContext().adapt(ExtendedCamelContext.class).getUnitOfWorkFactory();
}
}
@@ -601,7 +604,11 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
}
protected UnitOfWork createUnitOfWork(Exchange exchange) {
-return
exchange.getContext().adapt(ExtendedCamelContext.class).getUnitOfWorkFactory().createUnitOfWork(exchange);
+if (uowFactory != null) {
+return uowFactory.createUnitOfWork(exchange);
+} else {
+return
exchange.getContext().adapt(ExtendedCamelContext.class).getUnitOfWorkFactory().createUnitOfWork(exchange);
+}
}
}
@@ -644,12 +651,6 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
@Override
public MessageHistory before(Exchange exchange) throws Exception {
-List list =
exchange.getProperty(Exchange.MESSAGE_HISTORY, List.class);
-if (list == null) {
-list = new LinkedList<>();
-exchange.setProperty(Exchange.MESSAGE_HISTORY, list);
-}
-
// we may be routing outside a route in an onException or
interceptor and if so then grab
// route id from the exchange UoW state
String targetRouteId = this.routeId;
@@ -662,6 +663,11 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
MessageHistory history = factory.newMessageHistory(targetRouteId,
definition, System.currentTimeMillis(), exchange);
if (history != null) {
+List list =
exchange.getProperty(Exchange.MESSAGE_HISTORY, List.class);
+if (list == null) {
+list = new LinkedList<>();
+exchange.setProperty(Exchange.MESSAGE_HISTORY, list);
+}
list.add(history);
}
return history;
[camel] branch master updated (01a7ffa -> dd972bf)
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 01a7ffa Upgrade Netty to version 4.1.45.Final new c881a84 CAMEL-14354: camel-core - Optimize new dd972bf CAMEL-14354: camel-core - Optimize The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/processor/CamelInternalProcessor.java | 20 +--- .../java/org/apache/camel/support/ObjectHelper.java | 4 +++- 2 files changed, 16 insertions(+), 8 deletions(-)
[camel] 01/02: CAMEL-14354: camel-core - Optimize
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 c881a849e9dd80cc23046517fb2ff151a8bfaa92
Author: Claus Ibsen
AuthorDate: Mon Jan 13 20:30:48 2020 +0100
CAMEL-14354: camel-core - Optimize
---
.../src/main/java/org/apache/camel/support/ObjectHelper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
index bae4ac5..b9d79dd 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java
@@ -202,7 +202,9 @@ public final class ObjectHelper {
*/
public static Object invokeMethodSafe(Method method, Object instance,
Object... parameters) throws InvocationTargetException, IllegalAccessException {
Object answer;
-method.setAccessible(true);
+if (!method.isAccessible()) {
+method.setAccessible(true);
+}
if (parameters != null) {
answer = method.invoke(instance, parameters);
} else {
[camel] branch master updated: Upgrade Netty to version 4.1.45.Final
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 01a7ffa Upgrade Netty to version 4.1.45.Final 01a7ffa is described below commit 01a7ffa6208af24dbb45d61f81d5caa4701cb6ba Author: Andrea Cosentino AuthorDate: Mon Jan 13 21:23:12 2020 +0100 Upgrade Netty to version 4.1.45.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a0b2e87..2baaddb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -478,7 +478,7 @@ 1.0.0.RC4 0.4.0 3.10.6.Final -4.1.44.Final +4.1.45.Final 2.0.3 4.0.56.Final 1.0.29
[GitHub] [camel-k] davesargrad opened a new issue #1196: Performance Question On Camel-K
davesargrad opened a new issue #1196: Performance Question On Camel-K URL: https://github.com/apache/camel-k/issues/1196 We are looking at a system where we will need to run hundreds, perhaps even thousands, of camel-k integrations. I am trying to understand the overhead associated with a single camel-k integration. I'm assuming that 100 integrations would result in 100 instances of a camel-k based pod. This means each pod would require a single JVM, hence 100 JVM instances. I could envision an alternative architectural approach that would perform the same 100 functions in a single pod, as long as that pod is running all 100 routes. Is it possible to create an integration that implements N routes, rather than a single route per integration? Can you please help us to understand the way to most efficiently architect a camel-k based solution that must perform the equivalent of 100's or 1000's of routes? What are some of the things that you can offer us relative to helping us come up with an appropriate performance focused camel-k based architecture? I'm interested in understanding how to architect the system to find the right architectural balance with a focus on vCPU and RAM resources. 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 #613: Create a camel-websocket-jsr356 extension
lburgazzoli commented on issue #613: Create a camel-websocket-jsr356 extension URL: https://github.com/apache/camel-quarkus/issues/613#issuecomment-573780535 if the workaround is not too complex I'd go for the workaround and oyu are free to implement also camel-ahc-ws :) 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] davsclaus commented on issue #617: Build time Camel service resolution
davsclaus commented on issue #617: Build time Camel service resolution URL: https://github.com/apache/camel-quarkus/issues/617#issuecomment-573768756 the configurers are source code generated and loaded from classpath and as such these are not looked up anywhere. So its because you are doing something "different" in quarkus. 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 #617: Build time Camel service resolution
ppalaga commented on issue #617: Build time Camel service resolution URL: https://github.com/apache/camel-quarkus/issues/617#issuecomment-573765094 Filed https://issues.apache.org/jira/browse/CAMEL-14397 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 #617: Build time Camel service resolution
lburgazzoli commented on issue #617: Build time Camel service resolution URL: https://github.com/apache/camel-quarkus/issues/617#issuecomment-573758834 mh strange, I think that code should be fixed unless @davsclaus did it on purpose. 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-runtime] branch master updated (c703ea5 -> c117db0)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. from c703ea5 Merge pull request #223 from nicolaferraro/cron add 0894c7c [maven-release-plugin] prepare release camel-k-runtime-parent-1.0.10 new c117db0 [maven-release-plugin] prepare for next development iteration The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-k-loader-groovy/pom.xml | 2 +- camel-k-loader-java/pom.xml | 2 +- camel-k-loader-js/pom.xml | 2 +- camel-k-loader-knative/pom.xml| 2 +- camel-k-loader-kotlin/pom.xml | 2 +- camel-k-loader-xml/pom.xml| 2 +- camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml| 2 +- camel-k-loader-yaml/camel-k-loader-yaml/pom.xml | 2 +- camel-k-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-knative/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/runtime/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/it/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-runtime-quarkus/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/runtime/pom.xml | 2 +- camel-k-quarkus/pom.xml | 2 +- camel-k-runtime-bom/pom.xml | 2 +- camel-k-runtime-core/pom.xml | 2 +- camel-k-runtime-cron/pom.xml | 5 ++--- camel-k-runtime-health/pom.xml| 2 +- camel-k-runtime-knative/pom.xml | 2 +- camel-k-runtime-main/pom.xml | 2 +- camel-k-runtime-servlet/pom.xml | 2 +- camel-k-runtime-webhook/pom.xml | 2 +- camel-knative/camel-knative-api/pom.xml | 2 +- camel-knative/camel-knative-http/pom.xml | 2 +- camel-knative/camel-knative/pom.xml | 2 +- camel-knative/pom.xml | 2 +- distribution/pom.xml | 2 +- examples/camel-k-runtime-example-health/pom.xml | 2 +-
[camel-k-runtime] annotated tag camel-k-runtime-parent-1.0.10 created (now e1a5407)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to annotated tag camel-k-runtime-parent-1.0.10 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. at e1a5407 (tag) tagging 0894c7c4a04090c00e11b29b369a4c0eb7e7447c (commit) replaces camel-k-runtime-parent-1.0.9 by Nicola Ferraro on Mon Jan 13 17:44:03 2020 +0100 - Log - [maven-release-plugin] copy for tag camel-k-runtime-parent-1.0.10 --- This annotated tag includes the following new commits: new 0894c7c [maven-release-plugin] prepare release camel-k-runtime-parent-1.0.10 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-k-runtime] 01/01: [maven-release-plugin] prepare release camel-k-runtime-parent-1.0.10
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to annotated tag camel-k-runtime-parent-1.0.10 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 0894c7c4a04090c00e11b29b369a4c0eb7e7447c Author: Nicola Ferraro AuthorDate: Mon Jan 13 17:40:08 2020 +0100 [maven-release-plugin] prepare release camel-k-runtime-parent-1.0.10 --- camel-k-loader-groovy/pom.xml | 2 +- camel-k-loader-java/pom.xml | 2 +- camel-k-loader-js/pom.xml | 2 +- camel-k-loader-knative/pom.xml| 2 +- camel-k-loader-kotlin/pom.xml | 2 +- camel-k-loader-xml/pom.xml| 2 +- camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml| 2 +- camel-k-loader-yaml/camel-k-loader-yaml/pom.xml | 2 +- camel-k-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-knative/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/runtime/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/it/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-runtime-quarkus/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/runtime/pom.xml | 2 +- camel-k-quarkus/pom.xml | 2 +- camel-k-runtime-bom/pom.xml | 4 ++-- camel-k-runtime-core/pom.xml | 2 +- camel-k-runtime-cron/pom.xml | 5 ++--- camel-k-runtime-health/pom.xml| 2 +- camel-k-runtime-knative/pom.xml | 2 +- camel-k-runtime-main/pom.xml | 2 +- camel-k-runtime-servlet/pom.xml | 2 +- camel-k-runtime-webhook/pom.xml | 2 +- camel-knative/camel-knative-api/pom.xml | 2 +- camel-knative/camel-knative-http/pom.xml | 2 +- camel-knative/camel-knative/pom.xml | 2 +- camel-knative/pom.xml | 2 +- distribution/pom.xml | 2 +- examples/camel-k-runtime-example-health/pom.xml | 2 +- examples/camel-k-runtime-example-knative/pom.xml | 2 +- examples/camel-k-runtime-example-quarkus-groovy/pom.xml | 2 +- examples/camel-k-runtime-example-quarkus-java/pom.xml | 2 +- examples/camel-k-runtime-example-quarkus-js/pom.xml | 2 +-
[camel] branch master updated (28b34ab -> cc8b286)
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 28b34ab Camel 3 migration guide: camel-rx component was removed new 0d6fa3f CAMEL-14354: camel-core - Optimize unnecessary object allocations. EventHelper no longer create objects new 1a25fc8 CAMEL-14354: camel-core - Optimize unnecessary object allocations. ReactiveExecutor no longer creates object for callback API. new cc8b286 CAMEL-14354: camel-core - Optimize 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: .../main/java/org/apache/camel/AsyncCallback.java |9 +- .../org/apache/camel/spi/ReactiveExecutor.java | 25 +- .../camel/impl/engine/DefaultReactiveExecutor.java | 14 - .../camel/processor/CamelInternalProcessor.java|2 +- .../apache/camel/processor/MulticastProcessor.java |2 +- .../java/org/apache/camel/processor/Pipeline.java |2 +- .../processor/SharedCamelInternalProcessor.java|2 +- .../errorhandler/RedeliveryErrorHandler.java | 10 +- .../java/org/apache/camel/support/EventHelper.java | 1432 +--- .../camel/support/processor/CamelLogProcessor.java |8 +- 10 files changed, 1271 insertions(+), 235 deletions(-)
[camel] 02/03: CAMEL-14354: camel-core - Optimize unnecessary object allocations. ReactiveExecutor no longer creates object for callback API.
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 1a25fc8175b8fd9464ba1e44c69b61b161d7ba07
Author: Claus Ibsen
AuthorDate: Mon Jan 13 17:13:21 2020 +0100
CAMEL-14354: camel-core - Optimize unnecessary object allocations.
ReactiveExecutor no longer creates object for callback API.
---
.../main/java/org/apache/camel/AsyncCallback.java | 9 +++-
.../org/apache/camel/spi/ReactiveExecutor.java | 25 +++---
.../camel/impl/engine/DefaultReactiveExecutor.java | 14
.../camel/processor/CamelInternalProcessor.java| 2 +-
.../apache/camel/processor/MulticastProcessor.java | 2 +-
.../java/org/apache/camel/processor/Pipeline.java | 2 +-
.../processor/SharedCamelInternalProcessor.java| 2 +-
.../errorhandler/RedeliveryErrorHandler.java | 10 -
8 files changed, 20 insertions(+), 46 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/AsyncCallback.java
b/core/camel-api/src/main/java/org/apache/camel/AsyncCallback.java
index 2d9f33f..d0c3e5d 100644
--- a/core/camel-api/src/main/java/org/apache/camel/AsyncCallback.java
+++ b/core/camel-api/src/main/java/org/apache/camel/AsyncCallback.java
@@ -25,7 +25,7 @@ package org.apache.camel;
* routing {@link Exchange} when all the data has been gathered. This allows
to build non blocking
* request/reply communication.
*/
-public interface AsyncCallback {
+public interface AsyncCallback extends Runnable {
/**
* This method is invoked once the {@link Exchange} is done.
@@ -38,4 +38,11 @@ public interface AsyncCallback {
*/
void done(boolean doneSync);
+/**
+ * Optimized for the reactive executor engine to be able to schedule this
callback in its engine.
+ */
+@Override
+default void run() {
+done(false);
+}
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java
b/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java
index fc3c4de..eb0df12 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ReactiveExecutor.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.spi;
-import org.apache.camel.AsyncCallback;
-
/**
* SPI to plugin different reactive engines in the Camel routing engine.
*/
@@ -36,6 +34,7 @@ public interface ReactiveExecutor {
* @param runnablethe task
* @param description a human readable description for logging purpose
*/
+@Deprecated
void schedule(Runnable runnable, String description);
/**
@@ -51,6 +50,7 @@ public interface ReactiveExecutor {
* @param runnablethe task
* @param description a human readable description for logging purpose
*/
+@Deprecated
void scheduleMain(Runnable runnable, String description);
/**
@@ -66,6 +66,7 @@ public interface ReactiveExecutor {
* @param runnablethe task
* @param description a human readable description for logging purpose
*/
+@Deprecated
void scheduleSync(Runnable runnable, String description);
/**
@@ -75,24 +76,4 @@ public interface ReactiveExecutor {
*/
boolean executeFromQueue();
-/**
- * Schedules the callback to be run
- *
- * @param callbackthe callable
- */
-default void callback(AsyncCallback callback) {
-schedule(new Runnable() {
-
-@Override
-public void run() {
-callback.done(false);
-}
-
-@Override
-public String toString() {
-return "Callback[" + callback + "]";
-}
-});
-}
-
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
index 7be0a46..b12b8f4 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
@@ -110,20 +110,6 @@ public class DefaultReactiveExecutor extends
ServiceSupport implements ReactiveE
return pendingTasks.get();
}
-@Override
-public void callback(AsyncCallback callback) {
-schedule(new Runnable() {
-@Override
-public void run() {
-callback.done(false);
-}
-@Override
-public String toString() {
-return "Callback[" + callback + "]";
-}
-});
-}
-
private static Runnable describe(Runnable runnable, String description) {
return new Runnable() {
@Override
diff --git
[camel] 03/03: CAMEL-14354: camel-core - Optimize
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 cc8b2861b1de05ba61f88d8258b04ebf852c25d3
Author: Claus Ibsen
AuthorDate: Mon Jan 13 17:33:36 2020 +0100
CAMEL-14354: camel-core - Optimize
---
.../org/apache/camel/support/processor/CamelLogProcessor.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
b/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
index 064b505..1656688 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
@@ -44,7 +44,7 @@ public class CamelLogProcessor extends AsyncProcessorSupport
implements IdAware,
private CamelLogger logger;
private ExchangeFormatter formatter;
private MaskingFormatter maskingFormatter;
-private Set listeners;
+private final Set listeners;
public CamelLogProcessor() {
this(new CamelLogger(CamelLogProcessor.class.getName()));
@@ -53,10 +53,12 @@ public class CamelLogProcessor extends
AsyncProcessorSupport implements IdAware,
public CamelLogProcessor(CamelLogger logger) {
this.formatter = new ToStringExchangeFormatter();
this.logger = logger;
+this.listeners = null;
}
public CamelLogProcessor(CamelLogger logger, ExchangeFormatter formatter,
MaskingFormatter maskingFormatter, Set listeners) {
-this(logger);
+this.formatter = new ToStringExchangeFormatter();
+this.logger = logger;
this.formatter = formatter;
this.maskingFormatter = maskingFormatter;
this.listeners = listeners;
@@ -124,7 +126,7 @@ public class CamelLogProcessor extends
AsyncProcessorSupport implements IdAware,
}
private String fireListeners(Exchange exchange, String message) {
-if (listeners == null) {
+if (listeners == null || listeners.isEmpty()) {
return message;
}
for (LogListener listener : listeners) {
[camel] 01/03: CAMEL-14354: camel-core - Optimize unnecessary object allocations. EventHelper no longer create objects
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 0d6fa3f7df94a2a9c1399d61ad6cc3cda6ba
Author: Claus Ibsen
AuthorDate: Mon Jan 13 16:23:48 2020 +0100
CAMEL-14354: camel-core - Optimize unnecessary object allocations.
EventHelper no longer create objects
---
.../java/org/apache/camel/support/EventHelper.java | 1432 +---
1 file changed, 1246 insertions(+), 186 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
index fb0b8f9..8a3e2ef 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -17,247 +17,270 @@
package org.apache.camel.support;
import java.util.List;
-import java.util.function.Function;
-import java.util.function.Predicate;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Route;
+import org.apache.camel.StatefulService;
import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.EventFactory;
import org.apache.camel.spi.EventNotifier;
import org.apache.camel.spi.ManagementStrategy;
-import org.apache.camel.support.service.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Helper for easily sending event notifications in a single line of code
+ *
*/
public final class EventHelper {
+// This implementation has been optimized to be as fast and not create
unnecessary objects or lambdas.
+// So therefore there is some code that seems duplicated. But this code is
used frequently during routing and should
+// be left as-is.
+
private static final Logger LOG =
LoggerFactory.getLogger(EventHelper.class);
private EventHelper() {
}
public static boolean notifyCamelContextStarting(CamelContext context) {
-return doNotify(context,
-factory -> factory.createCamelContextStartingEvent(context),
-EventNotifier::isIgnoreCamelContextEvents);
-}
-
-public static boolean notifyCamelContextStarted(CamelContext context) {
-return doNotify(context,
-factory -> factory.createCamelContextStartedEvent(context),
-EventNotifier::isIgnoreCamelContextEvents);
-}
-
-public static boolean notifyCamelContextStartupFailed(CamelContext
context, Throwable cause) {
-return doNotify(context,
-factory -> factory.createCamelContextStartupFailureEvent(context,
cause),
-EventNotifier::isIgnoreCamelContextEvents);
-}
-
-public static boolean notifyCamelContextStopping(CamelContext context) {
-return doNotify(context,
-factory -> factory.createCamelContextStoppingEvent(context),
-EventNotifier::isIgnoreCamelContextEvents);
-}
-
-public static boolean notifyCamelContextStopped(CamelContext context) {
-return doNotify(context,
-factory -> factory.createCamelContextStoppedEvent(context),
-EventNotifier::isIgnoreCamelContextEvents);
-}
-
-public static boolean notifyCamelContextRoutesStarting(CamelContext
context) {
-return doNotify(context,
-factory -> factory.createCamelContextRoutesStartingEvent(context),
-EventNotifier::isIgnoreCamelContextEvents);
-}
-
-public static boolean notifyCamelContextRoutesStarted(CamelContext
context) {
-return doNotify(context,
-factory -> factory.createCamelContextRoutesStartedEvent(context),
-EventNotifier::isIgnoreCamelContextEvents);
-}
+ManagementStrategy management = context.getManagementStrategy();
+if (management == null) {
+return false;
+}
-public static boolean notifyCamelContextRoutesStopping(CamelContext
context) {
-return doNotify(context,
-factory -> factory.createCamelContextRoutesStoppingEvent(context),
-EventNotifier::isIgnoreCamelContextEvents);
-}
+EventFactory factory = management.getEventFactory();
+if (factory == null) {
+return false;
+}
-public static boolean notifyCamelContextRoutesStopped(CamelContext
context) {
-return doNotify(context,
-factory -> factory.createCamelContextRoutesStoppedEvent(context),
-EventNotifier::isIgnoreCamelContextEvents);
-}
+List notifiers = management.getEventNotifiers();
[GitHub] [camel-quarkus] ppalaga commented on issue #617: Build time Camel service resolution
ppalaga commented on issue #617: Build time Camel service resolution URL: https://github.com/apache/camel-quarkus/issues/617#issuecomment-573755212 No, it checks only the FactoryFinder https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java#L408-L422 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 #617: Build time Camel service resolution
lburgazzoli commented on issue #617: Build time Camel service resolution URL: https://github.com/apache/camel-quarkus/issues/617#issuecomment-573754643 as far as I can remember the resolution always checks the registry and after the factory finder, this is how component, languages and other bits are actually resolved if does not it seems an error but I remember it should be already the case for the configurer 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-runtime] branch master updated (ae29e97 -> c703ea5)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.
from ae29e97 Merge pull request #221 from apache/deps
new 49cd31c Fix #222: initial implementation of native cron support
new 7538b7a Fix #222: second attempt using runtime listener
new 6dc1007 Fix #222: shutting down the runtime instead of the Camel
context
new c703ea5 Merge pull request #223 from nicolaferraro/cron
The 500 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-k-runtime-bom/pom.xml| 5 ++
.../src/main/java/org/apache/camel/k/Runtime.java | 8 +++
.../pom.xml| 22 ++
.../camel/k/cron/CronRoutePolicyFactory.java | 72 +++
.../apache/camel/k/cron/CronRuntimeListener.java | 82 ++
.../services/org.apache.camel.k.Runtime$Listener | 2 +-
.../java/org/apache/camel/k/cron/CronTest.java | 81 +
.../src/test/resources/log4j2-test.xml | 2 +-
.../src/test/resources/routes-quartz.js| 5 +-
.../src/test/resources/routes-timer.js | 5 +-
.../apache/camel/k/main/ApplicationRuntime.java| 3 +-
pom.xml| 1 +
12 files changed, 263 insertions(+), 25 deletions(-)
copy {camel-k-runtime-webhook => camel-k-runtime-cron}/pom.xml (87%)
create mode 100644
camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronRoutePolicyFactory.java
create mode 100644
camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronRuntimeListener.java
copy
camel-k-runtime-main/src/test/resources/META-INF/services/org/apache/camel/k/customizer/test
=>
camel-k-runtime-cron/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
(94%)
create mode 100644
camel-k-runtime-cron/src/test/java/org/apache/camel/k/cron/CronTest.java
copy {camel-k-runtime-health =>
camel-k-runtime-cron}/src/test/resources/log4j2-test.xml (98%)
copy camel-k-loader-groovy/src/test/resources/routes.groovy =>
camel-k-runtime-cron/src/test/resources/routes-quartz.js (89%)
copy camel-k-loader-groovy/src/test/resources/routes.groovy =>
camel-k-runtime-cron/src/test/resources/routes-timer.js (89%)
[GitHub] [camel-k-runtime] nicolaferraro closed issue #222: Native support for CronJob: convert cron endpoints to fire once at startup
nicolaferraro closed issue #222: Native support for CronJob: convert cron endpoints to fire once at startup URL: https://github.com/apache/camel-k-runtime/issues/222 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 #617: Build time Camel service resolution
ppalaga commented on issue #617: Build time Camel service resolution URL: https://github.com/apache/camel-quarkus/issues/617#issuecomment-573750337 > I think all those services are already available from the registry I also suspected this might be true but I was not able to conceive any possibility how this fact could help. Maybe you mean that [DefaultComponent.doInit()](https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java#L408-L422) should prefer getting the configurers from the registry instead of from FactoryFinder? 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-runtime] nicolaferraro merged pull request #223: Fix #222: initial implementation of native cron support
nicolaferraro merged pull request #223: Fix #222: initial implementation of native cron support URL: https://github.com/apache/camel-k-runtime/pull/223 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 #617: Build time Camel service resolution
lburgazzoli commented on issue #617: Build time Camel service resolution URL: https://github.com/apache/camel-quarkus/issues/617#issuecomment-573735391 I think all those services are already available from the registry 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 issue #617: Build time Camel service resolution
ppalaga opened a new issue #617: Build time Camel service resolution URL: https://github.com/apache/camel-quarkus/issues/617 I stumbled upon this when I was rebasing my telegram branch on top of the current Camel master. It did not work because the endpoint and component configurers were not found. Those are currently looked up at runtime by inspecting the files in `META-INF/services/org/apache/camel/configurer` and we do not add them to the native image. Clearly, the problem could be solved by adding `META-INF/services/org/apache/camel/configurer` & co. to the native image, but that kind of solution would not utilize the full potential of Quarkus build time augmentation. I am currently having a PoC that provides a camel-quarkus specific implementation of FactoryFinderResolver. It resolves the services based on a single map that is filled at build time. I wonder whether anybody can think of a better strategy here? I'll share my code when I get all tests 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] jamesnetherton commented on issue #613: Create a camel-websocket-jsr356 extension
jamesnetherton commented on issue #613: Create a camel-websocket-jsr356 extension URL: https://github.com/apache/camel-quarkus/issues/613#issuecomment-573718266 It is possible. Would need to override and extend some bits of the component internals. 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-runtime] nicolaferraro commented on a change in pull request #223: Fix #222: initial implementation of native cron support
nicolaferraro commented on a change in pull request #223: Fix #222: initial
implementation of native cron support
URL: https://github.com/apache/camel-k-runtime/pull/223#discussion_r365863121
##
File path:
camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronRoutePolicyFactory.java
##
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.cron;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.NamedNode;
+import org.apache.camel.Route;
+import org.apache.camel.spi.RoutePolicy;
+import org.apache.camel.spi.RoutePolicyFactory;
+import org.apache.camel.support.RoutePolicySupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A RoutePolicyFactory that shuts the context down after the first exchange
has been done.
+ */
+public class CronRoutePolicyFactory implements RoutePolicyFactory {
+
+public CronRoutePolicyFactory() {
+}
+
+@Override
+public RoutePolicy createRoutePolicy(CamelContext camelContext, String
routeId, NamedNode route) {
+return new CronRoutePolicy(camelContext);
+}
+
+private static class CronRoutePolicy extends RoutePolicySupport {
+
+private static final Logger LOG =
LoggerFactory.getLogger(CronRoutePolicy.class);
+
+private final CamelContext context;
+
+public CronRoutePolicy(CamelContext context) {
+this.context = context;
+}
+
+@Override
+public void onExchangeDone(Route route, Exchange exchange) {
+LOG.info("Context shutdown started by cron policy");
+context.getExecutorServiceManager().newThread("terminator",
context::stop).start();
Review comment:
I've updated it
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-website] zregvart commented on issue #150: chore: update FOSDEM post with the social event
zregvart commented on issue #150: chore: update FOSDEM post with the social event URL: https://github.com/apache/camel-website/pull/150#issuecomment-573715553 Preview is [here](https://builds.apache.org/job/Camel.website/job/PR-150/Preview/blog/FOSDEM-2020/). 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 #613: Create a camel-websocket-jsr356 extension
lburgazzoli commented on issue #613: Create a camel-websocket-jsr356 extension URL: https://github.com/apache/camel-quarkus/issues/613#issuecomment-573709275 @jamesnetherton no hack possible ? 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-website] zregvart opened a new pull request #150: chore: update FOSDEM post with the social event
zregvart opened a new pull request #150: chore: update FOSDEM post with the social event URL: https://github.com/apache/camel-website/pull/150 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-website] branch fosdem-update created (now b057af9)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch fosdem-update in repository https://gitbox.apache.org/repos/asf/camel-website.git. at b057af9 chore: update FOSDEM post with the social event This branch includes the following new commits: new b057af9 chore: update FOSDEM post with the social event 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-website] 01/01: chore: update FOSDEM post with the social event
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch fosdem-update in repository https://gitbox.apache.org/repos/asf/camel-website.git commit b057af9be7cceb9ddb43574c0c899a971820bb56 Author: Zoran Regvart AuthorDate: Mon Jan 13 15:44:46 2020 +0100 chore: update FOSDEM post with the social event --- content/blog/FOSDEM-2020/index.md | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/content/blog/FOSDEM-2020/index.md b/content/blog/FOSDEM-2020/index.md index b4e579e..536b67d 100644 --- a/content/blog/FOSDEM-2020/index.md +++ b/content/blog/FOSDEM-2020/index.md @@ -14,9 +14,13 @@ preview: Camel will be in full force at FOSDEM 2020 FOSDEM 2020 is on 1st (from 9:30 to 19:00) and 2nd (from 9:00 to 18:00) of February. +Camel social event is on Saturday, 1st of February from 20:00 + # Where -[Université libre de Bruxelles](https://fosdem.org/2020/practical/transportation/), Campus du Solbosch, Avenue Franklin D. Roosevelt 50, 1050 Bruxelles, Belgium. +FOSDEM is at [Université libre de Bruxelles](https://fosdem.org/2020/practical/transportation/), Campus du Solbosch, Avenue Franklin D. Roosevelt 50, 1050 Bruxelles, Belgium. + +Camel social event is at [À la Mort Subite](https://www.alamortsubite.com/en/), [rue Montagne-aux-Herbes Potagères 7](https://www.openstreetmap.org/node/4480414658) # Why @@ -26,7 +30,6 @@ First, at the _Integration Process Community_ [stand](https://fosdem.org/2020/st The Camel BoF session at FOSDEM 2019 was very well received last year and we're repeating it: the [Camel birds of a feather](https://fosdem.org/2020/schedule/event/bof_apache_camel/) will be on Saturday from 11 to 12 in the room [H.3242](https://fosdem.org/2020/schedule/buildings/#h). Let's meet, discuss and exchange ideas. Anyone wishing to share can present on any topic relating to Apache Camel is welcome to do so, though please be mindful of the time - we have one hour in this session [...] -Lastly, we're planning on having a social event on Saturday a chance to wind down and discuss more in one of many Belgian pubs. Watch this space for details on that. +On Saturday evening, first day of FOSDEM, we have the social event, a chance to wind down and discuss more about Camel at À la Mort Subite a old traditional pub and brewery in the Brussels city center. I hope to see many of you at FOSDEM 2020! -
[GitHub] [camel-k] davsclaus closed issue #1187: Resource group endpoints is that a left over from old Camel version
davsclaus closed issue #1187: Resource group endpoints is that a left over from old Camel version URL: https://github.com/apache/camel-k/issues/1187 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] davsclaus commented on issue #1187: Resource group endpoints is that a left over from old Camel version
davsclaus commented on issue #1187: Resource group endpoints is that a left over from old Camel version URL: https://github.com/apache/camel-k/issues/1187#issuecomment-573694376 Okay yeah it doesnt have any api group that says camel 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: Camel 3 migration guide: camel-rx component was removed
This is an automated email from the ASF dual-hosted git repository. jpoth 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 28b34ab Camel 3 migration guide: camel-rx component was removed 28b34ab is described below commit 28b34abcdc962e0cc18ab8020475452aaf8bb543 Author: John Poth AuthorDate: Mon Jan 13 15:30:36 2020 +0100 Camel 3 migration guide: camel-rx component was removed --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index 758df6b..ea84705 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -151,7 +151,7 @@ The implementation is still named `org.apache.camel.component.properties.Propert === Removed components -We have removed all deprecated components from Camel 2.x, including the old `camel-http`, `camel-hdfs`, `camel-mina`, `camel-mongodb`, `camel-netty`, `camel-netty-http`, `camel-quartz` and `camel-rxjava` components. +We have removed all deprecated components from Camel 2.x, including the old `camel-http`, `camel-hdfs`, `camel-mina`, `camel-mongodb`, `camel-netty`, `camel-netty-http`, `camel-quartz` and `camel-rx` components. We removed `camel-jibx` component which wasn't working on JDK 8.
[GitHub] [camel-k] nicolaferraro opened a new issue #1195: Add build information when printing integration logs
nicolaferraro opened a new issue #1195: Add build information when printing integration logs URL: https://github.com/apache/camel-k/issues/1195 Currently when we run `--dev` mode or with `--logs` or just with the command `kamel log`, we just print pod information. We can also add build information if the integration is waiting for a build to be completed. 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 opened a new issue #1194: Add `kamel logs` alias
nicolaferraro opened a new issue #1194: Add `kamel logs` alias URL: https://github.com/apache/camel-k/issues/1194 Other than `kamel log` 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] jamesnetherton commented on issue #613: Create a camel-websocket-jsr356 extension
jamesnetherton commented on issue #613: Create a camel-websocket-jsr356 extension URL: https://github.com/apache/camel-quarkus/issues/613#issuecomment-573682624 As the producer part of this component is currently [broken](https://issues.apache.org/jira/browse/CAMEL-14390), is it worth me implementing an extension for `camel-ahc-ws` until the fix is available? 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 opened a new pull request #1193: Jolokia trait improvements
astefanutti opened a new pull request #1193: Jolokia trait improvements URL: https://github.com/apache/camel-k/pull/1193 **Release Note** ```release-note feat(jolokia): Support auto-configuration for OpenShift 4 feat(jolokia): Automatically adds the camel-management dependency ``` 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: CAMEL-14168 mention removal of camel-linkedin component in the camel3 migration guide
This is an automated email from the ASF dual-hosted git repository. jpoth 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 dc383a1 CAMEL-14168 mention removal of camel-linkedin component in the camel3 migration guide dc383a1 is described below commit dc383a1a1152c7bb1e3ab3a418b8295142f3eae9 Author: John Poth AuthorDate: Mon Jan 13 10:41:59 2020 +0100 CAMEL-14168 mention removal of camel-linkedin component in the camel3 migration guide --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index 7dc117a..758df6b 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -157,6 +157,8 @@ We removed `camel-jibx` component which wasn't working on JDK 8. We removed `camel-boon` dataformat which wasn't working on JDK 9 and later. +We removed the `camel-linkedin` component as the Linkedin API 1.0 is no longer https://engineering.linkedin.com/blog/2018/12/developer-program-updates[supported]. Support for the new 2.0 API is tracked by https://issues.apache.org/jira/browse/CAMEL-13813[CAMEL-13813]. + The `camel-zookeeper` has its route policy functionality removed, instead use `ZooKeeperClusterService` or the `camel-zookeeper-master` component. The `camel-jetty` component no longer supports producer (eg to) which has been removed, use `camel-http` component instead.
[camel] 01/08: CAMEL-14385: add a camel-cron component
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.git
commit 40690e59a8b490b0ac14371162fb9e703a1226a7
Author: Nicola Ferraro
AuthorDate: Fri Jan 10 12:33:56 2020 +0100
CAMEL-14385: add a camel-cron component
---
components/{camel-quartz => camel-cron}/pom.xml| 75 ++-
.../camel-cron/src/main/docs/cron-component.adoc | 135
.../apache/camel/component/cron/CronComponent.java | 109 ++
.../apache/camel/component/cron/CronEndpoint.java | 105 +
.../apache/camel/component/cron/CronHelper.java| 65 ++
.../component/cron/api/CamelCronConfiguration.java | 66 ++
.../camel/component/cron/api/CamelCronService.java | 29 +++
.../camel/component/cron/CronLoaderTest.java | 46
.../camel/component/cron/CronPatternsTest.java | 79 +++
.../component/cron/DummyCamelCronService.java | 51 +
...pache.camel.component.cron.api.CamelCronService | 18 ++
.../src/test/resources/log4j2.properties | 33 +++
components/camel-quartz/pom.xml| 5 +
.../src/main/docs/quartz-component.adoc| 25 +++
.../quartz/cron/CamelQuartzCronService.java| 72 +++
...pache.camel.component.cron.api.CamelCronService | 18 ++
.../quartz/cron/QuartzCronMappingTest.java | 87
.../component/quartz/cron/QuartzCronRouteTest.java | 45
components/pom.xml | 1 +
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../endpoint/dsl/CronEndpointBuilderFactory.java | 235 +
parent/pom.xml | 5 +
.../karaf/features/src/main/resources/features.xml | 4 +
.../apache/camel/itest/karaf/CamelCronTest.java| 33 +++
24 files changed, 1288 insertions(+), 54 deletions(-)
diff --git a/components/camel-quartz/pom.xml b/components/camel-cron/pom.xml
similarity index 58%
copy from components/camel-quartz/pom.xml
copy to components/camel-cron/pom.xml
index 6575113..7881656 100644
--- a/components/camel-quartz/pom.xml
+++ b/components/camel-cron/pom.xml
@@ -26,37 +26,31 @@
3.1.0-SNAPSHOT
-camel-quartz
+camel-cron
jar
-Camel :: Quartz
-Camel Quartz support
+Camel :: Cron
+Camel Cron Component
+
+
+
+
+
org.apache.camel
-camel-support
-
-
-org.quartz-scheduler
-quartz
-${quartz-version}
-
-
-c3p0
-c3p0
-
-
-
-
-com.mchange
-c3p0
-${c3p0-version}
+camel-core-engine
-junit
-junit
+org.apache.camel
+camel-test
+test
+
+
+org.apache.camel
+camel-timer
test
@@ -75,43 +69,16 @@
test
-org.apache.camel
-camel-test-spring
-test
-
-
-org.apache.commons
-commons-dbcp2
-test
-
-
-
-
-org.apache.derby
-derby
-test
-
-
-org.springframework
-spring-jdbc
+junit
+junit
test
-org.springframework
-spring-context-support
+org.assertj
+assertj-core
+${assertj-version}
test
-
-
-
-maven-surefire-plugin
-
-1
-false
-
-
-
-
diff --git a/components/camel-cron/src/main/docs/cron-component.adoc
b/components/camel-cron/src/main/docs/cron-component.adoc
new file mode 100644
index 000..aa991e2
--- /dev/null
+++ b/components/camel-cron/src/main/docs/cron-component.adoc
@@ -0,0 +1,135 @@
+[[cron-component]]
+= Cron Component
+
+*Since Camel 3.1*
+
+// HEADER START
+*Only consumer is supported*
+// HEADER END
+
+The Cron component is a generic interface component that allows triggering
events at specific time interval
+specified using the Unix cron syntax (e.g. `0/2 * * * * ?` to trigger an event
every two seconds).
+
+Being an interface component, the Cron component does not contain a default
implementation, instead it requires that the users plug
+the implementation of their choice.
+
+The following standard Camel components support the Cron endpoints:
+
+- Quartz
+
+The Cron component is also supported in **Camel K**, which can use the
Kubernetes scheduler to trigger the routes when required by the cron expression.
+Camel K does not
[camel] 04/08: CAMEL-14385: remove commented config
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.git
commit 2ba3c2e1ece4807a331e7118b2e4ec852cbd7fbd
Author: Nicola Ferraro
AuthorDate: Fri Jan 10 15:29:46 2020 +0100
CAMEL-14385: remove commented config
---
components/camel-cron/src/test/resources/log4j2.properties | 5 -
1 file changed, 5 deletions(-)
diff --git a/components/camel-cron/src/test/resources/log4j2.properties
b/components/camel-cron/src/test/resources/log4j2.properties
index 760a00b..a79c79b 100644
--- a/components/camel-cron/src/test/resources/log4j2.properties
+++ b/components/camel-cron/src/test/resources/log4j2.properties
@@ -26,8 +26,3 @@ appender.stdout.layout.type = PatternLayout
appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
rootLogger.level = INFO
rootLogger.appenderRef.file.ref = file
-
-#rootLogger.appenderRef.stdout.ref = stdout
-#logger.debug.name = org.apache.camel.component.cron
-#logger.debug.level = DEBUG
-#logger.debug.additivity = true
[camel] 02/08: CAMEL-14385: update docs and manifests for camel-cron component
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.git
commit 8a067cafe51a4d0035775b92c4152e2339b48501
Author: Nicola Ferraro
AuthorDate: Fri Jan 10 13:06:51 2020 +0100
CAMEL-14385: update docs and manifests for camel-cron component
---
apache-camel/pom.xml | 5 +
apache-camel/src/main/descriptors/common-bin.xml | 1 +
bom/camel-bom/pom.xml | 5 +
docs/components/modules/ROOT/nav.adoc | 1 +
.../modules/ROOT/pages/cron-component.adoc | 136 +
docs/components/modules/ROOT/pages/index.adoc | 4 +-
.../modules/ROOT/pages/quartz-component.adoc | 25
7 files changed, 176 insertions(+), 1 deletion(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index ab2edaa..fa0d4e1 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -433,6 +433,11 @@
org.apache.camel
+ camel-cron
+ ${project.version}
+
+
+ org.apache.camel
camel-crypto
${project.version}
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 3ef7e8b..533bdb5 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -107,6 +107,7 @@
org.apache.camel:camel-corda
org.apache.camel:camel-couchbase
org.apache.camel:camel-couchdb
+org.apache.camel:camel-cron
org.apache.camel:camel-crypto
org.apache.camel:camel-crypto-cms
org.apache.camel:camel-csv
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index f72ecdd..a639b8e 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -439,6 +439,11 @@
org.apache.camel
+camel-cron
+${project.version}
+
+
+org.apache.camel
camel-crypto
${project.version}
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index 0b5c531..c1493ff 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -76,6 +76,7 @@
* xref:corda-component.adoc[Corda Component]
* xref:couchbase-component.adoc[Couchbase Component]
* xref:couchdb-component.adoc[CouchDB Component]
+* xref:cron-component.adoc[Cron Component]
* xref:crypto-cms-component.adoc[Crypto CMS Component (deprecated)]
* xref:crypto-component.adoc[Crypto (JCE) Component]
* xref:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension) DataFormat]
diff --git a/docs/components/modules/ROOT/pages/cron-component.adoc
b/docs/components/modules/ROOT/pages/cron-component.adoc
new file mode 100644
index 000..3c5b6cd
--- /dev/null
+++ b/docs/components/modules/ROOT/pages/cron-component.adoc
@@ -0,0 +1,136 @@
+[[cron-component]]
+= Cron Component
+:page-source: components/camel-cron/src/main/docs/cron-component.adoc
+
+*Since Camel 3.1*
+
+// HEADER START
+*Only consumer is supported*
+// HEADER END
+
+The Cron component is a generic interface component that allows triggering
events at specific time interval
+specified using the Unix cron syntax (e.g. `0/2 * * * * ?` to trigger an event
every two seconds).
+
+Being an interface component, the Cron component does not contain a default
implementation, instead it requires that the users plug
+the implementation of their choice.
+
+The following standard Camel components support the Cron endpoints:
+
+- Quartz
+
+The Cron component is also supported in **Camel K**, which can use the
Kubernetes scheduler to trigger the routes when required by the cron expression.
+Camel K does not require additional libraries to be plugged when using cron
expressions compatible with Kubernetes cron syntax.
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+
+
+org.apache.camel
+camel-cron
+x.x.x
+
+
+
+
+Additional libraries may be needed in order to plug a specific implementation.
+
+== Options
+
+
+// component options: START
+The Cron component supports 4 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *cronService* (advanced) | The id of the CamelCronService to use when
multiple implementations are provided | | String
+| *basicPropertyBinding* (advanced) | Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
+| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and
[camel] 03/08: CAMEL-14385: add more tests
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.git
commit 247cf9cc9a12a1fa584f61dba6f7e1c05a0a5816
Author: Nicola Ferraro
AuthorDate: Fri Jan 10 13:30:38 2020 +0100
CAMEL-14385: add more tests
---
.../apache/camel/component/cron/CronComponent.java | 4 +++
.../camel/component/cron/CronLoaderTest.java | 40 ++
.../component/cron/DummyCamelCronService.java | 12 ++-
.../src/test/resources/log4j2.properties | 4 +--
4 files changed, 51 insertions(+), 9 deletions(-)
diff --git
a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
index acc6e8f..19192fc 100644
---
a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
+++
b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
@@ -83,6 +83,10 @@ public class CronComponent extends DefaultComponent {
}
}
+public CamelCronService getService() {
+return service;
+}
+
public String getCronService() {
return cronService;
}
diff --git
a/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronLoaderTest.java
b/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronLoaderTest.java
index 79bb1d5..ad11413 100644
---
a/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronLoaderTest.java
+++
b/components/camel-cron/src/test/java/org/apache/camel/component/cron/CronLoaderTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.cron;
-import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.cron.api.CamelCronService;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -26,21 +26,49 @@ public class CronLoaderTest extends CamelTestSupport {
@Test
public void testDummyCronServiceLoading() throws Exception {
+configureRoutes();
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("x");
+
+context.start();
mock.assertIsSatisfied();
}
-@Override
-protected RoutesBuilder createRouteBuilder() throws Exception {
-return new RouteBuilder() {
+@Test
+public void testPreferRegistryOverServiceLoading() throws Exception {
+context.getRegistry().bind("dummy2", new
DummyCamelCronService("dummy2"));
+configureRoutes();
+context.start();
+assertEquals("dummy2", getCamelCronService().getId());
+}
+
+@Test
+public void testUseNamesWhenLoading() throws Exception {
+context.getRegistry().bind("dummy2", new
DummyCamelCronService("dummy2"));
+context.getRegistry().bind("dummy3", new
DummyCamelCronService("dummy3"));
+configureRoutes();
+context.getComponent("cron",
CronComponent.class).setCronService("dummy3");
+context.start();
+assertEquals("dummy3", getCamelCronService().getId());
+}
+
+private CamelCronService getCamelCronService() {
+return context.getComponent("cron", CronComponent.class).getService();
+}
+
+private void configureRoutes() throws Exception {
+context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
from("cron:tab?schedule=0/1 * * * * ?")
.setBody().constant("x")
.to("mock:result");
-
}
-};
+});
+}
+
+@Override
+public boolean isUseRouteBuilder() {
+return false;
}
}
diff --git
a/components/camel-cron/src/test/java/org/apache/camel/component/cron/DummyCamelCronService.java
b/components/camel-cron/src/test/java/org/apache/camel/component/cron/DummyCamelCronService.java
index cfe49d0..7ff262c 100644
---
a/components/camel-cron/src/test/java/org/apache/camel/component/cron/DummyCamelCronService.java
+++
b/components/camel-cron/src/test/java/org/apache/camel/component/cron/DummyCamelCronService.java
@@ -27,6 +27,16 @@ public class DummyCamelCronService implements
CamelCronService, CamelContextAwar
private CamelContext camelContext;
+private String id;
+
+public DummyCamelCronService() {
+this("dummy");
+}
+
+public DummyCamelCronService(String id) {
+this.id = id;
+}
+
@Override
public Endpoint createEndpoint(CamelCronConfiguration configuration)
throws Exception {
TimerComponent timerComponent = camelContext.getComponent("timer",
TimerComponent.class);
@@ -35,7 +45,7 @@ public class DummyCamelCronService implements
CamelCronService, CamelContextAwar
[GitHub] [camel-k-runtime] nicolaferraro commented on a change in pull request #223: Fix #222: initial implementation of native cron support
nicolaferraro commented on a change in pull request #223: Fix #222: initial
implementation of native cron support
URL: https://github.com/apache/camel-k-runtime/pull/223#discussion_r365757076
##
File path:
camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronRoutePolicyFactory.java
##
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.cron;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.NamedNode;
+import org.apache.camel.Route;
+import org.apache.camel.spi.RoutePolicy;
+import org.apache.camel.spi.RoutePolicyFactory;
+import org.apache.camel.support.RoutePolicySupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A RoutePolicyFactory that shuts the context down after the first exchange
has been done.
+ */
+public class CronRoutePolicyFactory implements RoutePolicyFactory {
+
+public CronRoutePolicyFactory() {
+}
+
+@Override
+public RoutePolicy createRoutePolicy(CamelContext camelContext, String
routeId, NamedNode route) {
+return new CronRoutePolicy(camelContext);
+}
+
+private static class CronRoutePolicy extends RoutePolicySupport {
+
+private static final Logger LOG =
LoggerFactory.getLogger(CronRoutePolicy.class);
+
+private final CamelContext context;
+
+public CronRoutePolicy(CamelContext context) {
+this.context = context;
+}
+
+@Override
+public void onExchangeDone(Route route, Exchange exchange) {
+LOG.info("Context shutdown started by cron policy");
+context.getExecutorServiceManager().newThread("terminator",
context::stop).start();
Review comment:
Yeah, sounds good!
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] 05/08: CAMEL-14385: moving initialization to doStart
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.git
commit 72c1f118be4ca9ae479b42175e605991390d6471
Author: Nicola Ferraro
AuthorDate: Mon Jan 13 10:10:42 2020 +0100
CAMEL-14385: moving initialization to doStart
---
.../main/java/org/apache/camel/component/cron/CronComponent.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
index 19192fc..9c90b7d 100644
---
a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
+++
b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
@@ -43,8 +43,6 @@ public class CronComponent extends DefaultComponent {
@Override
public Endpoint createEndpoint(String uri, String remaining, Map properties) throws Exception {
-initCamelCronService();
-
CamelCronConfiguration configuration = new CamelCronConfiguration();
configuration.setName(remaining);
setProperties(configuration, properties);
@@ -61,10 +59,15 @@ public class CronComponent extends DefaultComponent {
return cronEndpoint;
}
+@Override
+protected void doStart() throws Exception {
+initCamelCronService();
+}
+
/**
* Lazy creation of the CamelCronService
*/
-public synchronized void initCamelCronService() {
+public void initCamelCronService() {
if (this.service == null) {
this.service = CronHelper.resolveCamelCronService(
getCamelContext(),
[camel] 06/08: CAMEL-14385: support cron component in camel-spring
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.git
commit b91d58609a4b94ffb87908c105429b26981d2469
Author: Nicola Ferraro
AuthorDate: Mon Jan 13 10:11:10 2020 +0100
CAMEL-14385: support cron component in camel-spring
---
.../camel-cron/src/main/docs/cron-component.adoc | 3 +-
components/camel-spring/pom.xml| 5 ++
components/camel-spring/src/main/docs/spring.adoc | 26 +
.../component/cron/CamelSpringCronService.java | 62 ++
.../camel/component/cron/SpringCronConsumer.java | 36 +
.../camel/component/cron/SpringCronEndpoint.java | 42 +++
...pache.camel.component.cron.api.CamelCronService | 18 +++
.../camel/component/cron/SpringCronRouteTest.java | 41 ++
.../org/apache/camel/component/cron/cron.xml | 36 +
9 files changed, 268 insertions(+), 1 deletion(-)
diff --git a/components/camel-cron/src/main/docs/cron-component.adoc
b/components/camel-cron/src/main/docs/cron-component.adoc
index aa991e2..b4d2288 100644
--- a/components/camel-cron/src/main/docs/cron-component.adoc
+++ b/components/camel-cron/src/main/docs/cron-component.adoc
@@ -15,7 +15,8 @@ the implementation of their choice.
The following standard Camel components support the Cron endpoints:
-- Quartz
+- Camel-quartz
+- Camel-spring
The Cron component is also supported in **Camel K**, which can use the
Kubernetes scheduler to trigger the routes when required by the cron expression.
Camel K does not require additional libraries to be plugged when using cron
expressions compatible with Kubernetes cron syntax.
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 75a83b3..a061848 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -54,6 +54,11 @@
camel-core-xml
+org.apache.camel
+camel-cron
+true
+
+
org.springframework
spring-core
diff --git a/components/camel-spring/src/main/docs/spring.adoc
b/components/camel-spring/src/main/docs/spring.adoc
index b3c9a37..cb9dbc9 100644
--- a/components/camel-spring/src/main/docs/spring.adoc
+++ b/components/camel-spring/src/main/docs/spring.adoc
@@ -379,3 +379,29 @@ Integration] for further injections.
To avoid a hung route when testing using Spring Transactions see the
note about Spring Integration Testing under Transactional Client.
+== Cron Component Support
+
+Camel-spring can be used as implementation of the Camel Cron component.
+
+
+Maven users will need to add the following additional dependency to their
`pom.xml`:
+
+[source,xml]
+
+
+org.apache.camel
+camel-cron
+x.x.x
+
+
+
+
+Users can then use the cron component inside routes of their Spring or
Spring-boot application:
+
+[source,xml]
+
+
+
+
+
+
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/component/cron/CamelSpringCronService.java
b/components/camel-spring/src/main/java/org/apache/camel/component/cron/CamelSpringCronService.java
new file mode 100644
index 000..723fa1e
--- /dev/null
+++
b/components/camel-spring/src/main/java/org/apache/camel/component/cron/CamelSpringCronService.java
@@ -0,0 +1,62 @@
+/*
+ * 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.cron;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.cron.api.CamelCronConfiguration;
+import org.apache.camel.component.cron.api.CamelCronService;
+
+/**
+ * Allows camel-spring to be used as implementation for camel-cron endpoints.
+ */
+public class CamelSpringCronService implements CamelCronService,
CamelContextAware {
+
+private CamelContext context;
+
+@Override
+public Endpoint
[camel] branch master updated (67d3c3e -> 2a9c609)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 67d3c3e Regen docs
new 40690e5 CAMEL-14385: add a camel-cron component
new 8a067ca CAMEL-14385: update docs and manifests for camel-cron
component
new 247cf9c CAMEL-14385: add more tests
new 2ba3c2e CAMEL-14385: remove commented config
new 72c1f11 CAMEL-14385: moving initialization to doStart
new b91d586 CAMEL-14385: support cron component in camel-spring
new 5d4ee62 CAMEL-14385: fix configure consumer
new 2a9c609 CAMEL-14385: switch to factory finder
The 8 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-quartz => camel-cron}/pom.xml| 72 ++-
.../camel-cron/src/main/docs/cron-component.adoc | 135
.../apache/camel/component/cron/CronComponent.java | 116 ++
.../apache/camel/component/cron/CronEndpoint.java | 107 ++
.../apache/camel/component/cron/CronHelper.java| 63 ++
.../component/cron/api/CamelCronConfiguration.java | 66 ++
.../camel/component/cron/api/CamelCronService.java | 29 +++
.../camel/component/cron/CronLoaderTest.java | 74 +++
.../camel/component/cron/CronPatternsTest.java | 79 +++
.../component/cron/DummyCamelCronService.java | 61 ++
.../services/org/apache/camel/cron/cron-service| 17 ++
.../src/test/resources/log4j2.properties | 28 +++
components/camel-quartz/pom.xml| 5 +
.../src/main/docs/quartz-component.adoc| 25 +++
.../quartz/cron/CamelQuartzCronService.java| 72 +++
.../services/org/apache/camel/cron/cron-service| 17 ++
.../quartz/cron/QuartzCronMappingTest.java | 87
.../component/quartz/cron/QuartzCronRouteTest.java | 45
components/camel-spring/pom.xml| 5 +
components/camel-spring/src/main/docs/spring.adoc | 26 +++
.../component/cron/CamelSpringCronService.java | 62 ++
.../camel/component/cron/SpringCronConsumer.java | 36
.../camel/component/cron/SpringCronEndpoint.java | 42
.../services/org/apache/camel/cron/cron-service| 17 ++
.../camel/component/cron/SpringCronRouteTest.java | 41
.../org/apache/camel/component/cron/cron.xml | 36
components/pom.xml | 1 +
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../endpoint/dsl/CronEndpointBuilderFactory.java | 235 +
docs/components/modules/ROOT/nav.adoc | 1 +
.../modules/ROOT/pages/cron-component.adoc | 136
docs/components/modules/ROOT/pages/index.adoc | 4 +-
.../modules/ROOT/pages/quartz-component.adoc | 25 +++
parent/pom.xml | 5 +
.../karaf/features/src/main/resources/features.xml | 4 +
.../apache/camel/itest/karaf/CamelCronTest.java| 33 +++
39 files changed, 1765 insertions(+), 54 deletions(-)
copy components/{camel-quartz => camel-cron}/pom.xml (59%)
create mode 100644 components/camel-cron/src/main/docs/cron-component.adoc
create mode 100644
components/camel-cron/src/main/java/org/apache/camel/component/cron/CronComponent.java
create mode 100644
components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
create mode 100644
components/camel-cron/src/main/java/org/apache/camel/component/cron/CronHelper.java
create mode 100644
components/camel-cron/src/main/java/org/apache/camel/component/cron/api/CamelCronConfiguration.java
create mode 100644
components/camel-cron/src/main/java/org/apache/camel/component/cron/api/CamelCronService.java
create mode 100644
components/camel-cron/src/test/java/org/apache/camel/component/cron/CronLoaderTest.java
create mode 100644
components/camel-cron/src/test/java/org/apache/camel/component/cron/CronPatternsTest.java
create mode 100644
components/camel-cron/src/test/java/org/apache/camel/component/cron/DummyCamelCronService.java
create mode 100644
components/camel-cron/src/test/resources/META-INF/services/org/apache/camel/cron/cron-service
create mode 100644 components/camel-cron/src/test/resources/log4j2.properties
create mode 100644
components/camel-quartz/src/main/java/org/apache/camel/component/quartz/cron/CamelQuartzCronService.java
create mode 100644
components/camel-quartz/src/main/resources/META-INF/services/org/apache/camel/cron/cron-service
create mode 100644
[camel] 07/08: CAMEL-14385: fix configure consumer
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.git
commit 5d4ee623587081f9c6f5eb151f23eba67945e346
Author: Nicola Ferraro
AuthorDate: Mon Jan 13 10:24:23 2020 +0100
CAMEL-14385: fix configure consumer
---
.../src/main/java/org/apache/camel/component/cron/CronEndpoint.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
index d1ed013..41dbcec 100644
---
a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
+++
b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronEndpoint.java
@@ -55,7 +55,9 @@ public class CronEndpoint extends DefaultEndpoint implements
DelegateEndpoint {
@Override
public Consumer createConsumer(Processor processor) throws Exception {
-return delegate.createConsumer(processor);
+Consumer consumer = delegate.createConsumer(processor);
+configureConsumer(consumer);
+return consumer;
}
public CamelCronConfiguration getConfiguration() {
[camel] 08/08: CAMEL-14385: switch to factory finder
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.git
commit 2a9c6099ef9cee84f1352f47b58553cb29e77987
Author: Nicola Ferraro
AuthorDate: Mon Jan 13 11:09:57 2020 +0100
CAMEL-14385: switch to factory finder
---
components/camel-cron/pom.xml | 3 +--
.../camel-cron/src/main/docs/cron-component.adoc | 3 +--
.../apache/camel/component/cron/CronHelper.java| 28 ++
.../camel/component/cron/CronLoaderTest.java | 2 +-
.../apache/camel/cron/cron-service}| 3 +--
.../apache/camel/cron/cron-service}| 3 +--
.../apache/camel/cron/cron-service}| 3 +--
7 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/components/camel-cron/pom.xml b/components/camel-cron/pom.xml
index 7881656..1ca57c2 100644
--- a/components/camel-cron/pom.xml
+++ b/components/camel-cron/pom.xml
@@ -36,10 +36,9 @@
-
org.apache.camel
-camel-core-engine
+camel-support
diff --git a/components/camel-cron/src/main/docs/cron-component.adoc
b/components/camel-cron/src/main/docs/cron-component.adoc
index b4d2288..6035f87 100644
--- a/components/camel-cron/src/main/docs/cron-component.adoc
+++ b/components/camel-cron/src/main/docs/cron-component.adoc
@@ -40,7 +40,7 @@ Additional libraries may be needed in order to plug a
specific implementation.
// component options: START
-The Cron component supports 4 options, which are listed below.
+The Cron component supports 3 options, which are listed below.
@@ -49,7 +49,6 @@ The Cron component supports 4 options, which are listed below.
| Name | Description | Default | Type
| *cronService* (advanced) | The id of the CamelCronService to use when
multiple implementations are provided | | String
| *basicPropertyBinding* (advanced) | Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
-| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *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
|===
// component options: END
diff --git
a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronHelper.java
b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronHelper.java
index 208c0e1..d2d9deb 100644
---
a/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronHelper.java
+++
b/components/camel-cron/src/main/java/org/apache/camel/component/cron/CronHelper.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.component.cron;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.TreeMap;
-
import org.apache.camel.CamelContext;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.NoFactoryAvailableException;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.cron.api.CamelCronService;
+import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -30,6 +30,9 @@ import org.slf4j.LoggerFactory;
public final class CronHelper {
private static final Logger LOGGER =
LoggerFactory.getLogger(CronHelper.class);
+private static final String RESOURCE_PATH =
"META-INF/services/org/apache/camel/cron/";
+private static final String FACTORY_KEY = "cron-service";
+
private CronHelper() {
}
@@ -48,18 +51,13 @@ public final class CronHelper {
return service;
}
-// Fallback to service loader
-Map services = new TreeMap<>();
-ServiceLoader.load(CamelCronService.class).forEach(s ->
services.put(s.getId(), s));
-if (name != null) {
-return services.get(name);
-}
-if (services.size() == 1) {
-return services.values().iterator().next();
-} else if (services.size() > 1) {
-
[GitHub] [camel-k] astefanutti merged pull request #1191: Upgrade Operator SDK to version 0.14.0
astefanutti merged pull request #1191: Upgrade Operator SDK to version 0.14.0 URL: https://github.com/apache/camel-k/pull/1191 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: Upgrade Operator SDK to version 0.14.0
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new 8518467 Upgrade Operator SDK to version 0.14.0 8518467 is described below commit 85184678e459fddbb2031489aac9fadcd44e96de Author: Antonin Stefanutti AuthorDate: Mon Jan 13 10:04:16 2020 +0100 Upgrade Operator SDK to version 0.14.0 --- go.mod | 8 +++-- go.sum | 117 + 2 files changed, 122 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9528c45..b501283 100644 --- a/go.mod +++ b/go.mod @@ -16,9 +16,9 @@ require ( github.com/google/uuid v1.1.1 github.com/jpillora/backoff v0.0.0-20170918002102-8eab2debe79d github.com/mitchellh/mapstructure v1.1.2 - github.com/onsi/gomega v1.5.0 + github.com/onsi/gomega v1.7.0 github.com/openshift/api v3.9.1-0.20190927182313-d4a64ec2cbd8+incompatible - github.com/operator-framework/operator-sdk v0.13.0 + github.com/operator-framework/operator-sdk v0.14.0 github.com/pkg/errors v0.8.1 github.com/radovskyb/watcher v1.0.6 github.com/rs/xid v1.2.1 @@ -43,7 +43,7 @@ require ( // Pinned to kubernetes 1.16.2: // - Knative 0.9.0 requires 1.15.3 -// - Operator SDK 0.13.0 requires 1.16.2 +// - Operator SDK 0.14.0 requires 1.16.2 replace ( k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65 @@ -67,3 +67,5 @@ replace ( k8s.io/metrics => k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9 ) + +replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm diff --git a/go.sum b/go.sum index ba7786f..320552e 100644 --- a/go.sum +++ b/go.sum @@ -35,11 +35,16 @@ github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= +github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Masterminds/sprig/v3 v3.0.0/go.mod h1:NEUY/Qq8Gdm2xgYA+NwJM6wmfdRV9xkh8h/Rld20R0U= +github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= @@ -55,12 +60,15 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/alecthomas/jsonschema v0.0.0-20190122210438-a6952de1bbe6 h1:xadBCbc8D9mmkaNfCsEBHbIoCjbayJXJNsY1JjPjNio= github.com/alecthomas/jsonschema v0.0.0-20190122210438-a6952de1bbe6/go.mod h1:qpebaTNSsyUn5rPSJMsfqEtDw71TTggXM6stUDI16HA= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod
[GitHub] [camel-k-runtime] lburgazzoli commented on a change in pull request #223: Fix #222: initial implementation of native cron support
lburgazzoli commented on a change in pull request #223: Fix #222: initial
implementation of native cron support
URL: https://github.com/apache/camel-k-runtime/pull/223#discussion_r365749872
##
File path:
camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronRoutePolicyFactory.java
##
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.cron;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.NamedNode;
+import org.apache.camel.Route;
+import org.apache.camel.spi.RoutePolicy;
+import org.apache.camel.spi.RoutePolicyFactory;
+import org.apache.camel.support.RoutePolicySupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A RoutePolicyFactory that shuts the context down after the first exchange
has been done.
+ */
+public class CronRoutePolicyFactory implements RoutePolicyFactory {
+
+public CronRoutePolicyFactory() {
+}
+
+@Override
+public RoutePolicy createRoutePolicy(CamelContext camelContext, String
routeId, NamedNode route) {
+return new CronRoutePolicy(camelContext);
+}
+
+private static class CronRoutePolicy extends RoutePolicySupport {
+
+private static final Logger LOG =
LoggerFactory.getLogger(CronRoutePolicy.class);
+
+private final CamelContext context;
+
+public CronRoutePolicy(CamelContext context) {
+this.context = context;
+}
+
+@Override
+public void onExchangeDone(Route route, Exchange exchange) {
+LOG.info("Context shutdown started by cron policy");
+context.getExecutorServiceManager().newThread("terminator",
context::stop).start();
Review comment:
We probably need to add a new method `stop()` to the `Runtime` and invoke
such method here instead of `CamelContext::stop` so the standard runtime would
invoke `Main::stop` and the Quarkus one will invoke the correct method once
provided by quarkus
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 camel-2.x updated: Pick up parent version of commons io
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 5d31306 Pick up parent version of commons io
5d31306 is described below
commit 5d31306c3f6a58938b70e7480db32450d990f94f
Author: Colm O hEigeartaigh
AuthorDate: Mon Jan 13 10:26:17 2020 +
Pick up parent version of commons io
---
tests/camel-performance/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml
index a52ad52..9022670 100644
--- a/tests/camel-performance/pom.xml
+++ b/tests/camel-performance/pom.xml
@@ -80,7 +80,7 @@
commons-io
commons-io
- 2.4
+ ${commons-io-version}
test
[camel] branch master updated (d8e23b8 -> 67d3c3e)
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 d8e23b8 Regen docs add e88e505 Fixed TIP sections for EIPs add 67d3c3e Regen docs No new revisions were added by this update. Summary of changes: core/camel-core-engine/src/main/docs/eips/choice-eip.adoc | 5 - .../src/main/docs/eips/loadBalance-eip.adoc | 13 +++-- core/camel-core-engine/src/main/docs/eips/log-eip.adoc | 6 +- .../src/main/docs/eips/recipientList-eip.adoc | 5 - .../src/main/docs/eips/requestReply-eip.adoc| 7 ++- .../src/main/docs/eips/serviceCall-eip.adoc | 5 - docs/user-manual/modules/ROOT/pages/choice-eip.adoc | 5 - docs/user-manual/modules/ROOT/pages/loadBalance-eip.adoc| 13 +++-- docs/user-manual/modules/ROOT/pages/log-eip.adoc| 6 +- docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc | 5 - docs/user-manual/modules/ROOT/pages/requestReply-eip.adoc | 7 ++- docs/user-manual/modules/ROOT/pages/serviceCall-eip.adoc| 5 - 12 files changed, 68 insertions(+), 14 deletions(-)
[camel] branch master updated (f5bfea2 -> d8e23b8)
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 f5bfea2 Pick up parent version of commons io add b969913 Camel-Timer: Improve TIP sections add a5274c6 Camel Simple Language: Improve TIP sections add d8e23b8 Regen docs No new revisions were added by this update. Summary of changes: components/camel-timer/src/main/docs/timer-component.adoc | 5 - core/camel-base/src/main/docs/simple-language.adoc| 8 ++-- docs/components/modules/ROOT/pages/simple-language.adoc | 8 ++-- docs/components/modules/ROOT/pages/timer-component.adoc | 5 - docs/user-manual/modules/ROOT/pages/simple-language.adoc | 8 ++-- 5 files changed, 26 insertions(+), 8 deletions(-)
[camel] branch camel-3.0.x updated: Pick up parent version of commons io
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.0.x by this push:
new 1dfadc7 Pick up parent version of commons io
1dfadc7 is described below
commit 1dfadc7766c815185feefa5b7cc2006820407780
Author: Colm O hEigeartaigh
AuthorDate: Mon Jan 13 10:26:17 2020 +
Pick up parent version of commons io
---
tests/camel-performance/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml
index 9076291..ae0bf86 100644
--- a/tests/camel-performance/pom.xml
+++ b/tests/camel-performance/pom.xml
@@ -81,7 +81,7 @@
commons-io
commons-io
-2.4
+${commons-io-version}
test
[camel] branch master updated (b85c59b -> f5bfea2)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from b85c59b Regen docs add f5bfea2 Pick up parent version of commons io No new revisions were added by this update. Summary of changes: tests/camel-performance/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch master updated (dc5660c -> b85c59b)
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 dc5660c Regen docs add a4fdef0 Camel-Soap: Improve TIP section add d70a7f8 Camel-SQL: Improve TIP section add 3b8c14d Camel-test-spring: Improve TIP section add b85c59b Regen docs No new revisions were added by this update. Summary of changes: components/camel-soap/src/main/docs/soapjaxb-dataformat.adoc | 6 +- components/camel-sql/src/main/docs/sql-component.adoc| 5 - components/camel-test-spring/src/main/docs/test-spring.adoc | 5 - docs/components/modules/ROOT/pages/soapjaxb-dataformat.adoc | 6 +- docs/components/modules/ROOT/pages/sql-component.adoc| 5 - docs/components/modules/ROOT/pages/test-spring.adoc | 5 - 6 files changed, 26 insertions(+), 6 deletions(-)
[GitHub] [camel-k] haris-zynka opened a new issue #1192: Add test for registry connection
haris-zynka opened a new issue #1192: Add test for registry connection URL: https://github.com/apache/camel-k/issues/1192 I was trying to deploy local JFrog registry and connect it to Camel K. As I have no idea how to do this it still fails but the actual problem is that I cannot know until I try to push new camel K script. Then I get `Error from server (BadRequest): container "kaniko" in pod "camel-k-kit-boe43ei8411sjk3086d0-builder" is waiting to start: PodInitializing` which I guess indicates that I've put in some wrong details for registry. Is it possible to add extra option like --fail-no-registry, if not by default activated, to verify registry connection and fail if not successful with error printed out, instead of me doing a lot of kubectl and kamel commands just to verify that I have once again failed to connect them. Just to be sure to mention script works 100% as it runs on Azure Kubernetes Cluster connected to Azure Container Registry. I just want to connect local registries to save some money while testing. 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 camel-3.0.x updated (c153797 -> 00c6044)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-3.0.x in repository https://gitbox.apache.org/repos/asf/camel.git. from c153797 CAMEL-14372: Fixed file util to not compact http url new dfef008 CAMEL-14390: Ensure websocket-jsr356 producer invokes AsyncCallback.done new 00c6044 CAMEL-14390: Move AsyncCallback.done to finally block 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: .../org/apache/camel/websocket/jsr356/JSR356Producer.java| 12 +++- .../apache/camel/websocket/jsr356/JSR356ProducerTest.java| 2 -- 2 files changed, 7 insertions(+), 7 deletions(-)
[camel] 01/02: CAMEL-14390: Ensure websocket-jsr356 producer invokes AsyncCallback.done
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dfef008777d5917d9dd98dc52cfe269e9eefa333
Author: James Netherton
AuthorDate: Mon Jan 13 09:09:58 2020 +
CAMEL-14390: Ensure websocket-jsr356 producer invokes AsyncCallback.done
---
.../org/apache/camel/websocket/jsr356/JSR356Producer.java | 11 ++-
.../org/apache/camel/websocket/jsr356/JSR356ProducerTest.java | 2 --
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
index 566c3f3..1a8b1d0 100644
---
a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
+++
b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
@@ -49,7 +49,7 @@ public class JSR356Producer extends DefaultAsyncProducer {
final Session session =
exchange.getIn().getHeader(JSR356Constants.SESSION, Session.class);
if (session != null &&
exchange.getIn().getHeader(JSR356Constants.USE_INCOMING_SESSION, false,
Boolean.class)) {
synchronized (session) {
-doSend(exchange, session);
+doSend(exchange, callback, session);
}
} else {
onExchange.accept(exchange, callback);
@@ -68,14 +68,15 @@ public class JSR356Producer extends DefaultAsyncProducer {
final ClientEndpointConfig.Builder clientConfig =
ClientEndpointConfig.Builder.create();
manager = new ClientSessions(sessionCount, URI.create(endpointKey),
clientConfig.build(), null);
manager.prepare();
-onExchange = (ex, cb) -> manager.execute(session -> doSend(ex,
session));
+onExchange = (exchange, callback) -> manager.execute(session ->
doSend(exchange, callback, session));
}
-private void doSend(final Exchange ex, final Session session) {
+private void doSend(final Exchange exchange, final AsyncCallback callback,
final Session session) {
try {
-JSR356WebSocketComponent.sendMessage(session,
ex.getIn().getBody());
+JSR356WebSocketComponent.sendMessage(session,
exchange.getIn().getBody());
+callback.done(true);
} catch (final IOException e) {
-ex.setException(e);
+exchange.setException(e);
}
}
diff --git
a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
index 8c2769a..aebcbfd 100644
---
a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
+++
b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.meecrowave.Meecrowave;
import org.apache.meecrowave.junit.MeecrowaveRule;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
@@ -54,7 +53,6 @@ public class JSR356ProducerTest extends CamelTestSupport {
@Produce("direct:ensureServerModeSendsProperly")
private ProducerTemplate serverProducer;
-@Ignore
@Test
public void ensureServerModeSendsProperly() throws Exception {
final String body = getClass().getName() + "#" +
testName.getMethodName();
[camel] 02/02: CAMEL-14390: Move AsyncCallback.done to finally block
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 00c60443745037ce7fd583ff1e31347094d65096
Author: James Netherton
AuthorDate: Mon Jan 13 09:34:15 2020 +
CAMEL-14390: Move AsyncCallback.done to finally block
---
.../main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
index 1a8b1d0..f74361c 100644
---
a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
+++
b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
@@ -74,9 +74,10 @@ public class JSR356Producer extends DefaultAsyncProducer {
private void doSend(final Exchange exchange, final AsyncCallback callback,
final Session session) {
try {
JSR356WebSocketComponent.sendMessage(session,
exchange.getIn().getBody());
-callback.done(true);
} catch (final IOException e) {
exchange.setException(e);
+} finally {
+callback.done(true);
}
}
[camel] 11/13: Camel-Seda: fixed tip section
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 9720d3cb3056efd88b1bd73d607af1e00190a047 Author: Andrea Cosentino AuthorDate: Mon Jan 13 10:54:28 2020 +0100 Camel-Seda: fixed tip section --- components/camel-seda/src/main/docs/seda-component.adoc | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/camel-seda/src/main/docs/seda-component.adoc b/components/camel-seda/src/main/docs/seda-component.adoc index a2797f1..ed33ff9 100644 --- a/components/camel-seda/src/main/docs/seda-component.adoc +++ b/components/camel-seda/src/main/docs/seda-component.adoc @@ -23,9 +23,13 @@ if the VM terminates while messages are yet to be processed. If you need persistence, reliability or distributed SEDA, try using either xref:jms-component.adoc[JMS] or xref:jms-component.adoc[ActiveMQ]. -TIP:*Synchronous* +[TIP] + +*Synchronous* + The xref:direct-component.adoc[Direct] component provides synchronous invocation of any consumers when a producer sends a message exchange. + == URI format
[camel] 09/13: Regen docs
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 a246605f7b016eba70aaf06d6d882a4f58abba99
Author: Andrea Cosentino
AuthorDate: Mon Jan 13 10:50:08 2020 +0100
Regen docs
---
docs/components/modules/ROOT/pages/schematron-component.adoc | 12 ++--
docs/components/modules/ROOT/pages/seda-component.adoc | 6 +-
docs/components/modules/ROOT/pages/simple-language.adoc | 8 ++--
docs/components/modules/ROOT/pages/smpp-component.adoc | 12 ++--
4 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/schematron-component.adoc
b/docs/components/modules/ROOT/pages/schematron-component.adoc
index 5f472e9..f927165 100644
--- a/docs/components/modules/ROOT/pages/schematron-component.adoc
+++ b/docs/components/modules/ROOT/pages/schematron-component.adoc
@@ -165,10 +165,7 @@ XML DSL. The schematrion rules file is sourced from the
file system:
---
-[TIP]
-
-*Where to store schematron rules?*
-
+TIP: *Where to store schematron rules?*
Schematron rules can change with business requirement, as such it is
recommended to store these rules somewhere in file system. When the
schematron component endpoint is started, the rules are compiled into
@@ -181,7 +178,6 @@ So if you happen to store the rules in the file system, in
the event of
an update, all you need is to restart the route or the component. No
harm in storing these rules in the class path though, but you will have
to build and deploy the component to pick up the changes.
-
== Schematron rules and report samples
@@ -227,13 +223,9 @@ Here is an example of schematron report:
-[TIP]
-
-*Useful Links and resources*
-
+TIP: *Useful Links and resources*
* http://www.mulberrytech.com/papers/schematron-Philly.pdf[Introduction
to Schematron] by Mulleberry technologies. An excellent document in PDF
to get you started on Schematron.
* http://www.schematron.com[Schematron official site]. This contains
links to other resources
-
diff --git a/docs/components/modules/ROOT/pages/seda-component.adoc
b/docs/components/modules/ROOT/pages/seda-component.adoc
index 2567512..58d37da 100644
--- a/docs/components/modules/ROOT/pages/seda-component.adoc
+++ b/docs/components/modules/ROOT/pages/seda-component.adoc
@@ -24,13 +24,9 @@ if the VM terminates while messages are yet to be processed.
If you need
persistence, reliability or distributed SEDA, try using either
xref:jms-component.adoc[JMS] or xref:jms-component.adoc[ActiveMQ].
-[TIP]
-
-*Synchronous*
-
+TIP:*Synchronous*
The xref:direct-component.adoc[Direct] component provides synchronous
invocation
of any consumers when a producer sends a message exchange.
-
== URI format
diff --git a/docs/components/modules/ROOT/pages/simple-language.adoc
b/docs/components/modules/ROOT/pages/simple-language.adoc
index 770484c..67e3d09 100644
--- a/docs/components/modules/ROOT/pages/simple-language.adoc
+++ b/docs/components/modules/ROOT/pages/simple-language.adoc
@@ -25,14 +25,10 @@ The simple language uses `${body`} placeholders for complex
expressions
where the expression contains constant literals. The $\{ } placeholders
can be omitted if the expression is only the token itself.
-[TIP]
-
-*Alternative syntax*
-
-You can also use the alternative syntax which
+TIP: *Alternative syntax* You can also use the alternative syntax which
uses `$simple{ }` as placeholders. This can be used in situations to avoid
clashes when using for example
Spring property placeholder together with Camel.
-
+
== Simple Language options
diff --git a/docs/components/modules/ROOT/pages/smpp-component.adoc
b/docs/components/modules/ROOT/pages/smpp-component.adoc
index 14ac754..e7feedb 100644
--- a/docs/components/modules/ROOT/pages/smpp-component.adoc
+++ b/docs/components/modules/ROOT/pages/smpp-component.adoc
@@ -588,13 +588,9 @@ optional parameter. The value is converted in the
following way:
`org.jsmpp.bean.OptionalParameter.Null` -> `null`
|===
-[TIP]
-
-*JSMPP library*
-
+TIP: *JSMPP library*
See the documentation of the http://jsmpp.org[JSMPP Library] for more
details about the underlying library.
-
== Exception handling
@@ -671,14 +667,10 @@ A route which receives an SMS using the Spring XML DSL:
-[TIP]
-
-*SMSC simulator*
-
+TIP: *SMSC simulator*
If you need an SMSC simulator for your test, you can use the simulator
provided by
[camel] 01/13: Camel-pg-replication-slot: Fixed tip section (my fault)
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 ad92911cb4cffd04594966c1a0703896835c098c Author: Andrea Cosentino AuthorDate: Mon Jan 13 10:30:49 2020 +0100 Camel-pg-replication-slot: Fixed tip section (my fault) --- docs/components/modules/ROOT/pages/pg-replication-slot-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/modules/ROOT/pages/pg-replication-slot-component.adoc b/docs/components/modules/ROOT/pages/pg-replication-slot-component.adoc index eef28c4..6a7ac44 100644 --- a/docs/components/modules/ROOT/pages/pg-replication-slot-component.adoc +++ b/docs/components/modules/ROOT/pages/pg-replication-slot-component.adoc @@ -161,7 +161,7 @@ without waiting for the `delay`*`timeUnit` parameter between each exchange. [TIP] -TIP: The order of the messages is guaranteed, but the same message might come more than once. So, for example, if you're using +The order of the messages is guaranteed, but the same message might come more than once. So, for example, if you're using this component to sync data from PostgreSQL to other database, make sure your operations are idempotent (e.g. use UPSERT instead of INSERT,...). This will make sure repeated messages won't affect your system negatively.
[camel] branch master updated (d149cb5 -> dc5660c)
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 d149cb5 CAMEL-14390: Move AsyncCallback.done to finally block new ad92911 Camel-pg-replication-slot: Fixed tip section (my fault) new 4f198d0 Camel-RSS Dataformat: Improve TIP section new de61938 Camel-pg-replication-slot: Fixed tip section new c469565 Regen docs new e4d2eef Camel-Schematron: Improve TIP section new 140274e Camel-SEDA: Improve TIP section new 67ea033 Camel simple language: Improve TIP section new 81dd8d9 Camel-smpp: Improve TIP section new a246605 Regen docs new 2bec11a Camel-Schematron: Fixed tip section new 9720d3c Camel-Seda: fixed tip section new 63eacff Camel-smpp: Improve tip section new dc5660c Regen docs The 13 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/pg-replication-slot-component.adoc | 2 +- components/camel-rss/src/main/docs/rss-dataformat.adoc | 6 +- .../camel-schematron/src/main/docs/schematron-component.adoc | 12 ++-- components/camel-seda/src/main/docs/seda-component.adoc | 6 +- components/camel-smpp/src/main/docs/smpp-component.adoc | 11 +-- .../modules/ROOT/pages/pg-replication-slot-component.adoc| 2 +- docs/components/modules/ROOT/pages/rss-dataformat.adoc | 6 +- docs/components/modules/ROOT/pages/schematron-component.adoc | 12 ++-- docs/components/modules/ROOT/pages/seda-component.adoc | 6 +- docs/components/modules/ROOT/pages/smpp-component.adoc | 11 +-- 10 files changed, 60 insertions(+), 14 deletions(-)
[camel] 12/13: Camel-smpp: Improve tip section
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 63eacff87da850fd3c2398987afef5bb9698dd9f Author: Andrea Cosentino AuthorDate: Mon Jan 13 11:02:17 2020 +0100 Camel-smpp: Improve tip section --- components/camel-smpp/src/main/docs/smpp-component.adoc | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/components/camel-smpp/src/main/docs/smpp-component.adoc b/components/camel-smpp/src/main/docs/smpp-component.adoc index eb2eafb..2f61458 100644 --- a/components/camel-smpp/src/main/docs/smpp-component.adoc +++ b/components/camel-smpp/src/main/docs/smpp-component.adoc @@ -587,9 +587,13 @@ optional parameter. The value is converted in the following way: `org.jsmpp.bean.OptionalParameter.Null` -> `null` |=== -TIP: *JSMPP library* +[TIP] + +*JSMPP library* + See the documentation of the http://jsmpp.org[JSMPP Library] for more details about the underlying library. + == Exception handling @@ -665,11 +669,14 @@ A route which receives an SMS using the Spring XML DSL: +[TIP] + +*SMSC simulator* -TIP: *SMSC simulator* If you need an SMSC simulator for your test, you can use the simulator provided by http://opensmpp.logica.com/CommonPart/Download/download2.html#simulator[Logica]. + == Debug logging
[camel] 04/13: Regen docs
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 c4695657a6c5f0574fabe68800666dbb2e9e0f74
Author: Andrea Cosentino
AuthorDate: Mon Jan 13 10:40:18 2020 +0100
Regen docs
---
docs/components/modules/ROOT/pages/rss-dataformat.adoc | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/components/modules/ROOT/pages/rss-dataformat.adoc
b/docs/components/modules/ROOT/pages/rss-dataformat.adoc
index 08b307d..c966d31 100644
--- a/docs/components/modules/ROOT/pages/rss-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/rss-dataformat.adoc
@@ -16,11 +16,15 @@ The purpose of this feature is to make it possible to use
Camel's lovely
built-in expressions for manipulating RSS messages. As shown below, an
XPath expression can be used to filter the RSS message:
-TIP: *Query parameters*
+[TIP]
+
+*Query parameters*
+
If the URL for the RSS feed uses query parameters, this component will
understand them as well, for example if the feed uses `alt=rss`, then
you can for example do
`from("rss:http://someserver.com/feeds/posts/default?alt=rss=false=1000;).to("bean:rss");`
+
== Options
[camel] 06/13: Camel-SEDA: Improve TIP section
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 140274e81f942733b3fd3d43ccf9ecffdd0b3cbe Author: Andrea Cosentino AuthorDate: Mon Jan 13 10:45:08 2020 +0100 Camel-SEDA: Improve TIP section --- docs/components/modules/ROOT/pages/seda-component.adoc | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/components/modules/ROOT/pages/seda-component.adoc b/docs/components/modules/ROOT/pages/seda-component.adoc index 58d37da..2567512 100644 --- a/docs/components/modules/ROOT/pages/seda-component.adoc +++ b/docs/components/modules/ROOT/pages/seda-component.adoc @@ -24,9 +24,13 @@ if the VM terminates while messages are yet to be processed. If you need persistence, reliability or distributed SEDA, try using either xref:jms-component.adoc[JMS] or xref:jms-component.adoc[ActiveMQ]. -TIP:*Synchronous* +[TIP] + +*Synchronous* + The xref:direct-component.adoc[Direct] component provides synchronous invocation of any consumers when a producer sends a message exchange. + == URI format
[camel] 10/13: Camel-Schematron: Fixed tip section
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 2bec11a68bf44089d43da506f7b65541491a Author: Andrea Cosentino AuthorDate: Mon Jan 13 10:53:38 2020 +0100 Camel-Schematron: Fixed tip section --- .../camel-schematron/src/main/docs/schematron-component.adoc | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/components/camel-schematron/src/main/docs/schematron-component.adoc b/components/camel-schematron/src/main/docs/schematron-component.adoc index b518a0e..3d72874 100644 --- a/components/camel-schematron/src/main/docs/schematron-component.adoc +++ b/components/camel-schematron/src/main/docs/schematron-component.adoc @@ -164,7 +164,10 @@ XML DSL. The schematrion rules file is sourced from the file system: --- -TIP: *Where to store schematron rules?* +[TIP] + +*Where to store schematron rules?* + Schematron rules can change with business requirement, as such it is recommended to store these rules somewhere in file system. When the schematron component endpoint is started, the rules are compiled into @@ -177,6 +180,7 @@ So if you happen to store the rules in the file system, in the event of an update, all you need is to restart the route or the component. No harm in storing these rules in the class path though, but you will have to build and deploy the component to pick up the changes. + == Schematron rules and report samples @@ -222,9 +226,13 @@ Here is an example of schematron report: -TIP: *Useful Links and resources* +[TIP] + +*Useful Links and resources* + * http://www.mulberrytech.com/papers/schematron-Philly.pdf[Introduction to Schematron] by Mulleberry technologies. An excellent document in PDF to get you started on Schematron. * http://www.schematron.com[Schematron official site]. This contains links to other resources +
[camel] 03/13: Camel-pg-replication-slot: Fixed tip section
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 de619388e04a7b023974ad6628cf87853f2e4298 Author: Andrea Cosentino AuthorDate: Mon Jan 13 10:37:53 2020 +0100 Camel-pg-replication-slot: Fixed tip section --- .../src/main/docs/pg-replication-slot-component.adoc| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-pg-replication-slot/src/main/docs/pg-replication-slot-component.adoc b/components/camel-pg-replication-slot/src/main/docs/pg-replication-slot-component.adoc index 3f91ac5..ddbe827 100644 --- a/components/camel-pg-replication-slot/src/main/docs/pg-replication-slot-component.adoc +++ b/components/camel-pg-replication-slot/src/main/docs/pg-replication-slot-component.adoc @@ -160,7 +160,7 @@ without waiting for the `delay`*`timeUnit` parameter between each exchange. [TIP] -TIP: The order of the messages is guaranteed, but the same message might come more than once. So, for example, if you're using +The order of the messages is guaranteed, but the same message might come more than once. So, for example, if you're using this component to sync data from PostgreSQL to other database, make sure your operations are idempotent (e.g. use UPSERT instead of INSERT,...). This will make sure repeated messages won't affect your system negatively.
[camel] 08/13: Camel-smpp: Improve TIP section
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 81dd8d9611746b620c1a608cf47f583f365f73c2 Author: Andrea Cosentino AuthorDate: Mon Jan 13 10:48:41 2020 +0100 Camel-smpp: Improve TIP section --- docs/components/modules/ROOT/pages/smpp-component.adoc | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/components/modules/ROOT/pages/smpp-component.adoc b/docs/components/modules/ROOT/pages/smpp-component.adoc index e7feedb..14ac754 100644 --- a/docs/components/modules/ROOT/pages/smpp-component.adoc +++ b/docs/components/modules/ROOT/pages/smpp-component.adoc @@ -588,9 +588,13 @@ optional parameter. The value is converted in the following way: `org.jsmpp.bean.OptionalParameter.Null` -> `null` |=== -TIP: *JSMPP library* +[TIP] + +*JSMPP library* + See the documentation of the http://jsmpp.org[JSMPP Library] for more details about the underlying library. + == Exception handling @@ -667,10 +671,14 @@ A route which receives an SMS using the Spring XML DSL: -TIP: *SMSC simulator* +[TIP] + +*SMSC simulator* + If you need an SMSC simulator for your test, you can use the simulator provided by http://opensmpp.logica.com/CommonPart/Download/download2.html#simulator[Logica]. + == Debug logging
[camel] 07/13: Camel simple language: Improve TIP section
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 67ea0338ca0758c2985642c427310027e3de5c07
Author: Andrea Cosentino
AuthorDate: Mon Jan 13 10:46:05 2020 +0100
Camel simple language: Improve TIP section
---
docs/components/modules/ROOT/pages/simple-language.adoc | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/simple-language.adoc
b/docs/components/modules/ROOT/pages/simple-language.adoc
index 67e3d09..770484c 100644
--- a/docs/components/modules/ROOT/pages/simple-language.adoc
+++ b/docs/components/modules/ROOT/pages/simple-language.adoc
@@ -25,10 +25,14 @@ The simple language uses `${body`} placeholders for complex
expressions
where the expression contains constant literals. The $\{ } placeholders
can be omitted if the expression is only the token itself.
-TIP: *Alternative syntax* You can also use the alternative syntax which
+[TIP]
+
+*Alternative syntax*
+
+You can also use the alternative syntax which
uses `$simple{ }` as placeholders. This can be used in situations to avoid
clashes when using for example
Spring property placeholder together with Camel.
-
+
== Simple Language options
[camel] 02/13: Camel-RSS Dataformat: Improve TIP section
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 4f198d0c356e4f6580c12938dad41068048a9072
Author: Andrea Cosentino
AuthorDate: Mon Jan 13 10:33:27 2020 +0100
Camel-RSS Dataformat: Improve TIP section
---
components/camel-rss/src/main/docs/rss-dataformat.adoc | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/components/camel-rss/src/main/docs/rss-dataformat.adoc
b/components/camel-rss/src/main/docs/rss-dataformat.adoc
index 337d104..865230a 100644
--- a/components/camel-rss/src/main/docs/rss-dataformat.adoc
+++ b/components/camel-rss/src/main/docs/rss-dataformat.adoc
@@ -15,11 +15,15 @@ The purpose of this feature is to make it possible to use
Camel's lovely
built-in expressions for manipulating RSS messages. As shown below, an
XPath expression can be used to filter the RSS message:
-TIP: *Query parameters*
+[TIP]
+
+*Query parameters*
+
If the URL for the RSS feed uses query parameters, this component will
understand them as well, for example if the feed uses `alt=rss`, then
you can for example do
`from("rss:http://someserver.com/feeds/posts/default?alt=rss=false=1000;).to("bean:rss");`
+
== Options
[camel] 13/13: Regen docs
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 dc5660c800e9c2be66c222ec03518b42e2f59859 Author: Andrea Cosentino AuthorDate: Mon Jan 13 11:04:20 2020 +0100 Regen docs --- docs/components/modules/ROOT/pages/schematron-component.adoc | 12 ++-- docs/components/modules/ROOT/pages/seda-component.adoc | 6 +- docs/components/modules/ROOT/pages/smpp-component.adoc | 11 +-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/docs/components/modules/ROOT/pages/schematron-component.adoc b/docs/components/modules/ROOT/pages/schematron-component.adoc index f927165..5f472e9 100644 --- a/docs/components/modules/ROOT/pages/schematron-component.adoc +++ b/docs/components/modules/ROOT/pages/schematron-component.adoc @@ -165,7 +165,10 @@ XML DSL. The schematrion rules file is sourced from the file system: --- -TIP: *Where to store schematron rules?* +[TIP] + +*Where to store schematron rules?* + Schematron rules can change with business requirement, as such it is recommended to store these rules somewhere in file system. When the schematron component endpoint is started, the rules are compiled into @@ -178,6 +181,7 @@ So if you happen to store the rules in the file system, in the event of an update, all you need is to restart the route or the component. No harm in storing these rules in the class path though, but you will have to build and deploy the component to pick up the changes. + == Schematron rules and report samples @@ -223,9 +227,13 @@ Here is an example of schematron report: -TIP: *Useful Links and resources* +[TIP] + +*Useful Links and resources* + * http://www.mulberrytech.com/papers/schematron-Philly.pdf[Introduction to Schematron] by Mulleberry technologies. An excellent document in PDF to get you started on Schematron. * http://www.schematron.com[Schematron official site]. This contains links to other resources + diff --git a/docs/components/modules/ROOT/pages/seda-component.adoc b/docs/components/modules/ROOT/pages/seda-component.adoc index 58d37da..2567512 100644 --- a/docs/components/modules/ROOT/pages/seda-component.adoc +++ b/docs/components/modules/ROOT/pages/seda-component.adoc @@ -24,9 +24,13 @@ if the VM terminates while messages are yet to be processed. If you need persistence, reliability or distributed SEDA, try using either xref:jms-component.adoc[JMS] or xref:jms-component.adoc[ActiveMQ]. -TIP:*Synchronous* +[TIP] + +*Synchronous* + The xref:direct-component.adoc[Direct] component provides synchronous invocation of any consumers when a producer sends a message exchange. + == URI format diff --git a/docs/components/modules/ROOT/pages/smpp-component.adoc b/docs/components/modules/ROOT/pages/smpp-component.adoc index e7feedb..eec943f 100644 --- a/docs/components/modules/ROOT/pages/smpp-component.adoc +++ b/docs/components/modules/ROOT/pages/smpp-component.adoc @@ -588,9 +588,13 @@ optional parameter. The value is converted in the following way: `org.jsmpp.bean.OptionalParameter.Null` -> `null` |=== -TIP: *JSMPP library* +[TIP] + +*JSMPP library* + See the documentation of the http://jsmpp.org[JSMPP Library] for more details about the underlying library. + == Exception handling @@ -666,11 +670,14 @@ A route which receives an SMS using the Spring XML DSL: +[TIP] + +*SMSC simulator* -TIP: *SMSC simulator* If you need an SMSC simulator for your test, you can use the simulator provided by http://opensmpp.logica.com/CommonPart/Download/download2.html#simulator[Logica]. + == Debug logging
[camel] 05/13: Camel-Schematron: Improve TIP section
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 e4d2eeff7843384599711bb0c844b1c6a94f8920 Author: Andrea Cosentino AuthorDate: Mon Jan 13 10:42:47 2020 +0100 Camel-Schematron: Improve TIP section --- docs/components/modules/ROOT/pages/schematron-component.adoc | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/components/modules/ROOT/pages/schematron-component.adoc b/docs/components/modules/ROOT/pages/schematron-component.adoc index f927165..5f472e9 100644 --- a/docs/components/modules/ROOT/pages/schematron-component.adoc +++ b/docs/components/modules/ROOT/pages/schematron-component.adoc @@ -165,7 +165,10 @@ XML DSL. The schematrion rules file is sourced from the file system: --- -TIP: *Where to store schematron rules?* +[TIP] + +*Where to store schematron rules?* + Schematron rules can change with business requirement, as such it is recommended to store these rules somewhere in file system. When the schematron component endpoint is started, the rules are compiled into @@ -178,6 +181,7 @@ So if you happen to store the rules in the file system, in the event of an update, all you need is to restart the route or the component. No harm in storing these rules in the class path though, but you will have to build and deploy the component to pick up the changes. + == Schematron rules and report samples @@ -223,9 +227,13 @@ Here is an example of schematron report: -TIP: *Useful Links and resources* +[TIP] + +*Useful Links and resources* + * http://www.mulberrytech.com/papers/schematron-Philly.pdf[Introduction to Schematron] by Mulleberry technologies. An excellent document in PDF to get you started on Schematron. * http://www.schematron.com[Schematron official site]. This contains links to other resources +
[GitHub] [camel-quarkus] lburgazzoli commented on issue #616: Utility to generate/scaffold an extension for a camel component
lburgazzoli commented on issue #616: Utility to generate/scaffold an extension for a camel component URL: https://github.com/apache/camel-quarkus/issues/616#issuecomment-573579694 Depends on https://issues.apache.org/jira/browse/CAMEL-14394 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 opened a new issue #616: Utility to generate/scaffold an extension for a camel component
lburgazzoli opened a new issue #616: Utility to generate/scaffold an extension for a camel component URL: https://github.com/apache/camel-quarkus/issues/616 We should have an utility like https://github.com/apache/camel-spring-boot#creating--deleting-starters to generate/scaffold an extension out of a camel component 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: CAMEL-14390: Move AsyncCallback.done to finally block
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton 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 d149cb5 CAMEL-14390: Move AsyncCallback.done to finally block
d149cb5 is described below
commit d149cb567488890590d455e01529120cd16ab895
Author: James Netherton
AuthorDate: Mon Jan 13 09:34:15 2020 +
CAMEL-14390: Move AsyncCallback.done to finally block
---
.../main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
index 1a8b1d0..f74361c 100644
---
a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
+++
b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Producer.java
@@ -74,9 +74,10 @@ public class JSR356Producer extends DefaultAsyncProducer {
private void doSend(final Exchange exchange, final AsyncCallback callback,
final Session session) {
try {
JSR356WebSocketComponent.sendMessage(session,
exchange.getIn().getBody());
-callback.done(true);
} catch (final IOException e) {
exchange.setException(e);
+} finally {
+callback.done(true);
}
}
[camel] branch master updated (123bc26 -> 5b790ec)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 123bc26 Regen docs add 5b790ec CAMEL-14390: Ensure websocket-jsr356 producer invokes AsyncCallback.done No new revisions were added by this update. Summary of changes: .../org/apache/camel/websocket/jsr356/JSR356Producer.java | 11 ++- .../org/apache/camel/websocket/jsr356/JSR356ProducerTest.java | 2 -- 2 files changed, 6 insertions(+), 7 deletions(-)
[GitHub] [camel-kafka-connector] valdar merged pull request #73: Added sourcecheck to github actions, added master push github action …
valdar merged pull request #73: Added sourcecheck to github actions, added master push github action … URL: https://github.com/apache/camel-kafka-connector/pull/73 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-kafka-connector] branch master updated (84ea014 -> b1ef1a0)
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
from 84ea014 Updated integration test image to kafka 2.4
new ca26346 Added sourcecheck to github actions, added master push github
action workflow and badge in readme.
new b1ef1a0 Fixed codestyle in itests
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:
.../{pr-build.yml => master-pr-build.yml} | 8 ---
.../{pr-build.yml => master-push-build.yml}| 20
README.adoc| 1 +
parent/pom.xml | 11 -
.../services/kafka/StrimziContainer.java | 25 ++--
.../services/kafka/ZookeeperContainer.java | 27 +++---
6 files changed, 54 insertions(+), 38 deletions(-)
copy .github/workflows/{pr-build.yml => master-pr-build.yml} (79%)
rename .github/workflows/{pr-build.yml => master-push-build.yml} (66%)
[camel-kafka-connector] 01/02: Added sourcecheck to github actions, added master push github action workflow and badge in readme.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit ca263464838e521dbd6d4dfcd3a0f0314f10b9cc
Author: Andrea Tarocchi
AuthorDate: Mon Jan 13 00:44:42 2020 +0100
Added sourcecheck to github actions, added master push github action
workflow and badge in readme.
---
.../workflows/{pr-build.yml => master-pr-build.yml} | 8 +---
.../{pr-build.yml => master-push-build.yml} | 20 +++-
README.adoc | 1 +
parent/pom.xml | 9 +
4 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/pr-build.yml
b/.github/workflows/master-pr-build.yml
similarity index 79%
copy from .github/workflows/pr-build.yml
copy to .github/workflows/master-pr-build.yml
index c331ad5..37c750c 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/master-pr-build.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Build PR
+name: master pr build
on:
pull_request:
@@ -33,5 +33,7 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
-- name: mvn verify
- run: ./mvnw -V --no-transfer-progress clean install
-DskipIntegrationTests=false
+- name: mvn sourcecheck
+ run: ./mvnw -V --no-transfer-progress -Dcheckstyle.failOnViolation=true
-Psourcecheck -DskipTests clean verify
+- name: mvn build and itests
+ run: ./mvnw -V --no-transfer-progress -DskipIntegrationTests=false clean
install
diff --git a/.github/workflows/pr-build.yml
b/.github/workflows/master-push-build.yml
similarity index 66%
rename from .github/workflows/pr-build.yml
rename to .github/workflows/master-push-build.yml
index c331ad5..d36e1bd 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/master-push-build.yml
@@ -15,10 +15,10 @@
# limitations under the License.
#
-name: Build PR
+name: master build
on:
- pull_request:
+ push:
branches:
- master
jobs:
@@ -28,10 +28,12 @@ jobs:
matrix:
java: [ '1.8', '11' ]
steps:
-- uses: actions/checkout@v1
-- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
- with:
-java-version: ${{ matrix.java }}
-- name: mvn verify
- run: ./mvnw -V --no-transfer-progress clean install
-DskipIntegrationTests=false
+ - uses: actions/checkout@v1
+ - name: Set up JDK ${{ matrix.java }}
+uses: actions/setup-java@v1
+with:
+ java-version: ${{ matrix.java }}
+ - name: mvn sourcecheck
+run: ./mvnw -V --no-transfer-progress
-Dcheckstyle.failOnViolation=true -Psourcecheck -DskipTests clean verify
+ - name: mvn build and itests
+run: ./mvnw -V --no-transfer-progress -DskipIntegrationTests=false
clean install
diff --git a/README.adoc b/README.adoc
index d2db51a..0f8d3f8 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,7 @@
== Camel Kafka Connector
image:https://img.shields.io/gitter/room/apache/camel-kafka-connector["Chat on
Gitter", link="https://gitter.im/apache/camel-kafka-connector;]
+image:https://github.com/apache/camel-kafka-connector/workflows/master%20build/badge.svg[Master
Build,
link="https://github.com/apache/camel-kafka-connector/actions?query=workflow%3A%22master+build%22;]
=== Introduction
[NOTE]
diff --git a/parent/pom.xml b/parent/pom.xml
index a9cdf46..e2f9255 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -62,6 +62,7 @@
2.12.4
1.12.4
0.40.0
+
1.6.0
8.26
3.1.0
@@ -70,6 +71,8 @@
strimzi/kafka:0.16.0-rc1-kafka-2.4.0
strimzi/kafka:0.16.0-rc1-kafka-2.4.0
+
+false
@@ -386,6 +389,12 @@
org.apache.maven.plugins
+maven-remote-resources-plugin
+
${version.maven.maven-remote-resources-plugin}
+
+
+
+org.apache.maven.plugins
maven-checkstyle-plugin
${version.maven.checkstyle.plugin}
[camel-kafka-connector] 02/02: Fixed codestyle in itests
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit b1ef1a01c4e87626011c8e7163000e0069f39fba Author: Andrea Tarocchi AuthorDate: Mon Jan 13 09:55:34 2020 +0100 Fixed codestyle in itests --- parent/pom.xml | 2 +- .../services/kafka/StrimziContainer.java | 25 ++-- .../services/kafka/ZookeeperContainer.java | 27 +++--- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index e2f9255..531583a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -427,7 +427,7 @@ header-java.txt **/*.java,**/*.groovy,**/*.scala,**/*.properties,**/*.xml,**/*.xsd - **/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java + **/archetype-resources/**/*.java,**/archetype-resources/**/*.groovy,**/archetype-resources/**/*.scala,**/archetype-resources/**/*.xml,**/org/json/simple/**/*.java,**/camel-checkstyle.xml diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java index 748a1d1..0b7e45d 100644 --- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java +++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java @@ -1,23 +1,24 @@ /* - * 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 + * 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 + * 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. + * 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.kafkaconnector.services.kafka; import java.util.function.Consumer; + import com.github.dockerjava.api.command.CreateContainerCmd; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java index 4051b94..c6d81f1 100644 --- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java +++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java @@ -1,23 +1,24 @@ /* - * 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 + * 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
[camel] branch master updated (06f0a6c -> 123bc26)
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 06f0a6c Fix "Boxed variable is never null" warnings reported by lgtm.com. (#3476) add 7ee6321 Camel-Mina: Improve TIP section add f9b7cfd Camel-Mock: Improve TIP, Note and Caution sections add ac55bcc Camel-Mongodb: Improve TIP section add dd7d05a Regen docs add 92e78e3 Camel-Netty: Improve TIP sections add 1395ff4 Camel-pg-replication-slot: Improve TIP section add f96dc99 Camel-Rest: Improved tip section add cb93d85 Camel-RSS: Improve TIP section add 123bc26 Regen docs No new revisions were added by this update. Summary of changes: .../camel-mina/src/main/docs/mina-component.adoc | 5 - .../camel-mock/src/main/docs/mock-component.adoc | 16 +++- .../camel-mongodb/src/main/docs/mongodb-component.adoc | 18 +++--- .../camel-netty/src/main/docs/netty-component.adoc | 10 -- .../src/main/docs/pg-replication-slot-component.adoc | 9 +++-- .../camel-rest/src/main/docs/rest-component.adoc | 6 +- components/camel-rss/src/main/docs/rss-component.adoc | 5 - docs/components/modules/ROOT/pages/mina-component.adoc | 5 - docs/components/modules/ROOT/pages/mock-component.adoc | 16 +++- .../modules/ROOT/pages/mongodb-component.adoc | 18 +++--- .../components/modules/ROOT/pages/netty-component.adoc | 10 -- .../ROOT/pages/pg-replication-slot-component.adoc | 9 +++-- docs/components/modules/ROOT/pages/rest-component.adoc | 6 +- docs/components/modules/ROOT/pages/rss-component.adoc | 5 - 14 files changed, 108 insertions(+), 30 deletions(-)
[GitHub] [camel-k] astefanutti opened a new pull request #1191: Upgrade Operator SDK to version 0.14.0
astefanutti opened a new pull request #1191: Upgrade Operator SDK to version 0.14.0 URL: https://github.com/apache/camel-k/pull/1191 **Release Note** ```release-note Upgrade Operator SDK to version 0.14.0 ``` 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 (1098bb3 -> 06f0a6c)
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 1098bb3 Regen docs add 06f0a6c Fix "Boxed variable is never null" warnings reported by lgtm.com. (#3476) No new revisions were added by this update. Summary of changes: .../apache/camel/component/beanstalk/processors/BuryCommand.java | 2 +- .../camel/component/beanstalk/processors/DeleteCommand.java | 2 +- .../camel/component/beanstalk/processors/ReleaseCommand.java | 2 +- .../camel/component/elasticsearch/ElasticsearchComponent.java | 2 +- .../src/main/java/org/apache/camel/component/grpc/GrpcUtils.java | 2 +- .../src/main/java/org/apache/camel/component/jms/JmsBinding.java | 2 +- .../main/java/org/apache/camel/component/sjms/jms/JmsBinding.java | 2 +- .../camel/component/telegram/model/UnixTimestampDeserializer.java | 2 +- .../camel/management/DefaultManagementObjectNameStrategy.java | 8 .../main/java/org/apache/camel/management/mbean/ManagedRoute.java | 2 +- .../org/apache/camel/management/mbean/ManagedSendProcessor.java | 2 +- .../main/java/org/apache/camel/example/client/CamelClient.java| 4 ++-- .../org/apache/camel/commands/AbstractLocalCamelController.java | 8 13 files changed, 20 insertions(+), 20 deletions(-)
[camel] 07/07: Regen docs
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 1098bb3b05cb5e63526c574fdcd4741bf8bdce57
Author: Andrea Cosentino
AuthorDate: Mon Jan 13 09:12:28 2020 +0100
Regen docs
---
docs/components/modules/ROOT/pages/file-component.adoc | 12 ++--
docs/components/modules/ROOT/pages/ftp-component.adoc| 6 +++---
docs/components/modules/ROOT/pages/ignite.adoc | 5 -
.../components/modules/ROOT/pages/jacksonxml-dataformat.adoc | 5 -
docs/components/modules/ROOT/pages/jasypt.adoc | 6 --
docs/components/modules/ROOT/pages/log-component.adoc| 6 +-
6 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/file-component.adoc
b/docs/components/modules/ROOT/pages/file-component.adoc
index 0b1d096..0156d64 100644
--- a/docs/components/modules/ROOT/pages/file-component.adoc
+++ b/docs/components/modules/ROOT/pages/file-component.adoc
@@ -209,8 +209,12 @@ Notice: The various read locks is not all suited to work
in clustered mode, wher
|===
// endpoint options: END
+[TIP]
+
+*Default behavior for file producer*
-TIP: *Default behavior for file producer* By default it will override any
existing file, if one exist with the same name.
+By default it will override any existing file, if one exist with the same name.
+
// spring-boot-auto-configure options: START
== Spring Boot Auto-Configuration
@@ -1028,11 +1032,15 @@ file:
-TIP: *URI options can reference beans using the # syntax*
+[TIP]
+
+*URI options can reference beans using the # syntax*
+
In the Spring DSL route above notice that we can refer to beans in the
Registry by prefixing the id with `#`. So writing
`sorter=#mySorter`, will instruct Camel to go look in the
Registry for a bean with the ID, `mySorter`.
+
=== Sorting using sortBy
diff --git a/docs/components/modules/ROOT/pages/ftp-component.adoc
b/docs/components/modules/ROOT/pages/ftp-component.adoc
index d48e5eb..ec1bd77 100644
--- a/docs/components/modules/ROOT/pages/ftp-component.adoc
+++ b/docs/components/modules/ROOT/pages/ftp-component.adoc
@@ -449,13 +449,13 @@ as files then you need to route to a file endpoint such
as:
from("ftp://some...@someserver.com?password=secret=/tmp;).to("file://inbox");
-[TIP, caption='Optimization by renaming work file']
-===
+[TIP]
+
The route above is ultra efficient as it avoids reading the entire file
content into memory.
It will download the remote file directly to a local file stream.
The `java.io.File` handle is then used as the Exchange body. The file producer
leverages this fact and can work directly on the work file `java.io.File`
handle and perform a `java.io.File.rename` to the target filename.
As Camel knows it's a local work file, it can optimize and use a rename
instead of a file copy, as the work file is meant to be deleted anyway.
-===
+
== Stepwise changing directories
diff --git a/docs/components/modules/ROOT/pages/ignite.adoc
b/docs/components/modules/ROOT/pages/ignite.adoc
index 5c1f5d0..7a045b0 100644
--- a/docs/components/modules/ROOT/pages/ignite.adoc
+++ b/docs/components/modules/ROOT/pages/ignite.adoc
@@ -96,7 +96,10 @@ Some Ignite operations can deal with multiple elements at
once, if passed a Coll
[[Ignite-OsgiSupport]]
== OSGi Support
-TIP: Apache Ignite supports OSGi from version 1.5.0.final onwards.
+[TIP]
+
+Apache Ignite supports OSGi from version 1.5.0.final onwards.
+
When installing on Apache Karaf:
diff --git a/docs/components/modules/ROOT/pages/jacksonxml-dataformat.adoc
b/docs/components/modules/ROOT/pages/jacksonxml-dataformat.adoc
index 16de590..065a33a 100644
--- a/docs/components/modules/ROOT/pages/jacksonxml-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/jacksonxml-dataformat.adoc
@@ -10,9 +10,12 @@
https://github.com/FasterXML/jackson-dataformat-xml[XMLMapper extension]
to unmarshal an XML payload into Java objects or to marshal Java objects
into an XML payload.
-TIP: If you are familiar with Jackson, this XML data format behaves in the
+[TIP]
+
+If you are familiar with Jackson, this XML data format behaves in the
same way as its JSON counterpart, and thus can be used with classes
annotated for JSON serialization/deserialization.
+
This extension also mimics
https://github.com/FasterXML/jackson-dataformat-xml/blob/master/README.md[JAXB's
diff --git a/docs/components/modules/ROOT/pages/jasypt.adoc
b/docs/components/modules/ROOT/pages/jasypt.adoc
index b7a4df7..61d122b 100644
--- a/docs/components/modules/ROOT/pages/jasypt.adoc
+++ b/docs/components/modules/ROOT/pages/jasypt.adoc
@@ -101,8 +101,10 @@ The idea is then to use those encrypted values in your
xref:properties-component.adoc[Properties] files. Notice how the password
value is
encrypted and
