diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java index a0e5d37d1278..d8205b6e7203 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java @@ -38,7 +38,7 @@ public class CodegenModel { public Set allMandatory; public Set imports = new TreeSet(); - public Boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasRequired, isArrayModel, hasChildrens; + public Boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasRequired, isArrayModel, hasChildren; public ExternalDocs externalDocs; public Map vendorExtensions; @@ -123,7 +123,7 @@ public class CodegenModel { return false; if (externalDocs != null ? !externalDocs.equals(that.externalDocs) : that.externalDocs != null) return false; - if (!Objects.equals(hasChildrens, that.hasChildrens)) + if (!Objects.equals(hasChildren, that.hasChildren)) return false; if (!Objects.equals(parentVars, that.parentVars)) return false; @@ -163,7 +163,7 @@ public class CodegenModel { result = 31 * result + (isEnum != null ? isEnum.hashCode() : 0); result = 31 * result + (externalDocs != null ? externalDocs.hashCode() : 0); result = 31 * result + (vendorExtensions != null ? vendorExtensions.hashCode() : 0); - result = 31 * result + Objects.hash(hasChildrens); + result = 31 * result + Objects.hash(hasChildren); result = 31 * result + Objects.hash(parentVars); return result; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java index ae9c6368d077..3eec3751364b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java @@ -63,7 +63,7 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen { private final Map dependencies = new HashMap<>(); private final Set parentModels = new HashSet<>(); - private final Multimap children = ArrayListMultimap.create(); + private final Multimap childrenByParent = ArrayListMultimap.create(); private final BiMap modelNameMapping = HashBiMap.create(); public NancyFXServerCodegen() { @@ -225,9 +225,9 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen { log.info("Processing parents: " + parentModels); for (final String parent : parentModels) { final CodegenModel parentModel = modelByName(parent, models); - parentModel.hasChildrens = true; - final Collection childrens = children.get(parent); - for (final CodegenModel child : childrens) { + parentModel.hasChildren = true; + final Collection childrenModels = childrenByParent.get(parent); + for (final CodegenModel child : childrenModels) { processParentPropertiesInChildModel(parentModel, child); } } @@ -282,8 +282,8 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen { super.postProcessModelProperty(model, property); if (!isNullOrEmpty(model.parent)) { parentModels.add(model.parent); - if (!children.containsEntry(model.parent, model)) { - children.put(model.parent, model); + if (!childrenByParent.containsEntry(model.parent, model)) { + childrenByParent.put(model.parent, model); } } } diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache index e76319291d1a..2313ae976f1e 100644 --- a/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache +++ b/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache @@ -14,7 +14,7 @@ namespace {{packageName}}.{{packageContext}}.Models /// /// {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}} /// - public {{^hasChildrens}}sealed {{/hasChildrens}}class {{classname}}: {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}> + public {{^hasChildren}}sealed {{/hasChildren}}class {{classname}}: {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}> { {{#vars}}{{^isInherited}} /// /// {{^description}}{{{name}}}{{/description}}{{#description}}{{description}}{{/description}} @@ -31,7 +31,7 @@ namespace {{packageName}}.{{packageContext}}.Models { } - {{#hasChildrens}}protected{{/hasChildrens}}{{^hasChildrens}}private{{/hasChildrens}} {{classname}}({{#vars}}{{>nullableDataType}} {{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}){{#parent}} : base({{#parentVars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/parentVars}}){{/parent}} + {{#hasChildren}}protected{{/hasChildren}}{{^hasChildren}}private{{/hasChildren}} {{classname}}({{#vars}}{{>nullableDataType}} {{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}){{#parent}} : base({{#parentVars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/parentVars}}){{/parent}} { {{#vars}}{{^isInherited}} this.{{name}} = {{name}}; diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/modelMutable.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/modelMutable.mustache index 3d03a8acfc29..a9ef6c90bd33 100644 --- a/modules/swagger-codegen/src/main/resources/nancyfx/modelMutable.mustache +++ b/modules/swagger-codegen/src/main/resources/nancyfx/modelMutable.mustache @@ -17,7 +17,7 @@ namespace {{packageName}}.{{packageContext}}.Models /// /// {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}} /// - public {{^hasChildrens}}sealed {{/hasChildrens}}class {{classname}}: {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}> + public {{^hasChildren}}sealed {{/hasChildren}}class {{classname}}: {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}> { {{#vars}}{{^isInherited}} /// /// {{^description}}{{{name}}}{{/description}}{{#description}}{{description}}{{/description}}