Repository: camel Updated Branches: refs/heads/master cebc58cd7 -> fd08031bb
Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd08031b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd08031b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd08031b Branch: refs/heads/master Commit: fd08031bb53387f9a4108da7d03245fa81181c3a Parents: f483e70 Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Apr 7 16:24:47 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Apr 7 16:27:24 2016 +0200 ---------------------------------------------------------------------- .../camel/http/common/DefaultHttpBinding.java | 24 ++++++------- .../camel/http/common/HttpCommonEndpoint.java | 38 ++++++++++---------- .../jetty/HttpBridgeBigFormPostRouteTest.java | 2 +- 3 files changed, 32 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fd08031b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java index 974b869..6f5a97f 100644 --- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java +++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java @@ -561,22 +561,22 @@ public class DefaultHttpBinding implements HttpBinding { } public boolean isMapHttpMessageBody() { - return mapHttpMessageBody; - } + return mapHttpMessageBody; + } - public void setMapHttpMessageBody(boolean mapHttpMessageBody) { - this.mapHttpMessageBody = mapHttpMessageBody; - } + public void setMapHttpMessageBody(boolean mapHttpMessageBody) { + this.mapHttpMessageBody = mapHttpMessageBody; + } - public boolean isMapHttpMessageHeaders() { - return mapHttpMessageHeaders; - } + public boolean isMapHttpMessageHeaders() { + return mapHttpMessageHeaders; + } - public void setMapHttpMessageHeaders(boolean mapHttpMessageHeaders) { - this.mapHttpMessageHeaders = mapHttpMessageHeaders; - } + public void setMapHttpMessageHeaders(boolean mapHttpMessageHeaders) { + this.mapHttpMessageHeaders = mapHttpMessageHeaders; + } - protected static SimpleDateFormat getHttpDateFormat() { + protected static SimpleDateFormat getHttpDateFormat() { SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT, Locale.US); dateFormat.setTimeZone(TIME_ZONE_GMT); return dateFormat; http://git-wip-us.apache.org/repos/asf/camel/blob/fd08031b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java index e9b45fb..fb4e73b 100644 --- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java +++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java @@ -100,13 +100,6 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head description = "Whether to eager check whether the HTTP requests has content if the content-length header is 0 or not present." + " This can be turned on in case HTTP clients do not send streamed data.") boolean eagerCheckContentAvailable; - @UriParam(label = "producer", defaultValue = "200-299", - description = "The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included.") - private String okStatusCodeRange = "200-299"; - @UriParam(label = "producer,advanced", - description = "Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints." - + " See more details at http://camel.apache.org/urlrewrite.html";) - private UrlRewrite urlRewrite; @UriParam(label = "advanced", defaultValue = "true", description = "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body." + " Setting this to false will avoid the HTTP mapping.") @@ -115,6 +108,13 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head description = "If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers." + " Setting this to false will avoid the HTTP Headers mapping.") boolean mapHttpMessageHeaders = true; + @UriParam(label = "producer", defaultValue = "200-299", + description = "The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included.") + private String okStatusCodeRange = "200-299"; + @UriParam(label = "producer,advanced", + description = "Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints." + + " See more details at http://camel.apache.org/urlrewrite.html";) + private UrlRewrite urlRewrite; public HttpCommonEndpoint() { } @@ -456,25 +456,25 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head this.okStatusCodeRange = okStatusCodeRange; } - public boolean isMapHttpMessageBody() { - return mapHttpMessageBody; - } + public boolean isMapHttpMessageBody() { + return mapHttpMessageBody; + } /** * If this option is true, the IN exchange body will be mapped to HTTP */ - public void setMapHttpMessageBody(boolean mapHttpMessageBody) { - this.mapHttpMessageBody = mapHttpMessageBody; - } + public void setMapHttpMessageBody(boolean mapHttpMessageBody) { + this.mapHttpMessageBody = mapHttpMessageBody; + } - public boolean isMapHttpMessageHeaders() { - return mapHttpMessageHeaders; - } + public boolean isMapHttpMessageHeaders() { + return mapHttpMessageHeaders; + } /** * If this option is true, the IN exchange headers will be mapped to HTTP Headers */ - public void setMapHttpMessageHeaders(boolean mapHttpMessageHeaders) { - this.mapHttpMessageHeaders = mapHttpMessageHeaders; - } + public void setMapHttpMessageHeaders(boolean mapHttpMessageHeaders) { + this.mapHttpMessageHeaders = mapHttpMessageHeaders; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/fd08031b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBridgeBigFormPostRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBridgeBigFormPostRouteTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBridgeBigFormPostRouteTest.java index dd0ee1f..9d4221d 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBridgeBigFormPostRouteTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpBridgeBigFormPostRouteTest.java @@ -118,7 +118,7 @@ public class HttpBridgeBigFormPostRouteTest extends BaseJettyTest { from("jetty:http://localhost:"; + port2 + "/test/hello?matchOnUriPrefix=true") .removeHeaders("formMetaData") - .to("http://localhost:"; + port1 + "?bridgeEndpoint=true&mapHttpMessageHeaders=false"); + .to("http://localhost:"; + port1 + "?bridgeEndpoint=true"); } }; }
