From a339422bd5ef3860e2f5a2fc591d80a4a6cce711 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 9 Apr 2018 00:08:50 +0800 Subject: [PATCH] move get type declaration method to c++ restbed --- .../openapitools/codegen/languages/AbstractCppCodegen.java | 5 +++++ .../codegen/languages/CppRestClientCodegen.java | 5 ----- samples/server/petstore/restbed/.swagger-codegen/VERSION | 2 +- samples/server/petstore/restbed/api/PetApi.cpp | 2 +- samples/server/petstore/restbed/api/PetApi.h | 2 +- samples/server/petstore/restbed/api/StoreApi.cpp | 2 +- samples/server/petstore/restbed/api/StoreApi.h | 2 +- samples/server/petstore/restbed/api/UserApi.cpp | 6 +++--- samples/server/petstore/restbed/api/UserApi.h | 3 +-- samples/server/petstore/restbed/git_push.sh | 2 +- samples/server/petstore/restbed/model/ApiResponse.cpp | 2 +- samples/server/petstore/restbed/model/ApiResponse.h | 2 +- samples/server/petstore/restbed/model/Category.cpp | 2 +- samples/server/petstore/restbed/model/Category.h | 2 +- samples/server/petstore/restbed/model/Order.cpp | 2 +- samples/server/petstore/restbed/model/Order.h | 2 +- samples/server/petstore/restbed/model/Pet.cpp | 2 +- samples/server/petstore/restbed/model/Pet.h | 2 +- samples/server/petstore/restbed/model/Tag.cpp | 2 +- samples/server/petstore/restbed/model/Tag.h | 2 +- samples/server/petstore/restbed/model/User.cpp | 2 +- samples/server/petstore/restbed/model/User.h | 2 +- 22 files changed, 27 insertions(+), 28 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 07a430abecf..d3984d2de54 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 @@ -179,4 +179,9 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg public String toBooleanGetter(String name) { return "is" + getterAndSetterCapitalize(name); } + + @Override + public String getTypeDeclaration(String str) { + return "std::shared_ptr<" + toModelName(str) + ">"; + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java index 2c7e77d6f37..5e4b271f238 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java @@ -292,11 +292,6 @@ public class CppRestClientCodegen extends AbstractCppCodegen { return "std::shared_ptr<" + openAPIType + ">"; } - @Override - public String getTypeDeclaration(String str) { - return "std::shared_ptr<" + toModelName(str) + ">"; - } - @Override public String toDefaultValue(Schema p) { if (p instanceof StringSchema) { diff --git a/samples/server/petstore/restbed/.swagger-codegen/VERSION b/samples/server/petstore/restbed/.swagger-codegen/VERSION index f9f7450d135..096bf47efe3 100644 --- a/samples/server/petstore/restbed/.swagger-codegen/VERSION +++ b/samples/server/petstore/restbed/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.0-SNAPSHOT \ No newline at end of file +3.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/restbed/api/PetApi.cpp b/samples/server/petstore/restbed/api/PetApi.cpp index a681ad1431b..cf65ed9b489 100644 --- a/samples/server/petstore/restbed/api/PetApi.cpp +++ b/samples/server/petstore/restbed/api/PetApi.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/api/PetApi.h b/samples/server/petstore/restbed/api/PetApi.h index b178f31fac0..977dc27ad25 100644 --- a/samples/server/petstore/restbed/api/PetApi.h +++ b/samples/server/petstore/restbed/api/PetApi.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/api/StoreApi.cpp b/samples/server/petstore/restbed/api/StoreApi.cpp index c3a8545061d..15be337f83b 100644 --- a/samples/server/petstore/restbed/api/StoreApi.cpp +++ b/samples/server/petstore/restbed/api/StoreApi.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/api/StoreApi.h b/samples/server/petstore/restbed/api/StoreApi.h index 5c7142cfc4f..2ece789ddfe 100644 --- a/samples/server/petstore/restbed/api/StoreApi.h +++ b/samples/server/petstore/restbed/api/StoreApi.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/api/UserApi.cpp b/samples/server/petstore/restbed/api/UserApi.cpp index 19ebcd66c1d..362a126c746 100644 --- a/samples/server/petstore/restbed/api/UserApi.cpp +++ b/samples/server/petstore/restbed/api/UserApi.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ @@ -344,9 +344,9 @@ void UserApiUserLoginResource::GET_method_handler(const std::shared_ptrset_header("X-Rate-Limit", ""); // Change second param to your header value - // Description: date in UTC when toekn expires + // Description: session->set_header("X-Expires-After", ""); // Change second param to your header value session->close(200, "successful operation", { {"Connection", "close"} }); return; diff --git a/samples/server/petstore/restbed/api/UserApi.h b/samples/server/petstore/restbed/api/UserApi.h index 4e0205f971d..cec925c3ba2 100644 --- a/samples/server/petstore/restbed/api/UserApi.h +++ b/samples/server/petstore/restbed/api/UserApi.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ @@ -27,7 +27,6 @@ #include "User.h" #include -#include namespace io { namespace swagger { diff --git a/samples/server/petstore/restbed/git_push.sh b/samples/server/petstore/restbed/git_push.sh index 35d20f1851d..bd57362e9ca 100644 --- a/samples/server/petstore/restbed/git_push.sh +++ b/samples/server/petstore/restbed/git_push.sh @@ -36,7 +36,7 @@ git_remote=`git remote` if [ "$git_remote" = "" ]; then # git remote not defined if [ "$GIT_TOKEN" = "" ]; then - echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment." + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git else git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git diff --git a/samples/server/petstore/restbed/model/ApiResponse.cpp b/samples/server/petstore/restbed/model/ApiResponse.cpp index 8335db91c2b..180847a950a 100644 --- a/samples/server/petstore/restbed/model/ApiResponse.cpp +++ b/samples/server/petstore/restbed/model/ApiResponse.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/ApiResponse.h b/samples/server/petstore/restbed/model/ApiResponse.h index 40b1d93a8ce..6c1b7b963ab 100644 --- a/samples/server/petstore/restbed/model/ApiResponse.h +++ b/samples/server/petstore/restbed/model/ApiResponse.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/Category.cpp b/samples/server/petstore/restbed/model/Category.cpp index 0f3a41858ab..82a63ed7c4a 100644 --- a/samples/server/petstore/restbed/model/Category.cpp +++ b/samples/server/petstore/restbed/model/Category.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/Category.h b/samples/server/petstore/restbed/model/Category.h index 83fed4a0275..99aa32ed30e 100644 --- a/samples/server/petstore/restbed/model/Category.h +++ b/samples/server/petstore/restbed/model/Category.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/Order.cpp b/samples/server/petstore/restbed/model/Order.cpp index ae0888a7f96..18758c8df3e 100644 --- a/samples/server/petstore/restbed/model/Order.cpp +++ b/samples/server/petstore/restbed/model/Order.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/Order.h b/samples/server/petstore/restbed/model/Order.h index 4c44b06faeb..ef1c5ecb574 100644 --- a/samples/server/petstore/restbed/model/Order.h +++ b/samples/server/petstore/restbed/model/Order.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/Pet.cpp b/samples/server/petstore/restbed/model/Pet.cpp index e1512ddb698..3e41917e882 100644 --- a/samples/server/petstore/restbed/model/Pet.cpp +++ b/samples/server/petstore/restbed/model/Pet.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/Pet.h b/samples/server/petstore/restbed/model/Pet.h index c45b9a2bda7..317e5b2719b 100644 --- a/samples/server/petstore/restbed/model/Pet.h +++ b/samples/server/petstore/restbed/model/Pet.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/Tag.cpp b/samples/server/petstore/restbed/model/Tag.cpp index 5504323641d..180daaf925a 100644 --- a/samples/server/petstore/restbed/model/Tag.cpp +++ b/samples/server/petstore/restbed/model/Tag.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/Tag.h b/samples/server/petstore/restbed/model/Tag.h index 1fd64907e38..db1b1337560 100644 --- a/samples/server/petstore/restbed/model/Tag.h +++ b/samples/server/petstore/restbed/model/Tag.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/User.cpp b/samples/server/petstore/restbed/model/User.cpp index e34781c782b..b3e4f027f85 100644 --- a/samples/server/petstore/restbed/model/User.cpp +++ b/samples/server/petstore/restbed/model/User.cpp @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */ diff --git a/samples/server/petstore/restbed/model/User.h b/samples/server/petstore/restbed/model/User.h index 5a79bba992b..19b4e72a11f 100644 --- a/samples/server/petstore/restbed/model/User.h +++ b/samples/server/petstore/restbed/model/User.h @@ -5,7 +5,7 @@ * OpenAPI spec version: 1.0.0 * Contact: apiteam@swagger.io * - * NOTE: This class is auto generated by the swagger code generator 2.3.0-SNAPSHOT. + * NOTE: This class is auto generated by the swagger code generator 3.0.0-SNAPSHOT. * https://github.com/swagger-api/swagger-codegen.git * Do not edit the class manually. */