[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
2018-08-07 17:07:05 +02:00
parent baf16cf834
commit 0809d8f527
21 changed files with 25 additions and 20 deletions
--- 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<std::string, " + inner + ">()";
--- 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<String, String>();
        importMapping.put("std::vector", "#include <vector>");
@@ -271,6 +272,8 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen {
        } else if (ModelUtils.isMapSchema(p)) {
            Schema inner = (Schema) p.getAdditionalProperties();
            return getSchemaType(p) + "<std::string, " + getTypeDeclaration(inner) + ">";
+        } 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<std::string, " + inner + ">()";
--- a/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION
+++ b/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.0-SNAPSHOT
+3.2.1-SNAPSHOT
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */
--- 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.
 */