From aa084a0443d864a12e120feef2d449b2ead54da5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 12 May 2014 15:21:33 +0200 Subject: [PATCH] Memory hog: these collections are not fields This builder collections are only used in build() and not used afterwards. Do not store them in the object, such that they can be freed as soon as possible. Change-Id: Iffad875b618f4cecbcda424c6f75275046189c90 Signed-off-by: Robert Varga --- .../parser/builder/impl/ChoiceBuilder.java | 38 ++++++------- .../builder/impl/ChoiceCaseBuilder.java | 54 +++++++++++-------- .../builder/impl/ListSchemaNodeBuilder.java | 49 ++++++++++------- .../builder/impl/NotificationBuilder.java | 26 ++++----- .../builder/impl/RpcDefinitionBuilder.java | 22 ++++---- .../builder/impl/UsesNodeBuilderImpl.java | 24 ++++----- 6 files changed, 117 insertions(+), 96 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java index d885a76ae1..47f39659c6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java @@ -40,10 +40,8 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da // DataSchemaNode args private final ConstraintsBuilder constraints; // AugmentationTarget args - private final List augmentations = new ArrayList<>(); private final List augmentationBuilders = new ArrayList<>(); // ChoiceNode args - private Set cases = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); private final Set caseBuilders = new HashSet<>(); private String defaultCase; @@ -91,16 +89,18 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da instance.setDefaultCase(defaultCase); // CASES + final Set cases = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); for (ChoiceCaseBuilder caseBuilder : caseBuilders) { cases.add(caseBuilder.build()); } instance.addCases(cases); // AUGMENTATIONS + final Set augmentations = new HashSet<>(); for (AugmentationSchemaBuilder builder : augmentationBuilders) { augmentations.add(builder.build()); } - instance.addAvailableAugmentations(new HashSet<>(augmentations)); + instance.addAvailableAugmentations(augmentations); // UNKNOWN NODES for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { @@ -124,7 +124,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public void setPath(SchemaPath path) { + public void setPath(final SchemaPath path) { instance.path = path; } @@ -135,7 +135,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da * name of case to search * @return case with given name if present, null otherwise */ - public ChoiceCaseBuilder getCaseNodeByName(String caseName) { + public ChoiceCaseBuilder getCaseNodeByName(final String caseName) { for (ChoiceCaseBuilder addedCase : caseBuilders) { if (addedCase.getQName().getLocalName().equals(caseName)) { return addedCase; @@ -153,7 +153,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da * @param caseNode * case node */ - public void addCase(DataSchemaNodeBuilder caseNode) { + public void addCase(final DataSchemaNodeBuilder caseNode) { QName caseQName = caseNode.getQName(); String caseName = caseQName.getLocalName(); @@ -209,7 +209,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public void setStatus(Status status) { + public void setStatus(final Status status) { if (status != null) { instance.status = status; } @@ -221,7 +221,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public void setAugmenting(boolean augmenting) { + public void setAugmenting(final boolean augmenting) { instance.augmenting = augmenting; } @@ -241,7 +241,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public void setConfiguration(boolean configuration) { + public void setConfiguration(final boolean configuration) { instance.configuration = configuration; } @@ -251,7 +251,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public void addAugmentation(AugmentationSchemaBuilder augment) { + public void addAugmentation(final AugmentationSchemaBuilder augment) { augmentationBuilders.add(augment); } @@ -263,7 +263,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return defaultCase; } - public void setDefaultCase(String defaultCase) { + public void setDefaultCase(final String defaultCase) { this.defaultCase = defaultCase; } @@ -276,7 +276,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -324,7 +324,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da private final List unknownNodes = new ArrayList<>(); private String defaultCase; - private ChoiceNodeImpl(QName qname, SchemaPath path) { + private ChoiceNodeImpl(final QName qname, final SchemaPath path) { this.qname = qname; this.path = path; } @@ -374,7 +374,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return constraints; } - private void setConstraints(ConstraintDefinition constraints) { + private void setConstraints(final ConstraintDefinition constraints) { this.constraints = constraints; } @@ -383,7 +383,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return Collections.unmodifiableSet(augmentations); } - private void addAvailableAugmentations(Set availableAugmentations) { + private void addAvailableAugmentations(final Set availableAugmentations) { if (availableAugmentations != null) { this.augmentations.addAll(availableAugmentations); } @@ -394,7 +394,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return Collections.unmodifiableList(unknownNodes); } - private void addUnknownSchemaNodes(List unknownSchemaNodes) { + private void addUnknownSchemaNodes(final List unknownSchemaNodes) { if (unknownSchemaNodes != null) { this.unknownNodes.addAll(unknownSchemaNodes); } @@ -432,7 +432,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return null; } - private void addCases(Set cases) { + private void addCases(final Set cases) { if (cases != null) { this.cases.addAll(cases); } @@ -443,7 +443,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da return defaultCase; } - private void setDefaultCase(String defaultCase) { + private void setDefaultCase(final String defaultCase) { this.defaultCase = defaultCase; } @@ -457,7 +457,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java index 59072615d3..8c39f60204 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java @@ -17,7 +17,16 @@ import java.util.Set; import java.util.TreeSet; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.*; +import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; +import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; +import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.Status; +import org.opendaylight.yangtools.yang.model.api.TypeDefinition; +import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.model.api.UsesNode; import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder; @@ -33,10 +42,9 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im private boolean isBuilt; private final ChoiceCaseNodeImpl instance; // SchemaNode args - private SchemaPath schemaPath; + private final SchemaPath schemaPath; private final ConstraintsBuilder constraints; // AugmentationTarget args - private final List augmentations = new ArrayList<>(); private final List augmentationBuilders = new ArrayList<>(); public ChoiceCaseBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) { @@ -95,10 +103,11 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im instance.addUnknownSchemaNodes(unknownNodes); // AUGMENTATIONS + final Set augmentations = new HashSet<>(); for (AugmentationSchemaBuilder builder : augmentationBuilders) { augmentations.add(builder.build()); } - instance.addAvailableAugmentations(new HashSet<>(augmentations)); + instance.addAvailableAugmentations(augmentations); isBuilt = true; } @@ -113,10 +122,11 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im } @Override - public void setPath(SchemaPath path) { + public void setPath(final SchemaPath path) { instance.path = path; } + @Override public String getDescription() { return instance.description; } @@ -126,21 +136,23 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im instance.description = description; } + @Override public String getReference() { return instance.reference; } @Override - public void setReference(String reference) { + public void setReference(final String reference) { instance.reference = reference; } + @Override public Status getStatus() { return instance.status; } @Override - public void setStatus(Status status) { + public void setStatus(final Status status) { if (status != null) { instance.status = status; } @@ -152,7 +164,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im } @Override - public void setAugmenting(boolean augmenting) { + public void setAugmenting(final boolean augmenting) { instance.augmenting = augmenting; } @@ -162,7 +174,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im } @Override - public void setAddedByUses(boolean addedByUses) { + public void setAddedByUses(final boolean addedByUses) { instance.addedByUses = addedByUses; } @@ -172,7 +184,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im } @Override - public void addTypedef(TypeDefinitionBuilder typedefBuilder) { + public void addTypedef(final TypeDefinitionBuilder typedefBuilder) { throw new YangParseException(moduleName, line, "Can not add type definition to choice case."); } @@ -192,7 +204,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im } @Override - public void addAugmentation(AugmentationSchemaBuilder augment) { + public void addAugmentation(final AugmentationSchemaBuilder augment) { augmentationBuilders.add(augment); } @@ -205,7 +217,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -252,7 +264,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im private final Set uses = new HashSet<>(); private final List unknownNodes = new ArrayList<>(); - private ChoiceCaseNodeImpl(QName qname, SchemaPath path) { + private ChoiceCaseNodeImpl(final QName qname, final SchemaPath path) { this.qname = qname; this.path = path; } @@ -292,7 +304,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im return constraints; } - private void setConstraints(ConstraintDefinition constraints) { + private void setConstraints(final ConstraintDefinition constraints) { this.constraints = constraints; } @@ -311,7 +323,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im return Collections.unmodifiableList(unknownNodes); } - private void addUnknownSchemaNodes(List unknownNodes) { + private void addUnknownSchemaNodes(final List unknownNodes) { if (unknownNodes != null) { this.unknownNodes.addAll(unknownNodes); } @@ -331,7 +343,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im return Collections.unmodifiableSet(childNodes); } - private void addChildNodes(Set childNodes) { + private void addChildNodes(final Set childNodes) { if (childNodes != null) { this.childNodes.addAll(childNodes); } @@ -343,12 +355,12 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im } @Override - public DataSchemaNode getDataChildByName(QName name) { + public DataSchemaNode getDataChildByName(final QName name) { return getChildNode(childNodes, name); } @Override - public DataSchemaNode getDataChildByName(String name) { + public DataSchemaNode getDataChildByName(final String name) { return getChildNode(childNodes, name); } @@ -357,7 +369,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im return Collections.unmodifiableSet(uses); } - private void addUses(Set uses) { + private void addUses(final Set uses) { if (uses != null) { this.uses.addAll(uses); } @@ -368,7 +380,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im return Collections.unmodifiableSet(augmentations); } - private void addAvailableAugmentations(Set augmentations) { + private void addAvailableAugmentations(final Set augmentations) { if (augmentations != null) { this.augmentations.addAll(augmentations); } @@ -384,7 +396,7 @@ public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder im } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java index bba5c7c92a..bddaf9f2ce 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java @@ -17,7 +17,16 @@ import java.util.Set; import java.util.TreeSet; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.model.api.*; +import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; +import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; +import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; +import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.Status; +import org.opendaylight.yangtools.yang.model.api.TypeDefinition; +import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.model.api.UsesNode; import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder; @@ -35,11 +44,10 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde private final ListSchemaNodeImpl instance; private List keys; // SchemaNode args - private SchemaPath schemaPath; + private final SchemaPath schemaPath; // DataSchemaNode args private final ConstraintsBuilder constraints; // AugmentationTarget args - private final List augmentations = new ArrayList<>(); private final List augmentationBuilders = new ArrayList<>(); @@ -119,10 +127,11 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde instance.addGroupings(groupings); // AUGMENTATIONS + final Set augmentations = new HashSet<>(); for (AugmentationSchemaBuilder builder : augmentationBuilders) { augmentations.add(builder.build()); } - instance.addAvailableAugmentations(new HashSet<>(augmentations)); + instance.addAvailableAugmentations(augmentations); // UNKNOWN NODES for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { @@ -161,7 +170,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde } @Override - public void setPath(SchemaPath path) { + public void setPath(final SchemaPath path) { instance.path = path; } @@ -191,14 +200,14 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde } @Override - public void setStatus(Status status) { + public void setStatus(final Status status) { if (status != null) { instance.status = status; } } @Override - public void addAugmentation(AugmentationSchemaBuilder augment) { + public void addAugmentation(final AugmentationSchemaBuilder augment) { augmentationBuilders.add(augment); } @@ -220,7 +229,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde } @Override - public void setAugmenting(boolean augmenting) { + public void setAugmenting(final boolean augmenting) { instance.augmenting = augmenting; } @@ -240,7 +249,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde } @Override - public void setConfiguration(boolean configuration) { + public void setConfiguration(final boolean configuration) { instance.configuration = configuration; } @@ -266,7 +275,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -373,7 +382,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return constraints; } - private void setConstraints(ConstraintDefinition constraints) { + private void setConstraints(final ConstraintDefinition constraints) { this.constraints = constraints; } @@ -382,7 +391,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return Collections.unmodifiableSet(augmentations); } - private void addAvailableAugmentations(Set augmentations) { + private void addAvailableAugmentations(final Set augmentations) { if (augmentations != null) { this.augmentations.addAll(augmentations); } @@ -393,7 +402,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return Collections.unmodifiableSet(childNodes); } - private void addChildNodes(Set childNodes) { + private void addChildNodes(final Set childNodes) { if (childNodes != null) { this.childNodes.addAll(childNodes); } @@ -404,7 +413,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return Collections.unmodifiableSet(groupings); } - private void addGroupings(Set groupings) { + private void addGroupings(final Set groupings) { if (groupings != null) { this.groupings.addAll(groupings); } @@ -415,7 +424,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return Collections.unmodifiableSet(typeDefinitions); } - private void addTypeDefinitions(Set> typeDefinitions) { + private void addTypeDefinitions(final Set> typeDefinitions) { if (typeDefinitions != null) { this.typeDefinitions.addAll(typeDefinitions); } @@ -426,19 +435,19 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return Collections.unmodifiableSet(uses); } - private void addUses(Set uses) { + private void addUses(final Set uses) { if (uses != null) { this.uses.addAll(uses); } } @Override - public DataSchemaNode getDataChildByName(QName name) { + public DataSchemaNode getDataChildByName(final QName name) { return getChildNode(childNodes, name); } @Override - public DataSchemaNode getDataChildByName(String name) { + public DataSchemaNode getDataChildByName(final String name) { return getChildNode(childNodes, name); } @@ -452,7 +461,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde return Collections.unmodifiableList(unknownNodes); } - private void addUnknownSchemaNodes(List unknownNodes) { + private void addUnknownSchemaNodes(final List unknownNodes) { if (unknownNodes != null) { this.unknownNodes.addAll(unknownNodes); } @@ -468,7 +477,7 @@ public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilde } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java index c2f20e8287..9ad6fe0322 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java @@ -42,8 +42,7 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder AugmentationTargetBuilder { private boolean isBuilt; private final NotificationDefinitionImpl instance; - private SchemaPath schemaPath; - private final List augmentations = new ArrayList<>(); + private final SchemaPath schemaPath; private final List augmentationBuilders = new ArrayList<>(); NotificationBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path) { @@ -52,7 +51,7 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder instance = new NotificationDefinitionImpl(qname, path); } - NotificationBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path, NotificationDefinition base) { + NotificationBuilder(final String moduleName, final int line, final QName qname, final SchemaPath path, final NotificationDefinition base) { super(moduleName, line, qname); this.schemaPath = path; instance = new NotificationDefinitionImpl(qname, path); @@ -105,10 +104,11 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder instance.setUses(usesNodes); // AUGMENTATIONS + final Set augmentations = new HashSet<>(); for (AugmentationSchemaBuilder builder : augmentationBuilders) { augmentations.add(builder.build()); } - instance.setAvailableAugmentations(new HashSet<>(augmentations)); + instance.setAvailableAugmentations(augmentations); // UNKNOWN NODES for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { @@ -165,14 +165,14 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder } @Override - public void setStatus(Status status) { + public void setStatus(final Status status) { if (status != null) { instance.status = status; } } @Override - public void addAugmentation(AugmentationSchemaBuilder augment) { + public void addAugmentation(final AugmentationSchemaBuilder augment) { augmentationBuilders.add(augment); } @@ -229,7 +229,7 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder return Collections.unmodifiableSet(childNodes); } - private void setChildNodes(Set childNodes) { + private void setChildNodes(final Set childNodes) { if (childNodes != null) { this.childNodes.addAll(childNodes); } @@ -240,7 +240,7 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder return Collections.unmodifiableSet(groupings); } - private void setGroupings(Set groupings) { + private void setGroupings(final Set groupings) { if (groupings != null) { this.groupings.addAll(groupings); } @@ -251,7 +251,7 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder return Collections.unmodifiableSet(uses); } - private void setUses(Set uses) { + private void setUses(final Set uses) { if (uses != null) { this.uses.addAll(uses); } @@ -273,7 +273,7 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder return Collections.unmodifiableSet(augmentations); } - private void setAvailableAugmentations(Set augmentations) { + private void setAvailableAugmentations(final Set augmentations) { if (augmentations != null) { this.augmentations.addAll(augmentations); } @@ -291,12 +291,12 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder } @Override - public DataSchemaNode getDataChildByName(QName name) { + public DataSchemaNode getDataChildByName(final QName name) { return getChildNode(childNodes, name); } @Override - public DataSchemaNode getDataChildByName(String name) { + public DataSchemaNode getDataChildByName(final String name) { return getChildNode(childNodes, name); } @@ -310,7 +310,7 @@ public final class NotificationBuilder extends AbstractDataNodeContainerBuilder } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java index e503977590..23b7aed404 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java @@ -32,9 +32,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { private final RpcDefinitionImpl instance; private ContainerSchemaNodeBuilder inputBuilder; private ContainerSchemaNodeBuilder outputBuilder; - private final Set> typedefs = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); private final Set addedTypedefs = new HashSet<>(); - private final Set groupings = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); private final Set addedGroupings = new HashSet<>(); public ContainerSchemaNodeBuilder getInput() { @@ -60,12 +58,14 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { instance.setOutput(output); // TYPEDEFS + final Set> typedefs = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); for (TypeDefinitionBuilder entry : addedTypedefs) { typedefs.add(entry.build()); } instance.setTypeDefinitions(typedefs); // GROUPINGS + final Set groupings = new TreeSet<>(Comparators.SCHEMA_NODE_COMP); for (GroupingBuilder entry : addedGroupings) { groupings.add(entry.build()); } @@ -114,7 +114,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { } @Override - public void setStatus(Status status) { + public void setStatus(final Status status) { if (status != null) { instance.status = status; } @@ -140,7 +140,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { return addedGroupings; } - public void addGrouping(GroupingBuilder grouping) { + public void addGrouping(final GroupingBuilder grouping) { addedGroupings.add(grouping); } @@ -154,7 +154,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (obj == null) { return false; } @@ -231,7 +231,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { return input; } - private void setInput(ContainerSchemaNode input) { + private void setInput(final ContainerSchemaNode input) { this.input = input; } @@ -240,7 +240,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { return output; } - private void setOutput(ContainerSchemaNode output) { + private void setOutput(final ContainerSchemaNode output) { this.output = output; } @@ -249,7 +249,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { return Collections.unmodifiableSet(typeDefinitions); } - private void setTypeDefinitions(Set> typeDefinitions) { + private void setTypeDefinitions(final Set> typeDefinitions) { this.typeDefinitions.addAll(typeDefinitions); } @@ -258,7 +258,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { return Collections.unmodifiableSet(groupings); } - private void setGroupings(Set groupings) { + private void setGroupings(final Set groupings) { this.groupings.addAll(groupings); } @@ -267,7 +267,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { return Collections.unmodifiableList(unknownNodes); } - private void setUnknownSchemaNodes(List unknownNodes) { + private void setUnknownSchemaNodes(final List unknownNodes) { if (unknownNodes != null) { this.unknownNodes.addAll(unknownNodes); } @@ -283,7 +283,7 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java index c790874a30..fe89819864 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java @@ -44,7 +44,6 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo private boolean addedByUses; private boolean augmenting; private boolean resolved; - private final Set augments = new HashSet<>(); private final Set addedAugments = new HashSet<>(); private final List refineBuilders = new ArrayList<>(); private final List refines = new ArrayList<>(); @@ -62,6 +61,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo instance.setAddedByUses(addedByUses); // AUGMENTATIONS + final Set augments = new HashSet<>(); for (AugmentationSchemaBuilder builder : addedAugments) { augments.add(builder.build()); } @@ -94,7 +94,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo } @Override - public void setParent(Builder parent) { + public void setParent(final Builder parent) { if (!(parent instanceof DataNodeContainerBuilder)) { throw new YangParseException(moduleName, line, "Parent of 'uses' has to be instance of DataNodeContainerBuilder, but was: '" + parent + "'."); @@ -113,7 +113,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo } @Override - public void setGroupingDefinition(GroupingDefinition groupingDefinition) { + public void setGroupingDefinition(final GroupingDefinition groupingDefinition) { this.groupingDefinition = groupingDefinition; if (groupingDefinition != null) { this.groupingPath = groupingDefinition.getPath(); @@ -126,7 +126,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo } @Override - public void setGrouping(GroupingBuilder grouping) { + public void setGrouping(final GroupingBuilder grouping) { this.groupingBuilder = grouping; if (groupingBuilder != null) { this.groupingPath = groupingBuilder.getPath(); @@ -163,7 +163,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo } @Override - public void setAugmenting(boolean augmenting) { + public void setAugmenting(final boolean augmenting) { this.augmenting = augmenting; } @@ -173,7 +173,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo } @Override - public void setResolved(boolean resolved) { + public void setResolved(final boolean resolved) { this.resolved = resolved; } @@ -183,7 +183,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo } @Override - public void addRefineNode(DataSchemaNodeBuilder refineNode) { + public void addRefineNode(final DataSchemaNodeBuilder refineNode) { refineBuilders.add(refineNode); } @@ -193,7 +193,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo } @Override - public void addRefine(RefineHolder refine) { + public void addRefine(final RefineHolder refine) { refines.add(refine); } @@ -207,7 +207,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -286,13 +286,13 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo return refines; } - private void setRefines(Map refines) { + private void setRefines(final Map refines) { if (refines != null) { this.refines = refines; } } - private void addUnknownSchemaNodes(List unknownSchemaNodes) { + private void addUnknownSchemaNodes(final List unknownSchemaNodes) { if (unknownSchemaNodes != null) { this.unknownNodes.addAll(unknownSchemaNodes); } @@ -308,7 +308,7 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } -- 2.36.6