Repository: camel Updated Branches: refs/heads/camel-2.17.x 76123a4fe -> f86a11089
CAMEL-9911: rest-dsl biding mode is off by default. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f86a1108 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f86a1108 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f86a1108 Branch: refs/heads/camel-2.17.x Commit: f86a11089c95da0743749a2fd0485c84ea128012 Parents: 76123a4 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Apr 27 08:26:10 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Apr 27 08:30:15 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/model/rest/RestBindingDefinition.java | 4 ++-- .../org/apache/camel/model/rest/RestConfigurationDefinition.java | 4 ++-- .../org/apache/camel/processor/binding/RestBindingProcessor.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f86a1108/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java index b46aba5..a835a35 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java @@ -54,7 +54,7 @@ public class RestBindingDefinition extends NoOutputDefinition<RestBindingDefinit private String produces; @XmlAttribute - @Metadata(defaultValue = "auto") + @Metadata(defaultValue = "off") private RestBindingMode bindingMode; @XmlAttribute @@ -299,7 +299,7 @@ public class RestBindingDefinition extends NoOutputDefinition<RestBindingDefinit /** * Sets the binding mode to use. * <p/> - * The default value is auto + * The default value is off */ public void setBindingMode(RestBindingMode bindingMode) { this.bindingMode = bindingMode; http://git-wip-us.apache.org/repos/asf/camel/blob/f86a1108/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java index fb03ef5..89ad625 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java @@ -72,7 +72,7 @@ public class RestConfigurationDefinition { @XmlAttribute private RestHostNameResolver hostNameResolver; - @XmlAttribute @Metadata(defaultValue = "auto") + @XmlAttribute @Metadata(defaultValue = "off") private RestBindingMode bindingMode; @XmlAttribute @@ -263,7 +263,7 @@ public class RestConfigurationDefinition { /** * Sets the binding mode to use. * <p/> - * The default value is auto + * The default value is off */ public void setBindingMode(RestBindingMode bindingMode) { this.bindingMode = bindingMode; http://git-wip-us.apache.org/repos/asf/camel/blob/f86a1108/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java index d79b099..5614797 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/binding/RestBindingProcessor.java @@ -156,7 +156,7 @@ public class RestBindingProcessor extends ServiceSupport implements AsyncProcess // okay we have a binding mode, so need to check for empty body as that can cause the marshaller to fail // as they assume a non-empty body if (isXml || isJson) { - // we have binding enabled, so we need to know if there body is empty or not\ + // we have binding enabled, so we need to know if there body is empty or not // so force reading the body as a String which we can work with body = MessageHelper.extractBodyAsString(exchange.getIn()); if (body != null) {