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 2014/07/20 08:53:20 UTC
[14/33] git commit: CAMEL-7354: include accept in the rest DSL
CAMEL-7354: include accept in the rest DSL
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3b5059c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3b5059c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3b5059c
Branch: refs/heads/master
Commit: d3b5059c0058a95ce6a4609feabede2776ac3b35
Parents: 3862067
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 15 13:27:14 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jul 19 09:38:50 2014 +0200
----------------------------------------------------------------------
.../org/apache/camel/model/rest/PathDefinition.java | 12 ++++++++++++
.../org/apache/camel/model/rest/VerbDefinition.java | 11 +++++++++++
.../apache/camel/component/rest/FromRestGetTest.java | 3 ++-
.../camel/component/rest/SpringFromRestGetTest.xml | 2 +-
.../test/blueprint/component/rest/FromRestGetTest.xml | 2 +-
5 files changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d3b5059c/camel-core/src/main/java/org/apache/camel/model/rest/PathDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/PathDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/PathDefinition.java
index 2c29b2f..c41a610 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/PathDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/PathDefinition.java
@@ -89,6 +89,18 @@ public class PathDefinition {
return this;
}
+ public PathDefinition accept(String accept) {
+ // add to last verb
+ if (getVerbs().isEmpty()) {
+ throw new IllegalArgumentException("Must add verb first, such as get/post/delete");
+ }
+
+ VerbDefinition verb = getVerbs().get(getVerbs().size() - 1);
+ verb.setAccept(accept);
+
+ return this;
+ }
+
public PathDefinition to(String url) {
// add to last verb
if (getVerbs().isEmpty()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d3b5059c/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
index c486045..6dea3de 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
@@ -39,6 +39,9 @@ public class VerbDefinition {
@XmlAttribute
private String uri;
+ @XmlAttribute
+ private String accept;
+
@XmlElementRef
private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
@@ -66,6 +69,14 @@ public class VerbDefinition {
this.uri = uri;
}
+ public String getAccept() {
+ return accept;
+ }
+
+ public void setAccept(String accept) {
+ this.accept = accept;
+ }
+
public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d3b5059c/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
index bc16772..a21cbae 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
@@ -51,6 +51,7 @@ public class FromRestGetTest extends ContextTestSupport {
assertEquals("direct:hello", to.getUri());
assertEquals("/bye", path.getVerbs().get(1).getUri());
+ assertEquals("application/json", path.getVerbs().get(1).getAccept());
to = assertIsInstanceOf(ToDefinition.class, path.getVerbs().get(1).getOutputs().get(0));
assertEquals("direct:bye", to.getUri());
@@ -76,7 +77,7 @@ public class FromRestGetTest extends ContextTestSupport {
rest()
.path("/say")
.get("/hello").routeId("hello").to("direct:hello")
- .get("/bye").routeId("bye").to("direct:bye")
+ .get("/bye").accept("application/json").routeId("bye").to("direct:bye")
.post().to("mock:update");
from("direct:hello")
http://git-wip-us.apache.org/repos/asf/camel/blob/d3b5059c/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
index f33e99d..918085f 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
@@ -32,7 +32,7 @@
<get uri="/hello" routeId="hello">
<to uri="direct:hello"/>
</get>
- <get uri="/bye" routeId="bye">
+ <get uri="/bye" accept="application/json" routeId="bye">
<to uri="direct:bye"/>
</get>
<post>
http://git-wip-us.apache.org/repos/asf/camel/blob/d3b5059c/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml
index 0ee3624..ff38c7a 100644
--- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml
+++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml
@@ -30,7 +30,7 @@
<get uri="/hello" routeId="hello">
<to uri="direct:hello"/>
</get>
- <get uri="/bye" routeId="bye">
+ <get uri="/bye" accept="application/json" routeId="bye">
<to uri="direct:bye"/>
</get>
<post>