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 8203719d786f19abe92b4bfd6cec19f303e265dd
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Jul 29 12:31:51 2019 +0200
Camel-Micrometer: Use BindToRegistry annotation wherever possible
---
.../AbstractMicrometerEventNotifierTest.java | 15 +++++++--------
.../messagehistory/ManagedMessageHistoryTest.java | 14 ++++++--------
.../routepolicy/AbstractMicrometerRoutePolicyTest.java | 10 +++++-----
3 files changed, 18 insertions(+), 21 deletions(-)
diff --git
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
index a52b356..ea20308 100644
---
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
+++
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
@@ -21,6 +21,8 @@ import
io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import io.micrometer.core.instrument.util.HierarchicalNameMapper;
import io.micrometer.jmx.JmxMeterRegistry;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
@@ -29,7 +31,8 @@ import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport {
-
+
+ @BindToRegistry(MicrometerConstants.METRICS_REGISTRY_NAME)
protected CompositeMeterRegistry meterRegistry;
@Override
@@ -37,19 +40,16 @@ abstract class AbstractMicrometerEventNotifierTest extends
CamelTestSupport {
return true;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- meterRegistry = new CompositeMeterRegistry();
+ public void addRegistry() throws Exception {
+ meterRegistry = new CompositeMeterRegistry();
meterRegistry.add(new SimpleMeterRegistry());
meterRegistry.add(new JmxMeterRegistry(CamelJmxConfig.DEFAULT,
Clock.SYSTEM, HierarchicalNameMapper.DEFAULT));
- registry.bind(MicrometerConstants.METRICS_REGISTRY_NAME,
meterRegistry);
- return registry;
}
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
+ addRegistry();
AbstractMicrometerEventNotifier<?> eventNotifier = getEventNotifier();
eventNotifier.setMeterRegistry(meterRegistry);
eventNotifier.setPrettyPrint(true);
@@ -58,5 +58,4 @@ abstract class AbstractMicrometerEventNotifierTest extends
CamelTestSupport {
}
protected abstract AbstractMicrometerEventNotifier<?> getEventNotifier();
-
}
diff --git
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
index 930833a..80e67d5 100644
---
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
+++
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
@@ -24,6 +24,8 @@ import
io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import io.micrometer.core.instrument.util.HierarchicalNameMapper;
import io.micrometer.jmx.JmxMeterRegistry;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.micrometer.CamelJmxConfig;
@@ -33,7 +35,8 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class ManagedMessageHistoryTest extends CamelTestSupport {
-
+
+ @BindToRegistry(MicrometerConstants.METRICS_REGISTRY_NAME)
private CompositeMeterRegistry meterRegistry;
@Override
@@ -45,21 +48,16 @@ public class ManagedMessageHistoryTest extends
CamelTestSupport {
return
context.getManagementStrategy().getManagementAgent().getMBeanServer();
}
- // Setup the common MetricsRegistry for MetricsComponent and
MetricsMessageHistoryFactory to use
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
+ public void addRegistry() throws Exception {
meterRegistry = new CompositeMeterRegistry();
meterRegistry.add(new SimpleMeterRegistry());
meterRegistry.add(new JmxMeterRegistry(CamelJmxConfig.DEFAULT,
Clock.SYSTEM, HierarchicalNameMapper.DEFAULT));
- registry.bind(MicrometerConstants.METRICS_REGISTRY_NAME,
meterRegistry);
- return registry;
}
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
-
+ addRegistry();
MicrometerMessageHistoryFactory factory = new
MicrometerMessageHistoryFactory();
factory.setPrettyPrint(true);
factory.setMeterRegistry(meterRegistry);
diff --git
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
index b82c6e5..324339e 100644
---
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
+++
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
@@ -21,6 +21,8 @@ import
io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import io.micrometer.core.instrument.util.HierarchicalNameMapper;
import io.micrometer.jmx.JmxMeterRegistry;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
@@ -36,14 +38,12 @@ public class AbstractMicrometerRoutePolicyTest extends
CamelTestSupport {
return true;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
+ @BindToRegistry(MicrometerConstants.METRICS_REGISTRY_NAME)
+ public CompositeMeterRegistry addRegistry() throws Exception {
meterRegistry = new CompositeMeterRegistry();
meterRegistry.add(new SimpleMeterRegistry());
meterRegistry.add(new JmxMeterRegistry(CamelJmxConfig.DEFAULT,
Clock.SYSTEM, HierarchicalNameMapper.DEFAULT));
- registry.bind(MicrometerConstants.METRICS_REGISTRY_NAME,
meterRegistry);
- return registry;
+ return meterRegistry;
}
@Override
