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/07/27 12:10:21 UTC
[1/3] camel git commit: CAMEL-9013: rest binding should inheirt the
options
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 25ab4d49d -> 3c7d40466
refs/heads/master fae3bb65f -> b2bac745a
CAMEL-9013: rest binding should inheirt the options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b2bac745
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b2bac745
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b2bac745
Branch: refs/heads/master
Commit: b2bac745a408199562d7ac64a6eb680d3a41d4f6
Parents: fae3bb6
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 27 12:12:56 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 27 12:12:56 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/servlet/ServletComponent.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b2bac745/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
index b84bce2..1d573a8 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
@@ -196,7 +196,11 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume
setProperties(endpoint, parameters);
// use the rest binding
- endpoint.setBinding(new ServletRestHttpBinding());
+ HttpBinding binding = new ServletRestHttpBinding();
+ binding.setHeaderFilterStrategy(endpoint.getHeaderFilterStrategy());
+ binding.setTransferException(endpoint.isTransferException());
+ binding.setEagerCheckContentAvailable(endpoint.isEagerCheckContentAvailable());
+ endpoint.setBinding(binding);
// configure consumer properties
Consumer consumer = endpoint.createConsumer(processor);
[2/3] camel git commit: CAMEL-9013: rest binding should inheirt the
options
Posted by da...@apache.org.
CAMEL-9013: rest binding should inheirt the options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b6974639
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b6974639
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b6974639
Branch: refs/heads/camel-2.15.x
Commit: b697463925feed78c3c9c8d1c0e4da431a40c5c3
Parents: 25ab4d4
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 27 12:12:56 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 27 12:13:22 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/servlet/ServletComponent.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b6974639/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
index 727a4ce..81ba9d9 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
@@ -205,7 +205,11 @@ public class ServletComponent extends HttpComponent implements RestConsumerFacto
setProperties(endpoint, parameters);
// use the rest binding
- endpoint.setBinding(new ServletRestHttpBinding());
+ HttpBinding binding = new ServletRestHttpBinding();
+ binding.setHeaderFilterStrategy(endpoint.getHeaderFilterStrategy());
+ binding.setTransferException(endpoint.isTransferException());
+ binding.setEagerCheckContentAvailable(endpoint.isEagerCheckContentAvailable());
+ endpoint.setBinding(binding);
// configure consumer properties
Consumer consumer = endpoint.createConsumer(processor);
[3/3] camel git commit: CAMEL-9013: rest binding should inheirt the
options
Posted by da...@apache.org.
CAMEL-9013: rest binding should inheirt the options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c7d4046
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c7d4046
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c7d4046
Branch: refs/heads/camel-2.15.x
Commit: 3c7d404664d81aaa1d138f77ec4203b8238bcb6b
Parents: b697463
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 27 12:17:28 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 27 12:17:28 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/servlet/ServletComponent.java | 3 +--
.../camel/component/servlet/ServletRestHttpBinding.java | 8 ++++++++
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3c7d4046/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
index 81ba9d9..7911ab0 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
@@ -205,9 +205,8 @@ public class ServletComponent extends HttpComponent implements RestConsumerFacto
setProperties(endpoint, parameters);
// use the rest binding
- HttpBinding binding = new ServletRestHttpBinding();
+ HttpBinding binding = new ServletRestHttpBinding(endpoint);
binding.setHeaderFilterStrategy(endpoint.getHeaderFilterStrategy());
- binding.setTransferException(endpoint.isTransferException());
binding.setEagerCheckContentAvailable(endpoint.isEagerCheckContentAvailable());
endpoint.setBinding(binding);
http://git-wip-us.apache.org/repos/asf/camel/blob/3c7d4046/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletRestHttpBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletRestHttpBinding.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletRestHttpBinding.java
index add507a..30bbb21 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletRestHttpBinding.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletRestHttpBinding.java
@@ -19,10 +19,18 @@ package org.apache.camel.component.servlet;
import javax.servlet.http.HttpServletRequest;
import org.apache.camel.component.http.DefaultHttpBinding;
+import org.apache.camel.component.http.HttpEndpoint;
import org.apache.camel.component.http.HttpMessage;
public class ServletRestHttpBinding extends DefaultHttpBinding {
+ public ServletRestHttpBinding() {
+ }
+
+ public ServletRestHttpBinding(HttpEndpoint endpoint) {
+ super(endpoint);
+ }
+
@Override
protected void populateRequestParameters(HttpServletRequest request, HttpMessage message) throws Exception {
super.populateRequestParameters(request, message);