Add file post-processing to C++ client, server generators (OpenAPIToo…

…ls#1440) * add file post processing to cpp generators * use clang to auto format cpp-restsdk code * restore cpp-restsdk samples without clang format
ihsmarkitoss · Nov 14, 2018 · cca1dd8 · cca1dd8
1 parent 4fd7d74
commit cca1dd8
Show file tree

Hide file tree

Showing 49 changed files with 90 additions and 42 deletions.
diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -216,6 +216,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("CSHARP_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable CSHARP_POST_PROCESS_FILE not defined so the C# code may not be properly formatted by uncrustify (0.66 or later) or other code formatter. To define it, try `export CSHARP_POST_PROCESS_FILE=\"/usr/local/bin/uncrustify --no-backup\" && export UNCRUSTIFY_CONFIG=/path/to/uncrustify-rules.cfg` (Linux/Mac). Note: replace /path/to with the location of uncrustify-rules.cfg");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         // {{packageVersion}}

diff --git a/...penapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/...penapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
@@ -19,6 +19,8 @@
 
 import io.swagger.v3.oas.models.media.Schema;
 
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
 import com.google.common.collect.ImmutableMap;
 import com.samskivert.mustache.Mustache;
 import org.openapitools.codegen.CodegenConfig;
@@ -28,6 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -226,8 +229,8 @@ public CodegenProperty fromProperty(String name, Schema p) {
             nameInCamelCase = sanitizeName(nameInCamelCase);
         }
         if (isReservedWord(nameInCamelCase) || nameInCamelCase.matches("^\\d.*")) {
-            nameInCamelCase =  escapeReservedWord(nameInCamelCase);
-        }        
+            nameInCamelCase = escapeReservedWord(nameInCamelCase);
+        }
         property.nameInCamelCase = nameInCamelCase;
         return property;
     }
@@ -249,6 +252,12 @@ public String getTypeDeclaration(String str) {
 
     public void processOpts() {
         super.processOpts();
+
+        if (StringUtils.isEmpty(System.getenv("CPP_POST_PROCESS_FILE"))) {
+            LOGGER.info("Environment variable CPP_POST_PROCESS_FILE not defined so the C++ code may not be properly formatted. To define it, try 'export CPP_POST_PROCESS_FILE=\"/usr/local/bin/clang-format -i\"' (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
+        }
+
         addMustacheLambdas(additionalProperties);
     }
 
@@ -265,4 +274,31 @@ private void addMustacheLambdas(Map<String, Object> objs) {
             objs.put("lambda", lambdas);
         }
     }
+
+    @Override
+    public void postProcessFile(File file, String fileType) {
+        if (file == null) {
+            return;
+        }
+        String cppPostProcessFile = System.getenv("CPP_POST_PROCESS_FILE");
+        if (StringUtils.isEmpty(cppPostProcessFile)) {
+            return; // skip if CPP_POST_PROCESS_FILE env variable is not defined
+        }
+        // only process files with cpp extension
+        if ("cpp".equals(FilenameUtils.getExtension(file.toString())) || "h".equals(FilenameUtils.getExtension(file.toString()))) {
+            String command = cppPostProcessFile + " " + file.toString();
+            try {
+                Process p = Runtime.getRuntime().exec(command);
+                p.waitFor();
+                int exitValue = p.exitValue();
+                if (exitValue != 0) {
+                    LOGGER.error("Error running the command ({}). Exit value: {}", command, exitValue);
+                } else {
+                    LOGGER.info("Successfully executed: " + command);
+                }
+            } catch (Exception e) {
+                LOGGER.error("Error running the command ({}). Exception: {}", command, e.getMessage());
+            }
+        }
+    }
 }
diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -121,6 +121,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("GO_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable GO_POST_PROCESS_FILE not defined so Go code may not be properly formatted. To define it, try `export GO_POST_PROCESS_FILE=\"/usr/local/bin/gofmt -w\"` (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
     }
 

diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -215,6 +215,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("JAVA_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable JAVA_POST_PROCESS_FILE not defined so the Java code may not be properly formatted. To define it, try 'export JAVA_POST_PROCESS_FILE=\"/usr/local/bin/clang-format -i\"' (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         if (additionalProperties.containsKey(SUPPORT_JAVA6)) {

diff --git a/...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java b/...napi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
@@ -116,6 +116,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("SCALA_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable SCALA_POST_PROCESS_FILE not defined so the Scala code may not be properly formatted. To define it, try 'export SCALA_POST_PROCESS_FILE=/usr/local/bin/scalafmt' (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) {

diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java
@@ -152,6 +152,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("DART_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable DART_POST_PROCESS_FILE not defined so the Dart code may not be properly formatted. To define it, try `export DART_POST_PROCESS_FILE=\"/usr/local/bin/dartfmt -w\"` (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         if (additionalProperties.containsKey(BROWSER_CLIENT)) {

diff --git a/.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/.../openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
@@ -191,6 +191,7 @@ public void processOpts() {
             } else { // 0.19
                 LOGGER.info("Environment variable ELM_POST_PROCESS_FILE not defined so the Elm code may not be properly formatted. To define it, try `export ELM_POST_PROCESS_FILE=\"/usr/local/bin/elm-format --elm-version={} --yes\"` (Linux/Mac)", "0.19");
             }
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         switch (elmVersion) {

diff --git a/...i-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/...i-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
@@ -234,6 +234,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("JS_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable JS_POST_PROCESS_FILE not defined so the JS code may not be properly formatted. To define it, try 'export JS_POST_PROCESS_FILE=\"/usr/local/bin/js-beautify -r -f\"' (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         if (additionalProperties.containsKey(PROJECT_NAME)) {

diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java
@@ -135,6 +135,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("PERL_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable PERL_POST_PROCESS_FILE not defined so the Perl code may not be properly formatted. To define it, try 'export PERL_POST_PROCESS_FILE=/usr/local/bin/perltidy -b -bext=\"/\"' (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         if (additionalProperties.containsKey(MODULE_VERSION)) {

diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
@@ -174,6 +174,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("PYTHON_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable PYTHON_POST_PROCESS_FILE not defined so the Python code may not be properly formatted. To define it, try 'export PYTHON_POST_PROCESS_FILE=\"/usr/local/bin/yapf -i\"' (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         Boolean excludeTests = false;

diff --git a/...r/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java b/...r/src/main/java/org/openapitools/codegen/languages/PythonFlaskConnexionServerCodegen.java
@@ -157,6 +157,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("PYTHON_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable PYTHON_POST_PROCESS_FILE not defined so the Python code may not be properly formatted. To define it, try 'export PYTHON_POST_PROCESS_FILE=\"/usr/local/bin/yapf -i\"' (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         //apiTemplateFiles.clear();

diff --git a/...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java b/...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java
@@ -245,6 +245,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("SWIFT_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable SWIFT_POST_PROCESS_FILE not defined so the Swift code may not be properly formatted. To define it, try 'export SWIFT_POST_PROCESS_FILE=/usr/local/bin/swiftformat' (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         // Setup project name

diff --git a/...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java b/...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
@@ -300,6 +300,7 @@ public void processOpts() {
 
         if (StringUtils.isEmpty(System.getenv("SWIFT_POST_PROCESS_FILE"))) {
             LOGGER.info("Environment variable SWIFT_POST_PROCESS_FILE not defined so the Swift code may not be properly formatted. To define it, try 'export SWIFT_POST_PROCESS_FILE=/usr/local/bin/swiftformat' (Linux/Mac)");
+            LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
 
         // Setup project name

diff --git a/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION b/samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION
@@ -1 +1 @@
-3.3.0-SNAPSHOT
+3.3.3-SNAPSHOT
diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/ApiClient.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.h b/samples/client/petstore/cpp-restsdk/ApiClient.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/ApiConfiguration.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/ApiException.cpp b/samples/client/petstore/cpp-restsdk/ApiException.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/ApiException.h b/samples/client/petstore/cpp-restsdk/ApiException.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/HttpContent.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/HttpContent.h b/samples/client/petstore/cpp-restsdk/HttpContent.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/IHttpBody.h b/samples/client/petstore/cpp-restsdk/IHttpBody.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/JsonBody.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/JsonBody.h b/samples/client/petstore/cpp-restsdk/JsonBody.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/ModelBase.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/ModelBase.h b/samples/client/petstore/cpp-restsdk/ModelBase.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/MultipartFormData.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/Object.cpp b/samples/client/petstore/cpp-restsdk/Object.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/Object.h b/samples/client/petstore/cpp-restsdk/Object.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.h b/samples/client/petstore/cpp-restsdk/api/PetApi.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -25,7 +25,7 @@
 #include "HttpContent.h"
 #include "Pet.h"
 #include <cpprest/details/basic_types.h>
-#include "../ModelBase.h"
+
 
 #include <boost/optional.hpp>
 
@@ -63,7 +63,7 @@ class  PetApi
     /// 
     /// </remarks>
     /// <param name="petId">Pet id to delete</param>
-    /// <param name="apiKey"> (optional)</param>
+    /// <param name="apiKey"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<void> deletePet(
         int64_t petId,
         boost::optional<utility::string_t> apiKey

diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -24,7 +24,7 @@
 #include "Order.h"
 #include <map>
 #include <cpprest/details/basic_types.h>
-#include "../ModelBase.h"
+
 
 #include <boost/optional.hpp>
 

diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 3.3.3-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,6 +121,7 @@ public void processOpts() { @@
             if (StringUtils.isEmpty(System.getenv("GO_POST_PROCESS_FILE"))) {
                 LOGGER.info("Environment variable GO_POST_PROCESS_FILE not defined so Go code may not be properly formatted. To define it, try `export GO_POST_PROCESS_FILE=\"/usr/local/bin/gofmt -w\"` (Linux/Mac)");
+                LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
             }
         }
@@ Expand Down @@