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 13:07:05 UTC
[camel] branch master updated (b7ff24f -> 9672694)
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 b7ff24f Removed unused imports
new acb4321 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Zipkin
new 6d67081 Removed unused imports
new 266fb3f CAMEL-13801 - Fixed CS for Camel-zookeeper
new 9672694 Removed unused imports
The 4 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:
.../zipkin/ZipkinSpanReporterInRegistryTest.java | 7 ++++---
...rServiceRegistrationWithServiceComponentTest.java | 20 ++++++--------------
2 files changed, 10 insertions(+), 17 deletions(-)
[camel] 04/04: 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 9672694ceddc468328e52324c5db97d21504fe24
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 15:06:45 2019 +0200
Removed unused imports
---
.../cloud/ZooKeeperServiceRegistrationWithServiceComponentTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationWithServiceComponentTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationWithServiceComponentTest.java
index 1bf1b55..765c291 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationWithServiceComponentTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationWithServiceComponentTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.service.ServiceComponent;
-import org.apache.camel.impl.JndiRegistry;
public class ZooKeeperServiceRegistrationWithServiceComponentTest extends ZooKeeperServiceRegistrationTestBase {
[camel] 03/04: CAMEL-13801 - Fixed CS for Camel-zookeeper
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 266fb3fad20b2d39ca57e5a53058e3b838822042
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 15:06:04 2019 +0200
CAMEL-13801 - Fixed CS for Camel-zookeeper
---
...erServiceRegistrationWithServiceComponentTest.java | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationWithServiceComponentTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationWithServiceComponentTest.java
index ca131f8..1bf1b55 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationWithServiceComponentTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationWithServiceComponentTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.zookeeper.cloud;
import java.util.Collections;
import java.util.Map;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.service.ServiceComponent;
@@ -26,28 +27,20 @@ import org.apache.camel.impl.JndiRegistry;
public class ZooKeeperServiceRegistrationWithServiceComponentTest extends ZooKeeperServiceRegistrationTestBase {
+ @BindToRegistry("service")
+ private ServiceComponent service = new ServiceComponent();
+
protected Map<String, String> getMetadata() {
return Collections.singletonMap("service.type", "zookeeper");
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("service", new ServiceComponent());
-
- return registry;
- }
-
- @Override
protected RoutesBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- fromF("service:%s:jetty:http://0.0.0.0:%d/service/endpoint?service.type=zookeeper", SERVICE_NAME, SERVICE_PORT)
- .routeId(SERVICE_ID)
- .routeGroup(SERVICE_NAME)
- .noAutoStartup()
- .to("log:service-registry?level=INFO");
+ fromF("service:%s:jetty:http://0.0.0.0:%d/service/endpoint?service.type=zookeeper", SERVICE_NAME, SERVICE_PORT).routeId(SERVICE_ID).routeGroup(SERVICE_NAME)
+ .noAutoStartup().to("log:service-registry?level=INFO");
}
};
}
[camel] 02/04: 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 6d6708147fd7633aa657da324855d0f27f2b9700
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 14:56:56 2019 +0200
Removed unused imports
---
.../java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java
index a66977d..f1c0d0b 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java
@@ -16,9 +16,7 @@
*/
package org.apache.camel.zipkin;
-import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
[camel] 01/04: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Zipkin
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 acb43213ccdc3fc12e391464728afb322220f642
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 14:56:40 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Zipkin
---
.../org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java
index b437123..a66977d 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinSpanReporterInRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.zipkin;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import zipkin2.reporter.Reporter;
@@ -37,8 +40,8 @@ public class ZipkinSpanReporterInRegistryTest extends CamelTestSupport {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
+ protected Registry createCamelRegistry() throws Exception {
+ Registry registry = new SimpleRegistry();
registry.bind("span", Reporter.NOOP);
return registry;
}