You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/07/27 05:04:25 UTC
[camel] branch camel-3.4.x updated (19318d8 -> 96ef8a8)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 19318d8 [CAMEL-15314] Make dsl static builders public (#4047)
new 5ff8e23 Replace old groupExchanges in EIP docs.
new 96ef8a8 CAMEL-15298: Fixed WARN about cannot inject camel context into default health check registry when using spring boot.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/docs/modules/eips/pages/aggregate-eip.adoc | 17 ++++++++---------
.../camel/impl/health/DefaultHealthCheckRegistry.java | 2 ++
2 files changed, 10 insertions(+), 9 deletions(-)
[camel] 01/02: Replace old groupExchanges in EIP docs.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5ff8e23ccce16bbb418262e817ddc23959ba0494
Author: Jan Bednář <ma...@janbednar.eu>
AuthorDate: Sun Jul 26 23:55:09 2020 +0200
Replace old groupExchanges in EIP docs.
---
.../src/main/docs/modules/eips/pages/aggregate-eip.adoc | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/aggregate-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/aggregate-eip.adoc
index a27492a..4765a7a 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/aggregate-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/aggregate-eip.adoc
@@ -368,25 +368,24 @@ To configure this from XML DSL
There is also JMX API on the aggregator which is available under the
processors node in the Camel JMX tree.
-== Using GroupedExchanges
+== Using GroupedExchangeAggregationStrategy
In the route below we group all the exchanges together using
-`groupExchanges()`:
+`GroupedExchangeAggregationStrategy`:
[source,java]
----
from("direct:start")
- // aggregate all using same expression
- .aggregate(constant(true))
+ // aggregate all using same expression and group the
+ // exchanges so we get one single exchange containing all
+ // the others
+ .aggregate(new GroupedExchangeAggregationStrategy()).constant(true)
// wait for 0.5 seconds to aggregate
- .completionTimeout(500L)
- // group the exchanges so we get one single exchange containing all the others
- .groupExchanges()
- .to("mock:result");
+ .completionTimeout(500L).to("mock:result");
----
As a result we have one outgoing `Exchange` being
-routed the `"mock:result"` endpoint. The exchange is a holder
+routed to the `"mock:result"` endpoint. The exchange is a holder
containing all the incoming Exchanges.
The output of the aggregator will then contain the exchanges grouped
[camel] 02/02: CAMEL-15298: Fixed WARN about cannot inject camel
context into default health check registry when using spring boot.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96ef8a8a44b9340af5c55a2408d854bbb68a98c5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jul 27 07:02:22 2020 +0200
CAMEL-15298: Fixed WARN about cannot inject camel context into default health check registry when using spring boot.
---
.../java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
index 0cd7e6a..cf4a4cc 100644
--- a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
+++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
@@ -23,6 +23,7 @@ import java.util.stream.Stream;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
+import org.apache.camel.DeferredContextBinding;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckRegistry;
@@ -38,6 +39,7 @@ import org.slf4j.LoggerFactory;
* Default {@link HealthCheckRegistry}.
*/
@JdkService(HealthCheckRegistry.FACTORY)
+@DeferredContextBinding
public class DefaultHealthCheckRegistry extends ServiceSupport implements HealthCheckRegistry {
private static final Logger LOG = LoggerFactory.getLogger(DefaultHealthCheckRegistry.class);