[camel] 01/03: Camel-Metrics: Use BindToRegistry annotation wherever possible

[acosentino]

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 254d0f64fb4128d659072c3506d17ae98d7cf24f
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Jul 29 11:55:16 2019 +0200

    Camel-Metrics: Use BindToRegistry annotation wherever possible
---
 .../metrics/messagehistory/ManagedMessageHistoryTest.java     | 11 +++--------
 .../metrics/routepolicy/ManagedMetricsRoutePolicyTest.java    | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git 
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
 
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
index df5d28f..fe82af6 100644
--- 
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
+++ 
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/messagehistory/ManagedMessageHistoryTest.java
@@ -21,6 +21,8 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import com.codahale.metrics.MetricRegistry;
+
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.metrics.MetricsComponent;
@@ -30,6 +32,7 @@ import org.junit.Test;
 
 public class ManagedMessageHistoryTest extends CamelTestSupport {
 
+       @BindToRegistry(MetricsComponent.METRIC_REGISTRY_NAME)
     private MetricRegistry metricRegistry = new MetricRegistry();
 
     @Override
@@ -40,14 +43,6 @@ public class ManagedMessageHistoryTest extends 
CamelTestSupport {
     protected MBeanServer getMBeanServer() {
         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();
-        registry.bind(MetricsComponent.METRIC_REGISTRY_NAME, metricRegistry);
-        return registry;
-    }
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git 
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java
 
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java
index 942124d..8201c6b 100644
--- 
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java
+++ 
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/ManagedMetricsRoutePolicyTest.java
@@ -22,6 +22,8 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import com.codahale.metrics.MetricRegistry;
+
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.metrics.MetricsComponent;
@@ -31,6 +33,7 @@ import org.junit.Test;
 
 public class ManagedMetricsRoutePolicyTest extends CamelTestSupport {
 
+       @BindToRegistry(MetricsComponent.METRIC_REGISTRY_NAME)
     private MetricRegistry metricRegistry = new MetricRegistry();
 
     @Override
@@ -41,14 +44,6 @@ public class ManagedMetricsRoutePolicyTest extends 
CamelTestSupport {
     protected MBeanServer getMBeanServer() {
         return 
context.getManagementStrategy().getManagementAgent().getMBeanServer();
     }
-    
-    // Setup the common MetricsRegistry for MetricsComponent and 
MetricsRoutePolicy to use
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry registry = super.createRegistry();
-        registry.bind(MetricsComponent.METRIC_REGISTRY_NAME, metricRegistry);
-        return registry;
-    }
 
     @Override
     protected CamelContext createCamelContext() throws Exception {