fix string type in c++ generator

OpenAPITools · Apr 8, 2018 · f192613 · f192613
1 parent 665f0bd
commit f192613
Show file tree

Hide file tree

Showing 58 changed files with 186 additions and 205 deletions.
diff --git a/bin/cpprest-petstore.sh b/bin/cpprest-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/openapi-generator/src/main/resources/cpprest -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l cpprest -o samples/client/petstore/cpprest"
+ags="generate -t modules/openapi-generator/src/main/resources/cpprest -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l cpp-restsdk -o samples/client/petstore/cpprest $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/pistache-server-petstore.sh b/bin/pistache-server-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -l pistache-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/pistache-server"
+ags="$@ generate -l cpp-pistache-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/pistache-server"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/cpprest-petstore.bat b/bin/windows/cpprest-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l cpprest -o samples\client\petstore\cpprest
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l cpp-restsdk -o samples\client\petstore\cpprest
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/restbed-petstore-server.bat b/bin/windows/restbed-petstore-server.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l restbed -o samples\server\petstore\restbed\
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l cpp-restbed-server -o samples\server\petstore\restbed\
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/...-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java b/...-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java
@@ -179,7 +179,7 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
 
                 op.bodyParam.vendorExtensions.put("x-codegen-pistache-isStringOrDate", op.bodyParam.isString || op.bodyParam.isDate);
             }
