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

removed hotfix (#15868)

Browse Source
This commit is contained in:
devhl-labs 2023-06-18 02:57:14 -04:00 committed by GitHub
parent 5555137b79
commit e0d89c3846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
View File

@ -493,7 +493,6 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
for (Map.Entry<String, ModelsMap> entry : objs.entrySet()) { for (Map.Entry<String, ModelsMap> entry : objs.entrySet()) {
CodegenModel model = ModelUtils.getModelByName(entry.getKey(), objs); CodegenModel model = ModelUtils.getModelByName(entry.getKey(), objs);
removeCircularReferencesInComposedSchemas(model);
CodegenComposedSchemas composedSchemas = model.getComposedSchemas(); CodegenComposedSchemas composedSchemas = model.getComposedSchemas();
if (composedSchemas != null) { if (composedSchemas != null) {
@ -613,33 +612,6 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
} }
} }
/**
* Mitigates https://github.com/OpenAPITools/openapi-generator/issues/13709
*/
private void removeCircularReferencesInComposedSchemas(CodegenModel cm) {
cm.anyOf.removeIf(anyOf -> anyOf.equals(cm.classname));
cm.oneOf.removeIf(oneOf -> oneOf.equals(cm.classname));
cm.allOf.removeIf(allOf -> allOf.equals(cm.classname));
CodegenComposedSchemas composedSchemas = cm.getComposedSchemas();
if (composedSchemas != null) {
List<CodegenProperty> anyOf = composedSchemas.getAnyOf();
if (anyOf != null) {
anyOf.removeIf(p -> p.dataType.equals(cm.classname));
}
List<CodegenProperty> oneOf = composedSchemas.getOneOf();
if (oneOf != null) {
oneOf.removeIf(p -> p.dataType.equals(cm.classname));
}
List<CodegenProperty> allOf = composedSchemas.getAllOf();
if (allOf != null) {
allOf.removeIf(p -> p.dataType.equals(cm.classname));
}
}
}
@Override @Override
protected List<Map<String, Object>> buildEnumVars(List<Object> values, String dataType) { protected List<Map<String, Object>> buildEnumVars(List<Object> values, String dataType) {
List<Map<String, Object>> enumVars = super.buildEnumVars(values, dataType); List<Map<String, Object>> enumVars = super.buildEnumVars(values, dataType);