You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/02 07:03:51 UTC

[camel] branch master updated (624e73a -> acabd92)

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

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 624e73a  Upgrade Tika to version 1.22
     new 897614d  CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Twitter
     new f707a89  CAMEL-13801 - Fixed CS for Camel-Twitter
     new acabd92  Removed unused imports

The 3 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:
 .../component/twitter/SearchDirectCustomComponentTest.java    | 11 +++--------
 .../org/apache/camel/component/twitter/SearchEventTest.java   |  7 ++++---
 .../camel/component/twitter/deprecated/SearchEventTest.java   |  7 ++++---
 3 files changed, 11 insertions(+), 14 deletions(-)


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

Posted by ac...@apache.org.
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 <an...@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;
     }


[camel] 02/03: CAMEL-13801 - Fixed CS for Camel-Twitter

Posted by ac...@apache.org.
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 f707a89e2b68d416b8ff65a0e63957c06ccbd49b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 09:02:49 2019 +0200

    CAMEL-13801 - Fixed CS for Camel-Twitter
---
 .../camel/component/twitter/SearchDirectCustomComponentTest.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 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 279a34f..ec4af46 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
@@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory;
  */
 public class SearchDirectCustomComponentTest extends CamelTwitterConsumerTestSupport {
 
-	@BindToRegistry("my-twitter")
-	private TwitterSearchComponent component = new TwitterSearchComponent();
+    @BindToRegistry("my-twitter")
+    private TwitterSearchComponent component = new TwitterSearchComponent();
 
     @Override
     protected String getUri() {


[camel] 03/03: Removed unused imports

Posted by ac...@apache.org.
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 acabd9215584a72bb9db754108f03249b74df831
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 09:03:30 2019 +0200

    Removed unused imports
---
 .../apache/camel/component/twitter/SearchDirectCustomComponentTest.java  | 1 -
 .../test/java/org/apache/camel/component/twitter/SearchEventTest.java    | 1 -
 .../org/apache/camel/component/twitter/deprecated/SearchEventTest.java   | 1 -
 3 files changed, 3 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 ec4af46..2410f0e 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
@@ -18,7 +18,6 @@ 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;
 import org.slf4j.LoggerFactory;
 
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 c285265..618fbbf 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
@@ -23,7 +23,6 @@ import java.lang.reflect.Proxy;
 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;
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 9078fc6..ae1b77b 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
@@ -24,7 +24,6 @@ import org.apache.camel.EndpointInject;
 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;