[camel] branch master updated: Replaced usage of deprecated JndiRegistry

[aldettinger]

This is an automated email from the ASF dual-hosted git repository.

aldettinger 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 754f9a0  Replaced usage of deprecated JndiRegistry
754f9a0 is described below

commit 754f9a0b73b6b476580535861bf8c344c2ccea94
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Tue Jul 2 18:04:32 2019 +0200

    Replaced usage of deprecated JndiRegistry
---
 .../camel/component/consul/ConsulClientKeyValueTest.java | 16 ++++++++--------
 .../apache/camel/component/consul/ConsulTestSupport.java | 14 +++++---------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git 
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
 
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
index e4a384f..ef6cc27 100644
--- 
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
+++ 
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulClientKeyValueTest.java
@@ -18,10 +18,12 @@ package org.apache.camel.component.consul;
 
 import java.util.Optional;
 
+import com.orbitz.consul.Consul;
+
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.consul.endpoint.ConsulKeyValueActions;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
 
 public class ConsulClientKeyValueTest extends ConsulTestSupport {
@@ -50,17 +52,15 @@ public class ConsulClientKeyValueTest extends 
ConsulTestSupport {
         assertTrue(keyVal.isPresent());
         assertEquals(val, keyVal.get());
     }
-    
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry registry = super.createRegistry();
-        registry.bind("consulClient", getConsul());
-        return registry;
-    }
 
+    @BindToRegistry("consulClient")
+    public Consul getConsulClient() {
+        return getConsul();
+    }
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
+
         return new RouteBuilder() {
             public void configure() {
                 from("direct:kv")
diff --git 
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
 
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
index 19c6fac..bc1d6cd 100644
--- 
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
+++ 
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
@@ -22,7 +22,8 @@ import java.util.UUID;
 
 import com.orbitz.consul.Consul;
 import com.orbitz.consul.KeyValueClient;
-import org.apache.camel.impl.JndiRegistry;
+
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
 import org.apache.camel.test.testcontainers.Wait;
 import org.junit.Rule;
@@ -37,16 +38,11 @@ public class ConsulTestSupport extends 
ContainerAwareTestSupport {
     @Rule
     public final TestName testName = new TestName();
 
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry registry = super.createRegistry();
-
+    @BindToRegistry("consul")
+    public ConsulComponent getConsulComponent() {
         ConsulComponent component = new ConsulComponent();
         component.setUrl(consulUrl());
-
-        registry.bind("consul", component);
-
-        return registry;
+        return component;
     }
 
     protected Consul getConsul() {