Repository: camel Updated Branches: refs/heads/master 46d5e4d8d -> a80e4d146
CAMEL-8897: Polished the rest param a bit and added for the xml example Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a80e4d14 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a80e4d14 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a80e4d14 Branch: refs/heads/master Commit: a80e4d146e5ad7820a0349a9bc8573dd93f6dbc3 Parents: 46d5e4d Author: Claus Ibsen <[email protected]> Authored: Wed Jul 1 14:53:28 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Jul 1 15:04:54 2015 +0200 ---------------------------------------------------------------------- .../rest/RestOperationParamDefinition.java | 37 ++++++++++---------- .../rest/FromRestExplicitComponentTest.java | 6 ++-- .../camel/component/rest/FromRestGetTest.java | 12 +++---- .../rest/FromRestIdAndDescriptionTest.java | 6 ++-- .../management/ManagedFromRestGetTest.java | 14 ++++---- .../rest/SpringFromRestConfigurationTest.xml | 4 +-- .../component/rest/SpringFromRestGetTest.xml | 4 +-- .../rest/SpringFromRestIdAndDescriptionTest.xml | 4 +-- .../component/swagger/RestSwaggerReader.scala | 4 +-- .../component/rest/FromRestGetTest.java | 8 ++--- .../rest/FromRestConfigurationTest.xml | 4 +-- .../component/rest/FromRestGetTest.xml | 4 +-- .../rest/FromRestIdAndDescriptionTest.xml | 4 +-- .../camel/example/rest/UserRouteBuilder.java | 4 +-- .../src/main/resources/camel-config-xml.xml | 5 +-- 15 files changed, 58 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java index 82dcffd..168946a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java @@ -46,11 +46,11 @@ public class RestOperationParamDefinition { private VerbDefinition verb; @XmlAttribute(required = true) - @Metadata(defaultValue = "path") - private RestParamType paramType; + private String name; @XmlAttribute(required = true) - private String name; + @Metadata(defaultValue = "path") + private RestParamType type; @XmlAttribute @Metadata(defaultValue = "") @@ -78,7 +78,7 @@ public class RestOperationParamDefinition { @XmlAttribute @Metadata(defaultValue = "") - private String paramAccess; + private String access; public RestOperationParamDefinition() { } @@ -87,15 +87,15 @@ public class RestOperationParamDefinition { this.verb = verb; } - public RestParamType getParamType() { - return paramType != null ? paramType : RestParamType.path; + public RestParamType getType() { + return type != null ? type : RestParamType.path; } /** * Sets the Swagger Parameter type. */ - public void setParamType(RestParamType paramType) { - this.paramType = paramType; + public void setType(RestParamType type) { + this.type = type; } public String getName() { @@ -154,7 +154,7 @@ public class RestOperationParamDefinition { } public String getDataType() { - return dataType != null ? dataType : "string"; + return dataType; } /** @@ -179,15 +179,15 @@ public class RestOperationParamDefinition { this.allowableValues = allowableValues; } - public String getParamAccess() { - return paramAccess != null ? paramAccess : ""; + public String getAccess() { + return access != null ? access : ""; } /** * Sets the Swagger Parameter paramAccess flag. */ - public void setParamAccess(String paramAccess) { - this.paramAccess = paramAccess; + public void setAccess(String access) { + this.access = access; } /** @@ -233,7 +233,7 @@ public class RestOperationParamDefinition { } /** - * The data type of the parameter such as string,int + * The data type of the parameter such as <tt>string</tt>, <tt>long</tt>, <tt>int</tt>, <tt>boolean</tt> */ public RestOperationParamDefinition dataType(String type) { setDataType(type); @@ -260,15 +260,16 @@ public class RestOperationParamDefinition { * The parameter type such as body, form, header, path, query */ public RestOperationParamDefinition type(RestParamType type) { - setParamType(type); + setType(type); return this; } /** - * A flag to hide the parameter if set to false + * Parameter access. Use <tt>false</tt> or <tt>internal</tt> to indicate the parameter + * should be hidden for the public. */ - public RestOperationParamDefinition paramAccess(String paramAccess) { - setParamAccess(paramAccess); + public RestOperationParamDefinition access(String paramAccess) { + setAccess(paramAccess); return this; } http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java index 1da0795..9db9cab 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestExplicitComponentTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.rest; -import java.util.Arrays; - import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.rest.RestParamType; @@ -37,10 +35,10 @@ public class FromRestExplicitComponentTest extends FromRestGetTest { rest("dummy-rest").path("/say/bye") .get().consumes("application/json") .param().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues("1", "2", "3", "4") - .defaultValue("1").allowMultiple(false).name("header_count").required(true).paramAccess("acc1") + .defaultValue("1").allowMultiple(false).name("header_count").required(true).access("acc1") .endParam(). param().type(RestParamType.query).description("header param description2").dataType("string").allowableValues("a", "b", "c", "d") - .defaultValue("b").allowMultiple(true).name("header_letter").required(false).paramAccess("acc2") + .defaultValue("b").allowMultiple(true).name("header_letter").required(false).access("acc2") .endParam() .responseMessage().code(300).message("test msg").responseModel(Integer.class).endResponseMessage() .to("direct:bye") http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/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 73c93c0..b82d9a0 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 @@ -56,8 +56,8 @@ public class FromRestGetTest extends ContextTestSupport { assertEquals("application/json", rest.getVerbs().get(0).getConsumes()); assertEquals(2, rest.getVerbs().get(0).getParams().size()); - assertEquals(RestParamType.header, rest.getVerbs().get(0).getParams().get(0).getParamType()); - assertEquals(RestParamType.query, rest.getVerbs().get(0).getParams().get(1).getParamType()); + assertEquals(RestParamType.header, rest.getVerbs().get(0).getParams().get(0).getType()); + assertEquals(RestParamType.query, rest.getVerbs().get(0).getParams().get(1).getType()); assertEquals("header param description1", rest.getVerbs().get(0).getParams().get(0).getDescription()); assertEquals("header param description2", rest.getVerbs().get(0).getParams().get(1).getDescription()); @@ -76,8 +76,8 @@ public class FromRestGetTest extends ContextTestSupport { assertEquals("header_letter", rest.getVerbs().get(0).getParams().get(1).getName()); assertEquals(Boolean.TRUE, rest.getVerbs().get(0).getParams().get(0).getRequired()); assertEquals(Boolean.FALSE, rest.getVerbs().get(0).getParams().get(1).getRequired()); - assertEquals("acc1", rest.getVerbs().get(0).getParams().get(0).getParamAccess()); - assertEquals("acc2", rest.getVerbs().get(0).getParams().get(1).getParamAccess()); + assertEquals("acc1", rest.getVerbs().get(0).getParams().get(0).getAccess()); + assertEquals("acc2", rest.getVerbs().get(0).getParams().get(1).getAccess()); assertEquals(300, rest.getVerbs().get(0).getResponseMsgs().get(0).getCode()); assertEquals("test msg", rest.getVerbs().get(0).getResponseMsgs().get(0).getMessage()); @@ -109,10 +109,10 @@ public class FromRestGetTest extends ContextTestSupport { rest("/say/bye") .get().consumes("application/json") .param().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues("1", "2", "3", "4") - .defaultValue("1").allowMultiple(false).name("header_count").required(true).paramAccess("acc1") + .defaultValue("1").allowMultiple(false).name("header_count").required(true).access("acc1") .endParam(). param().type(RestParamType.query).description("header param description2").dataType("string").allowableValues("a", "b", "c", "d") - .defaultValue("b").allowMultiple(true).name("header_letter").required(false).paramAccess("acc2") + .defaultValue("b").allowMultiple(true).name("header_letter").required(false).access("acc2") .endParam() .responseMessage().code(300).message("test msg").responseModel(Integer.class).endResponseMessage() .to("direct:bye") http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java index 15b3c3a..b42d7bf 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.rest; -import java.util.Arrays; - import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.rest.RestDefinition; import org.apache.camel.model.rest.RestParamType; @@ -55,10 +53,10 @@ public class FromRestIdAndDescriptionTest extends FromRestGetTest { rest("/say/bye").description("bye", "Bye Service", "en") .get().description("Says bye to you").consumes("application/json") .param().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues("1", "2", "3", "4") - .defaultValue("1").allowMultiple(false).name("header_count").required(true).paramAccess("acc1") + .defaultValue("1").allowMultiple(false).name("header_count").required(true).access("acc1") .endParam(). param().type(RestParamType.query).description("header param description2").dataType("string").allowableValues("a", "b", "c", "d") - .defaultValue("b").allowMultiple(true).name("header_letter").required(false).paramAccess("acc2") + .defaultValue("b").allowMultiple(true).name("header_letter").required(false).access("acc2") .endParam() .responseMessage().code(300).message("test msg").responseModel(Integer.class).endResponseMessage() .to("direct:bye") http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java index 75138e9..d58fac9 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java @@ -61,17 +61,15 @@ public class ManagedFromRestGetTest extends ManagementTestSupport { assertTrue(xml.contains("application/json")); assertTrue(xml.contains("</rests>")); - assertTrue(xml.contains("<param paramType=\"query\" name=\"header_letter\" description=\"header param description2\"" - + " defaultValue=\"b\" required=\"false\" allowMultiple=\"true\" dataType=\"string\" paramAccess=\"acc2\">")); - assertTrue(xml.contains("<param paramType=\"header\" name=\"header_count\" description=\"header param description1\" " - + "defaultValue=\"1\" required=\"true\" allowMultiple=\"false\" dataType=\"integer\" paramAccess=\"acc1\">")); + assertTrue(xml.contains("<param name=\"header_letter\" type=\"query\" description=\"header param description2\"" + + " defaultValue=\"b\" required=\"false\" allowMultiple=\"true\" dataType=\"string\" access=\"acc2\">")); + assertTrue(xml.contains("<param name=\"header_count\" type=\"header\" description=\"header param description1\" " + + "defaultValue=\"1\" required=\"true\" allowMultiple=\"false\" dataType=\"integer\" access=\"acc1\">")); assertTrue(xml.contains("<value>1</value>")); assertTrue(xml.contains("<value>a</value>")); assertTrue(xml.contains("<responseMessage code=\"300\" message=\"test msg\" responseModel=\"java.lang.Integer\"/>")); - - String xml2 = (String) mbeanServer.invoke(on, "dumpRoutesAsXml", null, null); log.info(xml2); // and we should have rest in the routes that indicate its from a rest dsl @@ -93,10 +91,10 @@ public class ManagedFromRestGetTest extends ManagementTestSupport { rest("/say/bye") .get().consumes("application/json") .param().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues(Arrays.asList("1", "2", "3", "4")) - .defaultValue("1").allowMultiple(false).name("header_count").required(true).paramAccess("acc1") + .defaultValue("1").allowMultiple(false).name("header_count").required(true).access("acc1") .endParam(). param().type(RestParamType.query).description("header param description2").dataType("string").allowableValues(Arrays.asList("a", "b", "c", "d")) - .defaultValue("b").allowMultiple(true).name("header_letter").required(false).paramAccess("acc2") + .defaultValue("b").allowMultiple(true).name("header_letter").required(false).access("acc2") .endParam() .responseMessage().code(300).message("test msg").responseModel(Integer.class).endResponseMessage() .to("direct:bye") http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml index 6792a70..df44a33 100644 --- a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml +++ b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml @@ -41,7 +41,7 @@ </rest> <rest path="/say/bye"> <get consumes="application/json"> - <param paramType="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" name="header_count" required="true" paramAccess="acc1"> + <param name="header_count" type="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" required="true" access="acc1"> <allowableValues> <value>1</value> <value>2</value> @@ -49,7 +49,7 @@ <value>4</value> </allowableValues> </param> - <param paramType="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" name="header_letter" required="false" paramAccess="acc2"> + <param name="header_letter" type="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" required="false" access="acc2"> <allowableValues> <value>a</value> <value>b</value> http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/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 f576fd3..2af7064 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 @@ -34,7 +34,7 @@ </rest> <rest path="/say/bye"> <get consumes="application/json"> - <param paramType="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" name="header_count" required="true" paramAccess="acc1"> + <param name="header_count" type="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" required="true" access="acc1"> <allowableValues> <value>1</value> <value>2</value> @@ -42,7 +42,7 @@ <value>4</value> </allowableValues> </param> - <param paramType="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" name="header_letter" required="false" paramAccess="acc2"> + <param name="header_letter" type="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" required="false" access="acc2"> <allowableValues> <value>a</value> <value>b</value> http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml index 394384a..c6a5eaa 100644 --- a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml +++ b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml @@ -38,7 +38,7 @@ <description lang="en">Bye Service</description> <get consumes="application/json"> <description>Says bye to you</description> - <param paramType="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" name="header_count" required="true" paramAccess="acc1"> + <param name="header_count" type="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" required="true" access="acc1"> <allowableValues> <value>1</value> <value>2</value> @@ -46,7 +46,7 @@ <value>4</value> </allowableValues> </param> - <param paramType="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" name="header_letter" required="false" paramAccess="acc2"> + <param name="header_letter" type="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" required="false" access="acc2"> <allowableValues> <value>a</value> <value>b</value> http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala ---------------------------------------------------------------------- diff --git a/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala b/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala index 6bec4b7..39d9b2b 100644 --- a/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala +++ b/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala @@ -205,8 +205,8 @@ class RestSwaggerReader { if (param.getAllowMultiple != null) param.getAllowMultiple.booleanValue() else false, param.getDataType, allowValues, - param.getParamType.toString, - Some(param.getParamAccess) + param.getType.toString, + Some(param.getAccess) ) } http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java index d03610c..20c359d 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.java @@ -53,8 +53,8 @@ public class FromRestGetTest extends CamelBlueprintTestSupport { assertEquals("application/json", rest.getVerbs().get(0).getConsumes()); assertEquals(2, rest.getVerbs().get(0).getParams().size()); - assertEquals(RestParamType.header, rest.getVerbs().get(0).getParams().get(0).getParamType()); - assertEquals(RestParamType.query, rest.getVerbs().get(0).getParams().get(1).getParamType()); + assertEquals(RestParamType.header, rest.getVerbs().get(0).getParams().get(0).getType()); + assertEquals(RestParamType.query, rest.getVerbs().get(0).getParams().get(1).getType()); assertEquals("header param description1", rest.getVerbs().get(0).getParams().get(0).getDescription()); assertEquals("header param description2", rest.getVerbs().get(0).getParams().get(1).getDescription()); @@ -73,8 +73,8 @@ public class FromRestGetTest extends CamelBlueprintTestSupport { assertEquals("header_letter", rest.getVerbs().get(0).getParams().get(1).getName()); assertEquals(Boolean.TRUE, rest.getVerbs().get(0).getParams().get(0).getRequired()); assertEquals(Boolean.FALSE, rest.getVerbs().get(0).getParams().get(1).getRequired()); - assertEquals("acc1", rest.getVerbs().get(0).getParams().get(0).getParamAccess()); - assertEquals("acc2", rest.getVerbs().get(0).getParams().get(1).getParamAccess()); + assertEquals("acc1", rest.getVerbs().get(0).getParams().get(0).getAccess()); + assertEquals("acc2", rest.getVerbs().get(0).getParams().get(1).getAccess()); assertEquals(300, rest.getVerbs().get(0).getResponseMsgs().get(0).getCode()); assertEquals("test msg", rest.getVerbs().get(0).getResponseMsgs().get(0).getMessage()); http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml index ade2001..2fa28f5 100644 --- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml +++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml @@ -39,7 +39,7 @@ </rest> <rest path="/say/bye"> <get consumes="application/json"> - <param paramType="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" name="header_count" required="true" paramAccess="acc1"> + <param name="header_count" type="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" required="true" access="acc1"> <allowableValues> <value>1</value> <value>2</value> @@ -47,7 +47,7 @@ <value>4</value> </allowableValues> </param> - <param paramType="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" name="header_letter" required="false" paramAccess="acc2"> + <param name="header_letter" type="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" required="false" access="acc2"> <allowableValues> <value>a</value> <value>b</value> http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/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 f2fdca9..8e1a89b 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 @@ -32,7 +32,7 @@ </rest> <rest path="/say/bye"> <get consumes="application/json"> - <param paramType="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" name="header_count" required="true" paramAccess="acc1"> + <param name="header_count" type="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" required="true" access="acc1"> <allowableValues> <value>1</value> <value>2</value> @@ -40,7 +40,7 @@ <value>4</value> </allowableValues> </param> - <param paramType="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" name="header_letter" required="false" paramAccess="acc2"> + <param name="header_letter" type="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" required="false" access="acc2"> <allowableValues> <value>a</value> <value>b</value> http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestIdAndDescriptionTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestIdAndDescriptionTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestIdAndDescriptionTest.xml index 56477d2..f9aa473 100644 --- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestIdAndDescriptionTest.xml +++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestIdAndDescriptionTest.xml @@ -36,7 +36,7 @@ <description lang="en">Bye Service</description> <get consumes="application/json"> <description>Says bye to you</description> - <param paramType="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" name="header_count" required="true" paramAccess="acc1"> + <param name="header_count" type="header" description="header param description1" dataType="integer" defaultValue="1" allowMultiple="false" required="true" access="acc1"> <allowableValues> <value>1</value> <value>2</value> @@ -44,7 +44,7 @@ <value>4</value> </allowableValues> </param> - <param paramType="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" name="header_letter" required="false" paramAccess="acc2"> + <param name="header_letter" type="query" description="header param description2" dataType="string" defaultValue="b" allowMultiple="true" required="false" access="acc2"> <allowableValues> <value>a</value> <value>b</value> http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserRouteBuilder.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserRouteBuilder.java b/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserRouteBuilder.java index 926b502..1412501 100644 --- a/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserRouteBuilder.java +++ b/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserRouteBuilder.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.rest.RestBindingMode; import static org.apache.camel.model.rest.RestParamType.body; -import static org.apache.camel.model.rest.RestParamType.query; +import static org.apache.camel.model.rest.RestParamType.path; /** * Define REST services using the Camel REST DSL @@ -49,7 +49,7 @@ public class UserRouteBuilder extends RouteBuilder { .consumes("application/json").produces("application/json") .get("/{id}").description("Find user by id").outType(User.class) - .param().name("id").type(query).description("The id of the user to get").dataType("int").endParam() + .param().name("id").type(path).description("The id of the user to get").dataType("int").endParam() .to("bean:userService?method=getUser(${header.id})") .put().description("Updates or create a user").type(User.class) http://git-wip-us.apache.org/repos/asf/camel/blob/a80e4d14/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config-xml.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config-xml.xml b/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config-xml.xml index 4977bef..cd6fdf0 100755 --- a/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config-xml.xml +++ b/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config-xml.xml @@ -29,7 +29,7 @@ <!-- a bean for user services --> <bean id="userService" class="org.apache.camel.example.rest.UserService"/> - <camelContext xmlns="http://camel.apache.org/schema/spring";> + <camelContext id="myCamel" xmlns="http://camel.apache.org/schema/spring";> <!-- configure rest to use the camel-servlet component, and use json binding mode --> <!-- and tell to output json in pretty print mode --> @@ -49,12 +49,14 @@ <!-- this is a rest GET to view an user by the given id --> <get uri="/{id}" outType="org.apache.camel.example.rest.User"> <description>Find user by id</description> + <param name="id" type="path" description="The id of the user to get" dataType="int"/> <to uri="bean:userService?method=getUser(${header.id})"/> </get> <!-- this is a rest PUT to create/update an user --> <put type="org.apache.camel.example.rest.User"> <description>Updates or create a user</description> + <param name="body" type="body" description="The user to update or create"/> <to uri="bean:userService?method=updateUser"/> </put> @@ -63,7 +65,6 @@ <description>Find all users</description> <to uri="bean:userService?method=listUsers"/> </get> - </rest> </camelContext>
