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

Simplify forward declaration detection (#11490)

Browse Source 
This makes sure all model classes are added to the forward declarations
which makes it possible to create templates without any model includes
which helps to resolve circular inclusion issues.
This commit is contained in:
Dominik Schmidt 2022-02-26 07:56:41 +01:00 committed by GitHub
parent 4d6b733d91
commit e35a1270a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
View File

@ -418,16 +418,13 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg
if( !childPropertyType.equals(childModel.classname) || childPropertyType.equals(parentModel.classname) || !childModel.hasVars ){
continue;
}
for(CodegenProperty p : childModel.vars) {
if(((p.isModel && p.dataType.equals(parentModel.classname)) || (p.isContainer && p.mostInnerItems.baseType.equals(parentModel.classname)))) {
String forwardDecl = "class " + childModel.classname + ";";
String forwardDecl = "class " + childPropertyType + ";";
if(!forwardDeclarations.contains(forwardDecl)) {
forwardDeclarations.add(forwardDecl);
}
}
}
}
}
if(!forwardDeclarations.isEmpty()){
parentModel.vendorExtensions.put("x-has-forward-declarations", true);
parentModel.vendorExtensions.put("x-forward-declarations", forwardDeclarations);

2
samples/client/petstore/cpp-qt/client/PFXPet.h
View File

@ -29,6 +29,8 @@
#include "PFXObject.h"
namespace test_namespace {
class PFXCategory;
class PFXTag;
class PFXPet : public PFXObject {
public:

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

@ -31,6 +31,8 @@ namespace openapitools {
namespace client {
namespace model {
class Category;
class Tag;
/// <summary>
/// A pet for sale in the pet store