[cpp-restsdk] Change build folder structure to match include folder structure in installed client (#11487)

* change source folder structure

* fix importMapping

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

@@ -44,6 +44,7 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
     protected String packageVersion = "1.0.0";
     protected String declspec = "";
     protected String defaultInclude = "";
+    protected String apiDirName = "api";
     protected String modelDirName = "model";
 
     private final Set<String> parentModels = new HashSet<>();
@@ -143,29 +144,6 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
                 VARIABLE_NAME_FIRST_CHARACTER_UPPERCASE_DESC,
                 Boolean.toString(this.variableNameFirstCharacterUppercase));
 
-        supportingFiles.add(new SupportingFile("modelbase-header.mustache", "", "ModelBase.h"));
-        supportingFiles.add(new SupportingFile("modelbase-source.mustache", "", "ModelBase.cpp"));
-        supportingFiles.add(new SupportingFile("object-header.mustache", "", "Object.h"));
-        supportingFiles.add(new SupportingFile("object-source.mustache", "", "Object.cpp"));
-        supportingFiles.add(new SupportingFile("apiclient-header.mustache", "", "ApiClient.h"));
-        supportingFiles.add(new SupportingFile("apiclient-source.mustache", "", "ApiClient.cpp"));
-        supportingFiles.add(new SupportingFile("apiconfiguration-header.mustache", "", "ApiConfiguration.h"));
-        supportingFiles.add(new SupportingFile("apiconfiguration-source.mustache", "", "ApiConfiguration.cpp"));
-        supportingFiles.add(new SupportingFile("apiexception-header.mustache", "", "ApiException.h"));
-        supportingFiles.add(new SupportingFile("apiexception-source.mustache", "", "ApiException.cpp"));
-        supportingFiles.add(new SupportingFile("ihttpbody-header.mustache", "", "IHttpBody.h"));
-        supportingFiles.add(new SupportingFile("jsonbody-header.mustache", "", "JsonBody.h"));
-        supportingFiles.add(new SupportingFile("jsonbody-source.mustache", "", "JsonBody.cpp"));
-        supportingFiles.add(new SupportingFile("httpcontent-header.mustache", "", "HttpContent.h"));
-        supportingFiles.add(new SupportingFile("httpcontent-source.mustache", "", "HttpContent.cpp"));
-        supportingFiles.add(new SupportingFile("multipart-header.mustache", "", "MultipartFormData.h"));
-        supportingFiles.add(new SupportingFile("multipart-source.mustache", "", "MultipartFormData.cpp"));
-        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
-        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
-        supportingFiles.add(new SupportingFile("cmake-lists.mustache", "", "CMakeLists.txt"));
-        supportingFiles.add(new SupportingFile("cmake-config.mustache", "", "Config.cmake.in"));
-        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-
         languageSpecificPrimitives = new HashSet<>(
                 Arrays.asList("int", "char", "bool", "long", "float", "double", "int32_t", "int64_t"));
 
@@ -229,24 +207,54 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
         additionalProperties.put("declspec", declspec);
         additionalProperties.put("defaultInclude", defaultInclude);
         additionalProperties.put(RESERVED_WORD_PREFIX_OPTION, reservedWordPrefix);