-            if(op.consumes != null) {
+            if (op.consumes != null) {
                 for (Map<String, String> consume : op.consumes) {
                     if (consume.get("mediaType") != null && consume.get("mediaType").equals("application/json")) {
                         consumeJson = true;
@@ -189,17 +189,17 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
 
             op.httpMethod = op.httpMethod.substring(0, 1).toUpperCase() + op.httpMethod.substring(1).toLowerCase();
 
-            for(CodegenParameter param : op.allParams){
-                if (param.isFormParam) isParsingSupported=false;
-                if (param.isFile) isParsingSupported=false;
-                if (param.isCookieParam) isParsingSupported=false;
+            for (CodegenParameter param : op.allParams) {
+                if (param.isFormParam) isParsingSupported = false;
+                if (param.isFile) isParsingSupported = false;
+                if (param.isCookieParam) isParsingSupported = false;
 
                 //TODO: This changes the info about the real type but it is needed to parse the header params
                 if (param.isHeaderParam) {
                     param.dataType = "Optional<Net::Http::Header::Raw>";
                     param.baseType = "Optional<Net::Http::Header::Raw>";
-                } else if(param.isQueryParam){
-                    if(param.isPrimitiveType) {
+                } else if (param.isQueryParam) {
+                    if (param.isPrimitiveType) {
                         param.dataType = "Optional<" + param.dataType + ">";
                     } else {
                         param.dataType = "Optional<" + param.baseType + ">";
@@ -227,15 +227,15 @@ public String toModelFilename(String name) {
     public String apiFilename(String templateName, String tag) {
         String result = super.apiFilename(templateName, tag);
 
-        if ( templateName.endsWith("impl-header.mustache") ) {
+        if (templateName.endsWith("impl-header.mustache")) {
             int ix = result.lastIndexOf('/');
             result = result.substring(0, ix) + result.substring(ix, result.length() - 2) + "Impl.h";
             result = result.replace(apiFileFolder(), implFileFolder());
-        } else if ( templateName.endsWith("impl-source.mustache") ) {
+        } else if (templateName.endsWith("impl-source.mustache")) {
             int ix = result.lastIndexOf('/');
             result = result.substring(0, ix) + result.substring(ix, result.length() - 4) + "Impl.cpp";
             result = result.replace(apiFileFolder(), implFileFolder());
-        } else if ( templateName.endsWith("api-server.mustache") ) {
+        } else if (templateName.endsWith("api-server.mustache")) {
             int ix = result.lastIndexOf('/');
             result = result.substring(0, ix) + result.substring(ix, result.length() - 4) + "MainServer.cpp";
             result = result.replace(apiFileFolder(), outputFolder);
@@ -254,11 +254,11 @@ public String toApiFilename(String name) {
      * for different property types
      *
      * @return a string value used as the `dataType` field for model templates,
-     *         `returnType` for api templates
+     * `returnType` for api templates
      */
     @Override
     public String getTypeDeclaration(Schema p) {
-        String swaggerType = getSchemaType(p);
+        String openAPIType = getSchemaType(p);
 
         if (p instanceof ArraySchema) {
             ArraySchema ap = (ArraySchema) p;
@@ -269,13 +269,14 @@ public String getTypeDeclaration(Schema p) {
             Schema inner = (Schema) p.getAdditionalProperties();
             return getSchemaType(p) + "<std::string, " + getTypeDeclaration(inner) + ">";
         }
-        if (p instanceof StringSchema || p instanceof DateSchema
+        if (p instanceof StringSchema || SchemaTypeUtil.STRING_TYPE.equals(p.getType())
+                || p instanceof DateSchema
                 || p instanceof DateTimeSchema || p instanceof FileSchema
-                || languageSpecificPrimitives.contains(swaggerType)) {
-            return toModelName(swaggerType);
+                || languageSpecificPrimitives.contains(openAPIType)) {
+            return toModelName(openAPIType);
         }
 
-        return "std::shared_ptr<" + swaggerType + ">";
+        return "std::shared_ptr<" + openAPIType + ">";
     }
 
     @Override
@@ -358,14 +359,14 @@ private String implFileFolder() {
      */
     @Override
     public String getSchemaType(Schema p) {
-        String swaggerType = super.getSchemaType(p);
+        String openAPIType = super.getSchemaType(p);
         String type = null;
-        if (typeMapping.containsKey(swaggerType)) {
-            type = typeMapping.get(swaggerType);
+        if (typeMapping.containsKey(openAPIType)) {
+            type = typeMapping.get(openAPIType);
             if (languageSpecificPrimitives.contains(type))
                 return toModelName(type);
         } else
-            type = swaggerType;
+            type = openAPIType;
         return toModelName(type);
     }
 

diff --git a/...napi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java b/...napi-generator/src/main/java/org/openapitools/codegen/languages/CppRestClientCodegen.java
@@ -279,13 +279,12 @@ public String getTypeDeclaration(Schema p) {
             ArraySchema ap = (ArraySchema) p;
             Schema inner = ap.getItems();
             return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
-        }
-        if (isMapSchema(p)) {
+        } else if (isMapSchema(p)) {
             Schema inner = (Schema) p.getAdditionalProperties();
             return getSchemaType(p) + "<utility::string_t, " + getTypeDeclaration(inner) + ">";
-        }
-        if (p instanceof StringSchema || p instanceof DateSchema
-                || p instanceof DateTimeSchema || p instanceof FileSchema
+        } else if (p instanceof StringSchema || SchemaTypeUtil.STRING_TYPE.equals(p.getType())
+                || p instanceof DateSchema || p instanceof DateTimeSchema
+                || p instanceof FileSchema
                 || languageSpecificPrimitives.contains(openAPIType)) {
             return toModelName(openAPIType);
         }

diff --git a/modules/openapi-generator/src/main/resources/pistache-server/api-source.mustache b/modules/openapi-generator/src/main/resources/pistache-server/api-source.mustache
@@ -75,7 +75,8 @@ void {{classname}}::{{operationIdSnakeCase}}_handler(const Pistache::Rest::Reque
     {{#bodyParam}}
       nlohmann::json request_body = nlohmann::json::parse(request.body());
     {{^isPrimitiveType}}
-      {{paramName}}.fromJson(request_body); {{/isPrimitiveType}}
+      {{paramName}}.fromJson(request_body);
+    {{/isPrimitiveType}}
     {{#isPrimitiveType}}
       // The conversion is done automatically by the json library
       {{paramName}} = request_body;

diff --git a/samples/client/petstore/cpprest/.swagger-codegen/VERSION b/samples/client/petstore/cpprest/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
+3.0.0-SNAPSHOT
diff --git a/samples/client/petstore/cpprest/ApiClient.cpp b/samples/client/petstore/cpprest/ApiClient.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/ApiClient.h b/samples/client/petstore/cpprest/ApiClient.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/ApiConfiguration.cpp b/samples/client/petstore/cpprest/ApiConfiguration.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/ApiConfiguration.h b/samples/client/petstore/cpprest/ApiConfiguration.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/ApiException.cpp b/samples/client/petstore/cpprest/ApiException.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/ApiException.h b/samples/client/petstore/cpprest/ApiException.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/HttpContent.cpp b/samples/client/petstore/cpprest/HttpContent.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/HttpContent.h b/samples/client/petstore/cpprest/HttpContent.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/IHttpBody.h b/samples/client/petstore/cpprest/IHttpBody.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/JsonBody.cpp b/samples/client/petstore/cpprest/JsonBody.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/JsonBody.h b/samples/client/petstore/cpprest/JsonBody.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/ModelBase.cpp b/samples/client/petstore/cpprest/ModelBase.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/ModelBase.h b/samples/client/petstore/cpprest/ModelBase.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/MultipartFormData.cpp b/samples/client/petstore/cpprest/MultipartFormData.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/MultipartFormData.h b/samples/client/petstore/cpprest/MultipartFormData.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/Object.cpp b/samples/client/petstore/cpprest/Object.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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/client/petstore/cpprest/Object.h b/samples/client/petstore/cpprest/Object.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: [email protected]
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.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.
  */