Skip to content

Commit baf16cf

Browse files
authored
[cpp pistache] use model namespace only on Model import (#733)
Don't use model namespaces when not imported
1 parent 629608c commit baf16cf

5 files changed

Lines changed: 14 additions & 4 deletions

File tree

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,12 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
246246
}
247247
op.vendorExtensions.put("x-codegen-pistache-consumesJson", consumeJson);
248248
op.vendorExtensions.put("x-codegen-pistache-isParsingSupported", isParsingSupported);
249+
for(String hdr : op.imports) {
250+
if(importMapping.containsKey(hdr)) {
251+
continue;
252+
}
253+
additionalProperties.put("hasModelImport", true);
254+
}
249255
}
250256

251257
return objs;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
namespace {{this}} {
2424
{{/apiNamespaceDeclarations}}
2525

26-
using namespace {{modelNamespace}};
26+
{{#hasModelImport}}
27+
using namespace {{modelNamespace}};{{/hasModelImport}}
2728

2829
class {{declspec}} {{classname}} {
2930
public:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
namespace {{this}} {
2727
{{/apiNamespaceDeclarations}}
2828

29-
using namespace {{modelNamespace}};
29+
{{#hasModelImport}}
30+
using namespace {{modelNamespace}};{{/hasModelImport}}
3031

3132
class {{classname}}Impl : public {{apiNamespace}}::{{classname}} {
3233
public:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
namespace {{this}} {
88
{{/apiNamespaceDeclarations}}
99

10-
using namespace {{modelNamespace}};
10+
{{#hasModelImport}}
11+
using namespace {{modelNamespace}};{{/hasModelImport}}
1112

1213
{{classname}}Impl::{{classname}}Impl(Pistache::Address addr)
1314
: {{classname}}(addr)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
namespace {{this}} {
88
{{/apiNamespaceDeclarations}}
99

10-
using namespace {{modelNamespace}};
10+
{{#hasModelImport}}
11+
using namespace {{modelNamespace}};{{/hasModelImport}}
1112

1213
{{classname}}::{{classname}}(Pistache::Address addr)
1314
: httpEndpoint(addr)

0 commit comments

Comments
 (0)