camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: Fixed netty http component docs
Date Sun, 01 Nov 2015 16:16:46 GMT
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 <davsclaus@apache.org>
Authored: Sun Nov 1 17:18:26 2015 +0100
Committer: Claus Ibsen <davsclaus@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);


Mime
View raw message