[camel] 01/03: CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Twitter

[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 897614d48fa0024ae0c63fbb5eb6f17c929dc69c
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Aug 2 09:00:57 2019 +0200

    CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Twitter
---
 .../component/twitter/SearchDirectCustomComponentTest.java     | 10 +++-------
 .../org/apache/camel/component/twitter/SearchEventTest.java    |  6 ++++--
 .../camel/component/twitter/deprecated/SearchEventTest.java    |  6 ++++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchDirectCustomComponentTest.java
 
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchDirectCustomComponentTest.java
index 59e0580..279a34f 100644
--- 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchDirectCustomComponentTest.java
+++ 
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchDirectCustomComponentTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.twitter;
 
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.component.twitter.search.TwitterSearchComponent;
 import org.apache.camel.impl.JndiRegistry;
 import org.slf4j.Logger;
@@ -26,13 +27,8 @@ import org.slf4j.LoggerFactory;
  */
 public class SearchDirectCustomComponentTest extends 
CamelTwitterConsumerTestSupport {
 
-    @Override
-    protected JndiRegistry createRegistry() throws Exception {
-        JndiRegistry registry = super.createRegistry();
-        registry.bind("my-twitter", new TwitterSearchComponent());
-
-        return registry;
-    }
+       @BindToRegistry("my-twitter")
+       private TwitterSearchComponent component = new TwitterSearchComponent();
 
     @Override
     protected String getUri() {
diff --git 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java
 
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java
index 7d1b001..c285265 100644
--- 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java
+++ 
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchEventTest.java
@@ -24,6 +24,8 @@ import org.apache.camel.EndpointInject;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
 import org.junit.Test;
 import twitter4j.Status;
 import twitter4j.StatusListener;
@@ -59,11 +61,11 @@ public class SearchEventTest extends 
CamelTwitterTestSupport {
     }
 
     @Override
-    protected JndiRegistry createRegistry() throws Exception {
+    protected Registry createCamelRegistry() throws Exception {
         twitterStream = (TwitterStream) 
Proxy.newProxyInstance(getClass().getClassLoader(),
                 new Class[]{TwitterStream.class},
                 new TwitterHandler());
-        JndiRegistry registry = super.createRegistry();
+        Registry registry = new SimpleRegistry();
         registry.bind("twitterStream", twitterStream);
         return registry;
     }
diff --git 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java
 
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java
index dc2ec48..9078fc6 100644
--- 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java
+++ 
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/deprecated/SearchEventTest.java
@@ -25,6 +25,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.twitter.CamelTwitterTestSupport;
 import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
 import org.junit.Test;
 import twitter4j.Status;
 import twitter4j.StatusListener;
@@ -61,11 +63,11 @@ public class SearchEventTest extends 
CamelTwitterTestSupport {
     }
 
     @Override
-    protected JndiRegistry createRegistry() throws Exception {
+    protected Registry createCamelRegistry() throws Exception {
         twitterStream = (TwitterStream) 
Proxy.newProxyInstance(getClass().getClassLoader(),
                 new Class[]{TwitterStream.class},
                 new TwitterHandler());
-        JndiRegistry registry = super.createRegistry();
+        Registry registry = new SimpleRegistry();
         registry.bind("twitterStream", twitterStream);
         return registry;
     }