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 2018/08/20 17:26:50 UTC
[camel] branch camel-2.22.x updated (f0b93fc -> 14d4154)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from f0b93fc CAMEL-12709: Splitter aggregation strategy should also deal with delegate strategy and have share unit of work set on both conditions. Thanks to Matthias Humbert for reporting.
new 3aa75be Update micrometer-component.adoc (#2486)
new 14d4154 CAMEL-12740: HttpAsyncClientBuilder is now used when no ClientBuilder is specified (#2487)
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:
components/camel-micrometer/src/main/docs/micrometer-component.adoc | 6 +++---
.../java/org/apache/camel/component/olingo2/Olingo2Component.java | 2 ++
.../java/org/apache/camel/component/olingo4/Olingo4Component.java | 2 ++
3 files changed, 7 insertions(+), 3 deletions(-)
[camel] 02/02: CAMEL-12740: HttpAsyncClientBuilder is now used when
no ClientBuilder is specified (#2487)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 14d41543808ebd301df9ddc9252b2409d9266112
Author: ninckblokje <ni...@users.noreply.github.com>
AuthorDate: Mon Aug 20 19:23:21 2018 +0200
CAMEL-12740: HttpAsyncClientBuilder is now used when no ClientBuilder is specified (#2487)
---
.../main/java/org/apache/camel/component/olingo2/Olingo2Component.java | 2 ++
.../main/java/org/apache/camel/component/olingo4/Olingo4Component.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
index 4e7973d..77b9864 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
@@ -176,6 +176,8 @@ public class Olingo2Component extends AbstractApiComponent<Olingo2ApiName, Oling
} catch (IOException e) {
throw ObjectHelper.wrapRuntimeCamelException(e);
}
+
+ clientBuilder = asyncClientBuilder;
}
Olingo2AppImpl olingo2App;
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
index 0f17d73..b6a7b44 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
@@ -162,6 +162,8 @@ public class Olingo4Component extends AbstractApiComponent<Olingo4ApiName, Oling
} catch (IOException e) {
throw ObjectHelper.wrapRuntimeCamelException(e);
}
+
+ clientBuilder = asyncClientBuilder;
}
Olingo4AppImpl olingo4App;
[camel] 01/02: Update micrometer-component.adoc (#2486)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3aa75beb89321171f71a33475ce6403a167731e2
Author: David J. M. Karlsen <da...@gmail.com>
AuthorDate: Mon Aug 20 16:50:58 2018 +0200
Update micrometer-component.adoc (#2486)
Fix ComponentMeterRegistry -> CompositeMeterRegistry
---
components/camel-micrometer/src/main/docs/micrometer-component.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-micrometer/src/main/docs/micrometer-component.adoc b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
index c4e84e0..9bf2d90 100644
--- a/components/camel-micrometer/src/main/docs/micrometer-component.adoc
+++ b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
@@ -126,7 +126,7 @@ public static class MyConfig extends SingleRouteCamelConfiguration {
@Bean(name = MicrometerComponent.METRICS_REGISTRY_NAME)
public MeterRegistry getMeterRegistry() {
- ComponentMeterRegistry registry = ...;
+ CompositeMeterRegistry registry = ...;
registry.add(...);
// ...
return registry;
@@ -150,7 +150,7 @@ class MyBean extends RouteBuilder {
// If multiple MetricRegistry beans
// @Named(MicrometerComponent.METRIC_REGISTRY_NAME)
MetricRegistry registry() {
- ComponentMeterRegistry registry = ...;
+ CompositeMeterRegistry registry = ...;
registry.add(...);
// ...
return registry;
@@ -546,7 +546,7 @@ and add a `JmxMeterRegistry` instance:
@Bean(name = MicrometerComponent.METRICS_REGISTRY_NAME)
public MeterRegistry getMeterRegistry() {
- ComponentMeterRegistry meterRegistry = new CompositeMeterRegistry();
+ CompositeMeterRegistry meterRegistry = new CompositeMeterRegistry();
meterRegistry.add(...);
meterRegistry.add(new JmxMeterRegistry(
CamelJmxConfig.DEFAULT,