diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java index c46996afdd8..d996d7f83d4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java @@ -169,6 +169,10 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen { supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen supportingFiles.add(new SupportingFile("README.mustache", "", "README.md") .doNotOverwrite()); + supportingFiles.add(new SupportingFile("RestResourceRoot.mustache", + (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestResourceRoot.java") + .doNotOverwrite()); + if (generatePom) { supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml") .doNotOverwrite()); diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache index 3dd570e9c35..56618f1541a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestApplication.mustache @@ -3,7 +3,7 @@ package {{invokerPackage}}; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("{{{contextPath}}}") +@ApplicationPath(RestResourceRoot.APPLICATION_PATH) public class RestApplication extends Application { } diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestResourceRoot.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestResourceRoot.mustache new file mode 100644 index 00000000000..669fc2b4f9c --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/RestResourceRoot.mustache @@ -0,0 +1,5 @@ +package {{invokerPackage}}; + +public class RestResourceRoot { + public static final String APPLICATION_PATH = "{{{contextPath}}}"; +} diff --git a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES index 912cd6039b7..a5460bdf420 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES +++ b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/FILES @@ -4,6 +4,7 @@ src/gen/java/org/openapitools/api/AnotherFakeApi.java src/gen/java/org/openapitools/api/FakeApi.java src/gen/java/org/openapitools/api/FakeClassnameTestApi.java src/gen/java/org/openapitools/api/PetApi.java +src/gen/java/org/openapitools/api/RestResourceRoot.java src/gen/java/org/openapitools/api/StoreApi.java src/gen/java/org/openapitools/api/UserApi.java src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION index 5f68295fc19..66672d4e9d3 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION @@ -1 +1 @@ -6.0.0-SNAPSHOT \ No newline at end of file +6.1.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-interface-response/pom.xml b/samples/server/petstore/jaxrs-spec-interface-response/pom.xml index 9bac70f9095..861b090b321 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/pom.xml +++ b/samples/server/petstore/jaxrs-spec-interface-response/pom.xml @@ -93,6 +93,7 @@ 1.8 ${java.version} ${java.version} + UTF-8 2.9.9 4.13.2 2.10.13 diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 0d7fa5cb4d0..6107529c094 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -15,7 +15,8 @@ import javax.validation.Valid; @Path("/another-fake/dummy") @Api(description = "the another-fake API") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface AnotherFakeApi { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public interface AnotherFakeApi { @PATCH @Consumes({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java index 6647d22250f..ca6bdded416 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java @@ -25,7 +25,8 @@ import javax.validation.Valid; @Path("/fake") @Api(description = "the fake API") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface FakeApi { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public interface FakeApi { @POST @Path("/create_xml_item") diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java deleted file mode 100644 index f68a2aede99..00000000000 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.openapitools.api; - -import org.openapitools.model.Client; - -import javax.ws.rs.*; -import javax.ws.rs.core.Response; - -import io.swagger.annotations.*; - -import java.io.InputStream; -import java.util.Map; -import java.util.List; -import javax.validation.constraints.*; -import javax.validation.Valid; - -@Path("/FakeClassnameTags123") -@Api(description = "the FakeClassnameTags123 API") -public interface FakeClassnameTags123Api { - - @PATCH - @Consumes({ "application/json" }) - @Produces({ "application/json" }) - @ApiOperation(value = "To test class name in snake case", notes = "To test class name in snake case", authorizations = { - @Authorization(value = "api_key_query") - }, tags={ "fake_classname_tags 123#$%^" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - Response testClassname(@Valid Client body); -} diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index 5d1c770b70a..e14b0e6205e 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -15,7 +15,8 @@ import javax.validation.Valid; @Path("/fake_classname_test") @Api(description = "the fake_classname_test API") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface FakeClassnameTestApi { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public interface FakeClassnameTestApi { @PATCH @Consumes({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java index 688f409117a..5b895890757 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java @@ -18,7 +18,8 @@ import javax.validation.Valid; @Path("/pet") @Api(description = "the pet API") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface PetApi { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public interface PetApi { @POST @Consumes({ "application/json", "application/xml" }) diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/RestResourceRoot.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/RestResourceRoot.java new file mode 100644 index 00000000000..96ba6c8d8e4 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/RestResourceRoot.java @@ -0,0 +1,5 @@ +package org.openapitools.api; + +public class RestResourceRoot { + public static final String APPLICATION_PATH = "/v2"; +} diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java index 06a7a2967ed..98797af84d0 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java @@ -16,7 +16,8 @@ import javax.validation.Valid; @Path("/store") @Api(description = "the store API") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface StoreApi { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public interface StoreApi { @DELETE @Path("/order/{order_id}") diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java index ed2fcd7dc4e..888b96e8cd0 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java @@ -17,7 +17,8 @@ import javax.validation.Valid; @Path("/user") @Api(description = "the user API") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface UserApi { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public interface UserApi { @POST @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", tags={ "user" }) diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 50c6702c65f..749ca0e02cc 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesAnyType") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesAnyType extends HashMap implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class AdditionalPropertiesAnyType extends HashMap implements Serializable { private @Valid String name; /** @@ -30,8 +30,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java index 3b400ed375e..3563c9cdc65 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesArray") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesArray extends HashMap implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class AdditionalPropertiesArray extends HashMap implements Serializable { private @Valid String name; /** @@ -31,8 +31,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java index e1dbfa0821a..0afb07939f5 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesBoolean") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesBoolean extends HashMap implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class AdditionalPropertiesBoolean extends HashMap implements Serializable { private @Valid String name; /** @@ -30,8 +30,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index d8256b29ea3..31b4b91dfb2 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -20,16 +20,16 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesClass") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesClass implements Serializable { - - private @Valid Map mapString = new HashMap<>(); - private @Valid Map mapNumber = new HashMap<>(); - private @Valid Map mapInteger = new HashMap<>(); - private @Valid Map mapBoolean = new HashMap<>(); - private @Valid Map> mapArrayInteger = new HashMap<>(); - private @Valid Map> mapArrayAnytype = new HashMap<>(); - private @Valid Map> mapMapString = new HashMap<>(); - private @Valid Map> mapMapAnytype = new HashMap<>(); +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class AdditionalPropertiesClass implements Serializable { + private @Valid Map mapString = null; + private @Valid Map mapNumber = null; + private @Valid Map mapInteger = null; + private @Valid Map mapBoolean = null; + private @Valid Map> mapArrayInteger = null; + private @Valid Map> mapArrayAnytype = null; + private @Valid Map> mapMapString = null; + private @Valid Map> mapMapAnytype = null; private @Valid Object anytype1; private @Valid Object anytype2; private @Valid Object anytype3; @@ -42,8 +42,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("map_string") public Map getMapString() { @@ -71,7 +69,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public AdditionalPropertiesClass mapNumber(Map mapNumber) { this.mapNumber = mapNumber; @@ -79,8 +77,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("map_number") public Map getMapNumber() { @@ -108,7 +104,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public AdditionalPropertiesClass mapInteger(Map mapInteger) { this.mapInteger = mapInteger; @@ -116,8 +112,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("map_integer") public Map getMapInteger() { @@ -145,7 +139,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public AdditionalPropertiesClass mapBoolean(Map mapBoolean) { this.mapBoolean = mapBoolean; @@ -153,8 +147,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("map_boolean") public Map getMapBoolean() { @@ -182,7 +174,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public AdditionalPropertiesClass mapArrayInteger(Map> mapArrayInteger) { this.mapArrayInteger = mapArrayInteger; @@ -190,8 +182,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("map_array_integer") public Map> getMapArrayInteger() { @@ -219,7 +209,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public AdditionalPropertiesClass mapArrayAnytype(Map> mapArrayAnytype) { this.mapArrayAnytype = mapArrayAnytype; @@ -227,8 +217,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("map_array_anytype") public Map> getMapArrayAnytype() { @@ -256,7 +244,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public AdditionalPropertiesClass mapMapString(Map> mapMapString) { this.mapMapString = mapMapString; @@ -264,8 +252,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("map_map_string") public Map> getMapMapString() { @@ -293,7 +279,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public AdditionalPropertiesClass mapMapAnytype(Map> mapMapAnytype) { this.mapMapAnytype = mapMapAnytype; @@ -301,8 +287,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("map_map_anytype") public Map> getMapMapAnytype() { @@ -330,7 +314,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public AdditionalPropertiesClass anytype1(Object anytype1) { this.anytype1 = anytype1; @@ -338,8 +322,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("anytype_1") public Object getAnytype1() { @@ -351,7 +333,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.anytype1 = anytype1; } -/** + /** **/ public AdditionalPropertiesClass anytype2(Object anytype2) { this.anytype2 = anytype2; @@ -359,8 +341,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("anytype_2") public Object getAnytype2() { @@ -372,7 +352,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.anytype2 = anytype2; } -/** + /** **/ public AdditionalPropertiesClass anytype3(Object anytype3) { this.anytype3 = anytype3; @@ -380,8 +360,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("anytype_3") public Object getAnytype3() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java index fc85a62ad02..376aa5a7c61 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesInteger") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesInteger extends HashMap implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class AdditionalPropertiesInteger extends HashMap implements Serializable { private @Valid String name; /** @@ -30,8 +30,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java index 25852547106..03cf9a126d2 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesNumber") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesNumber extends HashMap implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class AdditionalPropertiesNumber extends HashMap implements Serializable { private @Valid String name; /** @@ -31,8 +31,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java index 998b85d511d..b9fae3edf82 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesObject") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesObject extends HashMap implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class AdditionalPropertiesObject extends HashMap implements Serializable { private @Valid String name; /** @@ -30,8 +30,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java index b317c03b4c0..9790203702e 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("AdditionalPropertiesString") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesString extends HashMap implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class AdditionalPropertiesString extends HashMap implements Serializable { private @Valid String name; /** @@ -30,8 +30,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java index f91fa587239..3548453f127 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java @@ -1,5 +1,6 @@ package org.openapitools.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.annotations.ApiModel; @@ -24,8 +25,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Animal") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Animal implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Animal implements Serializable { private @Valid String className; private @Valid String color = "red"; @@ -36,9 +37,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } - - - + @ApiModelProperty(required = true, value = "") @JsonProperty("className") @NotNull @@ -51,15 +50,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.className = className; } -/** + /** **/ public Animal color(String color) { this.color = color; return this; } - - @ApiModelProperty(value = "") @JsonProperty("color") @@ -95,7 +92,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Animal {\n"); - + sb.append(" className: ").append(toIndentedString(className)).append("\n"); sb.append(" color: ").append(toIndentedString(color)).append("\n"); sb.append("}"); diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AnimalFarm.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AnimalFarm.java deleted file mode 100644 index 810e56085b5..00000000000 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AnimalFarm.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.openapitools.model; - -import java.util.ArrayList; -import java.util.List; -import org.openapitools.model.Animal; -import java.io.Serializable; -import javax.validation.constraints.*; -import javax.validation.Valid; - -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - - - -public class AnimalFarm extends ArrayList implements Serializable { - - - - @Override - public boolean equals(java.lang.Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AnimalFarm animalFarm = (AnimalFarm) o; - return true; - } - - @Override - public int hashCode() { - return Objects.hash(); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class AnimalFarm {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(java.lang.Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 6e2646e4da0..0385c5e8290 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfArrayOfNumberOnly") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfArrayOfNumberOnly implements Serializable { - - private @Valid List> arrayArrayNumber = new ArrayList<>(); +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ArrayOfArrayOfNumberOnly implements Serializable { + private @Valid List> arrayArrayNumber = null; /** **/ @@ -31,8 +31,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index f2ab4241074..cbfdb520031 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayOfNumberOnly") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfNumberOnly implements Serializable { - - private @Valid List arrayNumber = new ArrayList<>(); +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ArrayOfNumberOnly implements Serializable { + private @Valid List arrayNumber = null; /** **/ @@ -31,8 +31,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("ArrayNumber") public List getArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java index 6f2fe46e0cc..b2043ee09c7 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java @@ -19,11 +19,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ArrayTest") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayTest implements Serializable { - - private @Valid List arrayOfString = new ArrayList<>(); - private @Valid List> arrayArrayOfInteger = new ArrayList<>(); - private @Valid List> arrayArrayOfModel = new ArrayList<>(); +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ArrayTest implements Serializable { + private @Valid List arrayOfString = null; + private @Valid List> arrayArrayOfInteger = null; + private @Valid List> arrayArrayOfModel = null; /** **/ @@ -33,8 +33,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("array_of_string") public List getArrayOfString() { @@ -62,7 +60,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { this.arrayArrayOfInteger = arrayArrayOfInteger; @@ -70,8 +68,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -99,7 +95,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) { this.arrayArrayOfModel = arrayArrayOfModel; @@ -107,8 +103,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java index 483c60b3d06..fb8229016dd 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java @@ -2,7 +2,6 @@ package org.openapitools.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.openapitools.model.BigCatAllOf; import org.openapitools.model.Cat; import java.io.Serializable; import javax.validation.constraints.*; @@ -18,10 +17,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("BigCat") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCat extends Cat implements Serializable { - - -public enum KindEnum { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class BigCat extends Cat implements Serializable { + public enum KindEnum { LIONS(String.valueOf("lions")), TIGERS(String.valueOf("tigers")), LEOPARDS(String.valueOf("leopards")), JAGUARS(String.valueOf("jaguars")); @@ -42,6 +40,21 @@ public enum KindEnum { return String.valueOf(value); } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static KindEnum fromString(String s) { + for (KindEnum b : KindEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static KindEnum fromValue(String value) { for (KindEnum b : KindEnum.values()) { @@ -63,8 +76,6 @@ public enum KindEnum { } - - @ApiModelProperty(value = "") @JsonProperty("kind") public KindEnum getKind() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java index 7ba1d7c23fc..21427933a94 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java @@ -17,10 +17,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("BigCat_allOf") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCatAllOf implements Serializable { - - -public enum KindEnum { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class BigCatAllOf implements Serializable { + public enum KindEnum { LIONS(String.valueOf("lions")), TIGERS(String.valueOf("tigers")), LEOPARDS(String.valueOf("leopards")), JAGUARS(String.valueOf("jaguars")); @@ -41,6 +40,21 @@ public enum KindEnum { return String.valueOf(value); } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static KindEnum fromString(String s) { + for (KindEnum b : KindEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static KindEnum fromValue(String value) { for (KindEnum b : KindEnum.values()) { @@ -62,8 +76,6 @@ public enum KindEnum { } - - @ApiModelProperty(value = "") @JsonProperty("kind") public KindEnum getKind() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java index 59529655970..862e34ac293 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Capitalization") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Capitalization implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Capitalization implements Serializable { private @Valid String smallCamel; private @Valid String capitalCamel; private @Valid String smallSnake; @@ -33,8 +33,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("smallCamel") public String getSmallCamel() { @@ -46,7 +44,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.smallCamel = smallCamel; } -/** + /** **/ public Capitalization capitalCamel(String capitalCamel) { this.capitalCamel = capitalCamel; @@ -54,8 +52,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("CapitalCamel") public String getCapitalCamel() { @@ -67,7 +63,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.capitalCamel = capitalCamel; } -/** + /** **/ public Capitalization smallSnake(String smallSnake) { this.smallSnake = smallSnake; @@ -75,8 +71,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("small_Snake") public String getSmallSnake() { @@ -88,7 +82,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.smallSnake = smallSnake; } -/** + /** **/ public Capitalization capitalSnake(String capitalSnake) { this.capitalSnake = capitalSnake; @@ -96,8 +90,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("Capital_Snake") public String getCapitalSnake() { @@ -109,7 +101,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.capitalSnake = capitalSnake; } -/** + /** **/ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { this.scAETHFlowPoints = scAETHFlowPoints; @@ -117,8 +109,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { @@ -130,7 +120,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.scAETHFlowPoints = scAETHFlowPoints; } -/** + /** * Name of the pet **/ public Capitalization ATT_NAME(String ATT_NAME) { @@ -139,8 +129,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "Name of the pet ") @JsonProperty("ATT_NAME") public String getATTNAME() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java index 948b28d037a..7fa39e3522d 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java @@ -3,7 +3,6 @@ package org.openapitools.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; -import org.openapitools.model.CatAllOf; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; @@ -18,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Cat") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Cat extends Animal implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Cat extends Animal implements Serializable { private @Valid Boolean declawed; /** @@ -30,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("declawed") public Boolean getDeclawed() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java index 2ed18a6de6c..491b09cbbaf 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Cat_allOf") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class CatAllOf implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class CatAllOf implements Serializable { private @Valid Boolean declawed; /** @@ -29,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("declawed") public Boolean getDeclawed() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java index 6d4e8a87992..3ae4d3b4b42 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Category") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Category implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Category implements Serializable { private @Valid Long id; private @Valid String name = "default-name"; @@ -29,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -42,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.id = id; } -/** + /** **/ public Category name(String name) { this.name = name; @@ -50,8 +48,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("name") @NotNull diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java index fec3c619257..ee9e240aac6 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; **/ @ApiModel(description = "Model for testing model with \"_class\" property") @JsonTypeName("ClassModel") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ClassModel implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ClassModel implements Serializable { private @Valid String propertyClass; /** @@ -30,8 +30,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("_class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java index 74d489b5ace..c3efb2cbd66 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Client") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Client implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Client implements Serializable { private @Valid String client; /** @@ -28,8 +28,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("client") public String getClient() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java index 20599ecebcf..2e8e10e6413 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java @@ -3,7 +3,6 @@ package org.openapitools.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; -import org.openapitools.model.DogAllOf; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; @@ -18,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Dog") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Dog extends Animal implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Dog extends Animal implements Serializable { private @Valid String breed; /** @@ -30,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("breed") public String getBreed() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java index 6c7208fe19b..a2e595a8a1a 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Dog_allOf") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class DogAllOf implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class DogAllOf implements Serializable { private @Valid String breed; /** @@ -29,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("breed") public String getBreed() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java index 502d24d9bce..4b2ef0c1c60 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java @@ -18,10 +18,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("EnumArrays") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class EnumArrays implements Serializable { - - -public enum JustSymbolEnum { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class EnumArrays implements Serializable { + public enum JustSymbolEnum { GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$")); @@ -42,6 +41,21 @@ public enum JustSymbolEnum { return String.valueOf(value); } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static JustSymbolEnum fromString(String s) { + for (JustSymbolEnum b : JustSymbolEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static JustSymbolEnum fromValue(String value) { for (JustSymbolEnum b : JustSymbolEnum.values()) { @@ -54,8 +68,7 @@ public enum JustSymbolEnum { } private @Valid JustSymbolEnum justSymbol; - -public enum ArrayEnumEnum { + public enum ArrayEnumEnum { FISH(String.valueOf("fish")), CRAB(String.valueOf("crab")); @@ -76,6 +89,21 @@ public enum ArrayEnumEnum { return String.valueOf(value); } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static ArrayEnumEnum fromString(String s) { + for (ArrayEnumEnum b : ArrayEnumEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static ArrayEnumEnum fromValue(String value) { for (ArrayEnumEnum b : ArrayEnumEnum.values()) { @@ -87,7 +115,7 @@ public enum ArrayEnumEnum { } } - private @Valid List arrayEnum = new ArrayList<>(); + private @Valid List arrayEnum = null; /** **/ @@ -97,8 +125,6 @@ public enum ArrayEnumEnum { } - - @ApiModelProperty(value = "") @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { @@ -110,7 +136,7 @@ public enum ArrayEnumEnum { this.justSymbol = justSymbol; } -/** + /** **/ public EnumArrays arrayEnum(List arrayEnum) { this.arrayEnum = arrayEnum; @@ -118,8 +144,6 @@ public enum ArrayEnumEnum { } - - @ApiModelProperty(value = "") @JsonProperty("array_enum") public List getArrayEnum() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumClass.java index 64c66917714..778c1dfb952 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumClass.java @@ -24,6 +24,21 @@ public enum EnumClass { this.value = value; } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static EnumClass fromString(String s) { + for (EnumClass b : EnumClass.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @Override @JsonValue public String toString() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java index af7ac236efe..b4692c31c46 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java @@ -18,10 +18,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Enum_Test") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class EnumTest implements Serializable { - - -public enum EnumStringEnum { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class EnumTest implements Serializable { + public enum EnumStringEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf("")); @@ -42,6 +41,21 @@ public enum EnumStringEnum { return String.valueOf(value); } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static EnumStringEnum fromString(String s) { + for (EnumStringEnum b : EnumStringEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static EnumStringEnum fromValue(String value) { for (EnumStringEnum b : EnumStringEnum.values()) { @@ -54,8 +68,7 @@ public enum EnumStringEnum { } private @Valid EnumStringEnum enumString; - -public enum EnumStringRequiredEnum { + public enum EnumStringRequiredEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf("")); @@ -76,6 +89,21 @@ public enum EnumStringRequiredEnum { return String.valueOf(value); } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static EnumStringRequiredEnum fromString(String s) { + for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static EnumStringRequiredEnum fromValue(String value) { for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) { @@ -88,8 +116,7 @@ public enum EnumStringRequiredEnum { } private @Valid EnumStringRequiredEnum enumStringRequired; - -public enum EnumIntegerEnum { + public enum EnumIntegerEnum { NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); @@ -110,6 +137,21 @@ public enum EnumIntegerEnum { return String.valueOf(value); } + /** + * Convert a String into Integer, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static EnumIntegerEnum fromString(String s) { + for (EnumIntegerEnum b : EnumIntegerEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static EnumIntegerEnum fromValue(Integer value) { for (EnumIntegerEnum b : EnumIntegerEnum.values()) { @@ -122,8 +164,7 @@ public enum EnumIntegerEnum { } private @Valid EnumIntegerEnum enumInteger; - -public enum EnumNumberEnum { + public enum EnumNumberEnum { NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); @@ -144,6 +185,21 @@ public enum EnumNumberEnum { return String.valueOf(value); } + /** + * Convert a String into Double, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static EnumNumberEnum fromString(String s) { + for (EnumNumberEnum b : EnumNumberEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static EnumNumberEnum fromValue(Double value) { for (EnumNumberEnum b : EnumNumberEnum.values()) { @@ -166,8 +222,6 @@ public enum EnumNumberEnum { } - - @ApiModelProperty(value = "") @JsonProperty("enum_string") public EnumStringEnum getEnumString() { @@ -179,7 +233,7 @@ public enum EnumNumberEnum { this.enumString = enumString; } -/** + /** **/ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { this.enumStringRequired = enumStringRequired; @@ -187,8 +241,6 @@ public enum EnumNumberEnum { } - - @ApiModelProperty(required = true, value = "") @JsonProperty("enum_string_required") @NotNull @@ -201,7 +253,7 @@ public enum EnumNumberEnum { this.enumStringRequired = enumStringRequired; } -/** + /** **/ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { this.enumInteger = enumInteger; @@ -209,8 +261,6 @@ public enum EnumNumberEnum { } - - @ApiModelProperty(value = "") @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { @@ -222,7 +272,7 @@ public enum EnumNumberEnum { this.enumInteger = enumInteger; } -/** + /** **/ public EnumTest enumNumber(EnumNumberEnum enumNumber) { this.enumNumber = enumNumber; @@ -230,8 +280,6 @@ public enum EnumNumberEnum { } - - @ApiModelProperty(value = "") @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { @@ -243,7 +291,7 @@ public enum EnumNumberEnum { this.enumNumber = enumNumber; } -/** + /** **/ public EnumTest outerEnum(OuterEnum outerEnum) { this.outerEnum = outerEnum; @@ -251,8 +299,6 @@ public enum EnumNumberEnum { } - - @ApiModelProperty(value = "") @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index f2ee479c5b9..8297178d42f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -19,10 +19,10 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("FileSchemaTestClass") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FileSchemaTestClass implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class FileSchemaTestClass implements Serializable { private @Valid ModelFile _file; - private @Valid List files = new ArrayList<>(); + private @Valid List files = null; /** **/ @@ -32,8 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("file") public ModelFile getFile() { @@ -45,7 +43,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this._file = _file; } -/** + /** **/ public FileSchemaTestClass files(List files) { this.files = files; @@ -53,8 +51,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("files") public List getFiles() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java index c6b8753a4e6..8d71c957011 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.File; import java.math.BigDecimal; +import java.util.Arrays; import java.util.Date; import java.util.UUID; import org.joda.time.LocalDate; @@ -22,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("format_test") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class FormatTest implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class FormatTest implements Serializable { private @Valid Integer integer; private @Valid Integer int32; private @Valid Long int64; @@ -49,8 +50,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("integer") @Min(10) @Max(100) public Integer getInteger() { @@ -62,7 +61,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.integer = integer; } -/** + /** * minimum: 20 * maximum: 200 **/ @@ -72,8 +71,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("int32") @Min(20) @Max(200) public Integer getInt32() { @@ -85,7 +82,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.int32 = int32; } -/** + /** **/ public FormatTest int64(Long int64) { this.int64 = int64; @@ -93,8 +90,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("int64") public Long getInt64() { @@ -106,7 +101,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.int64 = int64; } -/** + /** * minimum: 32.1 * maximum: 543.2 **/ @@ -116,8 +111,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("number") @NotNull @@ -130,7 +123,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.number = number; } -/** + /** * minimum: 54.3 * maximum: 987.6 **/ @@ -140,8 +133,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { @@ -153,7 +144,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this._float = _float; } -/** + /** * minimum: 67.8 * maximum: 123.4 **/ @@ -163,8 +154,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { @@ -176,7 +165,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this._double = _double; } -/** + /** **/ public FormatTest string(String string) { this.string = string; @@ -184,8 +173,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("string") @Pattern(regexp="/[a-z]/i") public String getString() { @@ -197,7 +184,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.string = string; } -/** + /** **/ public FormatTest _byte(byte[] _byte) { this._byte = _byte; @@ -205,8 +192,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("byte") @NotNull @@ -219,7 +204,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this._byte = _byte; } -/** + /** **/ public FormatTest binary(File binary) { this.binary = binary; @@ -227,8 +212,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("binary") public File getBinary() { @@ -240,7 +223,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.binary = binary; } -/** + /** **/ public FormatTest date(LocalDate date) { this.date = date; @@ -248,8 +231,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("date") @NotNull @@ -262,7 +243,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.date = date; } -/** + /** **/ public FormatTest dateTime(Date dateTime) { this.dateTime = dateTime; @@ -270,8 +251,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -283,7 +262,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.dateTime = dateTime; } -/** + /** **/ public FormatTest uuid(UUID uuid) { this.uuid = uuid; @@ -291,8 +270,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @JsonProperty("uuid") public UUID getUuid() { @@ -304,7 +281,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.uuid = uuid; } -/** + /** **/ public FormatTest password(String password) { this.password = password; @@ -312,8 +289,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("password") @NotNull @@ -326,7 +301,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.password = password; } -/** + /** **/ public FormatTest bigDecimal(BigDecimal bigDecimal) { this.bigDecimal = bigDecimal; @@ -334,8 +309,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("BigDecimal") public BigDecimal getBigDecimal() { @@ -364,7 +337,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; Objects.equals(this._float, formatTest._float) && Objects.equals(this._double, formatTest._double) && Objects.equals(this.string, formatTest.string) && - Objects.equals(this._byte, formatTest._byte) && + Arrays.equals(this._byte, formatTest._byte) && Objects.equals(this.binary, formatTest.binary) && Objects.equals(this.date, formatTest.date) && Objects.equals(this.dateTime, formatTest.dateTime) && @@ -375,7 +348,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @Override public int hashCode() { - return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal); + return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal); } @Override diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 49ca21e5a56..a3ff9057c6f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("hasOnlyReadOnly") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class HasOnlyReadOnly implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class HasOnlyReadOnly implements Serializable { private @Valid String bar; private @Valid String foo; @@ -30,8 +30,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("bar") public String getBar() { @@ -43,7 +41,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.bar = bar; } -/** + /** **/ public HasOnlyReadOnly foo(String foo) { this.foo = foo; @@ -51,8 +49,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("foo") public String getFoo() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java index 8d5dece7fbb..c45ee600ca2 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java @@ -3,7 +3,6 @@ package org.openapitools.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.io.Serializable; import javax.validation.constraints.*; @@ -19,11 +18,10 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("MapTest") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class MapTest implements Serializable { - - private @Valid Map> mapMapOfString = new HashMap<>(); - -public enum InnerEnum { +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class MapTest implements Serializable { + private @Valid Map> mapMapOfString = null; + public enum InnerEnum { UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")); @@ -44,6 +42,21 @@ public enum InnerEnum { return String.valueOf(value); } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static InnerEnum fromString(String s) { + for (InnerEnum b : InnerEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static InnerEnum fromValue(String value) { for (InnerEnum b : InnerEnum.values()) { @@ -55,9 +68,9 @@ public enum InnerEnum { } } - private @Valid Map mapOfEnumString = new HashMap<>(); - private @Valid Map directMap = new HashMap<>(); - private @Valid Map indirectMap = new HashMap<>(); + private @Valid Map mapOfEnumString = null; + private @Valid Map directMap = null; + private @Valid Map indirectMap = null; /** **/ @@ -67,8 +80,6 @@ public enum InnerEnum { } - - @ApiModelProperty(value = "") @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { @@ -96,7 +107,7 @@ public enum InnerEnum { return this; } -/** + /** **/ public MapTest mapOfEnumString(Map mapOfEnumString) { this.mapOfEnumString = mapOfEnumString; @@ -104,8 +115,6 @@ public enum InnerEnum { } - - @ApiModelProperty(value = "") @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { @@ -133,7 +142,7 @@ public enum InnerEnum { return this; } -/** + /** **/ public MapTest directMap(Map directMap) { this.directMap = directMap; @@ -141,8 +150,6 @@ public enum InnerEnum { } - - @ApiModelProperty(value = "") @JsonProperty("direct_map") public Map getDirectMap() { @@ -170,7 +177,7 @@ public enum InnerEnum { return this; } -/** + /** **/ public MapTest indirectMap(Map indirectMap) { this.indirectMap = indirectMap; @@ -178,8 +185,6 @@ public enum InnerEnum { } - - @ApiModelProperty(value = "") @JsonProperty("indirect_map") public Map getIndirectMap() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 92d8a9a4412..c5e37deb239 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.UUID; import org.openapitools.model.Animal; @@ -22,11 +21,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { private @Valid UUID uuid; private @Valid Date dateTime; - private @Valid Map map = new HashMap<>(); + private @Valid Map map = null; /** **/ @@ -36,8 +35,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("uuid") public UUID getUuid() { @@ -49,7 +46,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.uuid = uuid; } -/** + /** **/ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { this.dateTime = dateTime; @@ -57,8 +54,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -70,7 +65,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.dateTime = dateTime; } -/** + /** **/ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) { this.map = map; @@ -78,8 +73,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("map") public Map getMap() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java index af86cf00edb..9023f1b3641 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; **/ @ApiModel(description = "Model for testing model name starting with number") @JsonTypeName("200_response") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Model200Response implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Model200Response implements Serializable { private @Valid Integer name; private @Valid String propertyClass; @@ -32,8 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name") public Integer getName() { @@ -45,7 +43,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.name = name; } -/** + /** **/ public Model200Response propertyClass(String propertyClass) { this.propertyClass = propertyClass; @@ -53,8 +51,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java index 3bcaaffb3d3..58d4e3da8fe 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ApiResponse") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelApiResponse implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ModelApiResponse implements Serializable { private @Valid Integer code; private @Valid String type; private @Valid String message; @@ -31,8 +31,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("code") public Integer getCode() { @@ -44,7 +42,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.code = code; } -/** + /** **/ public ModelApiResponse type(String type) { this.type = type; @@ -52,8 +50,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("type") public String getType() { @@ -65,7 +61,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.type = type; } -/** + /** **/ public ModelApiResponse message(String message) { this.message = message; @@ -73,8 +69,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("message") public String getMessage() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelFile.java index 95dfa998db3..b68b1102096 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelFile.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; **/ @ApiModel(description = "Must be named `File` for test.") @JsonTypeName("File") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelFile implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ModelFile implements Serializable { private @Valid String sourceURI; /** @@ -32,8 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "Test capitalization") @JsonProperty("sourceURI") public String getSourceURI() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelList.java index ec97de0198c..5f5c9d766d5 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelList.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("List") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelList implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ModelList implements Serializable { private @Valid String _123list; /** @@ -29,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("123-list") public String get123list() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java index b9055976ff5..3af7ec36256 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; **/ @ApiModel(description = "Model for testing reserved words") @JsonTypeName("Return") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ModelReturn implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ModelReturn implements Serializable { private @Valid Integer _return; /** @@ -31,8 +31,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("return") public Integer getReturn() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java index 54d09365aed..09f3be2cf44 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; **/ @ApiModel(description = "Model for testing model name same as property name") @JsonTypeName("Name") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Name implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Name implements Serializable { private @Valid Integer name; private @Valid Integer snakeCase; private @Valid String property; @@ -33,8 +33,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("name") @NotNull @@ -47,7 +45,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.name = name; } -/** + /** **/ public Name snakeCase(Integer snakeCase) { this.snakeCase = snakeCase; @@ -55,8 +53,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("snake_case") public Integer getSnakeCase() { @@ -68,7 +64,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.snakeCase = snakeCase; } -/** + /** **/ public Name property(String property) { this.property = property; @@ -76,8 +72,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("property") public String getProperty() { @@ -89,7 +83,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.property = property; } -/** + /** **/ public Name _123number(Integer _123number) { this._123number = _123number; @@ -97,8 +91,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("123Number") public Integer get123number() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java index 9ea507266dc..d8bba4783ff 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("NumberOnly") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class NumberOnly implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class NumberOnly implements Serializable { private @Valid BigDecimal justNumber; /** @@ -29,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("JustNumber") public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java index e67d3772f9d..5a6d37a5d79 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java @@ -17,14 +17,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Order") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Order implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Order implements Serializable { private @Valid Long id; private @Valid Long petId; private @Valid Integer quantity; private @Valid Date shipDate; - -public enum StatusEnum { + public enum StatusEnum { PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered")); @@ -45,6 +44,21 @@ public enum StatusEnum { return String.valueOf(value); } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static StatusEnum fromString(String s) { + for (StatusEnum b : StatusEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static StatusEnum fromValue(String value) { for (StatusEnum b : StatusEnum.values()) { @@ -67,8 +81,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -80,7 +92,7 @@ public enum StatusEnum { this.id = id; } -/** + /** **/ public Order petId(Long petId) { this.petId = petId; @@ -88,8 +100,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { @@ -101,7 +111,7 @@ public enum StatusEnum { this.petId = petId; } -/** + /** **/ public Order quantity(Integer quantity) { this.quantity = quantity; @@ -109,8 +119,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { @@ -122,7 +130,7 @@ public enum StatusEnum { this.quantity = quantity; } -/** + /** **/ public Order shipDate(Date shipDate) { this.shipDate = shipDate; @@ -130,8 +138,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "") @JsonProperty("shipDate") public Date getShipDate() { @@ -143,7 +149,7 @@ public enum StatusEnum { this.shipDate = shipDate; } -/** + /** * Order Status **/ public Order status(StatusEnum status) { @@ -152,8 +158,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { @@ -165,7 +169,7 @@ public enum StatusEnum { this.status = status; } -/** + /** **/ public Order complete(Boolean complete) { this.complete = complete; @@ -173,8 +177,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java index 95ff03416bb..b369e965b69 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("OuterComposite") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class OuterComposite implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class OuterComposite implements Serializable { private @Valid BigDecimal myNumber; private @Valid String myString; private @Valid Boolean myBoolean; @@ -31,8 +31,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("my_number") public BigDecimal getMyNumber() { @@ -44,7 +42,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.myNumber = myNumber; } -/** + /** **/ public OuterComposite myString(String myString) { this.myString = myString; @@ -52,8 +50,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("my_string") public String getMyString() { @@ -65,7 +61,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.myString = myString; } -/** + /** **/ public OuterComposite myBoolean(Boolean myBoolean) { this.myBoolean = myBoolean; @@ -73,8 +69,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("my_boolean") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterEnum.java index fbd86c9bdbe..131a96d2ceb 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterEnum.java @@ -24,6 +24,21 @@ public enum OuterEnum { this.value = value; } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static OuterEnum fromString(String s) { + for (OuterEnum b : OuterEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @Override @JsonValue public String toString() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java index 8ec79b936c8..509dc7f912f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java @@ -23,15 +23,14 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Pet") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Pet implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Pet implements Serializable { private @Valid Long id; private @Valid Category category; private @Valid String name; private @Valid Set photoUrls = new LinkedHashSet<>(); - private @Valid List tags = new ArrayList<>(); - -public enum StatusEnum { + private @Valid List tags = null; + public enum StatusEnum { AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold")); @@ -52,6 +51,21 @@ public enum StatusEnum { return String.valueOf(value); } + /** + * Convert a String into String, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static StatusEnum fromString(String s) { + for (StatusEnum b : StatusEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + @JsonCreator public static StatusEnum fromValue(String value) { for (StatusEnum b : StatusEnum.values()) { @@ -73,8 +87,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -86,7 +98,7 @@ public enum StatusEnum { this.id = id; } -/** + /** **/ public Pet category(Category category) { this.category = category; @@ -94,8 +106,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { @@ -107,7 +117,7 @@ public enum StatusEnum { this.category = category; } -/** + /** **/ public Pet name(String name) { this.name = name; @@ -115,8 +125,6 @@ public enum StatusEnum { } - - @ApiModelProperty(example = "doggie", required = true, value = "") @JsonProperty("name") @NotNull @@ -129,7 +137,7 @@ public enum StatusEnum { this.name = name; } -/** + /** **/ public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; @@ -137,8 +145,6 @@ public enum StatusEnum { } - - @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") @NotNull @@ -168,7 +174,7 @@ public enum StatusEnum { return this; } -/** + /** **/ public Pet tags(List tags) { this.tags = tags; @@ -176,8 +182,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { @@ -205,7 +209,7 @@ public enum StatusEnum { return this; } -/** + /** * pet status in the store **/ public Pet status(StatusEnum status) { @@ -214,8 +218,6 @@ public enum StatusEnum { } - - @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index 71451f9cf68..164caf2e407 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("ReadOnlyFirst") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ReadOnlyFirst implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class ReadOnlyFirst implements Serializable { private @Valid String bar; private @Valid String baz; @@ -29,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("bar") public String getBar() { @@ -42,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.bar = bar; } -/** + /** **/ public ReadOnlyFirst baz(String baz) { this.baz = baz; @@ -50,8 +48,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("baz") public String getBaz() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java index 0fc3694ffad..03dbaba2b8f 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("$special[model.name]") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class SpecialModelName implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class SpecialModelName implements Serializable { private @Valid Long $specialPropertyName; /** @@ -29,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/StringBooleanMap.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/StringBooleanMap.java deleted file mode 100644 index e48ad0840ac..00000000000 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/StringBooleanMap.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.openapitools.model; - -import java.util.HashMap; -import java.util.Map; -import java.io.Serializable; -import javax.validation.constraints.*; -import javax.validation.Valid; - -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - - - -public class StringBooleanMap extends HashMap implements Serializable { - - - - @Override - public boolean equals(java.lang.Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - StringBooleanMap stringBooleanMap = (StringBooleanMap) o; - return true; - } - - @Override - public int hashCode() { - return Objects.hash(); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class StringBooleanMap {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(java.lang.Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } -} - diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java index db7d608abd5..56dde364824 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("Tag") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Tag implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class Tag implements Serializable { private @Valid Long id; private @Valid String name; @@ -29,8 +29,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -42,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.id = id; } -/** + /** **/ public Tag name(String name) { this.name = name; @@ -50,8 +48,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java index 98cdf57b7fe..5a58d2e4a49 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("TypeHolderDefault") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class TypeHolderDefault implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class TypeHolderDefault implements Serializable { private @Valid String stringItem = "what"; private @Valid BigDecimal numberItem; private @Valid Integer integerItem; @@ -35,8 +35,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("string_item") @NotNull @@ -49,7 +47,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.stringItem = stringItem; } -/** + /** **/ public TypeHolderDefault numberItem(BigDecimal numberItem) { this.numberItem = numberItem; @@ -57,8 +55,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("number_item") @NotNull @@ -71,7 +67,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.numberItem = numberItem; } -/** + /** **/ public TypeHolderDefault integerItem(Integer integerItem) { this.integerItem = integerItem; @@ -79,8 +75,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("integer_item") @NotNull @@ -93,7 +87,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.integerItem = integerItem; } -/** + /** **/ public TypeHolderDefault boolItem(Boolean boolItem) { this.boolItem = boolItem; @@ -101,8 +95,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("bool_item") @NotNull @@ -115,7 +107,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.boolItem = boolItem; } -/** + /** **/ public TypeHolderDefault arrayItem(List arrayItem) { this.arrayItem = arrayItem; @@ -123,8 +115,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(required = true, value = "") @JsonProperty("array_item") @NotNull diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java index f2fbe66277b..1c24650e192 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("TypeHolderExample") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class TypeHolderExample implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class TypeHolderExample implements Serializable { private @Valid String stringItem; private @Valid BigDecimal numberItem; private @Valid Float floatItem; @@ -36,8 +36,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "what", required = true, value = "") @JsonProperty("string_item") @NotNull @@ -50,7 +48,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.stringItem = stringItem; } -/** + /** **/ public TypeHolderExample numberItem(BigDecimal numberItem) { this.numberItem = numberItem; @@ -58,8 +56,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("number_item") @NotNull @@ -72,7 +68,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.numberItem = numberItem; } -/** + /** **/ public TypeHolderExample floatItem(Float floatItem) { this.floatItem = floatItem; @@ -80,8 +76,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "1.234", required = true, value = "") @JsonProperty("float_item") @NotNull @@ -94,7 +88,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.floatItem = floatItem; } -/** + /** **/ public TypeHolderExample integerItem(Integer integerItem) { this.integerItem = integerItem; @@ -102,8 +96,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "-2", required = true, value = "") @JsonProperty("integer_item") @NotNull @@ -116,7 +108,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.integerItem = integerItem; } -/** + /** **/ public TypeHolderExample boolItem(Boolean boolItem) { this.boolItem = boolItem; @@ -124,8 +116,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "true", required = true, value = "") @JsonProperty("bool_item") @NotNull @@ -138,7 +128,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.boolItem = boolItem; } -/** + /** **/ public TypeHolderExample arrayItem(List arrayItem) { this.arrayItem = arrayItem; @@ -146,8 +136,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") @JsonProperty("array_item") @NotNull diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java index 271676fb2e0..6b0eef1b19e 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("User") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class User implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class User implements Serializable { private @Valid Long id; private @Valid String username; private @Valid String firstName; @@ -35,8 +35,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { @@ -48,7 +46,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.id = id; } -/** + /** **/ public User username(String username) { this.username = username; @@ -56,8 +54,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { @@ -69,7 +65,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.username = username; } -/** + /** **/ public User firstName(String firstName) { this.firstName = firstName; @@ -77,8 +73,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { @@ -90,7 +84,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.firstName = firstName; } -/** + /** **/ public User lastName(String lastName) { this.lastName = lastName; @@ -98,8 +92,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { @@ -111,7 +103,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.lastName = lastName; } -/** + /** **/ public User email(String email) { this.email = email; @@ -119,8 +111,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { @@ -132,7 +122,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.email = email; } -/** + /** **/ public User password(String password) { this.password = password; @@ -140,8 +130,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { @@ -153,7 +141,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.password = password; } -/** + /** **/ public User phone(String phone) { this.phone = phone; @@ -161,8 +149,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { @@ -174,7 +160,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.phone = phone; } -/** + /** * User Status **/ public User userStatus(Integer userStatus) { @@ -183,8 +169,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java index c70af4c9e31..eff4ff035ff 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java @@ -19,37 +19,37 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonTypeName("XmlItem") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class XmlItem implements Serializable { - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen") +public class XmlItem implements Serializable { private @Valid String attributeString; private @Valid BigDecimal attributeNumber; private @Valid Integer attributeInteger; private @Valid Boolean attributeBoolean; - private @Valid List wrappedArray = new ArrayList<>(); + private @Valid List wrappedArray = null; private @Valid String nameString; private @Valid BigDecimal nameNumber; private @Valid Integer nameInteger; private @Valid Boolean nameBoolean; - private @Valid List nameArray = new ArrayList<>(); - private @Valid List nameWrappedArray = new ArrayList<>(); + private @Valid List nameArray = null; + private @Valid List nameWrappedArray = null; private @Valid String prefixString; private @Valid BigDecimal prefixNumber; private @Valid Integer prefixInteger; private @Valid Boolean prefixBoolean; - private @Valid List prefixArray = new ArrayList<>(); - private @Valid List prefixWrappedArray = new ArrayList<>(); + private @Valid List prefixArray = null; + private @Valid List prefixWrappedArray = null; private @Valid String namespaceString; private @Valid BigDecimal namespaceNumber; private @Valid Integer namespaceInteger; private @Valid Boolean namespaceBoolean; - private @Valid List namespaceArray = new ArrayList<>(); - private @Valid List namespaceWrappedArray = new ArrayList<>(); + private @Valid List namespaceArray = null; + private @Valid List namespaceWrappedArray = null; private @Valid String prefixNsString; private @Valid BigDecimal prefixNsNumber; private @Valid Integer prefixNsInteger; private @Valid Boolean prefixNsBoolean; - private @Valid List prefixNsArray = new ArrayList<>(); - private @Valid List prefixNsWrappedArray = new ArrayList<>(); + private @Valid List prefixNsArray = null; + private @Valid List prefixNsWrappedArray = null; /** **/ @@ -59,8 +59,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "string", value = "") @JsonProperty("attribute_string") public String getAttributeString() { @@ -72,7 +70,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.attributeString = attributeString; } -/** + /** **/ public XmlItem attributeNumber(BigDecimal attributeNumber) { this.attributeNumber = attributeNumber; @@ -80,8 +78,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "1.234", value = "") @JsonProperty("attribute_number") public BigDecimal getAttributeNumber() { @@ -93,7 +89,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.attributeNumber = attributeNumber; } -/** + /** **/ public XmlItem attributeInteger(Integer attributeInteger) { this.attributeInteger = attributeInteger; @@ -101,8 +97,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "-2", value = "") @JsonProperty("attribute_integer") public Integer getAttributeInteger() { @@ -114,7 +108,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.attributeInteger = attributeInteger; } -/** + /** **/ public XmlItem attributeBoolean(Boolean attributeBoolean) { this.attributeBoolean = attributeBoolean; @@ -122,8 +116,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "true", value = "") @JsonProperty("attribute_boolean") public Boolean getAttributeBoolean() { @@ -135,7 +127,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.attributeBoolean = attributeBoolean; } -/** + /** **/ public XmlItem wrappedArray(List wrappedArray) { this.wrappedArray = wrappedArray; @@ -143,8 +135,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("wrapped_array") public List getWrappedArray() { @@ -172,7 +162,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public XmlItem nameString(String nameString) { this.nameString = nameString; @@ -180,8 +170,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "string", value = "") @JsonProperty("name_string") public String getNameString() { @@ -193,7 +181,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.nameString = nameString; } -/** + /** **/ public XmlItem nameNumber(BigDecimal nameNumber) { this.nameNumber = nameNumber; @@ -201,8 +189,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "1.234", value = "") @JsonProperty("name_number") public BigDecimal getNameNumber() { @@ -214,7 +200,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.nameNumber = nameNumber; } -/** + /** **/ public XmlItem nameInteger(Integer nameInteger) { this.nameInteger = nameInteger; @@ -222,8 +208,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "-2", value = "") @JsonProperty("name_integer") public Integer getNameInteger() { @@ -235,7 +219,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.nameInteger = nameInteger; } -/** + /** **/ public XmlItem nameBoolean(Boolean nameBoolean) { this.nameBoolean = nameBoolean; @@ -243,8 +227,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "true", value = "") @JsonProperty("name_boolean") public Boolean getNameBoolean() { @@ -256,7 +238,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.nameBoolean = nameBoolean; } -/** + /** **/ public XmlItem nameArray(List nameArray) { this.nameArray = nameArray; @@ -264,8 +246,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name_array") public List getNameArray() { @@ -293,7 +273,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public XmlItem nameWrappedArray(List nameWrappedArray) { this.nameWrappedArray = nameWrappedArray; @@ -301,8 +281,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("name_wrapped_array") public List getNameWrappedArray() { @@ -330,7 +308,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public XmlItem prefixString(String prefixString) { this.prefixString = prefixString; @@ -338,8 +316,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "string", value = "") @JsonProperty("prefix_string") public String getPrefixString() { @@ -351,7 +327,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.prefixString = prefixString; } -/** + /** **/ public XmlItem prefixNumber(BigDecimal prefixNumber) { this.prefixNumber = prefixNumber; @@ -359,8 +335,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_number") public BigDecimal getPrefixNumber() { @@ -372,7 +346,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.prefixNumber = prefixNumber; } -/** + /** **/ public XmlItem prefixInteger(Integer prefixInteger) { this.prefixInteger = prefixInteger; @@ -380,8 +354,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "-2", value = "") @JsonProperty("prefix_integer") public Integer getPrefixInteger() { @@ -393,7 +365,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.prefixInteger = prefixInteger; } -/** + /** **/ public XmlItem prefixBoolean(Boolean prefixBoolean) { this.prefixBoolean = prefixBoolean; @@ -401,8 +373,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "true", value = "") @JsonProperty("prefix_boolean") public Boolean getPrefixBoolean() { @@ -414,7 +384,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.prefixBoolean = prefixBoolean; } -/** + /** **/ public XmlItem prefixArray(List prefixArray) { this.prefixArray = prefixArray; @@ -422,8 +392,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("prefix_array") public List getPrefixArray() { @@ -451,7 +419,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public XmlItem prefixWrappedArray(List prefixWrappedArray) { this.prefixWrappedArray = prefixWrappedArray; @@ -459,8 +427,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("prefix_wrapped_array") public List getPrefixWrappedArray() { @@ -488,7 +454,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public XmlItem namespaceString(String namespaceString) { this.namespaceString = namespaceString; @@ -496,8 +462,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "string", value = "") @JsonProperty("namespace_string") public String getNamespaceString() { @@ -509,7 +473,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.namespaceString = namespaceString; } -/** + /** **/ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { this.namespaceNumber = namespaceNumber; @@ -517,8 +481,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "1.234", value = "") @JsonProperty("namespace_number") public BigDecimal getNamespaceNumber() { @@ -530,7 +492,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.namespaceNumber = namespaceNumber; } -/** + /** **/ public XmlItem namespaceInteger(Integer namespaceInteger) { this.namespaceInteger = namespaceInteger; @@ -538,8 +500,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "-2", value = "") @JsonProperty("namespace_integer") public Integer getNamespaceInteger() { @@ -551,7 +511,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.namespaceInteger = namespaceInteger; } -/** + /** **/ public XmlItem namespaceBoolean(Boolean namespaceBoolean) { this.namespaceBoolean = namespaceBoolean; @@ -559,8 +519,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "true", value = "") @JsonProperty("namespace_boolean") public Boolean getNamespaceBoolean() { @@ -572,7 +530,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.namespaceBoolean = namespaceBoolean; } -/** + /** **/ public XmlItem namespaceArray(List namespaceArray) { this.namespaceArray = namespaceArray; @@ -580,8 +538,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("namespace_array") public List getNamespaceArray() { @@ -609,7 +565,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public XmlItem namespaceWrappedArray(List namespaceWrappedArray) { this.namespaceWrappedArray = namespaceWrappedArray; @@ -617,8 +573,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("namespace_wrapped_array") public List getNamespaceWrappedArray() { @@ -646,7 +600,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public XmlItem prefixNsString(String prefixNsString) { this.prefixNsString = prefixNsString; @@ -654,8 +608,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "string", value = "") @JsonProperty("prefix_ns_string") public String getPrefixNsString() { @@ -667,7 +619,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.prefixNsString = prefixNsString; } -/** + /** **/ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { this.prefixNsNumber = prefixNsNumber; @@ -675,8 +627,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "1.234", value = "") @JsonProperty("prefix_ns_number") public BigDecimal getPrefixNsNumber() { @@ -688,7 +638,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.prefixNsNumber = prefixNsNumber; } -/** + /** **/ public XmlItem prefixNsInteger(Integer prefixNsInteger) { this.prefixNsInteger = prefixNsInteger; @@ -696,8 +646,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "-2", value = "") @JsonProperty("prefix_ns_integer") public Integer getPrefixNsInteger() { @@ -709,7 +657,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.prefixNsInteger = prefixNsInteger; } -/** + /** **/ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { this.prefixNsBoolean = prefixNsBoolean; @@ -717,8 +665,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(example = "true", value = "") @JsonProperty("prefix_ns_boolean") public Boolean getPrefixNsBoolean() { @@ -730,7 +676,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; this.prefixNsBoolean = prefixNsBoolean; } -/** + /** **/ public XmlItem prefixNsArray(List prefixNsArray) { this.prefixNsArray = prefixNsArray; @@ -738,8 +684,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("prefix_ns_array") public List getPrefixNsArray() { @@ -767,7 +711,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; return this; } -/** + /** **/ public XmlItem prefixNsWrappedArray(List prefixNsWrappedArray) { this.prefixNsWrappedArray = prefixNsWrappedArray; @@ -775,8 +719,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; } - - @ApiModelProperty(value = "") @JsonProperty("prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml index d02806b2d38..bf1a4276417 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml @@ -46,7 +46,7 @@ paths: tags: - pet x-codegen-request-body-name: body - x-contentType: application/json + x-content-type: application/json x-accepts: application/json x-tags: - tag: pet @@ -83,7 +83,7 @@ paths: tags: - pet x-codegen-request-body-name: body - x-contentType: application/json + x-content-type: application/json x-accepts: application/json x-tags: - tag: pet @@ -262,13 +262,7 @@ paths: content: application/x-www-form-urlencoded: schema: - properties: - name: - description: Updated name of the pet - type: string - status: - description: Updated status of the pet - type: string + $ref: '#/components/schemas/updatePetWithForm_request' responses: "405": content: {} @@ -280,7 +274,7 @@ paths: summary: Updates a pet in the store with form data tags: - pet - x-contentType: application/x-www-form-urlencoded + x-content-type: application/x-www-form-urlencoded x-accepts: application/json x-tags: - tag: pet @@ -299,14 +293,7 @@ paths: content: multipart/form-data: schema: - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - file: - description: file to upload - format: binary - type: string + $ref: '#/components/schemas/uploadFile_request' responses: "200": content: @@ -321,7 +308,7 @@ paths: summary: uploads an image tags: - pet - x-contentType: multipart/form-data + x-content-type: multipart/form-data x-accepts: application/json x-tags: - tag: pet @@ -374,7 +361,7 @@ paths: tags: - store x-codegen-request-body-name: body - x-contentType: '*/*' + x-content-type: '*/*' x-accepts: application/json x-tags: - tag: store @@ -458,7 +445,7 @@ paths: tags: - user x-codegen-request-body-name: body - x-contentType: '*/*' + x-content-type: '*/*' x-accepts: application/json x-tags: - tag: user @@ -482,7 +469,7 @@ paths: tags: - user x-codegen-request-body-name: body - x-contentType: '*/*' + x-content-type: '*/*' x-accepts: application/json x-tags: - tag: user @@ -506,7 +493,7 @@ paths: tags: - user x-codegen-request-body-name: body - x-contentType: '*/*' + x-content-type: '*/*' x-accepts: application/json x-tags: - tag: user @@ -652,7 +639,7 @@ paths: tags: - user x-codegen-request-body-name: body - x-contentType: '*/*' + x-content-type: '*/*' x-accepts: application/json x-tags: - tag: user @@ -680,7 +667,7 @@ paths: tags: - fake_classname_tags 123#$%^ x-codegen-request-body-name: body - x-contentType: application/json + x-content-type: application/json x-accepts: application/json x-tags: - tag: fake_classname_tags 123#$%^ @@ -807,24 +794,7 @@ paths: content: application/x-www-form-urlencoded: schema: - properties: - enum_form_string_array: - description: Form parameter enum test (string array) - items: - default: $ - enum: - - '>' - - $ - type: string - type: array - enum_form_string: - default: -efg - description: Form parameter enum test (string) - enum: - - _abc - - -efg - - (xyz) - type: string + $ref: '#/components/schemas/testEnumParameters_request' responses: "400": content: {} @@ -835,7 +805,7 @@ paths: summary: To test enum parameters tags: - fake - x-contentType: application/x-www-form-urlencoded + x-content-type: application/x-www-form-urlencoded x-accepts: application/json x-tags: - tag: fake @@ -860,7 +830,7 @@ paths: tags: - fake x-codegen-request-body-name: body - x-contentType: application/json + x-content-type: application/json x-accepts: application/json x-tags: - tag: fake @@ -875,77 +845,7 @@ paths: content: application/x-www-form-urlencoded: schema: - properties: - integer: - description: None - format: int32 - maximum: 100 - minimum: 10 - type: integer - int32: - description: None - format: int32 - maximum: 200 - minimum: 20 - type: integer - int64: - description: None - format: int64 - type: integer - number: - description: None - maximum: 543.2 - minimum: 32.1 - type: number - float: - description: None - format: float - maximum: 987.6 - type: number - double: - description: None - format: double - maximum: 123.4 - minimum: 67.8 - type: number - string: - description: None - pattern: "/[a-z]/i" - type: string - pattern_without_delimiter: - description: None - pattern: "^[A-Z].*" - type: string - byte: - description: None - format: byte - type: string - binary: - description: None - format: binary - type: string - date: - description: None - format: date - type: string - dateTime: - description: None - format: date-time - type: string - password: - description: None - format: password - maxLength: 64 - minLength: 10 - type: string - callback: - description: None - type: string - required: - - byte - - double - - number - - pattern_without_delimiter + $ref: '#/components/schemas/testEndpointParameters_request' required: true responses: "400": @@ -963,7 +863,7 @@ paths: 가짜 엔드 포인트 tags: - fake - x-contentType: application/x-www-form-urlencoded + x-content-type: application/x-www-form-urlencoded x-accepts: application/json x-tags: - tag: fake @@ -988,7 +888,7 @@ paths: tags: - fake x-codegen-request-body-name: body - x-contentType: '*/*' + x-content-type: '*/*' x-accepts: '*/*' x-tags: - tag: fake @@ -1013,7 +913,7 @@ paths: tags: - fake x-codegen-request-body-name: body - x-contentType: '*/*' + x-content-type: '*/*' x-accepts: '*/*' x-tags: - tag: fake @@ -1038,7 +938,7 @@ paths: tags: - fake x-codegen-request-body-name: body - x-contentType: '*/*' + x-content-type: '*/*' x-accepts: '*/*' x-tags: - tag: fake @@ -1063,7 +963,7 @@ paths: tags: - fake x-codegen-request-body-name: body - x-contentType: '*/*' + x-content-type: '*/*' x-accepts: '*/*' x-tags: - tag: fake @@ -1074,16 +974,7 @@ paths: content: application/x-www-form-urlencoded: schema: - properties: - param: - description: field1 - type: string - param2: - description: field2 - type: string - required: - - param - - param2 + $ref: '#/components/schemas/testJsonFormData_request' required: true responses: "200": @@ -1092,7 +983,7 @@ paths: summary: test json serialization of form data tags: - fake - x-contentType: application/x-www-form-urlencoded + x-content-type: application/x-www-form-urlencoded x-accepts: application/json x-tags: - tag: fake @@ -1116,7 +1007,7 @@ paths: tags: - fake x-codegen-request-body-name: param - x-contentType: application/json + x-content-type: application/json x-accepts: application/json x-tags: - tag: fake @@ -1142,7 +1033,7 @@ paths: tags: - fake x-codegen-request-body-name: body - x-contentType: application/json + x-content-type: application/json x-accepts: application/json x-tags: - tag: fake @@ -1180,7 +1071,7 @@ paths: tags: - fake x-codegen-request-body-name: XmlItem - x-contentType: application/xml + x-content-type: application/xml x-accepts: application/json x-tags: - tag: fake @@ -1206,7 +1097,7 @@ paths: tags: - $another-fake? x-codegen-request-body-name: body - x-contentType: application/json + x-content-type: application/json x-accepts: application/json x-tags: - tag: $another-fake? @@ -1228,7 +1119,7 @@ paths: tags: - fake x-codegen-request-body-name: body - x-contentType: application/json + x-content-type: application/json x-accepts: application/json x-tags: - tag: fake @@ -1303,16 +1194,7 @@ paths: content: multipart/form-data: schema: - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - requiredFile: - description: file to upload - format: binary - type: string - required: - - requiredFile + $ref: '#/components/schemas/uploadFileWithRequiredFile_request' required: true responses: "200": @@ -1328,7 +1210,7 @@ paths: summary: uploads an image (required) tags: - pet - x-contentType: multipart/form-data + x-content-type: multipart/form-data x-accepts: application/json x-tags: - tag: pet @@ -2221,6 +2103,136 @@ components: xml: namespace: http://a.com/schema prefix: pre + updatePetWithForm_request: + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + uploadFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + format: binary + type: string + testEnumParameters_request: + properties: + enum_form_string_array: + description: Form parameter enum test (string array) + items: + default: $ + enum: + - '>' + - $ + type: string + type: array + enum_form_string: + default: -efg + description: Form parameter enum test (string) + enum: + - _abc + - -efg + - (xyz) + type: string + testEndpointParameters_request: + properties: + integer: + description: None + format: int32 + maximum: 100 + minimum: 10 + type: integer + int32: + description: None + format: int32 + maximum: 200 + minimum: 20 + type: integer + int64: + description: None + format: int64 + type: integer + number: + description: None + maximum: 543.2 + minimum: 32.1 + type: number + float: + description: None + format: float + maximum: 987.6 + type: number + double: + description: None + format: double + maximum: 123.4 + minimum: 67.8 + type: number + string: + description: None + pattern: "/[a-z]/i" + type: string + pattern_without_delimiter: + description: None + pattern: "^[A-Z].*" + type: string + byte: + description: None + format: byte + type: string + binary: + description: None + format: binary + type: string + date: + description: None + format: date + type: string + dateTime: + description: None + format: date-time + type: string + password: + description: None + format: password + maxLength: 64 + minLength: 10 + type: string + callback: + description: None + type: string + required: + - byte + - double + - number + - pattern_without_delimiter + testJsonFormData_request: + properties: + param: + description: field1 + type: string + param2: + description: field2 + type: string + required: + - param + - param2 + uploadFileWithRequiredFile_request: + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + requiredFile: + description: file to upload + format: binary + type: string + required: + - requiredFile Dog_allOf: properties: breed: diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/FILES b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/FILES index 912cd6039b7..a5460bdf420 100644 --- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/FILES +++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/FILES @@ -4,6 +4,7 @@ src/gen/java/org/openapitools/api/AnotherFakeApi.java src/gen/java/org/openapitools/api/FakeApi.java src/gen/java/org/openapitools/api/FakeClassnameTestApi.java src/gen/java/org/openapitools/api/PetApi.java +src/gen/java/org/openapitools/api/RestResourceRoot.java src/gen/java/org/openapitools/api/StoreApi.java src/gen/java/org/openapitools/api/UserApi.java src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/RestResourceRoot.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/RestResourceRoot.java new file mode 100644 index 00000000000..96ba6c8d8e4 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/RestResourceRoot.java @@ -0,0 +1,5 @@ +package org.openapitools.api; + +public class RestResourceRoot { + public static final String APPLICATION_PATH = "/v2"; +} diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/FILES b/samples/server/petstore/jaxrs-spec/.openapi-generator/FILES index 9ad6a195e8f..cf689a825e5 100644 --- a/samples/server/petstore/jaxrs-spec/.openapi-generator/FILES +++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/FILES @@ -5,6 +5,7 @@ src/gen/java/org/openapitools/api/FakeApi.java src/gen/java/org/openapitools/api/FakeClassnameTestApi.java src/gen/java/org/openapitools/api/PetApi.java src/gen/java/org/openapitools/api/RestApplication.java +src/gen/java/org/openapitools/api/RestResourceRoot.java src/gen/java/org/openapitools/api/StoreApi.java src/gen/java/org/openapitools/api/UserApi.java src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java index b98d35a4e93..7df2d0fe333 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestApplication.java @@ -3,7 +3,7 @@ package org.openapitools.api; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -@ApplicationPath("/v2") +@ApplicationPath(RestResourceRoot.APPLICATION_PATH) public class RestApplication extends Application { } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestResourceRoot.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestResourceRoot.java new file mode 100644 index 00000000000..96ba6c8d8e4 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/RestResourceRoot.java @@ -0,0 +1,5 @@ +package org.openapitools.api; + +public class RestResourceRoot { + public static final String APPLICATION_PATH = "/v2"; +}