You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/04/28 17:19:58 UTC
[1/3] camel git commit: CAMEL-9200: Context component conflates
endpoints with the same local id from different CamelContexts. Thanks to
Aaron Birkland for the patch.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x fa3ec4d99 -> 1b3b64a75
refs/heads/master 017dffc37 -> 935f36603
CAMEL-9200: Context component conflates endpoints with the same local id from different CamelContexts. Thanks to Aaron Birkland for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e903b35
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e903b35
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e903b35
Branch: refs/heads/master
Commit: 3e903b355ccd2a743f3bc79ac31ff2c896b0a46a
Parents: 017dffc
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 28 16:45:00 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 16:45:16 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/impl/DefaultEndpoint.java | 5 +++-
.../component/context/ContextEndpoint.java | 24 ++++++++++++++++++++
.../context/LocalContextComponent.java | 6 +++--
.../context/SpringDslContextComponentTest.java | 2 +-
4 files changed, 33 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3e903b35/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
index ff8253c..eded370 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
@@ -147,7 +147,10 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
public boolean equals(Object object) {
if (object instanceof DefaultEndpoint) {
DefaultEndpoint that = (DefaultEndpoint)object;
- return ObjectHelper.equal(this.getEndpointUri(), that.getEndpointUri());
+ // must also match the same CamelContext in case we compare endpoints from different contexts
+ String thisContextName = this.getCamelContext() != null ? this.getCamelContext().getName() : null;
+ String thatContextName = that.getCamelContext() != null ? that.getCamelContext().getName() : null;
+ return ObjectHelper.equal(this.getEndpointUri(), that.getEndpointUri()) && ObjectHelper.equal(thisContextName, thatContextName);
}
return false;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3e903b35/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java b/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
index 36ad929..ff88de6 100644
--- a/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
+++ b/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.context;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.DelegateEndpoint;
@@ -96,4 +99,25 @@ public class ContextEndpoint extends DefaultEndpoint implements DelegateEndpoint
public boolean isSingleton() {
return delegate.isSingleton();
}
+
+ @Override
+ public void start() throws Exception {
+ // noop by purpose
+ }
+
+ @Override
+ public void stop() throws Exception {
+ // noop by purpose
+ }
+
+ @Override
+ public void configureProperties(Map<String, Object> options) {
+ // noop by purpose
+ }
+
+ @Override
+ public void setCamelContext(CamelContext context) {
+ // noop by purpose
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3e903b35/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
index d341b4b..9ae64a7 100644
--- a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
+++ b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
@@ -78,7 +78,8 @@ public class LocalContextComponent extends DefaultComponent {
Endpoint endpoint = map.get(remaining);
if (endpoint != null) {
logUsingEndpoint(uri, endpoint);
- return endpoint;
+ return new ContextEndpoint(uri, this, endpoint);
+ //return new ExportedEndpoint(endpoint);
}
// look to see if there is an endpoint of name 'remaining' using one of the local endpoints within
@@ -90,7 +91,8 @@ public class LocalContextComponent extends DefaultComponent {
endpoint = map.get(newUri);
if (endpoint != null) {
logUsingEndpoint(uri, endpoint);
- return endpoint;
+ return new ContextEndpoint(uri, this, endpoint);
+ //return new ExportedEndpoint(endpoint);
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3e903b35/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java b/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
index 65742d1..d986d5d 100644
--- a/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
+++ b/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
@@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class SpringDslContextComponentTest extends AbstractJUnit4SpringContextTests {
- @EndpointInject(uri = "tester:results", context = "tester")
+ @EndpointInject(uri = "mock:results", context = "tester")
private MockEndpoint resultEndpoint;
@Produce(uri = "tester:start", context = "tester")
[2/3] camel git commit: Upgrade karaf
Posted by da...@apache.org.
Upgrade karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/935f3660
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/935f3660
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/935f3660
Branch: refs/heads/master
Commit: 935f36603587c9c2b53607a7a66f96d6a14f2368
Parents: 3e903b3
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 28 17:03:54 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 17:03:54 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/935f3660/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
index a2acca6..e75b278 100644
--- a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
+++ b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
@@ -249,7 +249,7 @@ public abstract class AbstractFeatureTest {
}
if (karafVersion == null) {
// setup the default version of it
- karafVersion = "4.0.4";
+ karafVersion = "4.0.5";
}
return karafVersion;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/935f3660/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ac5b391..02c9a49 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -352,7 +352,7 @@
<kafka-bundle-version>0.9.0.1_1</kafka-bundle-version>
<karaf-version>2.4.4</karaf-version>
<karaf3-version>3.0.6</karaf3-version>
- <karaf4-version>4.0.4</karaf4-version>
+ <karaf4-version>4.0.5</karaf4-version>
<kie-version>6.4.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
<kubernetes-client-version>1.3.83</kubernetes-client-version>
[3/3] camel git commit: CAMEL-9200: Context component conflates
endpoints with the same local id from different CamelContexts. Thanks to
Aaron Birkland for the patch.
Posted by da...@apache.org.
CAMEL-9200: Context component conflates endpoints with the same local id from different CamelContexts. Thanks to Aaron Birkland for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1b3b64a7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1b3b64a7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1b3b64a7
Branch: refs/heads/camel-2.16.x
Commit: 1b3b64a750a913562b9dc89f0d7dc32f6c4020e2
Parents: fa3ec4d
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 28 16:45:00 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 17:19:48 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/impl/DefaultEndpoint.java | 5 +++-
.../component/context/ContextEndpoint.java | 24 ++++++++++++++++++++
.../context/LocalContextComponent.java | 6 +++--
.../context/SpringDslContextComponentTest.java | 2 +-
4 files changed, 33 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1b3b64a7/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
index ff8253c..eded370 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
@@ -147,7 +147,10 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
public boolean equals(Object object) {
if (object instanceof DefaultEndpoint) {
DefaultEndpoint that = (DefaultEndpoint)object;
- return ObjectHelper.equal(this.getEndpointUri(), that.getEndpointUri());
+ // must also match the same CamelContext in case we compare endpoints from different contexts
+ String thisContextName = this.getCamelContext() != null ? this.getCamelContext().getName() : null;
+ String thatContextName = that.getCamelContext() != null ? that.getCamelContext().getName() : null;
+ return ObjectHelper.equal(this.getEndpointUri(), that.getEndpointUri()) && ObjectHelper.equal(thisContextName, thatContextName);
}
return false;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1b3b64a7/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java b/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
index 49dfddd..4704b1d 100644
--- a/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
+++ b/components/camel-context/src/main/java/org/apache/camel/component/context/ContextEndpoint.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.context;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.DelegateEndpoint;
@@ -87,4 +90,25 @@ public class ContextEndpoint extends DefaultEndpoint implements DelegateEndpoint
public boolean isSingleton() {
return delegate.isSingleton();
}
+
+ @Override
+ public void start() throws Exception {
+ // noop by purpose
+ }
+
+ @Override
+ public void stop() throws Exception {
+ // noop by purpose
+ }
+
+ @Override
+ public void configureProperties(Map<String, Object> options) {
+ // noop by purpose
+ }
+
+ @Override
+ public void setCamelContext(CamelContext context) {
+ // noop by purpose
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1b3b64a7/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
index d341b4b..9ae64a7 100644
--- a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
+++ b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
@@ -78,7 +78,8 @@ public class LocalContextComponent extends DefaultComponent {
Endpoint endpoint = map.get(remaining);
if (endpoint != null) {
logUsingEndpoint(uri, endpoint);
- return endpoint;
+ return new ContextEndpoint(uri, this, endpoint);
+ //return new ExportedEndpoint(endpoint);
}
// look to see if there is an endpoint of name 'remaining' using one of the local endpoints within
@@ -90,7 +91,8 @@ public class LocalContextComponent extends DefaultComponent {
endpoint = map.get(newUri);
if (endpoint != null) {
logUsingEndpoint(uri, endpoint);
- return endpoint;
+ return new ContextEndpoint(uri, this, endpoint);
+ //return new ExportedEndpoint(endpoint);
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1b3b64a7/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java b/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
index 65742d1..d986d5d 100644
--- a/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
+++ b/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
@@ -34,7 +34,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
public class SpringDslContextComponentTest extends AbstractJUnit4SpringContextTests {
- @EndpointInject(uri = "tester:results", context = "tester")
+ @EndpointInject(uri = "mock:results", context = "tester")
private MockEndpoint resultEndpoint;
@Produce(uri = "tester:start", context = "tester")