Fixed rest param rename in jaxb.index
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/69abfd77 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/69abfd77 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/69abfd77 Branch: refs/heads/master Commit: 69abfd77a2ee36483cf4e664efb503fb6c0cd9aa Parents: b3efc44 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue May 19 09:48:50 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue May 19 09:48:50 2015 +0200 ---------------------------------------------------------------------- .../rest/RestOperationParamDefinition.java | 44 +++++++++----------- .../apache/camel/model/rest/RestParamType.java | 3 ++ .../org/apache/camel/model/rest/jaxb.index | 4 +- 3 files changed, 25 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/69abfd77/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 ee2edf5..16db9e7 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 @@ -18,7 +18,6 @@ package org.apache.camel.model.rest; import java.util.ArrayList; import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -27,10 +26,11 @@ import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; - import org.apache.camel.spi.Metadata; /** + * To specify the rest operation parameters using Swagger. + * <p/> * This maps to the Swagger Parameter Object. * see com.wordnik.swagger.model.Parameter * and https://github.com/swagger-api/swagger-spec/blob/master/versions/1.2.md#524-parameter-object. @@ -43,37 +43,36 @@ public class RestOperationParamDefinition { @XmlTransient private VerbDefinition verb; - @XmlAttribute - @Metadata(required = "true") - RestParamType paramType; + @XmlAttribute(required = true) + @Metadata(defaultValue = "path") + private RestParamType paramType = RestParamType.path; - @XmlAttribute - @Metadata(required = "true") - String name; + @XmlAttribute(required = true) + private String name; @XmlAttribute - String description = ""; + private String description; @XmlAttribute - String defaultValue = ""; + private String defaultValue; @XmlAttribute - Boolean required = true; + @Metadata(defaultValue = "true") + private Boolean required = true; @XmlAttribute - Boolean allowMultiple = false; + private Boolean allowMultiple; @XmlAttribute @Metadata(defaultValue = "string") - String dataType; + private String dataType; @XmlElementWrapper(name = "allowableValues") @XmlElement(name = "value") - List<String> allowableValues; + private List<String> allowableValues; @XmlAttribute - String paramAccess; - + private String paramAccess; public RestOperationParamDefinition(VerbDefinition verb) { this.verb = verb; @@ -83,10 +82,9 @@ public class RestOperationParamDefinition { } public RestParamType getParamType() { - if (paramType != null) - return paramType; - return RestParamType.path; + return paramType; } + /** * Sets the Swagger Parameter type. */ @@ -97,6 +95,7 @@ public class RestOperationParamDefinition { public String getName() { return name; } + /** * Sets the Swagger Parameter name. */ @@ -149,10 +148,7 @@ public class RestOperationParamDefinition { } public String getDataType() { - if(dataType!=null) { - return dataType; - } - return "string"; + return dataType != null ? dataType : "string"; } /** @@ -171,7 +167,7 @@ public class RestOperationParamDefinition { } /** - * Sets the Swagger Parameter alist of allowable values. + * Sets the Swagger Parameter list of allowable values. */ public void setAllowableValues(List<String> allowableValues) { this.allowableValues = allowableValues; http://git-wip-us.apache.org/repos/asf/camel/blob/69abfd77/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java index b857f9f..61da45b 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java @@ -21,6 +21,9 @@ import javax.xml.bind.annotation.XmlType; import org.apache.camel.spi.Metadata; +/** + * Rest parameter types + */ @Metadata(label = "rest") @XmlType @XmlEnum(String.class) http://git-wip-us.apache.org/repos/asf/camel/blob/69abfd77/camel-core/src/main/resources/org/apache/camel/model/rest/jaxb.index ---------------------------------------------------------------------- diff --git a/camel-core/src/main/resources/org/apache/camel/model/rest/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/rest/jaxb.index index 9ebcd6c..1de414a 100644 --- a/camel-core/src/main/resources/org/apache/camel/model/rest/jaxb.index +++ b/camel-core/src/main/resources/org/apache/camel/model/rest/jaxb.index @@ -24,8 +24,8 @@ RestBindingMode RestConfigurationDefinition RestDefinition RestHostNameResolver +RestOperationParamDefinition +RestParamType RestPropertyDefinition RestsDefinition VerbDefinition -RestOperationParam -RestParamDefinition
