Repository: camel Updated Branches: refs/heads/master 29c000ba2 -> 76b4f4db5
rename methods and updated tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ba93162 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ba93162 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ba93162 Branch: refs/heads/master Commit: 6ba93162d580f286f9012bb8793bc3b435c3a136 Parents: 9d3effc Author: sebi <s...@softvision.ro> Authored: Fri Jun 5 15:17:10 2015 +0300 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Jun 6 10:27:02 2015 +0200 ---------------------------------------------------------------------- .../org/apache/camel/model/rest/RestDefinition.java | 16 ++++++++-------- .../model/rest/RestOperationParamDefinition.java | 7 +++++++ .../rest/RestOperationResponseMsgDefinition.java | 4 ++-- .../rest/FromRestExplicitComponentTest.java | 6 +++--- .../camel/component/rest/FromRestGetTest.java | 6 +++--- .../rest/FromRestIdAndDescriptionTest.java | 6 +++--- .../camel/management/ManagedFromRestGetTest.java | 8 ++++---- .../component/rest/FromRestConfigurationTest.xml | 2 +- .../blueprint/component/rest/FromRestGetTest.xml | 2 +- .../component/rest/FromRestIdAndDescriptionTest.xml | 2 +- 10 files changed, 33 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java index 941860e..acbcf56 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java @@ -268,27 +268,27 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> return this; } - public RestOperationParamDefinition restParam() { + public RestOperationParamDefinition param() { if (getVerbs().isEmpty()) { throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); - return restParam(verb); + return param(verb); } - public RestOperationParamDefinition restParam(VerbDefinition verb) { + public RestOperationParamDefinition param(VerbDefinition verb) { return new RestOperationParamDefinition(verb); } - public RestOperationResponseMsgDefinition restResponseMsg() { + public RestOperationResponseMsgDefinition responseMessage() { if (getVerbs().isEmpty()) { throw new IllegalArgumentException("Must add verb first, such as get/post/delete"); } VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); - return restResponseMsg(verb); + return responseMessage(verb); } - public RestOperationResponseMsgDefinition restResponseMsg(VerbDefinition verb) { + public RestOperationResponseMsgDefinition responseMessage(VerbDefinition verb) { return new RestOperationResponseMsgDefinition(verb); } @@ -584,7 +584,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> } } if (!found) { - restParam(verb).name(key).type(RestParamType.path).endParam(); + param(verb).name(key).type(RestParamType.path).endParam(); } } } @@ -594,7 +594,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> if (bodyType.endsWith("[]")) { bodyType = "List[" + bodyType.substring(0, bodyType.length() - 2) + "]"; } - restParam(verb).name(RestParamType.body.name()).type(RestParamType.body).dataType(bodyType).endParam(); + param(verb).name(RestParamType.body.name()).type(RestParamType.body).dataType(bodyType).endParam(); } http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/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 a89e980..75bd8f5 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 @@ -17,6 +17,7 @@ package org.apache.camel.model.rest; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -223,6 +224,12 @@ public class RestOperationParamDefinition { return this; } + public RestOperationParamDefinition allowableValues(String... allowableValues) { + setAllowableValues(Arrays.asList(allowableValues)); + return this; + } + + public RestOperationParamDefinition type(RestParamType type) { setParamType(type); return this; http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java index 3f44e03..dc2ce85 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java @@ -32,7 +32,7 @@ import org.apache.camel.spi.Metadata; * and https://github.com/swagger-api/swagger-spec/blob/master/versions/1.2.md#525-response-message-object. */ @Metadata(label = "rest") -@XmlRootElement(name = "respMsg") +@XmlRootElement(name = "responseMessage") @XmlAccessorType(XmlAccessType.FIELD) public class RestOperationResponseMsgDefinition { @@ -106,7 +106,7 @@ public class RestOperationResponseMsgDefinition { return this; } - public RestDefinition endResponseMsg() { + public RestDefinition endResponseMessage() { verb.getResponseMsgs().add(this); return verb.getRest(); } http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/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 f2a55d2..1da0795 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 @@ -36,13 +36,13 @@ public class FromRestExplicitComponentTest extends FromRestGetTest { rest("dummy-rest").path("/say/bye") .get().consumes("application/json") - .restParam().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues(Arrays.asList("1", "2", "3", "4")) + .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") .endParam(). - restParam().type(RestParamType.query).description("header param description2").dataType("string").allowableValues(Arrays.asList("a", "b", "c", "d")) + 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") .endParam() - .restResponseMsg().code(300).message("test msg").responseModel(Integer.class).endResponseMsg() + .responseMessage().code(300).message("test msg").responseModel(Integer.class).endResponseMessage() .to("direct:bye") .post().to("mock:update"); http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/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 336f68d..73c93c0 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 @@ -108,13 +108,13 @@ public class FromRestGetTest extends ContextTestSupport { rest("/say/bye") .get().consumes("application/json") - .restParam().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues(Arrays.asList("1", "2", "3", "4")) + .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") .endParam(). - restParam().type(RestParamType.query).description("header param description2").dataType("string").allowableValues(Arrays.asList("a", "b", "c", "d")) + 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") .endParam() - .restResponseMsg().code(300).message("test msg").responseModel(Integer.class).endResponseMsg() + .responseMessage().code(300).message("test msg").responseModel(Integer.class).endResponseMessage() .to("direct:bye") .post().to("mock:update"); http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/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 9d98168..15b3c3a 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 @@ -54,13 +54,13 @@ public class FromRestIdAndDescriptionTest extends FromRestGetTest { rest("/say/bye").description("bye", "Bye Service", "en") .get().description("Says bye to you").consumes("application/json") - .restParam().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues(Arrays.asList("1", "2", "3", "4")) + .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") .endParam(). - restParam().type(RestParamType.query).description("header param description2").dataType("string").allowableValues(Arrays.asList("a", "b", "c", "d")) + 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") .endParam() - .restResponseMsg().code(300).message("test msg").responseModel(Integer.class).endResponseMsg() + .responseMessage().code(300).message("test msg").responseModel(Integer.class).endResponseMessage() .to("direct:bye") .post().description("Updates the bye message").to("mock:update"); http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/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 c2a5873..75138e9 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 @@ -68,7 +68,7 @@ public class ManagedFromRestGetTest extends ManagementTestSupport { assertTrue(xml.contains("<value>1</value>")); assertTrue(xml.contains("<value>a</value>")); - assertTrue(xml.contains("<respMsg code=\"300\" message=\"test msg\" responseModel=\"java.lang.Integer\"/>")); + assertTrue(xml.contains("<responseMessage code=\"300\" message=\"test msg\" responseModel=\"java.lang.Integer\"/>")); @@ -92,13 +92,13 @@ public class ManagedFromRestGetTest extends ManagementTestSupport { rest("/say/bye") .get().consumes("application/json") - .restParam().type(RestParamType.header).description("header param description1").dataType("integer").allowableValues(Arrays.asList("1", "2", "3", "4")) + .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") .endParam(). - restParam().type(RestParamType.query).description("header param description2").dataType("string").allowableValues(Arrays.asList("a", "b", "c", "d")) + 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") .endParam() - .restResponseMsg().code(300).message("test msg").responseModel(Integer.class).endResponseMsg() + .responseMessage().code(300).message("test msg").responseModel(Integer.class).endResponseMessage() .to("direct:bye") .post().to("mock:update"); http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/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 04f11e2..ade2001 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 @@ -55,7 +55,7 @@ <value>d</value> </allowableValues> </param> - <respMsg code="300" message="test msg" responseModel="java.lang.Integer"/> + <responseMessage code="300" message="test msg" responseModel="java.lang.Integer"/> <to uri="direct:bye"/> </get> <post> http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/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 d363eb2..f2fdca9 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 @@ -48,7 +48,7 @@ <value>d</value> </allowableValues> </param> - <respMsg code="300" message="test msg" responseModel="java.lang.Integer"/> + <responseMessage code="300" message="test msg" responseModel="java.lang.Integer"/> <to uri="direct:bye"/> </get> <post> http://git-wip-us.apache.org/repos/asf/camel/blob/6ba93162/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 3bd4384..56477d2 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 @@ -52,7 +52,7 @@ <value>d</value> </allowableValues> </param> - <respMsg code="300" message="test msg" responseModel="java.lang.Integer"/> + <responseMessage code="300" message="test msg" responseModel="java.lang.Integer"/> <to uri="direct:bye"/> </get> <post>
