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 2015/11/01 17:16:45 UTC
[1/2] camel git commit: Fixed CamelCatalog to construct endpoint uris
for netty endpoints
Repository: camel
Updated Branches:
refs/heads/master 2026617e2 -> 47a0c26d8
Fixed CamelCatalog to construct endpoint uris for netty endpoints
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d20e0a43
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d20e0a43
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d20e0a43
Branch: refs/heads/master
Commit: d20e0a437b796cb0ba268046626a44db12598d03
Parents: 2026617
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 1 17:15:11 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 1 17:15:11 2015 +0100
----------------------------------------------------------------------
.../apache/camel/catalog/DefaultCamelCatalog.java | 15 +++++++++++++--
.../org/apache/camel/catalog/CamelCatalogTest.java | 13 +++++++++++++
2 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d20e0a43/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 45c63fc..ed3837c 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -40,6 +40,7 @@ import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Document;
+import static org.apache.camel.catalog.CatalogHelper.after;
import static org.apache.camel.catalog.JSonSchemaHelper.getPropertyDefaultValue;
import static org.apache.camel.catalog.JSonSchemaHelper.isPropertyRequired;
import static org.apache.camel.catalog.URISupport.createQueryString;
@@ -672,6 +673,9 @@ public class DefaultCamelCatalog implements CamelCatalog {
throw new IllegalArgumentException("Endpoint with scheme " + scheme + " has no syntax defined in the json schema");
}
+ // clip the scheme from the syntax
+ syntax = after(syntax, ":");
+
String originalSyntax = syntax;
// build at first according to syntax (use a tree map as we want the uri options sorted)
@@ -707,16 +711,23 @@ public class DefaultCamelCatalog implements CamelCatalog {
// build the endpoint
StringBuilder sb = new StringBuilder();
+ sb.append(scheme);
+ sb.append(":");
+
int range = 0;
+ boolean first = true;
for (int i = 0; i < options.size(); i++) {
String key = options.get(i);
String key2 = options2.get(i);
String token = tokens[i];
// was the option provided?
- if (i == 0 || properties.containsKey(key)) {
- sb.append(token);
+ if (properties.containsKey(key)) {
+ if (!first) {
+ sb.append(token);
+ }
sb.append(key2);
+ first = false;
}
range++;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d20e0a43/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 0d1e803..98962df 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -150,6 +150,19 @@ public class CamelCatalogTest extends TestCase {
}
@Test
+ public void testAsEndpointUriNetty4http() throws Exception {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("protocol", "http");
+ map.put("host", "localhost");
+ map.put("port", "8080");
+ map.put("path", "foo/bar");
+ map.put("disconnect", "true");
+
+ String uri = catalog.asEndpointUri("netty4-http", map);
+ assertEquals("netty4-http:http:localhost:8080/foo/bar?disconnect=true", uri);
+ }
+
+ @Test
public void testAsEndpointUriMapJmsRequiredOnly() throws Exception {
Map<String, String> map = new HashMap<String, String>();
map.put("destinationName", "foo");
[2/2] camel git commit: Fixed netty http component docs
Posted by da...@apache.org.
Fixed netty http component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/47a0c26d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/47a0c26d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/47a0c26d
Branch: refs/heads/master
Commit: 47a0c26d8a54adc8b60383827fe08c6e0875bbaa
Parents: d20e0a4
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Nov 1 17:18:26 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Nov 1 17:18:26 2015 +0100
----------------------------------------------------------------------
.../component/netty/http/NettyHttpConfiguration.java | 13 +++++++++++++
.../camel/component/netty/http/NettyHttpEndpoint.java | 2 +-
.../component/netty4/http/NettyHttpConfiguration.java | 13 +++++++++++++
.../camel/component/netty4/http/NettyHttpEndpoint.java | 2 +-
4 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/47a0c26d/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
index 7f63eba..187143a 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
@@ -34,6 +34,8 @@ import org.jboss.netty.handler.codec.frame.TooLongFrameException;
@UriParams
public class NettyHttpConfiguration extends NettyConfiguration {
+ @UriPath(enums = "http,https", defaultValue = "http") @Metadata(required = "true")
+ private String protocol;
@UriPath @Metadata(required = "true")
private String path;
@UriParam(label = "consumer,advanced")
@@ -87,6 +89,17 @@ public class NettyHttpConfiguration extends NettyConfiguration {
}
}
+ public String getProtocol() {
+ return protocol;
+ }
+
+ /**
+ * The protocol to use which is either http or https
+ */
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
public boolean isCompression() {
return compression;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/47a0c26d/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
index bd5332c..7c35ae2 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* HTTP based {@link NettyEndpoint}
*/
@UriEndpoint(scheme = "netty-http", extendsScheme = "netty", title = "Netty HTTP",
- syntax = "netty-http:host:port/path", consumerClass = NettyHttpConsumer.class, label = "http")
+ syntax = "netty-http:protocol:host:port/path", consumerClass = NettyHttpConsumer.class, label = "http")
public class NettyHttpEndpoint extends NettyEndpoint implements HeaderFilterStrategyAware {
private static final Logger LOG = LoggerFactory.getLogger(NettyHttpEndpoint.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/47a0c26d/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
index 31627aa..54b4e75 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
@@ -33,6 +33,8 @@ import org.apache.camel.spi.UriPath;
@UriParams
public class NettyHttpConfiguration extends NettyConfiguration {
+ @UriPath(enums = "http,https", defaultValue = "http") @Metadata(required = "true")
+ private String protocol;
@UriPath @Metadata(required = "true")
private String path;
@UriParam(label = "consumer,advanced")
@@ -86,6 +88,17 @@ public class NettyHttpConfiguration extends NettyConfiguration {
}
}
+ public String getProtocol() {
+ return protocol;
+ }
+
+ /**
+ * The protocol to use which is either http or https
+ */
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
public boolean isCompression() {
return compression;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/47a0c26d/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
index 5d96197..a7da693 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* HTTP based {@link NettyEndpoint}
*/
@UriEndpoint(scheme = "netty4-http", extendsScheme = "netty4", title = "Netty4 HTTP",
- syntax = "netty4-http:host:port/path", consumerClass = NettyHttpConsumer.class, label = "http")
+ syntax = "netty4-http:protocol:host:port/path", consumerClass = NettyHttpConsumer.class, label = "http")
public class NettyHttpEndpoint extends NettyEndpoint implements HeaderFilterStrategyAware {
private static final Logger LOG = LoggerFactory.getLogger(NettyHttpEndpoint.class);