+
+        importMapping.put("HttpContent", "#include \"" + packageName + "/" + "HttpContent.h\"");
+        importMapping.put("Object", "#include \"" + packageName + "/" + "Object.h\"");
+
+        supportingFiles.add(new SupportingFile("modelbase-header.mustache", getHeaderFolder(), "ModelBase.h"));
+        supportingFiles.add(new SupportingFile("modelbase-source.mustache", getSourceFolder(), "ModelBase.cpp"));
+        supportingFiles.add(new SupportingFile("object-header.mustache", getHeaderFolder(), "Object.h"));
+        supportingFiles.add(new SupportingFile("object-source.mustache", getSourceFolder(), "Object.cpp"));
+        supportingFiles.add(new SupportingFile("apiclient-header.mustache", getHeaderFolder(), "ApiClient.h"));
+        supportingFiles.add(new SupportingFile("apiclient-source.mustache", getSourceFolder(), "ApiClient.cpp"));
+        supportingFiles.add(new SupportingFile("apiconfiguration-header.mustache", getHeaderFolder(), "ApiConfiguration.h"));
+        supportingFiles.add(new SupportingFile("apiconfiguration-source.mustache", getSourceFolder(), "ApiConfiguration.cpp"));
+        supportingFiles.add(new SupportingFile("apiexception-header.mustache", getHeaderFolder(), "ApiException.h"));
+        supportingFiles.add(new SupportingFile("apiexception-source.mustache", getSourceFolder(), "ApiException.cpp"));
+        supportingFiles.add(new SupportingFile("ihttpbody-header.mustache", getHeaderFolder(), "IHttpBody.h"));
+        supportingFiles.add(new SupportingFile("jsonbody-header.mustache", getHeaderFolder(), "JsonBody.h"));
+        supportingFiles.add(new SupportingFile("jsonbody-source.mustache", getSourceFolder(), "JsonBody.cpp"));
+        supportingFiles.add(new SupportingFile("httpcontent-header.mustache", getHeaderFolder(), "HttpContent.h"));
+        supportingFiles.add(new SupportingFile("httpcontent-source.mustache", getSourceFolder(), "HttpContent.cpp"));
+        supportingFiles.add(new SupportingFile("multipart-header.mustache", getHeaderFolder(), "MultipartFormData.h"));
+        supportingFiles.add(new SupportingFile("multipart-source.mustache", getSourceFolder(), "MultipartFormData.cpp"));
+        supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
+        supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
+        supportingFiles.add(new SupportingFile("cmake-lists.mustache", "", "CMakeLists.txt"));
+        supportingFiles.add(new SupportingFile("cmake-config.mustache", "", "Config.cmake.in"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
     }
 
-    /**
+    protected String getHeaderFolder() {
-     * Location to write model files. You can use the modelPackage() as defined
+        return "include/" + packageName;
-     * when the class is instantiated
+    }
-     */
+
-    @Override
+    protected String getSourceFolder() {
-    public String modelFileFolder() {
+        return "src";
-        return outputFolder + "/" + modelDirName;
     }
 
-    /**
-     * Location to write api files. You can use the apiPackage() as defined when
-     * the class is instantiated
-     */
     @Override
-    public String apiFileFolder() {
+    public String apiFilename(String templateName, String tag) {
-        return outputFolder + "/api";
+        String suffix = apiTemplateFiles().get(templateName);
+        String targetOutDir = suffix.equals(".h") ? getHeaderFolder() : getSourceFolder();
+        return outputFolder + "/" + targetOutDir + "/" + apiDirName + "/" + toApiFilename(tag) + suffix;
+    }
+
+    @Override
+    public String modelFilename(String templateName, String modelName) {
+        String suffix = modelTemplateFiles().get(templateName);
+        String targetOutDir = suffix.equals(".h") ? getHeaderFolder() : getSourceFolder();
+        return outputFolder + "/" + targetOutDir + "/" + modelDirName + "/" + toModelFilename(modelName) + suffix;
     }
 
     @Override
@@ -254,7 +262,7 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
         if (importMapping.containsKey(name)) {
             return importMapping.get(name);
         } else {
-            return "#include \"" + modelDirName + "/" + toModelFilename(name) + ".h\"";
+            return "#include \"" + packageName + "/" + modelDirName + "/" + toModelFilename(name) + ".h\"";
         }
     }
 

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

@@ -10,8 +10,8 @@
 
 {{{defaultInclude}}}
 
-#include "ApiClient.h"
+#include "{{packageName}}/ApiClient.h"
-{{^hasModelImport}}#include "ModelBase.h"{{/hasModelImport}}
+{{^hasModelImport}}#include "{{packageName}}/ModelBase.h"{{/hasModelImport}}
 {{#imports}}{{{import}}}
 {{/imports}}
 #include <boost/optional.hpp>

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

@@ -1,15 +1,15 @@
 {{>licenseInfo}}
 {{#operations}}
 
-#include "{{classname}}.h"
+#include "{{packageName}}/api/{{classname}}.h"
-#include "IHttpBody.h"
+#include "{{packageName}}/IHttpBody.h"
-#include "JsonBody.h"
+#include "{{packageName}}/JsonBody.h"
-#include "MultipartFormData.h"
+#include "{{packageName}}/MultipartFormData.h"
-
-#include <unordered_set>
 
 #include <boost/algorithm/string/replace.hpp>
 
+#include <unordered_set>
+
 {{#apiNamespaceDeclarations}}
 namespace {{this}} {
 {{/apiNamespaceDeclarations}}

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-header.mustache

@@ -9,14 +9,10 @@
 #define {{apiHeaderGuardPrefix}}_ApiClient_H_
 
 {{{defaultInclude}}}
-#include "ApiConfiguration.h"
+#include "{{packageName}}/ApiConfiguration.h"
-#include "ApiException.h"
+#include "{{packageName}}/ApiException.h"
-#include "IHttpBody.h"
+#include "{{packageName}}/IHttpBody.h"
-#include "HttpContent.h"
+#include "{{packageName}}/HttpContent.h"
-
-#include <memory>
-#include <vector>
-#include <functional>
 
 #if  defined (_WIN32) || defined (_WIN64)
 #undef U
@@ -25,6 +21,10 @@
 #include <cpprest/details/basic_types.h>
 #include <cpprest/http_client.h>
 
+#include <memory>
+#include <vector>
+#include <functional>
+
 {{#apiNamespaceDeclarations}}
 namespace {{this}} {
 {{/apiNamespaceDeclarations}}

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

@@ -1,7 +1,7 @@
 {{>licenseInfo}}
-#include "ApiClient.h"
+#include "{{packageName}}/ApiClient.h"
-#include "MultipartFormData.h"
+#include "{{packageName}}/MultipartFormData.h"
-#include "ModelBase.h"
+#include "{{packageName}}/ModelBase.h"
 
 #include <sstream>
 #include <limits>

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiconfiguration-header.mustache

@@ -10,10 +10,11 @@
 
 {{{defaultInclude}}}
 
-#include <map>
-
 #include <cpprest/details/basic_types.h>
 #include <cpprest/http_client.h>
+
+#include <map>
+
 {{#apiNamespaceDeclarations}}
 namespace {{this}} {
 {{/apiNamespaceDeclarations}}

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

@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-#include "ApiConfiguration.h"
+#include "{{packageName}}/ApiConfiguration.h"
 
 {{#apiNamespaceDeclarations}}
 namespace {{this}} {

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiexception-header.mustache

@@ -10,12 +10,11 @@
 
 {{{defaultInclude}}}
 
-#include <memory>
-#include <map>
-
 #include <cpprest/details/basic_types.h>
 #include <cpprest/http_msg.h>
 
+#include <memory>
+#include <map>
 
 {{#apiNamespaceDeclarations}}
 namespace {{this}} {

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

@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-#include "ApiException.h"
+#include "{{packageName}}/ApiException.h"
 
 {{#apiNamespaceDeclarations}}
 namespace {{this}} {

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

@@ -1,5 +1,5 @@
 @PACKAGE_INIT@
 
-include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
 
 check_required_components("@PROJECT_NAME@")

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

@@ -29,8 +29,8 @@ find_package(Boost REQUIRED)
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-file(GLOB_RECURSE HEADER_FILES "*.h")
+file(GLOB_RECURSE HEADER_FILES "include/*.h")
-file(GLOB_RECURSE SOURCE_FILES "*.cpp")
+file(GLOB_RECURSE SOURCE_FILES "src/*.cpp")
 
 add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES})
 
@@ -42,7 +42,7 @@ target_compile_options(${PROJECT_NAME}
 
 target_include_directories(${PROJECT_NAME}
     PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>  
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>  
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
@@ -76,9 +76,8 @@ install(
 )
 
 install(
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    FILES_MATCHING PATTERN "*.h"
 )
 
 install(

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/httpcontent-header.mustache

@@ -10,10 +10,10 @@
 
 {{{defaultInclude}}}
 
-#include <memory>
-
 #include <cpprest/details/basic_types.h>
 
+#include <memory>
+
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {
 {{/modelNamespaceDeclarations}}

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

@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-#include "HttpContent.h"
+#include "{{packageName}}/HttpContent.h"
 
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/jsonbody-header.mustache

@@ -9,7 +9,7 @@
 #define {{modelHeaderGuardPrefix}}_JsonBody_H_
 
 {{{defaultInclude}}}
-#include "IHttpBody.h"
+#include "{{packageName}}/IHttpBody.h"
 
 #include <cpprest/json.h>
 

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

@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-#include "JsonBody.h"
+#include "{{packageName}}/JsonBody.h"
 
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-header.mustache

@@ -10,7 +10,7 @@
 
 {{^parent}}
 {{{defaultInclude}}}
-#include "ModelBase.h"
+#include "{{packageName}}/ModelBase.h"
 {{/parent}}
 
 {{#imports}}{{{this}}}

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

@@ -1,13 +1,12 @@
 {{>licenseInfo}}
 {{#models}}{{#model}}
 
-#include "{{classFilename}}.h"
+#include "{{packageName}}/model/{{classFilename}}.h"
 
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {
 {{/modelNamespaceDeclarations}}
 
-
 {{#isEnum}}
 
 namespace

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-header.mustache

@@ -9,15 +9,16 @@
 #define {{modelHeaderGuardPrefix}}_ModelBase_H_
 
 {{{defaultInclude}}}
-#include <map>
-#include <vector>
 
-#include "HttpContent.h"
+#include "{{packageName}}/HttpContent.h"
-#include "MultipartFormData.h"
+#include "{{packageName}}/MultipartFormData.h"
 
 #include <cpprest/details/basic_types.h>
 #include <cpprest/json.h>
 
+#include <map>
+#include <vector>
+
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {
 {{/modelNamespaceDeclarations}}

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

@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-#include "ModelBase.h"
+#include "{{packageName}}/ModelBase.h"
 
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/multipart-header.mustache

@@ -9,16 +9,15 @@
 #define {{modelHeaderGuardPrefix}}_MultipartFormData_H_
 
 {{{defaultInclude}}}
-#include "IHttpBody.h"
+#include "{{packageName}}/IHttpBody.h"
-#include "HttpContent.h"
+#include "{{packageName}}/HttpContent.h"
+
+#include <cpprest/details/basic_types.h>
 
 #include <vector>
 #include <map>
 #include <memory>
 
-#include <cpprest/details/basic_types.h>
-
-
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {
 {{/modelNamespaceDeclarations}}

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

@@ -1,6 +1,6 @@
 {{>licenseInfo}}
-#include "MultipartFormData.h"
+#include "{{packageName}}/MultipartFormData.h"
-#include "ModelBase.h"
+#include "{{packageName}}/ModelBase.h"
 
 #include <boost/uuid/random_generator.hpp>
 #include <boost/uuid/uuid_io.hpp>

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/object-header.mustache

@@ -9,7 +9,7 @@
 #define {{modelHeaderGuardPrefix}}_Object_H_
 
 {{{defaultInclude}}}
-#include "ModelBase.h"
+#include "{{packageName}}/ModelBase.h"
 
 #include <cpprest/details/basic_types.h>
 #include <cpprest/json.h>

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

@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-#include "Object.h"
+#include "{{packageName}}/Object.h"
 
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {

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

@@ -1,40 +1,40 @@
 .gitignore
-ApiClient.cpp
-ApiClient.h
-ApiConfiguration.cpp
-ApiConfiguration.h
-ApiException.cpp
-ApiException.h
 CMakeLists.txt
 Config.cmake.in
-HttpContent.cpp
-HttpContent.h
-IHttpBody.h
-JsonBody.cpp
-JsonBody.h
-ModelBase.cpp
-ModelBase.h
-MultipartFormData.cpp
-MultipartFormData.h
-Object.cpp
-Object.h
 README.md
-api/PetApi.cpp
-api/PetApi.h
-api/StoreApi.cpp
-api/StoreApi.h
-api/UserApi.cpp
-api/UserApi.h
 git_push.sh
-model/ApiResponse.cpp
+include/CppRestPetstoreClient/ApiClient.h
-model/ApiResponse.h
+include/CppRestPetstoreClient/ApiConfiguration.h
-model/Category.cpp
+include/CppRestPetstoreClient/ApiException.h
-model/Category.h
+include/CppRestPetstoreClient/HttpContent.h
-model/Order.cpp
+include/CppRestPetstoreClient/IHttpBody.h
-model/Order.h
+include/CppRestPetstoreClient/JsonBody.h
-model/Pet.cpp
+include/CppRestPetstoreClient/ModelBase.h
-model/Pet.h
+include/CppRestPetstoreClient/MultipartFormData.h
-model/Tag.cpp
+include/CppRestPetstoreClient/Object.h
-model/Tag.h
+include/CppRestPetstoreClient/api/PetApi.h
-model/User.cpp
+include/CppRestPetstoreClient/api/StoreApi.h
-model/User.h
+include/CppRestPetstoreClient/api/UserApi.h
+include/CppRestPetstoreClient/model/ApiResponse.h
+include/CppRestPetstoreClient/model/Category.h
+include/CppRestPetstoreClient/model/Order.h
+include/CppRestPetstoreClient/model/Pet.h
+include/CppRestPetstoreClient/model/Tag.h
+include/CppRestPetstoreClient/model/User.h
+src/ApiClient.cpp
+src/ApiConfiguration.cpp
+src/ApiException.cpp
+src/HttpContent.cpp
+src/JsonBody.cpp
+src/ModelBase.cpp
+src/MultipartFormData.cpp
+src/Object.cpp
+src/api/PetApi.cpp
+src/api/StoreApi.cpp
+src/api/UserApi.cpp
+src/model/ApiResponse.cpp
+src/model/Category.cpp
+src/model/Order.cpp
+src/model/Pet.cpp
+src/model/Tag.cpp
+src/model/User.cpp

samples/client/petstore/cpp-restsdk/client/CMakeLists.txt

@@ -29,8 +29,8 @@ find_package(Boost REQUIRED)
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-file(GLOB_RECURSE HEADER_FILES "*.h")
+file(GLOB_RECURSE HEADER_FILES "include/*.h")
-file(GLOB_RECURSE SOURCE_FILES "*.cpp")
+file(GLOB_RECURSE SOURCE_FILES "src/*.cpp")
 
 add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES})
 
@@ -42,7 +42,7 @@ target_compile_options(${PROJECT_NAME}
 
 target_include_directories(${PROJECT_NAME}
     PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>  
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>  
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
@@ -76,9 +76,8 @@ install(
 )
 
 install(
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    FILES_MATCHING PATTERN "*.h"
 )
 
 install(

samples/client/petstore/cpp-restsdk/client/Config.cmake.in

@@ -1,5 +1,5 @@
 @PACKAGE_INIT@
 
-include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
 
 check_required_components("@PROJECT_NAME@")

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h

@@ -19,14 +19,10 @@
 #define ORG_OPENAPITOOLS_CLIENT_API_ApiClient_H_
 
 
-#include "ApiConfiguration.h"
+#include "CppRestPetstoreClient/ApiConfiguration.h"
-#include "ApiException.h"
+#include "CppRestPetstoreClient/ApiException.h"
-#include "IHttpBody.h"
+#include "CppRestPetstoreClient/IHttpBody.h"
-#include "HttpContent.h"
+#include "CppRestPetstoreClient/HttpContent.h"
-
-#include <memory>
-#include <vector>
-#include <functional>
 
 #if  defined (_WIN32) || defined (_WIN64)
 #undef U
@@ -35,6 +31,10 @@
 #include <cpprest/details/basic_types.h>
 #include <cpprest/http_client.h>
 
+#include <memory>
+#include <vector>
+#include <functional>
+
 namespace org {
 namespace openapitools {
 namespace client {

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiConfiguration.h

@@ -20,10 +20,11 @@
 
 
 
-#include <map>
-
 #include <cpprest/details/basic_types.h>
 #include <cpprest/http_client.h>
+
+#include <map>
+
 namespace org {
 namespace openapitools {
 namespace client {

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiException.h

@@ -20,12 +20,11 @@
 
 
 
-#include <memory>
-#include <map>
-
 #include <cpprest/details/basic_types.h>
 #include <cpprest/http_msg.h>
 
+#include <memory>
+#include <map>
 
 namespace org {
 namespace openapitools {

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/HttpContent.h

@@ -20,10 +20,10 @@
 
 
 
-#include <memory>
-
 #include <cpprest/details/basic_types.h>
 
+#include <memory>
+
 namespace org {
 namespace openapitools {
 namespace client {

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/JsonBody.h

@@ -19,7 +19,7 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_JsonBody_H_
 
 
-#include "IHttpBody.h"
+#include "CppRestPetstoreClient/IHttpBody.h"
 
 #include <cpprest/json.h>
 

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ModelBase.h

@@ -19,15 +19,16 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_ModelBase_H_
 
 
-#include <map>
-#include <vector>
 
-#include "HttpContent.h"
+#include "CppRestPetstoreClient/HttpContent.h"
-#include "MultipartFormData.h"
+#include "CppRestPetstoreClient/MultipartFormData.h"
 
 #include <cpprest/details/basic_types.h>
 #include <cpprest/json.h>
 
+#include <map>
+#include <vector>
+
 namespace org {
 namespace openapitools {
 namespace client {

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/MultipartFormData.h

@@ -19,16 +19,15 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_MultipartFormData_H_
 
 
-#include "IHttpBody.h"
+#include "CppRestPetstoreClient/IHttpBody.h"
-#include "HttpContent.h"
+#include "CppRestPetstoreClient/HttpContent.h"
+
+#include <cpprest/details/basic_types.h>
 
 #include <vector>
 #include <map>
 #include <memory>
 
-#include <cpprest/details/basic_types.h>
-
-
 namespace org {
 namespace openapitools {
 namespace client {

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/Object.h

@@ -19,7 +19,7 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_Object_H_
 
 
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
 #include <cpprest/details/basic_types.h>
 #include <cpprest/json.h>

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/PetApi.h

@@ -20,11 +20,11 @@
 
 
 
-#include "ApiClient.h"
+#include "CppRestPetstoreClient/ApiClient.h"
 
-#include "model/ApiResponse.h"
+#include "CppRestPetstoreClient/model/ApiResponse.h"
-#include "HttpContent.h"
+#include "CppRestPetstoreClient/HttpContent.h"
-#include "model/Pet.h"
+#include "CppRestPetstoreClient/model/Pet.h"
 #include <cpprest/details/basic_types.h>
 #include <boost/optional.hpp>
 

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/StoreApi.h

@@ -20,9 +20,9 @@
 
 
 
-#include "ApiClient.h"
+#include "CppRestPetstoreClient/ApiClient.h"
 
-#include "model/Order.h"
+#include "CppRestPetstoreClient/model/Order.h"
 #include <map>
 #include <cpprest/details/basic_types.h>
 #include <boost/optional.hpp>

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/api/UserApi.h

@@ -20,9 +20,9 @@
 
 
 
-#include "ApiClient.h"
+#include "CppRestPetstoreClient/ApiClient.h"
 
-#include "model/User.h"
+#include "CppRestPetstoreClient/model/User.h"
 #include <vector>
 #include <cpprest/details/basic_types.h>
 #include <boost/optional.hpp>

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h

@@ -19,7 +19,7 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_ApiResponse_H_
 
 
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
 #include <cpprest/details/basic_types.h>
 

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h

@@ -19,7 +19,7 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_Category_H_
 
 
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
 #include <cpprest/details/basic_types.h>
 

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h

@@ -19,7 +19,7 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_Order_H_
 
 
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
 #include <cpprest/details/basic_types.h>
 

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h

@@ -19,12 +19,12 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_Pet_H_
 
 
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
-#include "model/Tag.h"
+#include "CppRestPetstoreClient/model/Tag.h"
+#include "CppRestPetstoreClient/model/Category.h"
 #include <cpprest/details/basic_types.h>
 #include <vector>
-#include "model/Category.h"
 
 namespace org {
 namespace openapitools {

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Tag.h

@@ -19,7 +19,7 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_Tag_H_
 
 
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
 #include <cpprest/details/basic_types.h>
 

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/User.h

@@ -19,7 +19,7 @@
 #define ORG_OPENAPITOOLS_CLIENT_MODEL_User_H_
 
 
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
 #include <cpprest/details/basic_types.h>
 

samples/client/petstore/cpp-restsdk/client/src/ApiClient.cpp

@@ -9,9 +9,9 @@
  * Do not edit the class manually.
  */
 
-#include "ApiClient.h"
+#include "CppRestPetstoreClient/ApiClient.h"
-#include "MultipartFormData.h"
+#include "CppRestPetstoreClient/MultipartFormData.h"
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
 #include <sstream>
 #include <limits>

samples/client/petstore/cpp-restsdk/client/src/ApiConfiguration.cpp

@@ -9,7 +9,7 @@
  * Do not edit the class manually.
  */
 
-#include "ApiConfiguration.h"
+#include "CppRestPetstoreClient/ApiConfiguration.h"
 
 namespace org {
 namespace openapitools {

samples/client/petstore/cpp-restsdk/client/src/ApiException.cpp

@@ -9,7 +9,7 @@
  * Do not edit the class manually.
  */
 
-#include "ApiException.h"
+#include "CppRestPetstoreClient/ApiException.h"
 
 namespace org {
 namespace openapitools {

samples/client/petstore/cpp-restsdk/client/src/HttpContent.cpp

@@ -9,7 +9,7 @@
  * Do not edit the class manually.
  */
 
-#include "HttpContent.h"
+#include "CppRestPetstoreClient/HttpContent.h"
 
 namespace org {
 namespace openapitools {

samples/client/petstore/cpp-restsdk/client/src/JsonBody.cpp

@@ -9,7 +9,7 @@
  * Do not edit the class manually.
  */
 
-#include "JsonBody.h"
+#include "CppRestPetstoreClient/JsonBody.h"
 
 namespace org {
 namespace openapitools {

samples/client/petstore/cpp-restsdk/client/src/ModelBase.cpp

@@ -9,7 +9,7 @@
  * Do not edit the class manually.
  */
 
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
 namespace org {
 namespace openapitools {

samples/client/petstore/cpp-restsdk/client/src/MultipartFormData.cpp

@@ -9,8 +9,8 @@
  * Do not edit the class manually.
  */
 
-#include "MultipartFormData.h"
+#include "CppRestPetstoreClient/MultipartFormData.h"
-#include "ModelBase.h"
+#include "CppRestPetstoreClient/ModelBase.h"
 
 #include <boost/uuid/random_generator.hpp>
 #include <boost/uuid/uuid_io.hpp>

samples/client/petstore/cpp-restsdk/client/src/Object.cpp

@@ -9,7 +9,7 @@
  * Do not edit the class manually.
  */
 
-#include "Object.h"
+#include "CppRestPetstoreClient/Object.h"
 
 namespace org {
 namespace openapitools {

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

@@ -10,15 +10,15 @@
  */
 
 
-#include "PetApi.h"
+#include "CppRestPetstoreClient/api/PetApi.h"
-#include "IHttpBody.h"
+#include "CppRestPetstoreClient/IHttpBody.h"
-#include "JsonBody.h"
+#include "CppRestPetstoreClient/JsonBody.h"
-#include "MultipartFormData.h"
+#include "CppRestPetstoreClient/MultipartFormData.h"
-
-#include <unordered_set>
 
 #include <boost/algorithm/string/replace.hpp>
 
+#include <unordered_set>
+
 namespace org {
 namespace openapitools {
 namespace client {

samples/client/petstore/cpp-restsdk/client/src/api/StoreApi.cpp

@@ -10,15 +10,15 @@
  */
 
 
-#include "StoreApi.h"
+#include "CppRestPetstoreClient/api/StoreApi.h"
-#include "IHttpBody.h"
+#include "CppRestPetstoreClient/IHttpBody.h"
-#include "JsonBody.h"
+#include "CppRestPetstoreClient/JsonBody.h"
-#include "MultipartFormData.h"
+#include "CppRestPetstoreClient/MultipartFormData.h"
-
-#include <unordered_set>
 
 #include <boost/algorithm/string/replace.hpp>
 
+#include <unordered_set>
+
 namespace org {
 namespace openapitools {
 namespace client {

samples/client/petstore/cpp-restsdk/client/src/api/UserApi.cpp

@@ -10,15 +10,15 @@
  */
 
 
-#include "UserApi.h"
+#include "CppRestPetstoreClient/api/UserApi.h"
-#include "IHttpBody.h"
+#include "CppRestPetstoreClient/IHttpBody.h"
-#include "JsonBody.h"
+#include "CppRestPetstoreClient/JsonBody.h"
-#include "MultipartFormData.h"
+#include "CppRestPetstoreClient/MultipartFormData.h"
-
-#include <unordered_set>
 
 #include <boost/algorithm/string/replace.hpp>
 
+#include <unordered_set>
+
 namespace org {
 namespace openapitools {
 namespace client {

samples/client/petstore/cpp-restsdk/client/src/model/ApiResponse.cpp

@@ -11,7 +11,7 @@
 
 
 
-#include "ApiResponse.h"
+#include "CppRestPetstoreClient/model/ApiResponse.h"
 
 namespace org {
 namespace openapitools {
@@ -20,7 +20,6 @@ namespace model {
 
 
 
-
 ApiResponse::ApiResponse()
 {
     m_Code = 0;

samples/client/petstore/cpp-restsdk/client/src/model/Category.cpp

@@ -11,7 +11,7 @@
 
 
 
-#include "Category.h"
+#include "CppRestPetstoreClient/model/Category.h"
 
 namespace org {
 namespace openapitools {
@@ -20,7 +20,6 @@ namespace model {
 
 
 
-
 Category::Category()
 {
     m_Id = 0L;

samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp

@@ -11,7 +11,7 @@
 
 
 
-#include "Order.h"
+#include "CppRestPetstoreClient/model/Order.h"
 
 namespace org {
 namespace openapitools {
@@ -20,7 +20,6 @@ namespace model {
 
 
 
-
 Order::Order()
 {
     m_Id = 0L;

samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp

@@ -11,7 +11,7 @@
 
 
 
-#include "Pet.h"
+#include "CppRestPetstoreClient/model/Pet.h"
 
 namespace org {
 namespace openapitools {
@@ -20,7 +20,6 @@ namespace model {
 
 
 
-
 Pet::Pet()
 {
     m_Id = 0L;

samples/client/petstore/cpp-restsdk/client/src/model/Tag.cpp

@@ -11,7 +11,7 @@
 
 
 
-#include "Tag.h"
+#include "CppRestPetstoreClient/model/Tag.h"
 
 namespace org {
 namespace openapitools {
@@ -20,7 +20,6 @@ namespace model {
 
 
 
-
 Tag::Tag()
 {
     m_Id = 0L;

samples/client/petstore/cpp-restsdk/client/src/model/User.cpp

@@ -11,7 +11,7 @@
 
 
 
-#include "User.h"
+#include "CppRestPetstoreClient/model/User.h"
 
 namespace org {
 namespace openapitools {
@@ -20,7 +20,6 @@ namespace model {
 
 
 
-
 User::User()
 {
     m_Id = 0L;