From 2340d83a3380f08bdc14a91c91ab085406d6ccd0 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 7 Aug 2018 01:39:54 +0800 Subject: [PATCH 1/5] add 3.3.0 to readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c7d2f6ba737..09ceabc2ecc 100644 --- a/README.md +++ b/README.md @@ -83,11 +83,12 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20 OpenAPI Generator Version | Release Date | OpenAPI Spec compatibility | Notes ---------------------------- | ------------ | -------------------------- | ----- 4.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes (no fallback) -3.2.1 (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.2.1-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release with breaking changes (with fallbacks) +3.3.0 (upcoming minor release)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release (breaking changes with fallbacks) +3.2.1 (current master, upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.2.1-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release [3.2.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.2.0) | 06.08.2018 | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release [3.1.2](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.1.2) | 25.07.2018 | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release [3.1.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.1.1) | 18.07.2018 | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release -[3.1.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.1.0) | 06.07.2018 | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release with breaking changes (with fallbacks) +[3.1.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.1.0) | 06.07.2018 | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release (breaking changes with fallbacks) [3.0.3](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.0.3) | 27.06.2018 | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release [3.0.2](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.0.2) | 18.06.2018 | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release [3.0.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.0.1) | 11.06.2018 | 1.0, 1.1, 1.2, 2.0, 3.0 | Bugfix release From e1432146853c6e4ecb3b8ff1e5d740b0a0ef400d Mon Sep 17 00:00:00 2001 From: sunn <33183834+etherealjoy@users.noreply.github.com> Date: Mon, 6 Aug 2018 22:22:22 +0200 Subject: [PATCH 2/5] [cpp pistache] fix leading number in model names and apply modelNamePrefix in all cases (#730) * Fix numbers in nameInCamelCase. Add possibility to prefix Names to avoid conflicts * Allow unique prefixing for template functions as well --- .../codegen/languages/AbstractCppCodegen.java | 9 +++++- .../languages/CppPistacheServerCodegen.java | 23 +++++++++++---- .../cpp-pistache-server/api-source.mustache | 2 +- .../cpp-pistache-server/model-header.mustache | 6 ++-- .../cpp-pistache-server/model-source.mustache | 6 ++-- .../modelbase-header.mustache | 28 +++++++++---------- .../modelbase-source.mustache | 20 ++++++------- 7 files changed, 57 insertions(+), 37 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java index 814d8e12bf2..c53021a7534 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java @@ -168,7 +168,7 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg return sanitizeName(name); } - if (isReservedWord(name)) { + if (isReservedWord(name) || name.matches("^\\d.*")) { return escapeReservedWord(name); } @@ -205,6 +205,10 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg @Override public String toParamName(String name) { + if (isReservedWord(name) || name.matches("^\\d.*")) { + return escapeReservedWord(name); + } + return sanitizeName(super.toParamName(name)); } @@ -217,6 +221,9 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg } else { nameInCamelCase = sanitizeName(nameInCamelCase); } + if (isReservedWord(nameInCamelCase) || nameInCamelCase.matches("^\\d.*")) { + nameInCamelCase = escapeReservedWord(nameInCamelCase); + } property.nameInCamelCase = nameInCamelCase; return property; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java index a1ac3bf86ae..c288575f695 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java @@ -46,6 +46,8 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { protected boolean isAddExternalLibs = true; public static final String OPTIONAL_EXTERNAL_LIB = "addExternalLibs"; public static final String OPTIONAL_EXTERNAL_LIB_DESC = "Add the Possibility to fetch and compile external Libraries needed by this Framework."; + protected final String PREFIX = ""; + @Override public CodegenType getTag() { return CodegenType.SERVER; @@ -63,6 +65,9 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { public CppPistacheServerCodegen() { super(); + if (StringUtils.isEmpty(modelNamePrefix)) { + modelNamePrefix = PREFIX; + } apiPackage = "org.openapitools.server.api"; modelPackage = "org.openapitools.server.model"; @@ -83,8 +88,8 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { reservedWords = new HashSet<>(); - supportingFiles.add(new SupportingFile("modelbase-header.mustache", "model", "ModelBase.h")); - supportingFiles.add(new SupportingFile("modelbase-source.mustache", "model", "ModelBase.cpp")); + supportingFiles.add(new SupportingFile("modelbase-header.mustache", "model", modelNamePrefix + "ModelBase.h")); + supportingFiles.add(new SupportingFile("modelbase-source.mustache", "model", modelNamePrefix + "ModelBase.cpp")); supportingFiles.add(new SupportingFile("cmake.mustache", "", "CMakeLists.txt")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); @@ -117,7 +122,14 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { @Override public void processOpts() { super.processOpts(); - + if (additionalProperties.containsKey("modelNamePrefix")) { + additionalProperties().put("prefix", modelNamePrefix); + supportingFiles.clear(); + supportingFiles.add(new SupportingFile("modelbase-header.mustache", "model", modelNamePrefix + "ModelBase.h")); + supportingFiles.add(new SupportingFile("modelbase-source.mustache", "model", modelNamePrefix + "ModelBase.cpp")); + supportingFiles.add(new SupportingFile("cmake.mustache", "", "CMakeLists.txt")); + supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + } additionalProperties.put("modelNamespaceDeclarations", modelPackage.split("\\.")); additionalProperties.put("modelNamespace", modelPackage.replaceAll("\\.", "::")); additionalProperties.put("apiNamespaceDeclarations", apiPackage.split("\\.")); @@ -138,6 +150,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { } } + @Override public CodegenModel fromModel(String name, Schema model, Map allDefinitions) { CodegenModel codegenModel = super.fromModel(name, model, allDefinitions); @@ -240,7 +253,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { @Override public String toModelFilename(String name) { - return initialCaps(name); + return initialCaps(toModelName(name)); } @Override @@ -265,7 +278,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { @Override public String toApiFilename(String name) { - return initialCaps(name) + "Api"; + return modelNamePrefix + initialCaps(name) + "Api"; } /** diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache index b9e97395e41..d6aa9becb04 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache @@ -76,7 +76,7 @@ void {{classname}}::{{operationIdSnakeCase}}_handler(const Pistache::Rest::Reque nlohmann::json request_body = nlohmann::json::parse(request.body()); {{^isPrimitiveType}}{{^isContainer}} {{paramName}}.fromJson(request_body); - {{/isContainer}}{{/isPrimitiveType}}{{#isContainer}} {{paramName}} = {{#isListContainer}} ModelArrayHelper{{/isListContainer}}{{#isMapContainer}} ModelMapHelper{{/isMapContainer}}::fromJson<{{items.baseType}}>(request_body);{{/isContainer}} + {{/isContainer}}{{/isPrimitiveType}}{{#isContainer}} {{paramName}} = {{#isListContainer}} {{prefix}}ModelArrayHelper{{/isListContainer}}{{#isMapContainer}} {{prefix}}ModelMapHelper{{/isMapContainer}}::fromJson<{{items.baseType}}>(request_body);{{/isContainer}} {{#isPrimitiveType}} // The conversion is done automatically by the json library {{paramName}} = request_body; diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache index 3efd24758f5..0fb65fa26b3 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache @@ -9,7 +9,7 @@ #define {{classname}}_H_ {{{defaultInclude}}} -#include "ModelBase.h" +#include "{{prefix}}ModelBase.h" {{#imports}}{{{this}}} {{/imports}} @@ -22,14 +22,14 @@ namespace {{this}} { /// {{description}} /// class {{declspec}} {{classname}} - : public ModelBase + : public {{prefix}}ModelBase { public: {{classname}}(); virtual ~{{classname}}(); ///////////////////////////////////////////// - /// ModelBase overrides + /// {{prefix}}ModelBase overrides void validate() override; diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache index 7a36c378903..9c60bbbaae0 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache @@ -38,7 +38,7 @@ nlohmann::json {{classname}}::toJson() const nlohmann::json jsonArray; for( auto& item : m_{{name}} ) { - jsonArray.push_back(ModelBase::toJson(item)); + jsonArray.push_back({{prefix}}ModelBase::toJson(item)); } {{#required}}val["{{baseName}}"] = jsonArray; {{/required}}{{^required}} @@ -50,9 +50,9 @@ nlohmann::json {{classname}}::toJson() const } {{/isListContainer}}{{^isListContainer}}{{^isPrimitiveType}}{{^required}}if(m_{{name}}IsSet) { - val["{{baseName}}"] = ModelBase::toJson(m_{{name}}); + val["{{baseName}}"] = {{prefix}}ModelBase::toJson(m_{{name}}); } - {{/required}}{{#required}}val["{{baseName}}"] = ModelBase::toJson(m_{{name}}); + {{/required}}{{#required}}val["{{baseName}}"] = {{prefix}}ModelBase::toJson(m_{{name}}); {{/required}}{{/isPrimitiveType}}{{/isListContainer}}{{/vars}} return val; diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-header.mustache index 1cb28f0d988..faeff483038 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-header.mustache @@ -1,12 +1,12 @@ {{>licenseInfo}} /* - * ModelBase.h + * {{prefix}}ModelBase.h * * This is the base class for all model classes */ -#ifndef ModelBase_H_ -#define ModelBase_H_ +#ifndef {{prefix}}ModelBase_H_ +#define {{prefix}}ModelBase_H_ {{{defaultInclude}}} #include "json.hpp" @@ -19,11 +19,11 @@ namespace {{this}} { {{/modelNamespaceDeclarations}} -class {{declspec}} ModelBase +class {{declspec}} {{prefix}}ModelBase { public: - ModelBase(); - virtual ~ModelBase(); + {{prefix}}ModelBase(); + virtual ~{{prefix}}ModelBase(); virtual void validate() = 0; @@ -36,16 +36,16 @@ public: static int64_t toJson( int64_t const value ); static double toJson( double const value ); static bool toJson( bool const value ); - static nlohmann::json toJson(ModelBase const& content ); + static nlohmann::json toJson({{prefix}}ModelBase const& content ); }; -class ModelArrayHelper { +class {{prefix}}ModelArrayHelper { public: template static std::vector fromJson(nlohmann::json& json) { T *ptrTest; std::vector val; - if (dynamic_cast(ptrTest) != nullptr) { + if (dynamic_cast<{{prefix}}ModelBase*>(ptrTest) != nullptr) { if (!json.empty()) { for (auto &item : json.items()) { T entry; @@ -66,7 +66,7 @@ public: } }; -class ArrayHelper { +class {{prefix}}ArrayHelper { public: template static std::vector fromJson(nlohmann::json& json) { @@ -82,13 +82,13 @@ public: } }; -class ModelMapHelper { +class {{prefix}}ModelMapHelper { public: template static std::map & fromJson(nlohmann::json& json) { T *ptrTest; std::map val; - if (dynamic_cast(ptrTest) != nullptr) { + if (dynamic_cast<{{prefix}}ModelBase*>(ptrTest) != nullptr) { if (!json.empty()) { for (auto &item : json.items()) { T entry; @@ -110,7 +110,7 @@ public: } }; -class MapHelper { +class {{prefix}}MapHelper { public: template static std::map & fromJson(nlohmann::json& json) { @@ -139,4 +139,4 @@ public: } {{/modelNamespaceDeclarations}} -#endif /* ModelBase_H_ */ +#endif /* {{prefix}}ModelBase_H_ */ diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-source.mustache index 3bc4c644e42..f097c3a4a19 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-source.mustache @@ -1,50 +1,50 @@ {{>licenseInfo}} -#include "ModelBase.h" +#include "{{prefix}}ModelBase.h" {{#modelNamespaceDeclarations}} namespace {{this}} { {{/modelNamespaceDeclarations}} -ModelBase::ModelBase() +{{prefix}}ModelBase::{{prefix}}ModelBase() { } -ModelBase::~ModelBase() +{{prefix}}ModelBase::~{{prefix}}ModelBase() { } -std::string ModelBase::toJson( std::string const& value ) +std::string {{prefix}}ModelBase::toJson( std::string const& value ) { return value; } -std::string ModelBase::toJson( std::time_t const& value ) +std::string {{prefix}}ModelBase::toJson( std::time_t const& value ) { char buf[sizeof "2011-10-08T07:07:09Z"]; strftime(buf, sizeof buf, "%FT%TZ", gmtime(&value)); return buf; } -int32_t ModelBase::toJson( int32_t const value ) +int32_t {{prefix}}ModelBase::toJson( int32_t const value ) { return value; } -int64_t ModelBase::toJson( int64_t const value ) +int64_t {{prefix}}ModelBase::toJson( int64_t const value ) { return value; } -double ModelBase::toJson( double const value ) +double {{prefix}}ModelBase::toJson( double const value ) { return value; } -bool ModelBase::toJson( bool const value ) +bool {{prefix}}ModelBase::toJson( bool const value ) { return value; } -nlohmann::json ModelBase::toJson(ModelBase const& content ) +nlohmann::json {{prefix}}ModelBase::toJson({{prefix}}ModelBase const& content ) { return content.toJson(); } From 629608c573bb73a976fb9d1ff1c2e4ae3aa69f31 Mon Sep 17 00:00:00 2001 From: Dec12 | Fujigon Date: Tue, 7 Aug 2018 17:45:09 +0900 Subject: [PATCH 3/5] [jaxrs-spec*] samples should be tested. repair import and dependency. (#755) * sample server projects "jaxrs-spec", "jaxrs-spec-interface", and "jaxrs-spec-interface-response" should be tested * update jax-rs api to 2.1, in which @PATCH annotation is available add jackson annotation dependency * add joda-time to dependency * modify mustache template to add @JsonCreate, @JsonValue import * fix return type of enum value() method * add InputStream import * Attachment class is in apache cxf. spec should not depend on it * re-generate sample jaxrs-spec, jaxrs-spec-interface, and jaxrs-spec-interface-response --- .../resources/JavaJaxRS/spec/api.mustache | 1 + .../JavaJaxRS/spec/enumClass.mustache | 2 +- .../JavaJaxRS/spec/formParams.mustache | 3 +- .../resources/JavaJaxRS/spec/model.mustache | 5 +- .../resources/JavaJaxRS/spec/pojo.mustache | 8 +- pom.xml | 36 ++++++ .../.openapi-generator/VERSION | 2 +- .../jaxrs-spec-interface-response/pom.xml | 35 +++++- .../org/openapitools/api/AnotherFakeApi.java | 5 +- .../java/org/openapitools/api/FakeApi.java | 30 ++++- .../api/FakeClassnameTestApi.java | 1 + .../gen/java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 1 + .../java/org/openapitools/api/UserApi.java | 1 + .../model/AdditionalPropertiesClass.java | 4 +- .../java/org/openapitools/model/Animal.java | 4 +- .../org/openapitools/model/AnimalFarm.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../openapitools/model/Capitalization.java | 4 +- .../gen/java/org/openapitools/model/Cat.java | 6 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 9 +- .../java/org/openapitools/model/Client.java | 4 +- .../gen/java/org/openapitools/model/Dog.java | 4 +- .../org/openapitools/model/EnumArrays.java | 8 +- .../org/openapitools/model/EnumClass.java | 3 +- .../java/org/openapitools/model/EnumTest.java | 16 +-- .../model/FileSchemaTestClass.java | 97 +++++++++++++++ .../org/openapitools/model/FormatTest.java | 4 +- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 51 +++++++- ...ropertiesAndAdditionalPropertiesClass.java | 4 +- .../openapitools/model/Model200Response.java | 9 +- .../openapitools/model/ModelApiResponse.java | 4 +- .../org/openapitools/model/ModelReturn.java | 9 +- .../gen/java/org/openapitools/model/Name.java | 9 +- .../org/openapitools/model/NumberOnly.java | 4 +- .../java/org/openapitools/model/Order.java | 8 +- .../openapitools/model/OuterComposite.java | 4 +- .../org/openapitools/model/OuterEnum.java | 3 +- .../gen/java/org/openapitools/model/Pet.java | 6 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 4 +- .../openapitools/model/StringBooleanMap.java | 58 +++++++++ .../gen/java/org/openapitools/model/Tag.java | 4 +- .../gen/java/org/openapitools/model/User.java | 4 +- .../src/main/openapi/openapi.yaml | 110 +++++++++++++++++- .../petstore/jaxrs-spec-interface/pom.xml | 35 +++++- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 7 +- .../api/FakeClassnameTestApi.java | 1 + .../gen/java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 1 + .../java/org/openapitools/api/UserApi.java | 1 + .../model/AdditionalPropertiesClass.java | 4 +- .../java/org/openapitools/model/Animal.java | 4 +- .../org/openapitools/model/AnimalFarm.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../openapitools/model/Capitalization.java | 4 +- .../gen/java/org/openapitools/model/Cat.java | 4 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 9 +- .../java/org/openapitools/model/Client.java | 4 +- .../gen/java/org/openapitools/model/Dog.java | 4 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../org/openapitools/model/EnumClass.java | 1 - .../java/org/openapitools/model/EnumTest.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 4 +- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 4 +- ...ropertiesAndAdditionalPropertiesClass.java | 4 +- .../openapitools/model/Model200Response.java | 9 +- .../openapitools/model/ModelApiResponse.java | 4 +- .../org/openapitools/model/ModelReturn.java | 9 +- .../gen/java/org/openapitools/model/Name.java | 9 +- .../org/openapitools/model/NumberOnly.java | 4 +- .../java/org/openapitools/model/Order.java | 4 +- .../openapitools/model/OuterComposite.java | 4 +- .../org/openapitools/model/OuterEnum.java | 1 - .../gen/java/org/openapitools/model/Pet.java | 4 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 4 +- .../openapitools/model/StringBooleanMap.java | 4 +- .../gen/java/org/openapitools/model/Tag.java | 4 +- .../gen/java/org/openapitools/model/User.java | 4 +- samples/server/petstore/jaxrs-spec/pom.xml | 35 +++++- .../org/openapitools/api/AnotherFakeApi.java | 1 + .../java/org/openapitools/api/FakeApi.java | 7 +- .../api/FakeClassnameTestApi.java | 1 + .../gen/java/org/openapitools/api/PetApi.java | 4 +- .../java/org/openapitools/api/StoreApi.java | 1 + .../java/org/openapitools/api/UserApi.java | 1 + .../model/AdditionalPropertiesClass.java | 4 +- .../java/org/openapitools/model/Animal.java | 4 +- .../org/openapitools/model/AnimalFarm.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../openapitools/model/ArrayOfNumberOnly.java | 4 +- .../org/openapitools/model/ArrayTest.java | 4 +- .../openapitools/model/Capitalization.java | 4 +- .../gen/java/org/openapitools/model/Cat.java | 4 +- .../java/org/openapitools/model/Category.java | 4 +- .../org/openapitools/model/ClassModel.java | 9 +- .../java/org/openapitools/model/Client.java | 4 +- .../gen/java/org/openapitools/model/Dog.java | 4 +- .../org/openapitools/model/EnumArrays.java | 4 +- .../org/openapitools/model/EnumClass.java | 1 - .../java/org/openapitools/model/EnumTest.java | 8 +- .../model/FileSchemaTestClass.java | 4 +- .../org/openapitools/model/FormatTest.java | 4 +- .../openapitools/model/HasOnlyReadOnly.java | 4 +- .../java/org/openapitools/model/MapTest.java | 4 +- ...ropertiesAndAdditionalPropertiesClass.java | 4 +- .../openapitools/model/Model200Response.java | 9 +- .../openapitools/model/ModelApiResponse.java | 4 +- .../org/openapitools/model/ModelReturn.java | 9 +- .../gen/java/org/openapitools/model/Name.java | 9 +- .../org/openapitools/model/NumberOnly.java | 4 +- .../java/org/openapitools/model/Order.java | 4 +- .../openapitools/model/OuterComposite.java | 4 +- .../org/openapitools/model/OuterEnum.java | 1 - .../gen/java/org/openapitools/model/Pet.java | 4 +- .../org/openapitools/model/ReadOnlyFirst.java | 4 +- .../openapitools/model/SpecialModelName.java | 4 +- .../openapitools/model/StringBooleanMap.java | 4 +- .../gen/java/org/openapitools/model/Tag.java | 4 +- .../gen/java/org/openapitools/model/User.java | 4 +- 131 files changed, 830 insertions(+), 194 deletions(-) create mode 100644 samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java create mode 100644 samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/StringBooleanMap.java diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache index 4ccb9cc73aa..f05b0a4073f 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/api.mustache @@ -8,6 +8,7 @@ import javax.ws.rs.core.Response; import io.swagger.annotations.*; +import java.io.InputStream; import java.util.Map; import java.util.List; {{#useBeanValidation}}import javax.validation.constraints.*; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumClass.mustache index a04c0563101..5dd9ad63a0b 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumClass.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumClass.mustache @@ -11,7 +11,7 @@ public enum {{datatypeWithEnum}} { value = v; } - public String value() { + public {{dataType}} value() { return value; } diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/formParams.mustache index cf455083338..885966e6442 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/formParams.mustache @@ -1,2 +1 @@ -{{#isFormParam}}{{^isFile}}@FormParam(value = "{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} @FormParam(value = "{{baseName}}") InputStream {{paramName}}InputStream, - @FormParam(value = "{{baseName}}") Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}@FormParam(value = "{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} @FormParam(value = "{{baseName}}") InputStream {{paramName}}InputStream{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/model.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/model.mustache index 3fb7e3cfb9d..7fad7858e99 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/model.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/model.mustache @@ -11,10 +11,7 @@ import javax.validation.Valid; {{/useBeanValidation}} {{#models}} -{{#model}}{{#description}} -/** - * {{description}} - **/{{/description}} +{{#model}} {{#isEnum}} {{>enumOuterClass}} {{/isEnum}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache index c558de65179..0dc89597ca1 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache @@ -1,8 +1,14 @@ import io.swagger.annotations.*; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; -{{#description}}@ApiModel(description = "{{{description}}}"){{/description}} +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +{{#description}} +/** + * {{description}} + **/{{/description}} +{{#description}}@ApiModel(description = "{{{description}}}"){{/description}} public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} { {{#vars}}{{#isEnum}}{{^isContainer}} diff --git a/pom.xml b/pom.xml index ab503b4c6dd..e30cd436b89 100644 --- a/pom.xml +++ b/pom.xml @@ -715,6 +715,42 @@ samples/server/petstore/jaxrs/jersey1 + + jaxrs-spec + + + env + java + + + + samples/server/petstore/jaxrs-spec + + + + jaxrs-spec-interface + + + env + java + + + + samples/server/petstore/jaxrs-spec-interface + + + + jaxrs-spec-interface-response + + + env + java + + + + samples/server/petstore/jaxrs-spec-interface-response + + typescript-fetch-client-tests-default 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 ad121e8340e..4395ff59232 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 @@ -3.0.1-SNAPSHOT \ No newline at end of file +3.2.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 4438c042a8a..85d300fd6c0 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/pom.xml +++ b/samples/server/petstore/jaxrs-spec-interface-response/pom.xml @@ -13,13 +13,32 @@ maven-jar-plugin 2.2 + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/gen/java + + + + + javax.ws.rs javax.ws.rs-api - 2.0 + 2.1 provided @@ -28,6 +47,18 @@ provided 1.5.3 + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + provided + + + joda-time + joda-time + ${jodatime-version} + provided + junit junit @@ -44,5 +75,7 @@ 4.8.1 + 2.8.9 + 2.9.9 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 946000e4a1d..d72eaf4a393 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 @@ -7,6 +7,7 @@ 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.*; @@ -20,8 +21,8 @@ public interface AnotherFakeApi { @Path("/dummy") @Consumes({ "application/json" }) @Produces({ "application/json" }) - @ApiOperation(value = "To test special tags", notes = "To test special tags", tags={ "$another-fake?" }) + @ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", tags={ "$another-fake?" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) - Response testSpecialTags(@Valid Client client); + Response call123testSpecialTags(@Valid Client client); } 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 3ad4a3541a3..f6e871ac85d 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 @@ -4,8 +4,10 @@ import java.math.BigDecimal; import org.openapitools.model.Client; import java.util.Date; import java.io.File; +import org.openapitools.model.FileSchemaTestClass; import org.joda.time.LocalDate; import java.util.Map; +import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; import org.openapitools.model.User; @@ -14,6 +16,7 @@ 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.*; @@ -55,6 +58,14 @@ public interface FakeApi { @ApiResponse(code = 200, message = "Output string", response = String.class) }) Response fakeOuterStringSerialize(@Valid String body); + @PUT + @Path("/body-with-file-schema") + @Consumes({ "application/json" }) + @ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake", }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Success", response = Void.class) }) + Response testBodyWithFileSchema(@Valid FileSchemaTestClass fileSchemaTestClass); + @PUT @Path("/body-with-query-params") @Consumes({ "application/json" }) @@ -79,8 +90,7 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream, - @FormParam(value = "binary") Attachment binaryDetail,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback); + Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback); @GET @Consumes({ "application/x-www-form-urlencoded" }) @@ -101,8 +111,22 @@ public interface FakeApi { @GET @Path("/jsonFormData") @Consumes({ "application/x-www-form-urlencoded" }) - @ApiOperation(value = "test json serialization of form data", notes = "", tags={ "fake" }) + @ApiOperation(value = "test json serialization of form data", notes = "", tags={ "fake", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Void.class) }) Response testJsonFormData(@FormParam(value = "param") String param,@FormParam(value = "param2") String param2); + + @POST + @Path("/{petId}/uploadImageWithRequiredFile") + @Consumes({ "multipart/form-data" }) + @Produces({ "application/json" }) + @ApiOperation(value = "uploads an image (required)", notes = "", authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") + }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) + Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata); } 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 ea9049a5997..4e7829ee210 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 @@ -7,6 +7,7 @@ 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.*; 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 8a3df967002..3b9b003dc30 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 @@ -9,6 +9,7 @@ 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.*; @@ -121,6 +122,5 @@ public interface PetApi { }, tags={ "pet" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream, - @FormParam(value = "file") Attachment fileDetail); + Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream); } 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 33975198bea..2712d44cc78 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 @@ -8,6 +8,7 @@ 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.*; 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 89851e5fecc..d239142bf3c 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 @@ -8,6 +8,7 @@ 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.*; 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 67f22897479..9ffada31ae8 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 @@ -7,10 +7,12 @@ 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 AdditionalPropertiesClass implements Serializable { 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 06cf55cd3bf..f5d49a3c4b2 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 @@ -6,10 +6,12 @@ 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 Animal implements Serializable { 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 index 848f6bc9ceb..810e56085b5 100644 --- 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 @@ -7,10 +7,12 @@ 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 { 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 bccec961376..19b4fb8672a 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 @@ -7,10 +7,12 @@ 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 ArrayOfArrayOfNumberOnly implements Serializable { 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 08bba9d8499..67f1a62787a 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 @@ -7,10 +7,12 @@ 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 ArrayOfNumberOnly implements Serializable { 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 47d1dedf961..6c812b8b684 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 @@ -7,10 +7,12 @@ 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 ArrayTest implements Serializable { 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 f206717f3bb..b2cc76b7b8d 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 @@ -4,10 +4,12 @@ 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 Capitalization implements Serializable { 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 edfa2176ffb..134779f46fc 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 @@ -5,10 +5,12 @@ 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 Cat extends Animal implements Serializable { @@ -25,7 +27,7 @@ public class Cat extends Animal implements Serializable { @ApiModelProperty(value = "") @JsonProperty("declawed") - public Boolean isDeclawed() { + public Boolean getDeclawed() { return declawed; } public void setDeclawed(Boolean declawed) { 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 adf8efa06c1..4eb21f49a58 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 @@ -4,10 +4,12 @@ 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 Category implements Serializable { 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 5fb585ab946..373ea29aa25 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 @@ -5,15 +5,16 @@ 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; /** * Model for testing model with \"_class\" property **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model with \"_class\" property") - public class ClassModel implements Serializable { private @Valid String propertyClass = null; 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 761e0d5dcb6..83c5ac4e182 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 @@ -4,10 +4,12 @@ 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 Client implements Serializable { 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 7c04ac357c5..3cf495a7b15 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 @@ -5,10 +5,12 @@ 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 Dog extends Animal implements Serializable { 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 c0b057dfac8..7a93f0b748b 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 @@ -6,10 +6,12 @@ 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 EnumArrays implements Serializable { @@ -43,7 +45,7 @@ public enum JustSymbolEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } @@ -77,7 +79,7 @@ public enum ArrayEnumEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } 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 fe5d360ab57..ba341ac9168 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 @@ -4,7 +4,6 @@ import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -38,7 +37,7 @@ public enum EnumClass { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + text + "'"); } } 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 f60a39f4b86..42348dcdc91 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 @@ -5,10 +5,12 @@ 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 EnumTest implements Serializable { @@ -42,7 +44,7 @@ public enum EnumStringEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } @@ -76,7 +78,7 @@ public enum EnumStringRequiredEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } @@ -93,7 +95,7 @@ public enum EnumIntegerEnum { value = v; } - public String value() { + public Integer value() { return value; } @@ -110,7 +112,7 @@ public enum EnumIntegerEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } @@ -127,7 +129,7 @@ public enum EnumNumberEnum { value = v; } - public String value() { + public Double value() { return value; } @@ -144,7 +146,7 @@ public enum EnumNumberEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } 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 new file mode 100644 index 00000000000..3acdf447102 --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -0,0 +1,97 @@ +package org.openapitools.model; + +import java.util.ArrayList; +import java.util.List; +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 FileSchemaTestClass implements Serializable { + + private @Valid java.io.File file = null; + private @Valid List files = new ArrayList(); + + /** + **/ + public FileSchemaTestClass file(java.io.File file) { + this.file = file; + return this; + } + + + @ApiModelProperty(value = "") + @JsonProperty("file") + public java.io.File getFile() { + return file; + } + public void setFile(java.io.File file) { + this.file = file; + } + + /** + **/ + public FileSchemaTestClass files(List files) { + this.files = files; + return this; + } + + + @ApiModelProperty(value = "") + @JsonProperty("files") + public List getFiles() { + return files; + } + public void setFiles(List files) { + this.files = files; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o; + return Objects.equals(file, fileSchemaTestClass.file) && + Objects.equals(files, fileSchemaTestClass.files); + } + + @Override + public int hashCode() { + return Objects.hash(file, files); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class FileSchemaTestClass {\n"); + + sb.append(" file: ").append(toIndentedString(file)).append("\n"); + sb.append(" files: ").append(toIndentedString(files)).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/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java index cf52c884af3..62bac3f6625 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 @@ -9,10 +9,12 @@ 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 FormatTest implements Serializable { 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 2c1f3d813fa..40af1963426 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 @@ -4,10 +4,12 @@ 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 HasOnlyReadOnly implements Serializable { 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 7fa3bae1640..2961088997d 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,14 +3,17 @@ package org.openapitools.model; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.openapitools.model.StringBooleanMap; 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 MapTest implements Serializable { @@ -45,11 +48,13 @@ public enum InnerEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } private @Valid Map mapOfEnumString = new HashMap(); + private @Valid Map directMap = new HashMap(); + private @Valid StringBooleanMap indirectMap = null; /** **/ @@ -85,6 +90,40 @@ public enum InnerEnum { this.mapOfEnumString = mapOfEnumString; } + /** + **/ + public MapTest directMap(Map directMap) { + this.directMap = directMap; + return this; + } + + + @ApiModelProperty(value = "") + @JsonProperty("direct_map") + public Map getDirectMap() { + return directMap; + } + public void setDirectMap(Map directMap) { + this.directMap = directMap; + } + + /** + **/ + public MapTest indirectMap(StringBooleanMap indirectMap) { + this.indirectMap = indirectMap; + return this; + } + + + @ApiModelProperty(value = "") + @JsonProperty("indirect_map") + public StringBooleanMap getIndirectMap() { + return indirectMap; + } + public void setIndirectMap(StringBooleanMap indirectMap) { + this.indirectMap = indirectMap; + } + @Override public boolean equals(java.lang.Object o) { @@ -96,12 +135,14 @@ public enum InnerEnum { } MapTest mapTest = (MapTest) o; return Objects.equals(mapMapOfString, mapTest.mapMapOfString) && - Objects.equals(mapOfEnumString, mapTest.mapOfEnumString); + Objects.equals(mapOfEnumString, mapTest.mapOfEnumString) && + Objects.equals(directMap, mapTest.directMap) && + Objects.equals(indirectMap, mapTest.indirectMap); } @Override public int hashCode() { - return Objects.hash(mapMapOfString, mapOfEnumString); + return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap); } @Override @@ -111,6 +152,8 @@ public enum InnerEnum { sb.append(" mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n"); sb.append(" mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n"); + sb.append(" directMap: ").append(toIndentedString(directMap)).append("\n"); + sb.append(" indirectMap: ").append(toIndentedString(indirectMap)).append("\n"); sb.append("}"); return sb.toString(); } 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 e043ead0b19..cc446a6fce4 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 @@ -10,10 +10,12 @@ 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 MixedPropertiesAndAdditionalPropertiesClass implements Serializable { 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 0d5fb9afffa..c5fbe95d9f6 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 @@ -5,15 +5,16 @@ 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; /** * Model for testing model name starting with number **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name starting with number") - public class Model200Response implements Serializable { private @Valid Integer name = null; 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 6ad0f2d2ee5..339ae0912fd 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 @@ -4,10 +4,12 @@ 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 ModelApiResponse implements Serializable { 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 ba467af8d56..e5585db2da5 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 @@ -5,15 +5,16 @@ 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; /** * Model for testing reserved words **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing reserved words") - public class ModelReturn implements Serializable { private @Valid Integer _return = null; 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 3176776b331..6fa1ec2f4c8 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 @@ -5,15 +5,16 @@ 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; /** * Model for testing model name same as property name **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name same as property name") - public class Name implements Serializable { private @Valid Integer name = null; 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 f9558b20dd1..9aa6bc73749 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 @@ -5,10 +5,12 @@ 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 NumberOnly implements Serializable { 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 656df24881c..f2b772249ae 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 @@ -5,10 +5,12 @@ 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 Order implements Serializable { @@ -46,7 +48,7 @@ public enum StatusEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } @@ -149,7 +151,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") @JsonProperty("complete") - public Boolean isComplete() { + public Boolean getComplete() { return complete; } public void setComplete(Boolean complete) { 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 f16bef370a7..c4c046c8953 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 @@ -5,10 +5,12 @@ 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 OuterComposite implements Serializable { 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 8fab87f63bb..f69d482a93d 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 @@ -4,7 +4,6 @@ import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; @@ -38,7 +37,7 @@ public enum OuterEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + text + "'"); } } 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 92d17319e79..bdb345ac05f 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 @@ -8,10 +8,12 @@ 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 Pet implements Serializable { @@ -50,7 +52,7 @@ public enum StatusEnum { return b; } } - return null; + throw new IllegalArgumentException("Unexpected value '" + v + "'"); } } 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 a27d005002f..b7349f0a256 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 @@ -4,10 +4,12 @@ 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 ReadOnlyFirst implements Serializable { 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 3bbdfdf72f1..5668baa8c70 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 @@ -4,10 +4,12 @@ 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 SpecialModelName implements Serializable { 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 new file mode 100644 index 00000000000..e48ad0840ac --- /dev/null +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/StringBooleanMap.java @@ -0,0 +1,58 @@ +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 1fd68c3f651..ced9e763c59 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 @@ -4,10 +4,12 @@ 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 Tag implements Serializable { 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 f940186f66b..47bd2cde5d3 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 @@ -4,10 +4,12 @@ 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 User implements Serializable { 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 43eafcddd2d..8ce9975a0aa 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 @@ -1016,8 +1016,8 @@ paths: - tag: fake /another-fake/dummy: patch: - description: To test special tags - operationId: test_special_tags + description: To test special tags and operation ID starting with number + operationId: 123_test_@#$%_special_tags requestBody: content: application/json: @@ -1037,6 +1037,66 @@ paths: - $another-fake? x-tags: - tag: $another-fake? + /fake/body-with-file-schema: + put: + description: For this test, the body for this request much reference a schema named `File`. + operationId: testBodyWithFileSchema + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/FileSchemaTestClass' + required: true + responses: + 200: + content: {} + description: Success + tags: + - fake + x-tags: + - tag: fake + /fake/{petId}/uploadImageWithRequiredFile: + post: + operationId: uploadFileWithRequiredFile + parameters: + - description: ID of pet to update + in: path + name: petId + required: true + schema: + format: int64 + type: integer + requestBody: + 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 + required: true + responses: + 200: + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + description: successful operation + security: + - petstore_auth: + - write:pets + - read:pets + summary: uploads an image (required) + tags: + - pet + x-tags: + - tag: pet components: schemas: Category: @@ -1342,14 +1402,18 @@ components: type: array type: object OuterComposite: - example: {} + example: + my_string: my_string + my_number: 0.80082819046101150206595775671303272247314453125 + my_boolean: true properties: my_number: - $ref: '#/components/schemas/OuterNumber' + type: number my_string: - $ref: '#/components/schemas/OuterString' + type: string my_boolean: - $ref: '#/components/schemas/OuterBoolean' + type: boolean + x-codegen-body-parameter-name: boolean_post_body type: object format_test: properties: @@ -1435,6 +1499,21 @@ components: OuterBoolean: type: boolean x-codegen-body-parameter-name: boolean_post_body + FileSchemaTestClass: + example: + file: + sourceURI: sourceURI + files: + - sourceURI: sourceURI + - sourceURI: sourceURI + properties: + file: + $ref: '#/components/schemas/File' + files: + items: + $ref: '#/components/schemas/File' + type: array + type: object Animal: discriminator: propertyName: className @@ -1447,6 +1526,10 @@ components: required: - className type: object + StringBooleanMap: + additionalProperties: + type: boolean + type: object Cat: allOf: - $ref: '#/components/schemas/Animal' @@ -1469,6 +1552,12 @@ components: - lower type: string type: object + direct_map: + additionalProperties: + type: boolean + type: object + indirect_map: + $ref: '#/components/schemas/StringBooleanMap' type: object Tag: example: @@ -1487,6 +1576,15 @@ components: items: $ref: '#/components/schemas/Animal' type: array + File: + description: Must be named `File` for test. + example: + sourceURI: sourceURI + properties: + sourceURI: + description: Test capitalization + type: string + type: object Pet: example: photoUrls: diff --git a/samples/server/petstore/jaxrs-spec-interface/pom.xml b/samples/server/petstore/jaxrs-spec-interface/pom.xml index 0c8e9282b13..7bf659704fe 100644 --- a/samples/server/petstore/jaxrs-spec-interface/pom.xml +++ b/samples/server/petstore/jaxrs-spec-interface/pom.xml @@ -13,13 +13,32 @@ maven-jar-plugin 2.2 + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/gen/java + + + + + javax.ws.rs javax.ws.rs-api - 2.0 + 2.1 provided @@ -28,6 +47,18 @@ provided 1.5.3 + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + provided + + + joda-time + joda-time + ${jodatime-version} + provided + junit junit @@ -44,5 +75,7 @@ 4.8.1 + 2.8.9 + 2.9.9 diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/AnotherFakeApi.java index cfa8e250aca..8c119364762 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -7,6 +7,7 @@ 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.*; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java index 20e3fa1229c..1a7f5a8084c 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java @@ -16,6 +16,7 @@ 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.*; @@ -89,8 +90,7 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - void testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream, - @FormParam(value = "binary") Attachment binaryDetail,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback); + void testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback); @GET @Consumes({ "application/x-www-form-urlencoded" }) @@ -128,6 +128,5 @@ public interface FakeApi { }, tags={ "pet" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream, - @FormParam(value = "requiredFile") Attachment requiredFileDetail,@FormParam(value = "additionalMetadata") String additionalMetadata); + ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata); } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index c0302bc70f0..39782c30cba 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -7,6 +7,7 @@ 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.*; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java index ea35664ca3c..87ddda4bcb5 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java @@ -9,6 +9,7 @@ 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.*; @@ -121,6 +122,5 @@ public interface PetApi { }, tags={ "pet" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - ModelApiResponse uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream, - @FormParam(value = "file") Attachment fileDetail); + ModelApiResponse uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream); } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java index 71561e9c877..102b70a5f08 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/StoreApi.java @@ -8,6 +8,7 @@ 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.*; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java index 913aaf456bf..e5d325d371a 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/UserApi.java @@ -8,6 +8,7 @@ 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.*; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 67f22897479..9ffada31ae8 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -7,10 +7,12 @@ 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 AdditionalPropertiesClass implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java index 06cf55cd3bf..f5d49a3c4b2 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java @@ -6,10 +6,12 @@ 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 Animal implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AnimalFarm.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AnimalFarm.java index 848f6bc9ceb..810e56085b5 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AnimalFarm.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AnimalFarm.java @@ -7,10 +7,12 @@ 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 { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index bccec961376..19b4fb8672a 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -7,10 +7,12 @@ 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 ArrayOfArrayOfNumberOnly implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 08bba9d8499..67f1a62787a 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -7,10 +7,12 @@ 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 ArrayOfNumberOnly implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java index 47d1dedf961..6c812b8b684 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java @@ -7,10 +7,12 @@ 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 ArrayTest implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java index f206717f3bb..b2cc76b7b8d 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java @@ -4,10 +4,12 @@ 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 Capitalization implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java index ace1f5440c1..134779f46fc 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java @@ -5,10 +5,12 @@ 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 Cat extends Animal implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java index adf8efa06c1..4eb21f49a58 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java @@ -4,10 +4,12 @@ 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 Category implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java index 5fb585ab946..373ea29aa25 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java @@ -5,15 +5,16 @@ 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; /** * Model for testing model with \"_class\" property **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model with \"_class\" property") - public class ClassModel implements Serializable { private @Valid String propertyClass = null; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java index 761e0d5dcb6..83c5ac4e182 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java @@ -4,10 +4,12 @@ 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 Client implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java index 7c04ac357c5..3cf495a7b15 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java @@ -5,10 +5,12 @@ 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 Dog extends Animal implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java index ea37d085b26..7a93f0b748b 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumArrays.java @@ -6,10 +6,12 @@ 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 EnumArrays implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumClass.java index 8572c270a4b..ba341ac9168 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumClass.java @@ -4,7 +4,6 @@ import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java index bb19b184b66..42348dcdc91 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/EnumTest.java @@ -5,10 +5,12 @@ 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 EnumTest implements Serializable { @@ -93,7 +95,7 @@ public enum EnumIntegerEnum { value = v; } - public String value() { + public Integer value() { return value; } @@ -127,7 +129,7 @@ public enum EnumNumberEnum { value = v; } - public String value() { + public Double value() { return value; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index a6f70c8addc..3acdf447102 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -6,10 +6,12 @@ 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 FileSchemaTestClass implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java index cf52c884af3..62bac3f6625 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java @@ -9,10 +9,12 @@ 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 FormatTest implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 2c1f3d813fa..40af1963426 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -4,10 +4,12 @@ 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 HasOnlyReadOnly implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java index 4a7bd06f768..2961088997d 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MapTest.java @@ -8,10 +8,12 @@ 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 MapTest implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e043ead0b19..cc446a6fce4 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -10,10 +10,12 @@ 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 MixedPropertiesAndAdditionalPropertiesClass implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java index 0d5fb9afffa..c5fbe95d9f6 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Model200Response.java @@ -5,15 +5,16 @@ 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; /** * Model for testing model name starting with number **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name starting with number") - public class Model200Response implements Serializable { private @Valid Integer name = null; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java index 6ad0f2d2ee5..339ae0912fd 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -4,10 +4,12 @@ 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 ModelApiResponse implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java index ba467af8d56..e5585db2da5 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ModelReturn.java @@ -5,15 +5,16 @@ 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; /** * Model for testing reserved words **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing reserved words") - public class ModelReturn implements Serializable { private @Valid Integer _return = null; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java index 3176776b331..6fa1ec2f4c8 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Name.java @@ -5,15 +5,16 @@ 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; /** * Model for testing model name same as property name **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name same as property name") - public class Name implements Serializable { private @Valid Integer name = null; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java index f9558b20dd1..9aa6bc73749 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/NumberOnly.java @@ -5,10 +5,12 @@ 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 NumberOnly implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java index 9838d803cbe..f2b772249ae 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Order.java @@ -5,10 +5,12 @@ 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 Order implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java index f16bef370a7..c4c046c8953 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterComposite.java @@ -5,10 +5,12 @@ 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 OuterComposite implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterEnum.java index af1536c79be..f69d482a93d 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/OuterEnum.java @@ -4,7 +4,6 @@ import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java index a1660ad22e6..bdb345ac05f 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java @@ -8,10 +8,12 @@ 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 Pet implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index a27d005002f..b7349f0a256 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -4,10 +4,12 @@ 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 ReadOnlyFirst implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java index 3bbdfdf72f1..5668baa8c70 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -4,10 +4,12 @@ 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 SpecialModelName implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/StringBooleanMap.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/StringBooleanMap.java index 99423ff436c..e48ad0840ac 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/StringBooleanMap.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/StringBooleanMap.java @@ -6,10 +6,12 @@ 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 { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java index 1fd68c3f651..ced9e763c59 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Tag.java @@ -4,10 +4,12 @@ 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 Tag implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java index f940186f66b..47bd2cde5d3 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/User.java @@ -4,10 +4,12 @@ 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 User implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/pom.xml b/samples/server/petstore/jaxrs-spec/pom.xml index 3505912ab2b..855d31c209e 100644 --- a/samples/server/petstore/jaxrs-spec/pom.xml +++ b/samples/server/petstore/jaxrs-spec/pom.xml @@ -28,13 +28,32 @@ + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + src/gen/java + + + + + javax.ws.rs javax.ws.rs-api - 2.0 + 2.1 provided @@ -43,6 +62,18 @@ provided 1.5.3 + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + provided + + + joda-time + joda-time + ${jodatime-version} + provided + junit junit @@ -79,5 +110,7 @@ 4.8.1 + 2.8.9 + 2.9.9 diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/AnotherFakeApi.java index e7671f76c59..15cf4917d0d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -7,6 +7,7 @@ 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.*; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java index c575f781e06..0bbd83c106b 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java @@ -16,6 +16,7 @@ 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.*; @@ -111,8 +112,7 @@ public class FakeApi { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream, - @FormParam(value = "binary") Attachment binaryDetail,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } @@ -162,8 +162,7 @@ public class FakeApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - public Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream, - @FormParam(value = "requiredFile") Attachment requiredFileDetail,@FormParam(value = "additionalMetadata") String additionalMetadata) { + public Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index 43d1adba5c5..c41753002a7 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -7,6 +7,7 @@ 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.*; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java index ec2658d28ce..118344943fa 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java @@ -9,6 +9,7 @@ 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.*; @@ -143,8 +144,7 @@ public class PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - public Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream, - @FormParam(value = "file") Attachment fileDetail) { + public Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java index 39d99a1bf62..82e6a101d12 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/StoreApi.java @@ -8,6 +8,7 @@ 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.*; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java index 48971df1500..f7983da6246 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/UserApi.java @@ -8,6 +8,7 @@ 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.*; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 67f22897479..9ffada31ae8 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -7,10 +7,12 @@ 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 AdditionalPropertiesClass implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java index 06cf55cd3bf..f5d49a3c4b2 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Animal.java @@ -6,10 +6,12 @@ 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 Animal implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AnimalFarm.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AnimalFarm.java index 848f6bc9ceb..810e56085b5 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AnimalFarm.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/AnimalFarm.java @@ -7,10 +7,12 @@ 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 { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index bccec961376..19b4fb8672a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -7,10 +7,12 @@ 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 ArrayOfArrayOfNumberOnly implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 08bba9d8499..67f1a62787a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -7,10 +7,12 @@ 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 ArrayOfNumberOnly implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java index 47d1dedf961..6c812b8b684 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ArrayTest.java @@ -7,10 +7,12 @@ 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 ArrayTest implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java index f206717f3bb..b2cc76b7b8d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Capitalization.java @@ -4,10 +4,12 @@ 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 Capitalization implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java index ace1f5440c1..134779f46fc 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Cat.java @@ -5,10 +5,12 @@ 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 Cat extends Animal implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java index adf8efa06c1..4eb21f49a58 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Category.java @@ -4,10 +4,12 @@ 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 Category implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java index 5fb585ab946..373ea29aa25 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ClassModel.java @@ -5,15 +5,16 @@ 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; /** * Model for testing model with \"_class\" property **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model with \"_class\" property") - public class ClassModel implements Serializable { private @Valid String propertyClass = null; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java index 761e0d5dcb6..83c5ac4e182 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Client.java @@ -4,10 +4,12 @@ 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 Client implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java index 7c04ac357c5..3cf495a7b15 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Dog.java @@ -5,10 +5,12 @@ 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 Dog extends Animal implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java index ea37d085b26..7a93f0b748b 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumArrays.java @@ -6,10 +6,12 @@ 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 EnumArrays implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumClass.java index 8572c270a4b..ba341ac9168 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumClass.java @@ -4,7 +4,6 @@ import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java index bb19b184b66..42348dcdc91 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/EnumTest.java @@ -5,10 +5,12 @@ 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 EnumTest implements Serializable { @@ -93,7 +95,7 @@ public enum EnumIntegerEnum { value = v; } - public String value() { + public Integer value() { return value; } @@ -127,7 +129,7 @@ public enum EnumNumberEnum { value = v; } - public String value() { + public Double value() { return value; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index a6f70c8addc..3acdf447102 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -6,10 +6,12 @@ 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 FileSchemaTestClass implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java index cf52c884af3..62bac3f6625 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java @@ -9,10 +9,12 @@ 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 FormatTest implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 2c1f3d813fa..40af1963426 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -4,10 +4,12 @@ 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 HasOnlyReadOnly implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java index 4a7bd06f768..2961088997d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MapTest.java @@ -8,10 +8,12 @@ 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 MapTest implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index e043ead0b19..cc446a6fce4 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -10,10 +10,12 @@ 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 MixedPropertiesAndAdditionalPropertiesClass implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java index 0d5fb9afffa..c5fbe95d9f6 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Model200Response.java @@ -5,15 +5,16 @@ 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; /** * Model for testing model name starting with number **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name starting with number") - public class Model200Response implements Serializable { private @Valid Integer name = null; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java index 6ad0f2d2ee5..339ae0912fd 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -4,10 +4,12 @@ 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 ModelApiResponse implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java index ba467af8d56..e5585db2da5 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ModelReturn.java @@ -5,15 +5,16 @@ 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; /** * Model for testing reserved words **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing reserved words") - public class ModelReturn implements Serializable { private @Valid Integer _return = null; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java index 3176776b331..6fa1ec2f4c8 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Name.java @@ -5,15 +5,16 @@ 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; /** * Model for testing model name same as property name **/ -import io.swagger.annotations.*; -import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name same as property name") - public class Name implements Serializable { private @Valid Integer name = null; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java index f9558b20dd1..9aa6bc73749 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/NumberOnly.java @@ -5,10 +5,12 @@ 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 NumberOnly implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java index 9838d803cbe..f2b772249ae 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Order.java @@ -5,10 +5,12 @@ 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 Order implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java index f16bef370a7..c4c046c8953 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterComposite.java @@ -5,10 +5,12 @@ 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 OuterComposite implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterEnum.java index af1536c79be..f69d482a93d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/OuterEnum.java @@ -4,7 +4,6 @@ import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java index a1660ad22e6..bdb345ac05f 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java @@ -8,10 +8,12 @@ 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 Pet implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index a27d005002f..b7349f0a256 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -4,10 +4,12 @@ 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 ReadOnlyFirst implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java index 3bbdfdf72f1..5668baa8c70 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -4,10 +4,12 @@ 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 SpecialModelName implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/StringBooleanMap.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/StringBooleanMap.java index 99423ff436c..e48ad0840ac 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/StringBooleanMap.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/StringBooleanMap.java @@ -6,10 +6,12 @@ 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 { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java index 1fd68c3f651..ced9e763c59 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Tag.java @@ -4,10 +4,12 @@ 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 Tag implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java index f940186f66b..47bd2cde5d3 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/User.java @@ -4,10 +4,12 @@ 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 User implements Serializable { From baf16cf834bed798bec05b79e7d0747fdbda944e Mon Sep 17 00:00:00 2001 From: sunn <33183834+etherealjoy@users.noreply.github.com> Date: Tue, 7 Aug 2018 15:19:56 +0200 Subject: [PATCH 4/5] [cpp pistache] use model namespace only on Model import (#733) Don't use model namespaces when not imported --- .../codegen/languages/CppPistacheServerCodegen.java | 6 ++++++ .../main/resources/cpp-pistache-server/api-header.mustache | 3 ++- .../resources/cpp-pistache-server/api-impl-header.mustache | 3 ++- .../resources/cpp-pistache-server/api-impl-source.mustache | 3 ++- .../main/resources/cpp-pistache-server/api-source.mustache | 3 ++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java index c288575f695..4bef1d6fc66 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java @@ -246,6 +246,12 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { } op.vendorExtensions.put("x-codegen-pistache-consumesJson", consumeJson); op.vendorExtensions.put("x-codegen-pistache-isParsingSupported", isParsingSupported); + for(String hdr : op.imports) { + if(importMapping.containsKey(hdr)) { + continue; + } + additionalProperties.put("hasModelImport", true); + } } return objs; diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-header.mustache index 1ede8d1a982..9db55ca4bac 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-header.mustache @@ -23,7 +23,8 @@ namespace {{this}} { {{/apiNamespaceDeclarations}} -using namespace {{modelNamespace}}; +{{#hasModelImport}} +using namespace {{modelNamespace}};{{/hasModelImport}} class {{declspec}} {{classname}} { public: diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-header.mustache index 3aa6d5bc421..49c274d8fd7 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-header.mustache @@ -26,7 +26,8 @@ namespace {{this}} { {{/apiNamespaceDeclarations}} -using namespace {{modelNamespace}}; +{{#hasModelImport}} +using namespace {{modelNamespace}};{{/hasModelImport}} class {{classname}}Impl : public {{apiNamespace}}::{{classname}} { public: diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-source.mustache index a3babcd5cad..d6ba91e15af 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-source.mustache @@ -7,7 +7,8 @@ namespace {{this}} { {{/apiNamespaceDeclarations}} -using namespace {{modelNamespace}}; +{{#hasModelImport}} +using namespace {{modelNamespace}};{{/hasModelImport}} {{classname}}Impl::{{classname}}Impl(Pistache::Address addr) : {{classname}}(addr) diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache index d6aa9becb04..c40c67eaa74 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache @@ -7,7 +7,8 @@ namespace {{this}} { {{/apiNamespaceDeclarations}} -using namespace {{modelNamespace}}; +{{#hasModelImport}} +using namespace {{modelNamespace}};{{/hasModelImport}} {{classname}}::{{classname}}(Pistache::Address addr) : httpEndpoint(addr) From 0809d8f5271212fef500d04a975e88088130e5f1 Mon Sep 17 00:00:00 2001 From: stkrwork Date: Tue, 7 Aug 2018 17:07:05 +0200 Subject: [PATCH 5/5] [C++][Restbed/Pistache] Added fix for byte array (#752) * Added fix for byte array * Fix spacing * Adapted default value for ByteArray * Adapted default value for ByteArray in Pistache Server --- .../codegen/languages/CppPistacheServerCodegen.java | 2 +- .../codegen/languages/CppRestbedServerCodegen.java | 5 +++++ .../server/petstore/cpp-restbed/.openapi-generator/VERSION | 2 +- samples/server/petstore/cpp-restbed/api/PetApi.cpp | 2 +- samples/server/petstore/cpp-restbed/api/PetApi.h | 2 +- samples/server/petstore/cpp-restbed/api/StoreApi.cpp | 2 +- samples/server/petstore/cpp-restbed/api/StoreApi.h | 2 +- samples/server/petstore/cpp-restbed/api/UserApi.cpp | 2 +- samples/server/petstore/cpp-restbed/api/UserApi.h | 2 +- samples/server/petstore/cpp-restbed/model/ApiResponse.cpp | 2 +- samples/server/petstore/cpp-restbed/model/ApiResponse.h | 2 +- samples/server/petstore/cpp-restbed/model/Category.cpp | 2 +- samples/server/petstore/cpp-restbed/model/Category.h | 2 +- samples/server/petstore/cpp-restbed/model/Order.cpp | 2 +- samples/server/petstore/cpp-restbed/model/Order.h | 2 +- samples/server/petstore/cpp-restbed/model/Pet.cpp | 2 +- samples/server/petstore/cpp-restbed/model/Pet.h | 2 +- samples/server/petstore/cpp-restbed/model/Tag.cpp | 2 +- samples/server/petstore/cpp-restbed/model/Tag.h | 2 +- samples/server/petstore/cpp-restbed/model/User.cpp | 2 +- samples/server/petstore/cpp-restbed/model/User.h | 2 +- 21 files changed, 25 insertions(+), 20 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java index 4bef1d6fc66..322509976b4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java @@ -341,7 +341,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { return "0"; } else if (ModelUtils.isByteArraySchema(p)) { - return ""; + return "\"\""; } else if (ModelUtils.isMapSchema(p)) { String inner = getSchemaType((Schema) p.getAdditionalProperties()); return "std::map()"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java index bb3ad824115..1dc73dca8b2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java @@ -90,6 +90,7 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen { typeMapping.put("binary", "restbed::Bytes"); typeMapping.put("number", "double"); typeMapping.put("UUID", "std::string"); + typeMapping.put("ByteArray", "std::string"); super.importMapping = new HashMap(); importMapping.put("std::vector", "#include "); @@ -271,6 +272,8 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen { } else if (ModelUtils.isMapSchema(p)) { Schema inner = (Schema) p.getAdditionalProperties(); return getSchemaType(p) + ""; + } else if (ModelUtils.isByteArraySchema(p)) { + return "std::string"; } else if (ModelUtils.isStringSchema(p) || ModelUtils.isDateSchema(p) || ModelUtils.isDateTimeSchema(p) || ModelUtils.isFileSchema(p) @@ -301,6 +304,8 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen { return "0L"; } return "0"; + } else if (ModelUtils.isByteArraySchema(p)) { + return "\"\""; } else if (ModelUtils.isMapSchema(p)) { String inner = getSchemaType((Schema) p.getAdditionalProperties()); return "std::map()"; diff --git a/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION b/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION index 096bf47efe3..14900cee60e 100644 --- a/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION @@ -1 +1 @@ -3.0.0-SNAPSHOT \ No newline at end of file +3.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/cpp-restbed/api/PetApi.cpp b/samples/server/petstore/cpp-restbed/api/PetApi.cpp index af068a3422f..2d25c503385 100644 --- a/samples/server/petstore/cpp-restbed/api/PetApi.cpp +++ b/samples/server/petstore/cpp-restbed/api/PetApi.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/api/PetApi.h b/samples/server/petstore/cpp-restbed/api/PetApi.h index 83607a10bcb..116e9f93d65 100644 --- a/samples/server/petstore/cpp-restbed/api/PetApi.h +++ b/samples/server/petstore/cpp-restbed/api/PetApi.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/api/StoreApi.cpp b/samples/server/petstore/cpp-restbed/api/StoreApi.cpp index 97f38c05207..b3e0a63e85c 100644 --- a/samples/server/petstore/cpp-restbed/api/StoreApi.cpp +++ b/samples/server/petstore/cpp-restbed/api/StoreApi.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/api/StoreApi.h b/samples/server/petstore/cpp-restbed/api/StoreApi.h index 0f0f34d9144..4e38fab61d3 100644 --- a/samples/server/petstore/cpp-restbed/api/StoreApi.h +++ b/samples/server/petstore/cpp-restbed/api/StoreApi.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/api/UserApi.cpp b/samples/server/petstore/cpp-restbed/api/UserApi.cpp index 158e5e8472b..74dadb906bd 100644 --- a/samples/server/petstore/cpp-restbed/api/UserApi.cpp +++ b/samples/server/petstore/cpp-restbed/api/UserApi.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/api/UserApi.h b/samples/server/petstore/cpp-restbed/api/UserApi.h index 9c638e11c5e..0d2716f37b0 100644 --- a/samples/server/petstore/cpp-restbed/api/UserApi.h +++ b/samples/server/petstore/cpp-restbed/api/UserApi.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp b/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp index 0ad76374228..2b1862b84de 100644 --- a/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp +++ b/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/ApiResponse.h b/samples/server/petstore/cpp-restbed/model/ApiResponse.h index 704fade4a1c..746bfb890fb 100644 --- a/samples/server/petstore/cpp-restbed/model/ApiResponse.h +++ b/samples/server/petstore/cpp-restbed/model/ApiResponse.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Category.cpp b/samples/server/petstore/cpp-restbed/model/Category.cpp index 4156dc195fc..d0e1898b235 100644 --- a/samples/server/petstore/cpp-restbed/model/Category.cpp +++ b/samples/server/petstore/cpp-restbed/model/Category.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Category.h b/samples/server/petstore/cpp-restbed/model/Category.h index cd514f3d33d..3a0060698e5 100644 --- a/samples/server/petstore/cpp-restbed/model/Category.h +++ b/samples/server/petstore/cpp-restbed/model/Category.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Order.cpp b/samples/server/petstore/cpp-restbed/model/Order.cpp index a82a0bb3466..ef339d7a66b 100644 --- a/samples/server/petstore/cpp-restbed/model/Order.cpp +++ b/samples/server/petstore/cpp-restbed/model/Order.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Order.h b/samples/server/petstore/cpp-restbed/model/Order.h index e6668897300..d964c84226b 100644 --- a/samples/server/petstore/cpp-restbed/model/Order.h +++ b/samples/server/petstore/cpp-restbed/model/Order.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Pet.cpp b/samples/server/petstore/cpp-restbed/model/Pet.cpp index 5fbecd6bc91..f56f2b45b51 100644 --- a/samples/server/petstore/cpp-restbed/model/Pet.cpp +++ b/samples/server/petstore/cpp-restbed/model/Pet.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Pet.h b/samples/server/petstore/cpp-restbed/model/Pet.h index 96e9fba3c73..8dab50f9295 100644 --- a/samples/server/petstore/cpp-restbed/model/Pet.h +++ b/samples/server/petstore/cpp-restbed/model/Pet.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Tag.cpp b/samples/server/petstore/cpp-restbed/model/Tag.cpp index ccefa0e8c75..9a6acfb4c49 100644 --- a/samples/server/petstore/cpp-restbed/model/Tag.cpp +++ b/samples/server/petstore/cpp-restbed/model/Tag.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Tag.h b/samples/server/petstore/cpp-restbed/model/Tag.h index 29b9a90e79e..5239be20809 100644 --- a/samples/server/petstore/cpp-restbed/model/Tag.h +++ b/samples/server/petstore/cpp-restbed/model/Tag.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/User.cpp b/samples/server/petstore/cpp-restbed/model/User.cpp index 637e5826c0b..1eca66674f8 100644 --- a/samples/server/petstore/cpp-restbed/model/User.cpp +++ b/samples/server/petstore/cpp-restbed/model/User.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/User.h b/samples/server/petstore/cpp-restbed/model/User.h index 054b31c534e..b557e5e42d8 100644 --- a/samples/server/petstore/cpp-restbed/model/User.h +++ b/samples/server/petstore/cpp-restbed/model/User.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 3.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 3.2.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */