[cpp-restsdk] Relative include paths

Created by: Peaches491

PR checklist

• Read the contribution guidelines.
• Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
• Filed the PR against the correct branch: master, 3.1.x, 4.0.x. Default: master.
• Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

Enables proper relative imports in cpp-restsdk generated code. This allows users to compile the C++ without any alterations to the import paths, making the codegen'd code more self-contained.

• Updates the cpp-restsdk petstore example, by running cpp-restsdk-petstore.sh.
• Removes the now-unnecessary import_directories in the generated CMakeLists.txt file.

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java

@@ -158,7 +158,7 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
         importMapping.put("std::vector", "#include <vector>");
         importMapping.put("std::map", "#include <map>");
         importMapping.put("std::string", "#include <string>");
-        importMapping.put("HttpContent", "#include \"HttpContent.h\"");
+        importMapping.put("HttpContent", "#include \"../HttpContent.h\"");
         importMapping.put("Object", "#include \"Object.h\"");
         importMapping.put("utility::string_t", "#include <cpprest/details/basic_types.h>");
         importMapping.put("utility::datetime", "#include <cpprest/details/basic_types.h>");
@@ -208,7 +208,8 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
         if (importMapping.containsKey(name)) {
             return importMapping.get(name);
         } else {
-            return "#include \"" + name + ".h\"";
+            // Use relative imports unless this model is explicitly import-mapped.
+            return "#include \"../model/" + name + ".h\"";
         }
     }
 

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache

@@ -2,9 +2,9 @@
 {{#operations}}
 
 #include "{{classname}}.h"
-#include "IHttpBody.h"
-#include "JsonBody.h"
-#include "MultipartFormData.h"
+#include "../IHttpBody.h"
+#include "../JsonBody.h"
+#include "../MultipartFormData.h"
 
 #include <unordered_set>
 

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache

@@ -39,7 +39,7 @@ if( NOT DEFINED CPPREST_ROOT )
     message( FATAL_ERROR "Failed to find cpprest SDK (or missing components). Double check that \"CPPREST_ROOT\" is properly set")
 endif( NOT DEFINED CPPREST_ROOT )
 
-include_directories(${PROJECT_SOURCE_DIR} api model ${CPPREST_INCLUDE_DIR})
+include_directories(${PROJECT_SOURCE_DIR} ${CPPREST_INCLUDE_DIR})
 
 #SUPPORTING FILES
 set(SUPPORTING_FILES  "ApiClient" "ApiConfiguration" "ApiException" "HttpContent" "IHttpBody" "JsonBody" "ModelBase" "MultipartFormData" "Object")

samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION

-3.0.0-SNAPSHOT
+3.1.1-SNAPSHOT
\ No newline at end of file

samples/client/petstore/cpp-restsdk/api/PetApi.cpp

@@ -4,16 +4,16 @@
  *
  * 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.1.1-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
 
 #include "PetApi.h"
-#include "IHttpBody.h"
-#include "JsonBody.h"
-#include "MultipartFormData.h"
+#include "../IHttpBody.h"
+#include "../JsonBody.h"
+#include "../MultipartFormData.h"
 
 #include <unordered_set>