You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/07/08 10:30:09 UTC
git commit: CAMEL-6516 added meanful endpointUri for the mina endpoint
Updated Branches:
refs/heads/master a6869ee26 -> d1c6062c1
CAMEL-6516 added meanful endpointUri for the mina endpoint
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1c6062c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1c6062c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1c6062c
Branch: refs/heads/master
Commit: d1c6062c1f041488d15908e796e6750a22500418
Parents: a6869ee
Author: Willem Jiang <ni...@apache.org>
Authored: Mon Jul 8 16:13:42 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Mon Jul 8 16:13:42 2013 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/mina/MinaComponent.java | 2 +-
.../java/org/apache/camel/component/mina/MinaConfiguration.java | 5 +++++
.../org/apache/camel/component/mina/SpringMinaEndpointTest.java | 3 +++
.../java/org/apache/camel/component/mina2/Mina2Component.java | 2 +-
.../org/apache/camel/component/mina2/Mina2Configuration.java | 5 +++++
.../camel/component/mina2/Mina2SpringMinaEndpointTest.java | 4 ++++
6 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d1c6062c/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
index 68375d5..1eba643 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
@@ -94,7 +94,7 @@ public class MinaComponent extends DefaultComponent {
}
public Endpoint createEndpoint(MinaConfiguration config) throws Exception {
- return createEndpoint(null, config);
+ return createEndpoint(config.getUriString(), config);
}
private Endpoint createEndpoint(String uri, MinaConfiguration config) throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/d1c6062c/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
index 57568e4..7cb9725 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConfiguration.java
@@ -225,4 +225,9 @@ public class MinaConfiguration implements Cloneable {
public void setNoReplyLogLevel(LoggingLevel noReplyLogLevel) {
this.noReplyLogLevel = noReplyLogLevel;
}
+
+ // here we just shows the option setting of host, port, protocol
+ public String getUriString() {
+ return "mina:" + getProtocol() + ":" + getHost() + ":" + getPort();
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d1c6062c/components/camel-mina/src/test/java/org/apache/camel/component/mina/SpringMinaEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/SpringMinaEndpointTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/SpringMinaEndpointTest.java
index ad79229..7483b5c 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/SpringMinaEndpointTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/SpringMinaEndpointTest.java
@@ -34,6 +34,9 @@ public class SpringMinaEndpointTest extends CamelSpringTestSupport {
template.sendBody("myMinaEndpoint", "Hello World");
assertMockEndpointsSatisfied();
+
+ MinaEndpoint endpoint = applicationContext.getBean("myMinaEndpoint", MinaEndpoint.class);
+ assertEquals("mina:tcp:localhost:1234", endpoint.getEndpointUri());
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/d1c6062c/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
index 1c8b95d..6dc88f8 100644
--- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
+++ b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
@@ -68,7 +68,7 @@ public class Mina2Component extends DefaultComponent {
}
public Endpoint createEndpoint(Mina2Configuration config) throws Exception {
- return createEndpoint(null, config);
+ return createEndpoint(config.getUriString(), config);
}
private Endpoint createEndpoint(String uri, Mina2Configuration config) throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/d1c6062c/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
index eae4313..3e28e34 100644
--- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
+++ b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
@@ -263,4 +263,9 @@ public class Mina2Configuration implements Cloneable {
public void setOrderedThreadPoolExecutor(boolean orderedThreadPoolExecutor) {
this.orderedThreadPoolExecutor = orderedThreadPoolExecutor;
}
+
+ // here we just shows the option setting of host, port, protocol
+ public String getUriString() {
+ return "mina2:" + getProtocol() + ":" + getHost() + ":" + getPort();
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d1c6062c/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
index 847dbfd..f748bef 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.mina2;
+
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
@@ -34,6 +35,9 @@ public class Mina2SpringMinaEndpointTest extends CamelSpringTestSupport {
template.sendBody("myMinaEndpoint", "Hello World");
assertMockEndpointsSatisfied();
+ // checking the endpoint uri
+ Mina2Endpoint endpoint = applicationContext.getBean("myMinaEndpoint", Mina2Endpoint.class);
+ assertEquals("mina2:tcp:localhost:1234", endpoint.getEndpointUri());
}
@Override