From 745951c1cef70e56fca248797aa2a57b5de38ce1 Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 25 Apr 2017 21:16:17 +0800 Subject: [PATCH] Add missing UUID mapping for some generators (#5474) * remove trailing space in cpprest, update samples * add missing uuid mapping for generators --- .../java/io/swagger/codegen/languages/BashClientCodegen.java | 1 + .../java/io/swagger/codegen/languages/CppRestClientCodegen.java | 1 + .../java/io/swagger/codegen/languages/DartClientCodegen.java | 1 + .../java/io/swagger/codegen/languages/FlashClientCodegen.java | 1 + .../java/io/swagger/codegen/languages/FlaskConnexionCodegen.java | 1 + .../main/java/io/swagger/codegen/languages/GoServerCodegen.java | 1 + .../java/io/swagger/codegen/languages/HaskellServantCodegen.java | 1 + .../java/io/swagger/codegen/languages/SinatraServerCodegen.java | 1 + .../java/io/swagger/codegen/languages/TizenClientCodegen.java | 1 + 9 files changed, 9 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/BashClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/BashClientCodegen.java index 8ee22c57c84..de7ae732d8b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/BashClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/BashClientCodegen.java @@ -178,6 +178,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("integer", "integer"); typeMapping.put("ByteArray", "string"); typeMapping.put("binary", "binary"); + typeMapping.put("UUID", "string"); /** * Additional Properties. These values can be passed to the templates and diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java index 7857fc765fe..98b6b06e2d0 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java @@ -114,6 +114,7 @@ public class CppRestClientCodegen extends DefaultCodegen implements CodegenConfi typeMapping.put("object", "Object"); typeMapping.put("binary", "std::string"); typeMapping.put("number", "double"); + typeMapping.put("UUID", "utility::string_t"); super.importMapping = new HashMap(); importMapping.put("std::vector", "#include "); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java index b85b1dd0151..da10196bfda 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/DartClientCodegen.java @@ -86,6 +86,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("Date", "DateTime"); typeMapping.put("date", "DateTime"); typeMapping.put("File", "MultipartFile"); + typeMapping.put("UUID", "String"); //TODO binary should be mapped to byte array // mapped to String as a workaround typeMapping.put("binary", "String"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java index 1a9cbdd6299..e36d1a875f7 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlashClientCodegen.java @@ -63,6 +63,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("DateTime", "Date"); typeMapping.put("object", "Object"); typeMapping.put("file", "File"); + typeMapping.put("UUID", "String"); //TODO binary should be mapped to byte array // mapped to String as a workaround typeMapping.put("binary", "String"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java index 5ec8e45411b..0c0993c3e03 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java @@ -67,6 +67,7 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf typeMapping.put("DateTime", "datetime"); typeMapping.put("object", "object"); typeMapping.put("file", "file"); + typeMapping.put("UUID", "str"); // set the output folder here outputFolder = "generated-code/connexion"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoServerCodegen.java index caf5765e247..873b2ec7020 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoServerCodegen.java @@ -117,6 +117,7 @@ public class GoServerCodegen extends DefaultCodegen implements CodegenConfig { // the correct solution is to use []byte typeMapping.put("binary", "string"); typeMapping.put("ByteArray", "string"); + typeMapping.put("UUID", "string"); importMapping = new HashMap(); importMapping.put("time.Time", "time"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java index b7a2462ab23..f970af807e3 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/HaskellServantCodegen.java @@ -145,6 +145,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf typeMapping.put("number", "Double"); typeMapping.put("integer", "Int"); typeMapping.put("any", "Value"); + typeMapping.put("UUID", "Text"); importMapping.clear(); importMapping.put("Map", "qualified Data.Map as Map"); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java index 32506898bcf..8fa7bd02fde 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SinatraServerCodegen.java @@ -67,6 +67,7 @@ public class SinatraServerCodegen extends DefaultCodegen implements CodegenConfi //TODO binary should be mapped to byte array // mapped to String as a workaround typeMapping.put("binary", "string"); + typeMapping.put("UUID", "string"); // remove modelPackage and apiPackage added by default cliOptions.clear(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java index 5b25ecb44e0..3a971b7ee77 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java @@ -76,6 +76,7 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("map", "HashMap"); typeMapping.put("number", "Long"); typeMapping.put("object", PREFIX + "Object"); + typeMapping.put("UUID", "String"); //TODO binary should be mapped to byte array // mapped to String as a workaround typeMapping.put("binary", "String");