From d59bd50d0fa43ba2b079c347bb5a5c5a44548e8c Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Thu, 26 Jul 2018 18:36:20 +0800 Subject: [PATCH 1/4] improve validation error message --- .../org/openapitools/codegen/config/CodegenConfigurator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java index 96492e5251c..2e2c7da0b56 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java @@ -535,7 +535,10 @@ public class CodegenConfigurator implements Serializable { } if (this.isValidateSpec()) { - SpecValidationException ex = new SpecValidationException("Specification has failed validation."); + StringBuilder sb = new StringBuilder(); + sb.append("There were issues with the specification. The option can be disabled by passing false to skipValidateSpec (Maven/Gradle) or --skip-validate-spec (CLI)."); + sb.append(System.lineSeparator()); + SpecValidationException ex = new SpecValidationException(sb.toString()); ex.setErrors(validationMessages); ex.setWarnings(warnings); throw ex; -- GitLab From 56f356cc511479d7a039309afed6328a7865f4b7 Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Thu, 26 Jul 2018 18:50:54 +0800 Subject: [PATCH 2/4] minor improvement to qt5 c++ server --- bin/windows/cpp-qt5-server-petstore.bat | 10 ++++++++++ .../codegen/languages/CppQt5ServerCodegen.java | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100755 bin/windows/cpp-qt5-server-petstore.bat diff --git a/bin/windows/cpp-qt5-server-petstore.bat b/bin/windows/cpp-qt5-server-petstore.bat new file mode 100755 index 00000000000..a00ec210d3f --- /dev/null +++ b/bin/windows/cpp-qt5-server-petstore.bat @@ -0,0 +1,10 @@ +set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-qt5-server -o samples\server\petstore\cpp-qt5-server + +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java index 7d2be8a6784..b5aefa1aa10 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java @@ -234,14 +234,14 @@ public class CppQt5ServerCodegen extends AbstractCppCodegen implements CodegenCo } /** - * Returns human-friendly help for the generator. Provide the consumer with help + * Returns human-friendly help for the generator. Provide the consumer with help * tips, parameters here * * @return A string value for the help message */ @Override public String getHelp() { - return "Generates a Qt5 C++ Server using the QHTTPEngine HTTP Library."; + return "Generates a Qt5 C++ Server (beta) using the QHTTPEngine HTTP Library."; } @Override -- GitLab From 97e7717b440a1ff470e5882ba8687c8e96ae9473 Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Thu, 26 Jul 2018 18:53:38 +0800 Subject: [PATCH 3/4] fix invalid spec (causing shippable failure) --- .../swift/petstore-with-fake-endpoints-models-for-testing.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml index c7205a8e0ea..2bc345dab4e 100644 --- a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml @@ -556,7 +556,7 @@ paths: tags: - "fake_classname_tags 123#$%^" summary: To test class name in snake case - descriptions: To test class name in snake case + description: To test class name in snake case operationId: testClassname consumes: - application/json -- GitLab From 4bf7cb3f5cce9561495edca5416a187b264c757f Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Thu, 26 Jul 2018 21:43:57 +0800 Subject: [PATCH 4/4] Revert "minor improvement to qt5 c++ server" This reverts commit 56f356cc511479d7a039309afed6328a7865f4b7. --- bin/windows/cpp-qt5-server-petstore.bat | 10 ---------- .../codegen/languages/CppQt5ServerCodegen.java | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100755 bin/windows/cpp-qt5-server-petstore.bat diff --git a/bin/windows/cpp-qt5-server-petstore.bat b/bin/windows/cpp-qt5-server-petstore.bat deleted file mode 100755 index a00ec210d3f..00000000000 --- a/bin/windows/cpp-qt5-server-petstore.bat +++ /dev/null @@ -1,10 +0,0 @@ -set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar - -If Not Exist %executable% ( - mvn clean package -) - -REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-qt5-server -o samples\server\petstore\cpp-qt5-server - -java %JAVA_OPTS% -jar %executable% %ags% diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java index b5aefa1aa10..7d2be8a6784 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ServerCodegen.java @@ -234,14 +234,14 @@ public class CppQt5ServerCodegen extends AbstractCppCodegen implements CodegenCo } /** - * Returns human-friendly help for the generator. Provide the consumer with help + * Returns human-friendly help for the generator. Provide the consumer with help * tips, parameters here * * @return A string value for the help message */ @Override public String getHelp() { - return "Generates a Qt5 C++ Server (beta) using the QHTTPEngine HTTP Library."; + return "Generates a Qt5 C++ Server using the QHTTPEngine HTTP Library."; } @Override -- GitLab