loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[cpp pistache] use model namespace only on Model import (#733)

Browse Source 
Don't use model namespaces when not imported
This commit is contained in:
sunn 2018-08-07 15:19:56 +02:00 committed by GitHub
parent 629608c573
commit baf16cf834
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java
View File

@ -246,6 +246,12 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen {
} }
op.vendorExtensions.put("x-codegen-pistache-consumesJson", consumeJson); op.vendorExtensions.put("x-codegen-pistache-consumesJson", consumeJson);
op.vendorExtensions.put("x-codegen-pistache-isParsingSupported", isParsingSupported); op.vendorExtensions.put("x-codegen-pistache-isParsingSupported", isParsingSupported);
for(String hdr : op.imports) {
if(importMapping.containsKey(hdr)) {
continue;
}
additionalProperties.put("hasModelImport", true);
}
} }
return objs; return objs;

3
modules/openapi-generator/src/main/resources/cpp-pistache-server/api-header.mustache
View File

@ -23,7 +23,8 @@
namespace {{this}} { namespace {{this}} {
{{/apiNamespaceDeclarations}} {{/apiNamespaceDeclarations}}
using namespace {{modelNamespace}}; {{#hasModelImport}}
using namespace {{modelNamespace}};{{/hasModelImport}}
class {{declspec}} {{classname}} { class {{declspec}} {{classname}} {
public: public:

3
modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-header.mustache
View File

@ -26,7 +26,8 @@
namespace {{this}} { namespace {{this}} {
{{/apiNamespaceDeclarations}} {{/apiNamespaceDeclarations}}
using namespace {{modelNamespace}}; {{#hasModelImport}}
using namespace {{modelNamespace}};{{/hasModelImport}}
class {{classname}}Impl : public {{apiNamespace}}::{{classname}} { class {{classname}}Impl : public {{apiNamespace}}::{{classname}} {
public: public:

3
modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-source.mustache
View File

@ -7,7 +7,8 @@
namespace {{this}} { namespace {{this}} {
{{/apiNamespaceDeclarations}} {{/apiNamespaceDeclarations}}
using namespace {{modelNamespace}}; {{#hasModelImport}}
using namespace {{modelNamespace}};{{/hasModelImport}}
{{classname}}Impl::{{classname}}Impl(Pistache::Address addr) {{classname}}Impl::{{classname}}Impl(Pistache::Address addr)
: {{classname}}(addr) : {{classname}}(addr)

3
modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache
View File

@ -7,7 +7,8 @@
namespace {{this}} { namespace {{this}} {
{{/apiNamespaceDeclarations}} {{/apiNamespaceDeclarations}}
using namespace {{modelNamespace}}; {{#hasModelImport}}
using namespace {{modelNamespace}};{{/hasModelImport}}
{{classname}}::{{classname}}(Pistache::Address addr) {{classname}}::{{classname}}(Pistache::Address addr)
: httpEndpoint(addr) : httpEndpoint(addr)