diff --git a/modules/swagger-codegen-maven-plugin/README.md b/modules/swagger-codegen-maven-plugin/README.md index 5592cfe23846..ad32fc9f41f2 100644 --- a/modules/swagger-codegen-maven-plugin/README.md +++ b/modules/swagger-codegen-maven-plugin/README.md @@ -46,7 +46,7 @@ mvn clean compile - `apiPackage` - the package to use for generated api objects/classes - `invokerPackage` - the package to use for the generated invoker objects - `modelNamePrefix` and `modelNameSuffix` - Sets the pre- or suffix for model classes and enums -- `useJaxbAnnotations` - enable Jaxb annotations inside the generated models +- `withXml` - enable XML annotations inside the generated models and API (only works with Java `language` and libraries that provide support for JSON and XML) - `configOptions` - a map of language-specific parameters (see below) - `configHelp` - dumps the configuration help for the specified library (generates no sources) - `ignoreFileOverride` - specifies the full path to a `.swagger-codegen-ignore` used for pattern based overrides of generated outputs diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java index ae07ccf1c7f8..6510ca455e69 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java @@ -150,7 +150,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code .SERIALIZE_BIG_DECIMAL_AS_STRING_DESC)); cliOptions.add(CliOption.newBoolean(FULL_JAVA_UTIL, "whether to use fully qualified name for classes under java.util. This option only works for Java API client")); cliOptions.add(new CliOption("hideGenerationTimestamp", "hides the timestamp when files were generated")); - cliOptions.add(CliOption.newBoolean(WITH_XML, "whether to include support for application/xml content type. This option only works for Java API client (resttemplate)")); + cliOptions.add(CliOption.newBoolean(WITH_XML, "whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)")); CliOption dateLibrary = new CliOption(DATE_LIBRARY, "Option. Date library to use"); Map dateOptions = new HashMap(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFClientCodegen.java index 5edd70e2ca15..649b09d17c40 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFClientCodegen.java @@ -11,20 +11,17 @@ import org.slf4j.LoggerFactory; import io.swagger.codegen.CliOption; import io.swagger.codegen.CodegenModel; import io.swagger.codegen.CodegenOperation; -import io.swagger.codegen.CodegenParameter; import io.swagger.codegen.CodegenProperty; -import io.swagger.codegen.CodegenResponse; import io.swagger.codegen.CodegenType; import io.swagger.codegen.SupportingFile; import io.swagger.codegen.languages.features.BeanValidationFeatures; import io.swagger.codegen.languages.features.GzipTestFeatures; -import io.swagger.codegen.languages.features.JaxbFeatures; import io.swagger.codegen.languages.features.LoggingTestFeatures; import io.swagger.codegen.languages.features.UseGenericResponseFeatures; import io.swagger.models.Operation; public class JavaCXFClientCodegen extends AbstractJavaCodegen - implements BeanValidationFeatures, UseGenericResponseFeatures, JaxbFeatures, GzipTestFeatures, LoggingTestFeatures { + implements BeanValidationFeatures, UseGenericResponseFeatures, GzipTestFeatures, LoggingTestFeatures { private static final Logger LOGGER = LoggerFactory.getLogger(JavaCXFClientCodegen.class); @@ -34,8 +31,6 @@ private static final Logger LOGGER = LoggerFactory.getLogger(JavaCXFClientCodege */ protected static final String JAXRS_TEMPLATE_DIRECTORY_NAME = "JavaJaxRS"; - protected boolean useJaxbAnnotations = true; - protected boolean useBeanValidation = false; protected boolean useGenericResponse = false; @@ -73,8 +68,6 @@ private static final Logger LOGGER = LoggerFactory.getLogger(JavaCXFClientCodege embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf"; - cliOptions.add(CliOption.newBoolean(USE_JAXB_ANNOTATIONS, "Use JAXB annotations for XML")); - cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations")); cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE_FOR_TESTS, "Use Gzip Feature for tests")); @@ -89,11 +82,6 @@ private static final Logger LOGGER = LoggerFactory.getLogger(JavaCXFClientCodege { super.processOpts(); - if (additionalProperties.containsKey(USE_JAXB_ANNOTATIONS)) { - boolean useJaxbAnnotationsProp = convertPropertyToBooleanAndWriteBack(USE_JAXB_ANNOTATIONS); - this.setUseJaxbAnnotations(useJaxbAnnotationsProp); - } - if (additionalProperties.containsKey(USE_BEANVALIDATION)) { boolean useBeanValidationProp = convertPropertyToBooleanAndWriteBack(USE_BEANVALIDATION); this.setUseBeanValidation(useBeanValidationProp); @@ -177,11 +165,6 @@ private static final Logger LOGGER = LoggerFactory.getLogger(JavaCXFClientCodege this.useBeanValidation = useBeanValidation; } - - public void setUseJaxbAnnotations(boolean useJaxbAnnotations) { - this.useJaxbAnnotations = useJaxbAnnotations; - } - public void setUseGzipFeatureForTests(boolean useGzipFeatureForTests) { this.useGzipFeatureForTests = useGzipFeatureForTests; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java index 4aa26394c6e3..a8f25d69206b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFServerCodegen.java @@ -15,20 +15,17 @@ import io.swagger.codegen.CodegenProperty; import io.swagger.codegen.SupportingFile; import io.swagger.codegen.languages.features.CXFServerFeatures; import io.swagger.codegen.languages.features.GzipTestFeatures; -import io.swagger.codegen.languages.features.JaxbFeatures; import io.swagger.codegen.languages.features.LoggingTestFeatures; import io.swagger.codegen.languages.features.UseGenericResponseFeatures; import io.swagger.models.Operation; public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen - implements CXFServerFeatures, GzipTestFeatures, LoggingTestFeatures, JaxbFeatures, UseGenericResponseFeatures -{ + implements CXFServerFeatures, GzipTestFeatures, LoggingTestFeatures, UseGenericResponseFeatures +{ private static final Logger LOGGER = LoggerFactory.getLogger(JavaCXFServerCodegen.class); protected boolean addConsumesProducesJson = true; - protected boolean useJaxbAnnotations = true; - protected boolean generateSpringApplication = false; protected boolean useSpringAnnotationConfig = false; @@ -86,8 +83,6 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf"; - cliOptions.add(CliOption.newBoolean(USE_JAXB_ANNOTATIONS, "Use JAXB annotations for XML")); - cliOptions.add(CliOption.newBoolean(GENERATE_SPRING_APPLICATION, "Generate Spring application")); cliOptions.add(CliOption.newBoolean(USE_SPRING_ANNOTATION_CONFIG, "Use Spring Annotation Config")); @@ -124,11 +119,6 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen { super.processOpts(); - if (additionalProperties.containsKey(USE_JAXB_ANNOTATIONS)) { - boolean useJaxbAnnotationsProp = convertPropertyToBooleanAndWriteBack(USE_JAXB_ANNOTATIONS); - this.setUseJaxbAnnotations(useJaxbAnnotationsProp); - } - if (additionalProperties.containsKey(ADD_CONSUMES_PRODUCES_JSON)) { this.setAddConsumesProducesJson(convertPropertyToBooleanAndWriteBack(ADD_CONSUMES_PRODUCES_JSON)); } @@ -288,10 +278,6 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen this.generateSpringBootApplication = generateSpringBootApplication; } - public void setUseJaxbAnnotations(boolean useJaxbAnnotations) { - this.useJaxbAnnotations = useJaxbAnnotations; - } - public void setGenerateJbossDeploymentDescriptor(boolean generateJbossDeploymentDescriptor) { this.generateJbossDeploymentDescriptor = generateJbossDeploymentDescriptor; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/features/JaxbFeatures.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/features/JaxbFeatures.java deleted file mode 100644 index 9693d6dcd075..000000000000 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/features/JaxbFeatures.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.swagger.codegen.languages.features; - -public interface JaxbFeatures { - public static final String USE_JAXB_ANNOTATIONS = "useJaxbAnnotations"; - - public void setUseJaxbAnnotations(boolean useJaxbAnnotations); -} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache index 8f56eb4c6012..bb9bbab729d2 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -7,14 +7,14 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; -{{#useJaxbAnnotations}} +{{#withXml}} @XmlAccessorType(XmlAccessType.FIELD) {{#hasVars}} @XmlType(name = "{{classname}}", propOrder = { {{#vars}}"{{name}}"{{^-last}}, {{/-last}}{{/vars}} }){{/hasVars}} {{^hasVars}}@XmlType(name = "{{classname}}"){{/hasVars}} {{^parent}}@XmlRootElement(name="{{classname}}"){{/parent}} -{{/useJaxbAnnotations}} +{{/withXml}} {{#description}} @ApiModel(description="{{{description}}}") {{/description}} @@ -24,9 +24,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { {{>enumClass}}{{/isContainer}}{{/isEnum}}{{#items.isEnum}}{{#items}} {{^isContainer}}{{>enumClass}}{{/isContainer}}{{/items}}{{/items.isEnum}} -{{#useJaxbAnnotations}} +{{#withXml}} @XmlElement(name="{{baseName}}"{{#required}}, required = {{required}}{{/required}}) -{{/useJaxbAnnotations}} +{{/withXml}} @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java index 336ed0ec4c0a..2d347f8c5c02 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java @@ -3,7 +3,6 @@ package io.swagger.codegen.java; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.options.JavaClientOptionsProvider; -import io.swagger.codegen.options.JavaClientOptionsProvider; import io.swagger.codegen.languages.JavaClientCodegen; import io.swagger.codegen.options.OptionsProvider; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsCXFClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsCXFClientOptionsTest.java index d48a2ccddea9..a36de6356196 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsCXFClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsCXFClientOptionsTest.java @@ -4,7 +4,6 @@ import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; import io.swagger.codegen.languages.JavaCXFClientCodegen; import io.swagger.codegen.options.JavaCXFClientOptionsProvider; -import io.swagger.codegen.options.JavaCXFServerOptionsProvider; import io.swagger.codegen.options.OptionsProvider; import mockit.Expectations; import mockit.Tested; @@ -67,11 +66,6 @@ public class JaxrsCXFClientOptionsTest extends AbstractOptionsTest { Boolean.valueOf(JavaCXFClientOptionsProvider.USE_LOGGING_FEATURE_FOR_TESTS)); times = 1; - - clientCodegen.setUseJaxbAnnotations(Boolean.valueOf(JavaCXFClientOptionsProvider.USE_JAXB_ANNOTATIONS)); - times = 1; - - } }; } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsCXFServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsCXFServerOptionsTest.java index aad1b0344e96..ab3f16f8770e 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsCXFServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JaxrsCXFServerOptionsTest.java @@ -87,9 +87,6 @@ public class JaxrsCXFServerOptionsTest extends AbstractOptionsTest { Boolean.valueOf(JavaCXFServerOptionsProvider.GENERATE_SPRING_BOOT_APPLICATION)); times = 1; - clientCodegen.setUseJaxbAnnotations(Boolean.valueOf(JavaCXFServerOptionsProvider.USE_JAXB_ANNOTATIONS)); - times = 1; - clientCodegen.setUseSpringAnnotationConfig( Boolean.valueOf(JavaCXFServerOptionsProvider.USE_SPRING_ANNOTATION_CONFIG)); times = 1; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaCXFClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaCXFClientOptionsProvider.java index d042e212da43..98088909587a 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaCXFClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaCXFClientOptionsProvider.java @@ -10,8 +10,6 @@ public class JavaCXFClientOptionsProvider extends JavaOptionsProvider { public static final String USE_BEANVALIDATION = "true"; - public static final String USE_JAXB_ANNOTATIONS = "true"; - public static final String USE_GZIP_FEATURE_FOR_TESTS = "true"; public static final String USE_LOGGING_FEATURE_FOR_TESTS = "true"; @@ -39,7 +37,6 @@ public class JavaCXFClientOptionsProvider extends JavaOptionsProvider { builder.put(JavaCXFClientCodegen.USE_BEANVALIDATION, JavaCXFClientOptionsProvider.USE_BEANVALIDATION); builder.put(JavaCXFClientCodegen.USE_GENERIC_RESPONSE, JavaCXFClientOptionsProvider.USE_GENERIC_RESPONSE); - builder.put(JavaCXFClientCodegen.USE_JAXB_ANNOTATIONS, USE_JAXB_ANNOTATIONS); builder.put(JavaCXFClientCodegen.USE_GZIP_FEATURE_FOR_TESTS, USE_GZIP_FEATURE_FOR_TESTS); builder.put(JavaCXFClientCodegen.USE_LOGGING_FEATURE_FOR_TESTS, USE_LOGGING_FEATURE_FOR_TESTS); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaCXFServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaCXFServerOptionsProvider.java index b343cdacb707..6a1cf6634c16 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaCXFServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaCXFServerOptionsProvider.java @@ -9,8 +9,6 @@ import io.swagger.codegen.languages.JavaCXFServerCodegen; public class JavaCXFServerOptionsProvider extends JavaOptionsProvider { - public static final String USE_JAXB_ANNOTATIONS = "true"; - public static final String GENERATE_SPRING_APPLICATION = "true"; public static final String USE_SWAGGER_FEATURE = "true"; @@ -69,7 +67,6 @@ public class JavaCXFServerOptionsProvider extends JavaOptionsProvider { builder.put("title", "Test title"); builder.put(JavaCXFServerCodegen.USE_BEANVALIDATION, JavaOptionsProvider.USE_BEANVALIDATION); - builder.put(JavaCXFServerCodegen.USE_JAXB_ANNOTATIONS, USE_JAXB_ANNOTATIONS); builder.put(JavaCXFServerCodegen.GENERATE_SPRING_APPLICATION, GENERATE_SPRING_APPLICATION); builder.put(JavaCXFServerCodegen.USE_SPRING_ANNOTATION_CONFIG, USE_SPRING_ANNOTATION_CONFIG); diff --git a/samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION b/samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION index 7fea99011a6f..f9f7450d1359 100644 --- a/samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION +++ b/samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.swagger-codegen/VERSION index 7fea99011a6f..f9f7450d1359 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/.swagger-codegen/VERSION +++ b/samples/server/petstore/jaxrs-cxf-cdi/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-cdi/swagger.json b/samples/server/petstore/jaxrs-cxf-cdi/swagger.json index df8ae51dbf4c..18ccb05b4bad 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/swagger.json +++ b/samples/server/petstore/jaxrs-cxf-cdi/swagger.json @@ -108,8 +108,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION index 7fea99011a6f..f9f7450d1359 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.swagger-codegen-ignore b/samples/server/petstore/jaxrs-resteasy/eap-java8/.swagger-codegen-ignore index 3adb38ed6e2c..c5fa491b4c55 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.swagger-codegen-ignore +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.swagger-codegen-ignore @@ -21,4 +21,3 @@ #docs/*.md # Then explicitly reverse the ignore rule for a single file: #!docs/README.md -pom.xml diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/mvn_test_jdk8_only.sh b/samples/server/petstore/jaxrs-resteasy/eap-java8/mvn_test_jdk8_only.sh deleted file mode 100755 index 48e5cea3cfdc..000000000000 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/mvn_test_jdk8_only.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -java -version 2>&1 | grep "java version \"1.8" - -if [ $? -eq 0 ] -then - echo "Running JDK8" - mvn test -else - echo "Not running JDK8" -fi diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml index 31be28211ac5..ffcf0f66e70a 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml @@ -14,6 +14,18 @@ maven-war-plugin 3.1.0 + + maven-failsafe-plugin + 2.6 + + + + integration-test + verify + + + + org.codehaus.mojo build-helper-maven-plugin @@ -34,23 +46,6 @@ - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - Play Test - integration-test - - exec - - - ./mvn_test_jdk8_only.sh - - - - diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.swagger-codegen/VERSION index 7fea99011a6f..f9f7450d1359 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.swagger-codegen/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.swagger-codegen/VERSION index 7fea99011a6f..f9f7450d1359 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/.swagger-codegen/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION index 7fea99011a6f..f9f7450d1359 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/joda/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs-spec/.swagger-codegen/VERSION index 7fea99011a6f..f9f7450d1359 100644 --- a/samples/server/petstore/jaxrs-spec/.swagger-codegen/VERSION +++ b/samples/server/petstore/jaxrs-spec/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec/swagger.json b/samples/server/petstore/jaxrs-spec/swagger.json index 72cf38c29461..bcdb5fc36c6d 100644 --- a/samples/server/petstore/jaxrs-spec/swagger.json +++ b/samples/server/petstore/jaxrs-spec/swagger.json @@ -108,8 +108,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], @@ -676,8 +676,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ ">", "$" ], - "default" : "$" + "default" : "$", + "enum" : [ ">", "$" ] } }, { "name" : "enum_form_string", @@ -695,8 +695,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ ">", "$" ], - "default" : "$" + "default" : "$", + "enum" : [ ">", "$" ] } }, { "name" : "enum_header_string", @@ -714,8 +714,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ ">", "$" ], - "default" : "$" + "default" : "$", + "enum" : [ ">", "$" ] } }, { "name" : "enum_query_string", diff --git a/samples/server/petstore/jaxrs/jersey1/.swagger-codegen/VERSION b/samples/server/petstore/jaxrs/jersey1/.swagger-codegen/VERSION index 7fea99011a6f..f9f7450d1359 100644 --- a/samples/server/petstore/jaxrs/jersey1/.swagger-codegen/VERSION +++ b/samples/server/petstore/jaxrs/jersey1/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java index 6d3964075a65..bb401a709daf 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApi.java @@ -134,7 +134,7 @@ public class FakeApi { @Consumes({ "*/*" }) @Produces({ "*/*" }) - @io.swagger.annotations.ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", response = void.class, tags={ "fake" }) + @io.swagger.annotations.ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", response = void.class, tags={ "fake", }) @io.swagger.annotations.ApiResponses(value = { @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = void.class), @io.swagger.annotations.ApiResponse(code = 404, message = "Not found", response = void.class) }) @@ -151,4 +151,18 @@ public class FakeApi { throws NotFoundException { return delegate.testEnumParameters(enumFormStringArray,enumFormString,enumHeaderStringArray,enumHeaderString,enumQueryStringArray,enumQueryString,enumQueryInteger,enumQueryDouble,securityContext); } + @GET + @Path("/jsonFormData") + @Consumes({ "application/json" }) + + @io.swagger.annotations.ApiOperation(value = "test json serialization of form data", notes = "", response = void.class, tags={ "fake" }) + @io.swagger.annotations.ApiResponses(value = { + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = void.class) }) + public Response testJsonFormData( + @ApiParam(value = "field1", required=true) @FormParam("param") String param, + @ApiParam(value = "field2", required=true) @FormParam("param2") String param2, + @Context SecurityContext securityContext) + throws NotFoundException { + return delegate.testJsonFormData(param,param2,securityContext); + } } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java index 4ad6f0d264e9..e5c185eef8ec 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/FakeApiService.java @@ -37,4 +37,6 @@ public abstract class FakeApiService { throws NotFoundException; public abstract Response testEnumParameters(List enumFormStringArray,String enumFormString,List enumHeaderStringArray,String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger,Double enumQueryDouble,SecurityContext securityContext) throws NotFoundException; + public abstract Response testJsonFormData(String param,String param2,SecurityContext securityContext) + throws NotFoundException; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java index e945e6189761..d2cbef7abb5a 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java @@ -47,10 +47,10 @@ public class AdditionalPropertiesClass { return this; } - /** + /** * Get mapProperty * @return mapProperty - **/ + **/ @JsonProperty("map_property") @ApiModelProperty(value = "") public Map getMapProperty() { @@ -74,10 +74,10 @@ public class AdditionalPropertiesClass { return this; } - /** + /** * Get mapOfMapProperty * @return mapOfMapProperty - **/ + **/ @JsonProperty("map_of_map_property") @ApiModelProperty(value = "") public Map> getMapOfMapProperty() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java index 1898c8254e0d..8f1fdfd45bb5 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Animal.java @@ -38,10 +38,10 @@ public class Animal { return this; } - /** + /** * Get className * @return className - **/ + **/ @JsonProperty("className") @ApiModelProperty(required = true, value = "") @NotNull @@ -58,10 +58,10 @@ public class Animal { return this; } - /** + /** * Get color * @return color - **/ + **/ @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java index 96ec13ad4f13..7dcd21182938 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java @@ -44,10 +44,10 @@ public class ArrayOfArrayOfNumberOnly { return this; } - /** + /** * Get arrayArrayNumber * @return arrayArrayNumber - **/ + **/ @JsonProperty("ArrayArrayNumber") @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java index e04487ba653c..05331fa55e90 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java @@ -44,10 +44,10 @@ public class ArrayOfNumberOnly { return this; } - /** + /** * Get arrayNumber * @return arrayNumber - **/ + **/ @JsonProperty("ArrayNumber") @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java index 6e391addfe94..295a1ea1f148 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ArrayTest.java @@ -50,10 +50,10 @@ public class ArrayTest { return this; } - /** + /** * Get arrayOfString * @return arrayOfString - **/ + **/ @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -77,10 +77,10 @@ public class ArrayTest { return this; } - /** + /** * Get arrayArrayOfInteger * @return arrayArrayOfInteger - **/ + **/ @JsonProperty("array_array_of_integer") @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -104,10 +104,10 @@ public class ArrayTest { return this; } - /** + /** * Get arrayArrayOfModel * @return arrayArrayOfModel - **/ + **/ @JsonProperty("array_array_of_model") @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Capitalization.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Capitalization.java index 8e880223f769..6ee896a961d1 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Capitalization.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Capitalization.java @@ -48,10 +48,10 @@ public class Capitalization { return this; } - /** + /** * Get smallCamel * @return smallCamel - **/ + **/ @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -67,10 +67,10 @@ public class Capitalization { return this; } - /** + /** * Get capitalCamel * @return capitalCamel - **/ + **/ @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -86,10 +86,10 @@ public class Capitalization { return this; } - /** + /** * Get smallSnake * @return smallSnake - **/ + **/ @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -105,10 +105,10 @@ public class Capitalization { return this; } - /** + /** * Get capitalSnake * @return capitalSnake - **/ + **/ @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -124,10 +124,10 @@ public class Capitalization { return this; } - /** + /** * Get scAETHFlowPoints * @return scAETHFlowPoints - **/ + **/ @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -143,10 +143,10 @@ public class Capitalization { return this; } - /** + /** * Name of the pet * @return ATT_NAME - **/ + **/ @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java index 80b35d133745..7c3b25e11db4 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Cat.java @@ -34,10 +34,10 @@ public class Cat extends Animal { return this; } - /** + /** * Get declawed * @return declawed - **/ + **/ @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java index 4251da675d19..0408b4d6acf7 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Category.java @@ -36,10 +36,10 @@ public class Category { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -55,10 +55,10 @@ public class Category { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ClassModel.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ClassModel.java index 81a9cac1a9aa..e96a4ff4eb8f 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ClassModel.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ClassModel.java @@ -34,10 +34,10 @@ public class ClassModel { return this; } - /** + /** * Get propertyClass * @return propertyClass - **/ + **/ @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java index e5d0a0ef8d07..7bae1955cb3c 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Client.java @@ -33,10 +33,10 @@ public class Client { return this; } - /** + /** * Get client * @return client - **/ + **/ @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java index 3a70bcc8a236..94fd1071a921 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Dog.java @@ -34,10 +34,10 @@ public class Dog extends Animal { return this; } - /** + /** * Get breed * @return breed - **/ + **/ @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java index a4fa1efac851..8542c26fea80 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumArrays.java @@ -101,10 +101,10 @@ public class EnumArrays { return this; } - /** + /** * Get justSymbol * @return justSymbol - **/ + **/ @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -128,10 +128,10 @@ public class EnumArrays { return this; } - /** + /** * Get arrayEnum * @return arrayEnum - **/ + **/ @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java index abb5128d612c..e233d15e2a9c 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/EnumTest.java @@ -139,10 +139,10 @@ public class EnumTest { return this; } - /** + /** * Get enumString * @return enumString - **/ + **/ @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -158,10 +158,10 @@ public class EnumTest { return this; } - /** + /** * Get enumInteger * @return enumInteger - **/ + **/ @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -177,10 +177,10 @@ public class EnumTest { return this; } - /** + /** * Get enumNumber * @return enumNumber - **/ + **/ @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -196,10 +196,10 @@ public class EnumTest { return this; } - /** + /** * Get outerEnum * @return outerEnum - **/ + **/ @JsonProperty("outerEnum") @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java index bdd53cb3e5d7..bc552c619c32 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/FormatTest.java @@ -72,12 +72,12 @@ public class FormatTest { return this; } - /** + /** * Get integer * minimum: 10 * maximum: 100 * @return integer - **/ + **/ @JsonProperty("integer") @ApiModelProperty(value = "") @Min(10) @Max(100) public Integer getInteger() { @@ -93,12 +93,12 @@ public class FormatTest { return this; } - /** + /** * Get int32 * minimum: 20 * maximum: 200 * @return int32 - **/ + **/ @JsonProperty("int32") @ApiModelProperty(value = "") @Min(20) @Max(200) public Integer getInt32() { @@ -114,10 +114,10 @@ public class FormatTest { return this; } - /** + /** * Get int64 * @return int64 - **/ + **/ @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -133,12 +133,12 @@ public class FormatTest { return this; } - /** + /** * Get number * minimum: 32.1 * maximum: 543.2 * @return number - **/ + **/ @JsonProperty("number") @ApiModelProperty(required = true, value = "") @NotNull @@ -155,12 +155,12 @@ public class FormatTest { return this; } - /** + /** * Get _float * minimum: 54.3 * maximum: 987.6 * @return _float - **/ + **/ @JsonProperty("float") @ApiModelProperty(value = "") @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { @@ -176,12 +176,12 @@ public class FormatTest { return this; } - /** + /** * Get _double * minimum: 67.8 * maximum: 123.4 * @return _double - **/ + **/ @JsonProperty("double") @ApiModelProperty(value = "") @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { @@ -197,10 +197,10 @@ public class FormatTest { return this; } - /** + /** * Get string * @return string - **/ + **/ @JsonProperty("string") @ApiModelProperty(value = "") @Pattern(regexp="/[a-z]/i") public String getString() { @@ -216,14 +216,14 @@ public class FormatTest { return this; } - /** + /** * Get _byte * @return _byte - **/ + **/ @JsonProperty("byte") @ApiModelProperty(required = true, value = "") @NotNull - public byte[] getByte() { + @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; } @@ -236,10 +236,10 @@ public class FormatTest { return this; } - /** + /** * Get binary * @return binary - **/ + **/ @JsonProperty("binary") @ApiModelProperty(value = "") public byte[] getBinary() { @@ -255,10 +255,10 @@ public class FormatTest { return this; } - /** + /** * Get date * @return date - **/ + **/ @JsonProperty("date") @ApiModelProperty(required = true, value = "") @NotNull @@ -275,10 +275,10 @@ public class FormatTest { return this; } - /** + /** * Get dateTime * @return dateTime - **/ + **/ @JsonProperty("dateTime") @ApiModelProperty(value = "") public Date getDateTime() { @@ -294,10 +294,10 @@ public class FormatTest { return this; } - /** + /** * Get uuid * @return uuid - **/ + **/ @JsonProperty("uuid") @ApiModelProperty(value = "") public UUID getUuid() { @@ -313,10 +313,10 @@ public class FormatTest { return this; } - /** + /** * Get password * @return password - **/ + **/ @JsonProperty("password") @ApiModelProperty(required = true, value = "") @NotNull diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java index ad387b8d1ef4..02480c10c653 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/HasOnlyReadOnly.java @@ -31,20 +31,20 @@ public class HasOnlyReadOnly { @JsonProperty("foo") private String foo = null; - /** + /** * Get bar * @return bar - **/ + **/ @JsonProperty("bar") @ApiModelProperty(value = "") public String getBar() { return bar; } - /** + /** * Get foo * @return foo - **/ + **/ @JsonProperty("foo") @ApiModelProperty(value = "") public String getFoo() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java index c1625ac70b48..73c04c4bd635 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MapTest.java @@ -79,10 +79,10 @@ public class MapTest { return this; } - /** + /** * Get mapMapOfString * @return mapMapOfString - **/ + **/ @JsonProperty("map_map_of_string") @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -106,10 +106,10 @@ public class MapTest { return this; } - /** + /** * Get mapOfEnumString * @return mapOfEnumString - **/ + **/ @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java index 85064283e4d7..5e1d96f5ecc5 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,10 +45,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass { return this; } - /** + /** * Get uuid * @return uuid - **/ + **/ @JsonProperty("uuid") @ApiModelProperty(value = "") public UUID getUuid() { @@ -64,10 +64,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass { return this; } - /** + /** * Get dateTime * @return dateTime - **/ + **/ @JsonProperty("dateTime") @ApiModelProperty(value = "") public Date getDateTime() { @@ -91,10 +91,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass { return this; } - /** + /** * Get map * @return map - **/ + **/ @JsonProperty("map") @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java index ecab5e15c3cd..954ef7ebed36 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Model200Response.java @@ -37,10 +37,10 @@ public class Model200Response { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -56,10 +56,10 @@ public class Model200Response { return this; } - /** + /** * Get propertyClass * @return propertyClass - **/ + **/ @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java index e4e80f26be66..2a54b591b320 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -39,10 +39,10 @@ public class ModelApiResponse { return this; } - /** + /** * Get code * @return code - **/ + **/ @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -58,10 +58,10 @@ public class ModelApiResponse { return this; } - /** + /** * Get type * @return type - **/ + **/ @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -77,10 +77,10 @@ public class ModelApiResponse { return this; } - /** + /** * Get message * @return message - **/ + **/ @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java index a3420db6ed59..12b213d6afb5 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ModelReturn.java @@ -34,10 +34,10 @@ public class ModelReturn { return this; } - /** + /** * Get _return * @return _return - **/ + **/ @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java index c48051e1b8e1..771531b30aba 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Name.java @@ -43,10 +43,10 @@ public class Name { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") @NotNull @@ -58,10 +58,10 @@ public class Name { this.name = name; } - /** + /** * Get snakeCase * @return snakeCase - **/ + **/ @JsonProperty("snake_case") @ApiModelProperty(value = "") public Integer getSnakeCase() { @@ -73,10 +73,10 @@ public class Name { return this; } - /** + /** * Get property * @return property - **/ + **/ @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -87,10 +87,10 @@ public class Name { this.property = property; } - /** + /** * Get _123Number * @return _123Number - **/ + **/ @JsonProperty("123Number") @ApiModelProperty(value = "") public Integer get123Number() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java index 3cf4872ff5ba..82604a5b9c79 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/NumberOnly.java @@ -34,10 +34,10 @@ public class NumberOnly { return this; } - /** + /** * Get justNumber * @return justNumber - **/ + **/ @JsonProperty("JustNumber") @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java index c3acd75afb54..06948a8368ec 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Order.java @@ -83,10 +83,10 @@ public class Order { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -102,10 +102,10 @@ public class Order { return this; } - /** + /** * Get petId * @return petId - **/ + **/ @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -121,10 +121,10 @@ public class Order { return this; } - /** + /** * Get quantity * @return quantity - **/ + **/ @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -140,10 +140,10 @@ public class Order { return this; } - /** + /** * Get shipDate * @return shipDate - **/ + **/ @JsonProperty("shipDate") @ApiModelProperty(value = "") public Date getShipDate() { @@ -159,10 +159,10 @@ public class Order { return this; } - /** + /** * Order Status * @return status - **/ + **/ @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -178,10 +178,10 @@ public class Order { return this; } - /** + /** * Get complete * @return complete - **/ + **/ @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/OuterComposite.java index aa6f16ba6404..c144ee99521a 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/OuterComposite.java @@ -40,10 +40,10 @@ public class OuterComposite { return this; } - /** + /** * Get myNumber * @return myNumber - **/ + **/ @JsonProperty("my_number") @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -59,10 +59,10 @@ public class OuterComposite { return this; } - /** + /** * Get myString * @return myString - **/ + **/ @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -78,10 +78,10 @@ public class OuterComposite { return this; } - /** + /** * Get myBoolean * @return myBoolean - **/ + **/ @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java index dee942d257fd..04480639f0ff 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Pet.java @@ -86,10 +86,10 @@ public class Pet { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -105,10 +105,10 @@ public class Pet { return this; } - /** + /** * Get category * @return category - **/ + **/ @JsonProperty("category") @ApiModelProperty(value = "") public Category getCategory() { @@ -124,10 +124,10 @@ public class Pet { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(example = "doggie", required = true, value = "") @NotNull @@ -149,10 +149,10 @@ public class Pet { return this; } - /** + /** * Get photoUrls * @return photoUrls - **/ + **/ @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") @NotNull @@ -177,10 +177,10 @@ public class Pet { return this; } - /** + /** * Get tags * @return tags - **/ + **/ @JsonProperty("tags") @ApiModelProperty(value = "") public List getTags() { @@ -196,10 +196,10 @@ public class Pet { return this; } - /** + /** * pet status in the store * @return status - **/ + **/ @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java index 1adefcf3fa04..5d26b4199f87 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/ReadOnlyFirst.java @@ -31,10 +31,10 @@ public class ReadOnlyFirst { @JsonProperty("baz") private String baz = null; - /** + /** * Get bar * @return bar - **/ + **/ @JsonProperty("bar") @ApiModelProperty(value = "") public String getBar() { @@ -46,10 +46,10 @@ public class ReadOnlyFirst { return this; } - /** + /** * Get baz * @return baz - **/ + **/ @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java index 48cbf2ace1c7..df3182fbd809 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/SpecialModelName.java @@ -33,10 +33,10 @@ public class SpecialModelName { return this; } - /** + /** * Get specialPropertyName * @return specialPropertyName - **/ + **/ @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long getSpecialPropertyName() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java index 84b113fb9246..a86f54144f8f 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/Tag.java @@ -36,10 +36,10 @@ public class Tag { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -55,10 +55,10 @@ public class Tag { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java index 493297f101f2..0c1b67c0d5be 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/model/User.java @@ -54,10 +54,10 @@ public class User { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -73,10 +73,10 @@ public class User { return this; } - /** + /** * Get username * @return username - **/ + **/ @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -92,10 +92,10 @@ public class User { return this; } - /** + /** * Get firstName * @return firstName - **/ + **/ @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -111,10 +111,10 @@ public class User { return this; } - /** + /** * Get lastName * @return lastName - **/ + **/ @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -130,10 +130,10 @@ public class User { return this; } - /** + /** * Get email * @return email - **/ + **/ @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -149,10 +149,10 @@ public class User { return this; } - /** + /** * Get password * @return password - **/ + **/ @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -168,10 +168,10 @@ public class User { return this; } - /** + /** * Get phone * @return phone - **/ + **/ @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -187,10 +187,10 @@ public class User { return this; } - /** + /** * User Status * @return userStatus - **/ + **/ @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() { diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java index 62d62d961ff3..54aa3577d523 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java @@ -65,4 +65,10 @@ public class FakeApiServiceImpl extends FakeApiService { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } + @Override + public Response testJsonFormData(String param, String param2, SecurityContext securityContext) + throws NotFoundException { + // do some magic! + return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); + } } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java index e945e6189761..d2cbef7abb5a 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java @@ -47,10 +47,10 @@ public class AdditionalPropertiesClass { return this; } - /** + /** * Get mapProperty * @return mapProperty - **/ + **/ @JsonProperty("map_property") @ApiModelProperty(value = "") public Map getMapProperty() { @@ -74,10 +74,10 @@ public class AdditionalPropertiesClass { return this; } - /** + /** * Get mapOfMapProperty * @return mapOfMapProperty - **/ + **/ @JsonProperty("map_of_map_property") @ApiModelProperty(value = "") public Map> getMapOfMapProperty() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Animal.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Animal.java index 1898c8254e0d..8f1fdfd45bb5 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Animal.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Animal.java @@ -38,10 +38,10 @@ public class Animal { return this; } - /** + /** * Get className * @return className - **/ + **/ @JsonProperty("className") @ApiModelProperty(required = true, value = "") @NotNull @@ -58,10 +58,10 @@ public class Animal { return this; } - /** + /** * Get color * @return color - **/ + **/ @JsonProperty("color") @ApiModelProperty(value = "") public String getColor() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java index 96ec13ad4f13..7dcd21182938 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java @@ -44,10 +44,10 @@ public class ArrayOfArrayOfNumberOnly { return this; } - /** + /** * Get arrayArrayNumber * @return arrayArrayNumber - **/ + **/ @JsonProperty("ArrayArrayNumber") @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java index e04487ba653c..05331fa55e90 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java @@ -44,10 +44,10 @@ public class ArrayOfNumberOnly { return this; } - /** + /** * Get arrayNumber * @return arrayNumber - **/ + **/ @JsonProperty("ArrayNumber") @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayTest.java index 6e391addfe94..295a1ea1f148 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ArrayTest.java @@ -50,10 +50,10 @@ public class ArrayTest { return this; } - /** + /** * Get arrayOfString * @return arrayOfString - **/ + **/ @JsonProperty("array_of_string") @ApiModelProperty(value = "") public List getArrayOfString() { @@ -77,10 +77,10 @@ public class ArrayTest { return this; } - /** + /** * Get arrayArrayOfInteger * @return arrayArrayOfInteger - **/ + **/ @JsonProperty("array_array_of_integer") @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -104,10 +104,10 @@ public class ArrayTest { return this; } - /** + /** * Get arrayArrayOfModel * @return arrayArrayOfModel - **/ + **/ @JsonProperty("array_array_of_model") @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Capitalization.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Capitalization.java index 8e880223f769..6ee896a961d1 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Capitalization.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Capitalization.java @@ -48,10 +48,10 @@ public class Capitalization { return this; } - /** + /** * Get smallCamel * @return smallCamel - **/ + **/ @JsonProperty("smallCamel") @ApiModelProperty(value = "") public String getSmallCamel() { @@ -67,10 +67,10 @@ public class Capitalization { return this; } - /** + /** * Get capitalCamel * @return capitalCamel - **/ + **/ @JsonProperty("CapitalCamel") @ApiModelProperty(value = "") public String getCapitalCamel() { @@ -86,10 +86,10 @@ public class Capitalization { return this; } - /** + /** * Get smallSnake * @return smallSnake - **/ + **/ @JsonProperty("small_Snake") @ApiModelProperty(value = "") public String getSmallSnake() { @@ -105,10 +105,10 @@ public class Capitalization { return this; } - /** + /** * Get capitalSnake * @return capitalSnake - **/ + **/ @JsonProperty("Capital_Snake") @ApiModelProperty(value = "") public String getCapitalSnake() { @@ -124,10 +124,10 @@ public class Capitalization { return this; } - /** + /** * Get scAETHFlowPoints * @return scAETHFlowPoints - **/ + **/ @JsonProperty("SCA_ETH_Flow_Points") @ApiModelProperty(value = "") public String getScAETHFlowPoints() { @@ -143,10 +143,10 @@ public class Capitalization { return this; } - /** + /** * Name of the pet * @return ATT_NAME - **/ + **/ @JsonProperty("ATT_NAME") @ApiModelProperty(value = "Name of the pet ") public String getATTNAME() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Cat.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Cat.java index 80b35d133745..7c3b25e11db4 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Cat.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Cat.java @@ -34,10 +34,10 @@ public class Cat extends Animal { return this; } - /** + /** * Get declawed * @return declawed - **/ + **/ @JsonProperty("declawed") @ApiModelProperty(value = "") public Boolean getDeclawed() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Category.java index 4251da675d19..0408b4d6acf7 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Category.java @@ -36,10 +36,10 @@ public class Category { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -55,10 +55,10 @@ public class Category { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ClassModel.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ClassModel.java index 81a9cac1a9aa..e96a4ff4eb8f 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ClassModel.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ClassModel.java @@ -34,10 +34,10 @@ public class ClassModel { return this; } - /** + /** * Get propertyClass * @return propertyClass - **/ + **/ @JsonProperty("_class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Client.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Client.java index e5d0a0ef8d07..7bae1955cb3c 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Client.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Client.java @@ -33,10 +33,10 @@ public class Client { return this; } - /** + /** * Get client * @return client - **/ + **/ @JsonProperty("client") @ApiModelProperty(value = "") public String getClient() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Dog.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Dog.java index 3a70bcc8a236..94fd1071a921 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Dog.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Dog.java @@ -34,10 +34,10 @@ public class Dog extends Animal { return this; } - /** + /** * Get breed * @return breed - **/ + **/ @JsonProperty("breed") @ApiModelProperty(value = "") public String getBreed() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/EnumArrays.java index a4fa1efac851..8542c26fea80 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/EnumArrays.java @@ -101,10 +101,10 @@ public class EnumArrays { return this; } - /** + /** * Get justSymbol * @return justSymbol - **/ + **/ @JsonProperty("just_symbol") @ApiModelProperty(value = "") public JustSymbolEnum getJustSymbol() { @@ -128,10 +128,10 @@ public class EnumArrays { return this; } - /** + /** * Get arrayEnum * @return arrayEnum - **/ + **/ @JsonProperty("array_enum") @ApiModelProperty(value = "") public List getArrayEnum() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/EnumTest.java index abb5128d612c..e233d15e2a9c 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/EnumTest.java @@ -139,10 +139,10 @@ public class EnumTest { return this; } - /** + /** * Get enumString * @return enumString - **/ + **/ @JsonProperty("enum_string") @ApiModelProperty(value = "") public EnumStringEnum getEnumString() { @@ -158,10 +158,10 @@ public class EnumTest { return this; } - /** + /** * Get enumInteger * @return enumInteger - **/ + **/ @JsonProperty("enum_integer") @ApiModelProperty(value = "") public EnumIntegerEnum getEnumInteger() { @@ -177,10 +177,10 @@ public class EnumTest { return this; } - /** + /** * Get enumNumber * @return enumNumber - **/ + **/ @JsonProperty("enum_number") @ApiModelProperty(value = "") public EnumNumberEnum getEnumNumber() { @@ -196,10 +196,10 @@ public class EnumTest { return this; } - /** + /** * Get outerEnum * @return outerEnum - **/ + **/ @JsonProperty("outerEnum") @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/FormatTest.java index 8b5e5b18ec08..bc552c619c32 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/FormatTest.java @@ -72,12 +72,12 @@ public class FormatTest { return this; } - /** + /** * Get integer * minimum: 10 * maximum: 100 * @return integer - **/ + **/ @JsonProperty("integer") @ApiModelProperty(value = "") @Min(10) @Max(100) public Integer getInteger() { @@ -93,12 +93,12 @@ public class FormatTest { return this; } - /** + /** * Get int32 * minimum: 20 * maximum: 200 * @return int32 - **/ + **/ @JsonProperty("int32") @ApiModelProperty(value = "") @Min(20) @Max(200) public Integer getInt32() { @@ -114,10 +114,10 @@ public class FormatTest { return this; } - /** + /** * Get int64 * @return int64 - **/ + **/ @JsonProperty("int64") @ApiModelProperty(value = "") public Long getInt64() { @@ -133,12 +133,12 @@ public class FormatTest { return this; } - /** + /** * Get number * minimum: 32.1 * maximum: 543.2 * @return number - **/ + **/ @JsonProperty("number") @ApiModelProperty(required = true, value = "") @NotNull @@ -155,12 +155,12 @@ public class FormatTest { return this; } - /** + /** * Get _float * minimum: 54.3 * maximum: 987.6 * @return _float - **/ + **/ @JsonProperty("float") @ApiModelProperty(value = "") @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { @@ -176,12 +176,12 @@ public class FormatTest { return this; } - /** + /** * Get _double * minimum: 67.8 * maximum: 123.4 * @return _double - **/ + **/ @JsonProperty("double") @ApiModelProperty(value = "") @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { @@ -197,10 +197,10 @@ public class FormatTest { return this; } - /** + /** * Get string * @return string - **/ + **/ @JsonProperty("string") @ApiModelProperty(value = "") @Pattern(regexp="/[a-z]/i") public String getString() { @@ -216,10 +216,10 @@ public class FormatTest { return this; } - /** + /** * Get _byte * @return _byte - **/ + **/ @JsonProperty("byte") @ApiModelProperty(required = true, value = "") @NotNull @@ -236,10 +236,10 @@ public class FormatTest { return this; } - /** + /** * Get binary * @return binary - **/ + **/ @JsonProperty("binary") @ApiModelProperty(value = "") public byte[] getBinary() { @@ -255,10 +255,10 @@ public class FormatTest { return this; } - /** + /** * Get date * @return date - **/ + **/ @JsonProperty("date") @ApiModelProperty(required = true, value = "") @NotNull @@ -275,10 +275,10 @@ public class FormatTest { return this; } - /** + /** * Get dateTime * @return dateTime - **/ + **/ @JsonProperty("dateTime") @ApiModelProperty(value = "") public Date getDateTime() { @@ -294,10 +294,10 @@ public class FormatTest { return this; } - /** + /** * Get uuid * @return uuid - **/ + **/ @JsonProperty("uuid") @ApiModelProperty(value = "") public UUID getUuid() { @@ -313,10 +313,10 @@ public class FormatTest { return this; } - /** + /** * Get password * @return password - **/ + **/ @JsonProperty("password") @ApiModelProperty(required = true, value = "") @NotNull diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/HasOnlyReadOnly.java index ad387b8d1ef4..02480c10c653 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/HasOnlyReadOnly.java @@ -31,20 +31,20 @@ public class HasOnlyReadOnly { @JsonProperty("foo") private String foo = null; - /** + /** * Get bar * @return bar - **/ + **/ @JsonProperty("bar") @ApiModelProperty(value = "") public String getBar() { return bar; } - /** + /** * Get foo * @return foo - **/ + **/ @JsonProperty("foo") @ApiModelProperty(value = "") public String getFoo() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/MapTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/MapTest.java index c1625ac70b48..73c04c4bd635 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/MapTest.java @@ -79,10 +79,10 @@ public class MapTest { return this; } - /** + /** * Get mapMapOfString * @return mapMapOfString - **/ + **/ @JsonProperty("map_map_of_string") @ApiModelProperty(value = "") public Map> getMapMapOfString() { @@ -106,10 +106,10 @@ public class MapTest { return this; } - /** + /** * Get mapOfEnumString * @return mapOfEnumString - **/ + **/ @JsonProperty("map_of_enum_string") @ApiModelProperty(value = "") public Map getMapOfEnumString() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java index 85064283e4d7..5e1d96f5ecc5 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,10 +45,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass { return this; } - /** + /** * Get uuid * @return uuid - **/ + **/ @JsonProperty("uuid") @ApiModelProperty(value = "") public UUID getUuid() { @@ -64,10 +64,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass { return this; } - /** + /** * Get dateTime * @return dateTime - **/ + **/ @JsonProperty("dateTime") @ApiModelProperty(value = "") public Date getDateTime() { @@ -91,10 +91,10 @@ public class MixedPropertiesAndAdditionalPropertiesClass { return this; } - /** + /** * Get map * @return map - **/ + **/ @JsonProperty("map") @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Model200Response.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Model200Response.java index ecab5e15c3cd..954ef7ebed36 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Model200Response.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Model200Response.java @@ -37,10 +37,10 @@ public class Model200Response { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(value = "") public Integer getName() { @@ -56,10 +56,10 @@ public class Model200Response { return this; } - /** + /** * Get propertyClass * @return propertyClass - **/ + **/ @JsonProperty("class") @ApiModelProperty(value = "") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelApiResponse.java index e4e80f26be66..2a54b591b320 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -39,10 +39,10 @@ public class ModelApiResponse { return this; } - /** + /** * Get code * @return code - **/ + **/ @JsonProperty("code") @ApiModelProperty(value = "") public Integer getCode() { @@ -58,10 +58,10 @@ public class ModelApiResponse { return this; } - /** + /** * Get type * @return type - **/ + **/ @JsonProperty("type") @ApiModelProperty(value = "") public String getType() { @@ -77,10 +77,10 @@ public class ModelApiResponse { return this; } - /** + /** * Get message * @return message - **/ + **/ @JsonProperty("message") @ApiModelProperty(value = "") public String getMessage() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelReturn.java index a3420db6ed59..12b213d6afb5 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ModelReturn.java @@ -34,10 +34,10 @@ public class ModelReturn { return this; } - /** + /** * Get _return * @return _return - **/ + **/ @JsonProperty("return") @ApiModelProperty(value = "") public Integer getReturn() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Name.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Name.java index c48051e1b8e1..771531b30aba 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Name.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Name.java @@ -43,10 +43,10 @@ public class Name { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(required = true, value = "") @NotNull @@ -58,10 +58,10 @@ public class Name { this.name = name; } - /** + /** * Get snakeCase * @return snakeCase - **/ + **/ @JsonProperty("snake_case") @ApiModelProperty(value = "") public Integer getSnakeCase() { @@ -73,10 +73,10 @@ public class Name { return this; } - /** + /** * Get property * @return property - **/ + **/ @JsonProperty("property") @ApiModelProperty(value = "") public String getProperty() { @@ -87,10 +87,10 @@ public class Name { this.property = property; } - /** + /** * Get _123Number * @return _123Number - **/ + **/ @JsonProperty("123Number") @ApiModelProperty(value = "") public Integer get123Number() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/NumberOnly.java index 3cf4872ff5ba..82604a5b9c79 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/NumberOnly.java @@ -34,10 +34,10 @@ public class NumberOnly { return this; } - /** + /** * Get justNumber * @return justNumber - **/ + **/ @JsonProperty("JustNumber") @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Order.java index c3acd75afb54..06948a8368ec 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Order.java @@ -83,10 +83,10 @@ public class Order { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -102,10 +102,10 @@ public class Order { return this; } - /** + /** * Get petId * @return petId - **/ + **/ @JsonProperty("petId") @ApiModelProperty(value = "") public Long getPetId() { @@ -121,10 +121,10 @@ public class Order { return this; } - /** + /** * Get quantity * @return quantity - **/ + **/ @JsonProperty("quantity") @ApiModelProperty(value = "") public Integer getQuantity() { @@ -140,10 +140,10 @@ public class Order { return this; } - /** + /** * Get shipDate * @return shipDate - **/ + **/ @JsonProperty("shipDate") @ApiModelProperty(value = "") public Date getShipDate() { @@ -159,10 +159,10 @@ public class Order { return this; } - /** + /** * Order Status * @return status - **/ + **/ @JsonProperty("status") @ApiModelProperty(value = "Order Status") public StatusEnum getStatus() { @@ -178,10 +178,10 @@ public class Order { return this; } - /** + /** * Get complete * @return complete - **/ + **/ @JsonProperty("complete") @ApiModelProperty(value = "") public Boolean getComplete() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/OuterComposite.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/OuterComposite.java index aa6f16ba6404..c144ee99521a 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/OuterComposite.java @@ -40,10 +40,10 @@ public class OuterComposite { return this; } - /** + /** * Get myNumber * @return myNumber - **/ + **/ @JsonProperty("my_number") @ApiModelProperty(value = "") public BigDecimal getMyNumber() { @@ -59,10 +59,10 @@ public class OuterComposite { return this; } - /** + /** * Get myString * @return myString - **/ + **/ @JsonProperty("my_string") @ApiModelProperty(value = "") public String getMyString() { @@ -78,10 +78,10 @@ public class OuterComposite { return this; } - /** + /** * Get myBoolean * @return myBoolean - **/ + **/ @JsonProperty("my_boolean") @ApiModelProperty(value = "") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Pet.java index dee942d257fd..04480639f0ff 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Pet.java @@ -86,10 +86,10 @@ public class Pet { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -105,10 +105,10 @@ public class Pet { return this; } - /** + /** * Get category * @return category - **/ + **/ @JsonProperty("category") @ApiModelProperty(value = "") public Category getCategory() { @@ -124,10 +124,10 @@ public class Pet { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(example = "doggie", required = true, value = "") @NotNull @@ -149,10 +149,10 @@ public class Pet { return this; } - /** + /** * Get photoUrls * @return photoUrls - **/ + **/ @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") @NotNull @@ -177,10 +177,10 @@ public class Pet { return this; } - /** + /** * Get tags * @return tags - **/ + **/ @JsonProperty("tags") @ApiModelProperty(value = "") public List getTags() { @@ -196,10 +196,10 @@ public class Pet { return this; } - /** + /** * pet status in the store * @return status - **/ + **/ @JsonProperty("status") @ApiModelProperty(value = "pet status in the store") public StatusEnum getStatus() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ReadOnlyFirst.java index 1adefcf3fa04..5d26b4199f87 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/ReadOnlyFirst.java @@ -31,10 +31,10 @@ public class ReadOnlyFirst { @JsonProperty("baz") private String baz = null; - /** + /** * Get bar * @return bar - **/ + **/ @JsonProperty("bar") @ApiModelProperty(value = "") public String getBar() { @@ -46,10 +46,10 @@ public class ReadOnlyFirst { return this; } - /** + /** * Get baz * @return baz - **/ + **/ @JsonProperty("baz") @ApiModelProperty(value = "") public String getBaz() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/SpecialModelName.java index 48cbf2ace1c7..df3182fbd809 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/SpecialModelName.java @@ -33,10 +33,10 @@ public class SpecialModelName { return this; } - /** + /** * Get specialPropertyName * @return specialPropertyName - **/ + **/ @JsonProperty("$special[property.name]") @ApiModelProperty(value = "") public Long getSpecialPropertyName() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Tag.java index 84b113fb9246..a86f54144f8f 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/Tag.java @@ -36,10 +36,10 @@ public class Tag { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -55,10 +55,10 @@ public class Tag { return this; } - /** + /** * Get name * @return name - **/ + **/ @JsonProperty("name") @ApiModelProperty(value = "") public String getName() { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/User.java index 493297f101f2..0c1b67c0d5be 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/io/swagger/model/User.java @@ -54,10 +54,10 @@ public class User { return this; } - /** + /** * Get id * @return id - **/ + **/ @JsonProperty("id") @ApiModelProperty(value = "") public Long getId() { @@ -73,10 +73,10 @@ public class User { return this; } - /** + /** * Get username * @return username - **/ + **/ @JsonProperty("username") @ApiModelProperty(value = "") public String getUsername() { @@ -92,10 +92,10 @@ public class User { return this; } - /** + /** * Get firstName * @return firstName - **/ + **/ @JsonProperty("firstName") @ApiModelProperty(value = "") public String getFirstName() { @@ -111,10 +111,10 @@ public class User { return this; } - /** + /** * Get lastName * @return lastName - **/ + **/ @JsonProperty("lastName") @ApiModelProperty(value = "") public String getLastName() { @@ -130,10 +130,10 @@ public class User { return this; } - /** + /** * Get email * @return email - **/ + **/ @JsonProperty("email") @ApiModelProperty(value = "") public String getEmail() { @@ -149,10 +149,10 @@ public class User { return this; } - /** + /** * Get password * @return password - **/ + **/ @JsonProperty("password") @ApiModelProperty(value = "") public String getPassword() { @@ -168,10 +168,10 @@ public class User { return this; } - /** + /** * Get phone * @return phone - **/ + **/ @JsonProperty("phone") @ApiModelProperty(value = "") public String getPhone() { @@ -187,10 +187,10 @@ public class User { return this; } - /** + /** * User Status * @return userStatus - **/ + **/ @JsonProperty("userStatus") @ApiModelProperty(value = "User Status") public Integer getUserStatus() {