From aa0d59e9afecc484e8d0e219d3156e7817266e28 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 27 Sep 2015 14:15:29 +0200 Subject: [PATCH] Use Objects.hashCode() Use JRE-provided Objects.hashCode(), lowering the number of branches in our code. Change-Id: I90e8dc80253c6bed49d8d561faced71729cc62f4 Signed-off-by: Robert Varga --- .../yangtools/yang/common/QName.java | 3 +- .../yangtools/yang/common/QNameModule.java | 4 +-- .../gson/AbstractNodeDataWithSchema.java | 5 ++- .../yang/data/impl/codec/ValueWithQName.java | 12 +++---- .../yang/data/impl/leafref/LeafRefPath.java | 6 ++-- .../yangtools/yang/model/api/SchemaPath.java | 3 +- .../model/api/stmt/SchemaNodeIdentifier.java | 3 +- .../yang/model/repo/api/SourceIdentifier.java | 5 +-- .../model/util/AbstractSignedInteger.java | 13 ++++--- .../model/util/AbstractUnsignedInteger.java | 11 +++--- .../yangtools/yang/model/util/BinaryType.java | 5 +-- .../yangtools/yang/model/util/BitImpl.java | 7 ++-- .../yangtools/yang/model/util/BitsType.java | 3 +- .../yang/model/util/EnumerationType.java | 7 ++-- .../yangtools/yang/model/util/Leafref.java | 3 +- .../yang/model/util/LengthConstraintImpl.java | 10 +++--- .../yang/model/util/ModuleImportImpl.java | 10 +++--- .../yang/model/util/MustDefinitionImpl.java | 7 ++-- .../model/util/PatternConstraintImpl.java | 14 ++++---- .../yang/model/util/RangeConstraintImpl.java | 10 +++--- .../model/util/RevisionAwareXPathImpl.java | 3 +- .../yangtools/yang/model/util/StringType.java | 7 ++-- .../parser/builder/impl/AnyXmlBuilder.java | 3 +- .../builder/impl/AnyXmlSchemaNodeImpl.java | 7 ++-- .../impl/AugmentationSchemaBuilderImpl.java | 5 +-- .../builder/impl/AugmentationSchemaImpl.java | 7 ++-- .../parser/builder/impl/ChoiceBuilder.java | 3 +- .../builder/impl/ChoiceCaseBuilder.java | 3 +- .../builder/impl/ChoiceCaseNodeImpl.java | 7 ++-- .../builder/impl/ChoiceSchemaNodeImpl.java | 7 ++-- .../builder/impl/ConstraintsBuilderImpl.java | 9 ++--- .../impl/ContainerSchemaNodeBuilder.java | 3 +- .../builder/impl/ContainerSchemaNodeImpl.java | 7 ++-- .../parser/builder/impl/DeviationBuilder.java | 7 ++-- .../builder/impl/ExtensionDefinitionImpl.java | 7 ++-- .../parser/builder/impl/FeatureBuilder.java | 5 +-- .../builder/impl/GroupingBuilderImpl.java | 5 +-- .../builder/impl/GroupingDefinitionImpl.java | 7 ++-- .../builder/impl/IdentitySchemaNodeImpl.java | 7 ++-- .../impl/LeafListSchemaNodeBuilder.java | 3 +- .../builder/impl/LeafListSchemaNodeImpl.java | 7 ++-- .../builder/impl/LeafSchemaNodeBuilder.java | 3 +- .../builder/impl/LeafSchemaNodeImpl.java | 7 ++-- .../builder/impl/ListSchemaNodeBuilder.java | 3 +- .../builder/impl/ListSchemaNodeImpl.java | 7 ++-- .../parser/builder/impl/ModuleBuilder.java | 5 +-- .../yang/parser/builder/impl/ModuleImpl.java | 5 +-- .../impl/NotificationDefinitionImpl.java | 7 ++-- .../parser/builder/impl/RefineHolderImpl.java | 25 ++++++------- .../builder/impl/RpcDefinitionBuilder.java | 5 +-- .../builder/impl/RpcDefinitionImpl.java | 7 ++-- .../impl/TypeDefinitionBuilderImpl.java | 3 +- .../impl/UnknownSchemaNodeBuilderImpl.java | 9 ++--- .../builder/impl/UnknownSchemaNodeImpl.java | 11 +++--- .../builder/impl/UsesNodeBuilderImpl.java | 5 +-- .../parser/builder/impl/UsesNodeImpl.java | 7 ++-- .../util/AbstractSchemaNodeBuilder.java | 5 +-- .../yang/parser/impl/ParserListenerUtils.java | 11 +++--- .../impl/util/YangModelDependencyInfo.java | 9 ++--- .../AnyXmlEffectiveStatementImpl.java | 19 +++++----- .../AugmentEffectiveStatementImpl.java | 27 +++++++------- .../effective/CaseEffectiveStatementImpl.java | 23 ++++++------ .../rfc6020/effective/CaseShorthandImpl.java | 25 ++++++------- .../ChoiceEffectiveStatementImpl.java | 7 ++-- .../ContainerEffectiveStatementImpl.java | 23 ++++++------ .../DeviationEffectiveStatementImpl.java | 13 ++++--- .../EffectiveConstraintDefinitionImpl.java | 32 ++++++----------- .../ExtensionEffectiveStatementImpl.java | 18 +++++----- .../FeatureEffectiveStatementImpl.java | 13 ++++--- .../GroupingEffectiveStatementImpl.java | 7 ++-- .../IdentityEffectiveStatementImpl.java | 24 ++++++------- .../ImportEffectiveStatementImpl.java | 7 ++-- .../InputEffectiveStatementImpl.java | 23 ++++++------ .../effective/LeafEffectiveStatementImpl.java | 13 +++---- .../LeafListEffectiveStatementImpl.java | 13 +++---- .../effective/ListEffectiveStatementImpl.java | 14 ++++---- .../ModuleEffectiveStatementImpl.java | 36 +++++++------------ .../effective/MustEffectiveStatementImpl.java | 21 +++++------ .../NotificationEffectiveStatementImpl.java | 22 ++++++------ .../OutputEffectiveStatementImpl.java | 23 ++++++------ .../effective/RpcEffectiveStatementImpl.java | 19 +++++----- .../SubmoduleEffectiveStatementImpl.java | 6 ++-- .../UnknownEffectiveStatementImpl.java | 9 ++--- .../effective/UsesEffectiveStatementImpl.java | 7 ++-- .../type/BitEffectiveStatementImpl.java | 17 +++++---- ...tsSpecificationEffectiveStatementImpl.java | 16 ++++----- ...64SpecificationEffectiveStatementImpl.java | 5 +-- ...umSpecificationEffectiveStatementImpl.java | 7 ++-- .../type/IntegerEffectiveImplBase.java | 17 ++++----- ...efSpecificationEffectiveStatementImpl.java | 16 ++++----- .../type/LengthConstraintEffectiveImpl.java | 8 ++--- .../type/PatternConstraintEffectiveImpl.java | 12 +++---- .../type/RangeConstraintEffectiveImpl.java | 8 ++--- .../type/StringEffectiveStatementImpl.java | 5 +-- .../UnsignedIntegerEffectiveImplBase.java | 20 +++++------ .../parser/util/ModuleDependencySort.java | 5 +-- .../yang/parser/util/TopologicalSort.java | 5 +-- 97 files changed, 505 insertions(+), 474 deletions(-) diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java index 25f6d30b99..0cdc5721bc 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.common; import static org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil.getRevisionFormat; - import com.google.common.base.Preconditions; import java.io.Serializable; import java.net.URI; @@ -186,7 +185,7 @@ public final class QName implements Immutable, Serializable, Comparable { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((localName == null) ? 0 : localName.hashCode()); + result = prime * result + Objects.hashCode(localName); result = prime * result + module.hashCode(); return result; } diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java index def8da86cb..1ddd092db5 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java @@ -101,8 +101,8 @@ public final class QNameModule implements Immutable, Serializable { @Override public int hashCode() { final int prime = 31; - int result = (namespace == null) ? 0 : namespace.hashCode(); - result = prime * result + ((revision == null) ? 0 : revision.hashCode()); + int result = Objects.hashCode(namespace); + result = prime * result + Objects.hashCode(revision); return result; } diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/AbstractNodeDataWithSchema.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/AbstractNodeDataWithSchema.java index 21899afbf1..d448d12ee6 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/AbstractNodeDataWithSchema.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/AbstractNodeDataWithSchema.java @@ -9,9 +9,8 @@ package org.opendaylight.yangtools.yang.data.codec.gson; import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; - import java.io.IOException; - +import java.util.Objects; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -51,7 +50,7 @@ abstract class AbstractNodeDataWithSchema { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((schema == null) ? 0 : schema.hashCode()); + result = prime * result + Objects.hashCode(schema); return result; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/ValueWithQName.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/ValueWithQName.java index 17906a06e5..289f9c35e1 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/ValueWithQName.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/ValueWithQName.java @@ -8,14 +8,14 @@ package org.opendaylight.yangtools.yang.data.impl.codec; import java.util.Map.Entry; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; public class ValueWithQName implements Entry{ - final QName qname; final V value; - public ValueWithQName(QName qname, V value) { + public ValueWithQName(final QName qname, final V value) { super(); this.qname = qname; this.value = value; @@ -36,7 +36,7 @@ public class ValueWithQName implements Entry{ } @Override - public V setValue(V value) { + public V setValue(final V value) { throw new UnsupportedOperationException(); } @@ -44,13 +44,13 @@ public class ValueWithQName implements Entry{ public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((value == null) ? 0 : value.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(value); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java index a3b28c5d1b..793c20a1fd 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java @@ -13,6 +13,7 @@ import com.google.common.collect.Iterables; import java.util.Arrays; import java.util.Iterator; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import org.opendaylight.yangtools.concepts.Immutable; @@ -105,12 +106,11 @@ public abstract class LeafRefPath implements Immutable { return ret; } - protected LeafRefPath(final LeafRefPath parent, - final QNameWithPredicate qname) { + protected LeafRefPath(final LeafRefPath parent, final QNameWithPredicate qname) { this.parent = parent; this.qname = qname; - int h = parent == null ? 0 : parent.hashCode(); + int h = Objects.hashCode(parent); if (qname != null) { h = h * 31 + qname.hashCode(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java index 352221c987..6164a8f891 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java @@ -17,6 +17,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; @@ -103,7 +104,7 @@ public abstract class SchemaPath implements Immutable { this.parent = parent; this.qname = qname; - int h = parent == null ? 0 : parent.hashCode(); + int h = Objects.hashCode(parent); if (qname != null) { h = h * 31 + qname.hashCode(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java index f94b7fac71..33e8cbde3a 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java @@ -16,6 +16,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; @@ -104,7 +105,7 @@ public abstract class SchemaNodeIdentifier implements Immutable { this.parent = parent; this.qname = qname; - int h = parent == null ? 0 : parent.hashCode(); + int h = Objects.hashCode(parent); if (qname != null) { h = h * 31 + qname.hashCode(); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SourceIdentifier.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SourceIdentifier.java index 2c62dcbd59..43879624c9 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SourceIdentifier.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SourceIdentifier.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.model.repo.api; import com.google.common.annotations.Beta; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Objects; import java.util.regex.Pattern; import org.opendaylight.yangtools.concepts.Identifier; import org.opendaylight.yangtools.concepts.Immutable; @@ -125,8 +126,8 @@ public final class SourceIdentifier implements Identifier, Immutable { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((revision == null) ? 0 : revision.hashCode()); + result = prime * result + Objects.hashCode(name); + result = prime * result + Objects.hashCode(revision); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java index 06fbdb629a..b9234e9d90 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java @@ -8,10 +8,9 @@ package org.opendaylight.yangtools.yang.model.util; import com.google.common.base.Optional; - import java.util.Collections; import java.util.List; - +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; @@ -112,11 +111,11 @@ abstract class AbstractSignedInteger implements IntegerTypeDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((description == null) ? 0 : description.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); - result = prime * result + ((rangeStatements == null) ? 0 : rangeStatements.hashCode()); - result = prime * result + ((units == null) ? 0 : units.hashCode()); + result = prime * result + Objects.hashCode(description); + result = prime * result + Objects.hashCode(name); + result = prime * result + Objects.hashCode(path); + result = prime * result + Objects.hashCode(rangeStatements); + result = prime * result + Objects.hashCode(units); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java index f17c741dc4..d791c88708 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.model.util; import com.google.common.base.Optional; import java.util.Collections; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; @@ -110,11 +111,11 @@ abstract class AbstractUnsignedInteger implements UnsignedIntegerTypeDefinition public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((description == null) ? 0 : description.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); - result = prime * result + ((rangeStatements == null) ? 0 : rangeStatements.hashCode()); - result = prime * result + ((units == null) ? 0 : units.hashCode()); + result = prime * result + Objects.hashCode(description); + result = prime * result + Objects.hashCode(name); + result = prime * result + Objects.hashCode(path); + result = prime * result + Objects.hashCode(rangeStatements); + result = prime * result + Objects.hashCode(units); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java index 30bbfe1b8b..18f416d117 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.model.util; import com.google.common.base.Optional; import java.util.Collections; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; @@ -149,8 +150,8 @@ public final class BinaryType implements BinaryTypeDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((bytes == null) ? 0 : bytes.hashCode()); - result = prime * result + ((lengthConstraints == null) ? 0 : lengthConstraints.hashCode()); + result = prime * result + Objects.hashCode(bytes); + result = prime * result + Objects.hashCode(lengthConstraints); result = prime * result + QNAME.hashCode(); result = prime * result + PATH.hashCode(); return result; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitImpl.java index 92f94f27ff..00762d6156 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitImpl.java @@ -7,9 +7,10 @@ */ package org.opendaylight.yangtools.yang.model.util; +import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; - +import java.util.Objects; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -18,8 +19,6 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit; -import com.google.common.base.Preconditions; - public final class BitImpl implements BitsTypeDefinition.Bit, Immutable { private final Long position; private final QName qname; @@ -89,7 +88,7 @@ public final class BitImpl implements BitsTypeDefinition.Bit, Immutable { result = prime * result + qname.hashCode(); result = prime * result + schemaPath.hashCode(); result = prime * result + position.hashCode(); - result = prime * result + ((unknownNodes == null) ? 0 : unknownNodes.hashCode()); + result = prime * result + Objects.hashCode(unknownNodes); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java index 169175fdeb..85b214d32d 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java @@ -11,6 +11,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; @@ -147,7 +148,7 @@ public final class BitsType implements BitsTypeDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((bits == null) ? 0 : bits.hashCode()); + result = prime * result + Objects.hashCode(bits); result = prime * result + NAME.hashCode(); result = prime * result + path.hashCode(); return result; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java index 91d2705c0f..df1ff71bd1 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java @@ -12,6 +12,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; @@ -159,10 +160,10 @@ public final class EnumerationType implements EnumTypeDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((defaultEnum == null) ? 0 : defaultEnum.hashCode()); - result = prime * result + ((enums == null) ? 0 : enums.hashCode()); + result = prime * result + Objects.hashCode(defaultEnum); + result = prime * result + Objects.hashCode(enums); result = prime * result + BaseTypes.ENUMERATION_QNAME.hashCode(); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(path); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java index 16c45d01ba..0024490dec 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.model.util; import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -100,7 +101,7 @@ public final class Leafref implements LeafrefTypeDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((xpath == null) ? 0 : xpath.hashCode()); + result = prime * result + Objects.hashCode(xpath); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LengthConstraintImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LengthConstraintImpl.java index bbab9505fa..6472d269f2 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LengthConstraintImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/LengthConstraintImpl.java @@ -7,11 +7,11 @@ */ package org.opendaylight.yangtools.yang.model.util; -import org.opendaylight.yangtools.concepts.Immutable; -import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; - import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Objects; +import org.opendaylight.yangtools.concepts.Immutable; +import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; /** * {@link Immutable} implementation of {@link LengthConstraint}. @@ -82,12 +82,12 @@ final class LengthConstraintImpl implements LengthConstraint, Immutable { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((description == null) ? 0 : description.hashCode()); + result = prime * result + Objects.hashCode(description); result = prime * result + errorAppTag.hashCode(); result = prime * result + errorMessage.hashCode(); result = prime * result + max.hashCode(); result = prime * result + min.hashCode(); - result = prime * result + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(reference); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleImportImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleImportImpl.java index b3e956825a..6ffb728626 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleImportImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ModuleImportImpl.java @@ -8,7 +8,7 @@ package org.opendaylight.yangtools.yang.model.util; import java.util.Date; - +import java.util.Objects; import org.opendaylight.yangtools.yang.model.api.ModuleImport; public final class ModuleImportImpl implements ModuleImport { @@ -41,14 +41,14 @@ public final class ModuleImportImpl implements ModuleImport { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((moduleName == null) ? 0 : moduleName.hashCode()); - result = prime * result + ((revision == null) ? 0 : revision.hashCode()); - result = prime * result + ((prefix == null) ? 0 : prefix.hashCode()); + result = prime * result + Objects.hashCode(moduleName); + result = prime * result + Objects.hashCode(revision); + result = prime * result + Objects.hashCode(prefix); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImpl.java index 3acb23041c..5e2949efbd 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.model.util; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Objects; import org.opendaylight.yangtools.yang.model.api.MustDefinition; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; @@ -83,9 +84,9 @@ public final class MustDefinitionImpl implements MustDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((mustStr == null) ? 0 : mustStr.hashCode()); - result = prime * result + ((description == null) ? 0 : description.hashCode()); - result = prime * result + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(mustStr); + result = prime * result + Objects.hashCode(description); + result = prime * result + Objects.hashCode(reference); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java index 8ab67a7636..d6701648a5 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/PatternConstraintImpl.java @@ -7,11 +7,11 @@ */ package org.opendaylight.yangtools.yang.model.util; -import org.opendaylight.yangtools.concepts.Immutable; -import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; - import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Objects; +import org.opendaylight.yangtools.concepts.Immutable; +import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; /** * {@link Immutable} implementation of {@link PatternConstraint} @@ -76,10 +76,10 @@ final class PatternConstraintImpl implements PatternConstraint, Immutable { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((description == null) ? 0 : description.hashCode()); - result = prime * result + ((errorAppTag == null) ? 0 : errorAppTag.hashCode()); - result = prime * result + ((errorMessage == null) ? 0 : errorMessage.hashCode()); - result = prime * result + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(description); + result = prime * result + Objects.hashCode(errorAppTag); + result = prime * result + Objects.hashCode(errorMessage); + result = prime * result + Objects.hashCode(reference); result = prime * result + regex.hashCode(); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RangeConstraintImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RangeConstraintImpl.java index 70acbc84eb..6f9a3f18a9 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RangeConstraintImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RangeConstraintImpl.java @@ -7,13 +7,13 @@ */ package org.opendaylight.yangtools.yang.model.util; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import java.util.Objects; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; - /** * {@link Immutable} implementation of {@link LengthConstraint}. * @@ -82,12 +82,12 @@ final class RangeConstraintImpl implements RangeConstraint, Immutable { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((description == null) ? 0 : description.hashCode()); + result = prime * result + Objects.hashCode(description); result = prime * result + errorAppTag.hashCode(); result = prime * result + errorMessage.hashCode(); result = prime * result + max.hashCode(); result = prime * result + min.hashCode(); - result = prime * result + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(reference); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java index 93b3dfe2a0..18ba81332c 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java @@ -7,6 +7,7 @@ */ package org.opendaylight.yangtools.yang.model.util; +import java.util.Objects; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; /** @@ -37,7 +38,7 @@ public class RevisionAwareXPathImpl implements RevisionAwareXPath { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((xpath == null) ? 0 : xpath.hashCode()); + result = prime * result + Objects.hashCode(xpath); result = prime * result + (absolute ? HASH_BOOLEAN_TRUE : HASH_BOOLEAN_FALSE); return result; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java index 984580adc6..434676dd0a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java @@ -8,10 +8,9 @@ package org.opendaylight.yangtools.yang.model.util; import com.google.common.base.Optional; - import java.util.Collections; import java.util.List; - +import java.util.Objects; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -166,10 +165,10 @@ public final class StringType implements StringTypeDefinition, Immutable { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((lengthStatements == null) ? 0 : lengthStatements.hashCode()); + result = prime * result + Objects.hashCode(lengthStatements); result = prime * result + NAME.hashCode(); result = prime * result + PATH.hashCode(); - result = prime * result + ((patterns == null) ? 0 : patterns.hashCode()); + result = prime * result + Objects.hashCode(patterns); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java index 5058948774..2a9e4cde7a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -131,7 +132,7 @@ public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements Da public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(schemaPath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java index 484c5ccebc..ab4a18b45a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlSchemaNodeImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; @@ -95,8 +96,8 @@ final class AnyXmlSchemaNodeImpl implements AnyXmlSchemaNode, DerivableSchemaNod public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -139,4 +140,4 @@ final class AnyXmlSchemaNodeImpl implements AnyXmlSchemaNode, DerivableSchemaNod return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java index fad4dc81e3..46f809b31b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.collect.ImmutableList; +import java.util.Objects; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -143,8 +144,8 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDocumentedDataN public int hashCode() { final int prime = 17; int result = 1; - result = prime * result + ((augmentTargetStr == null) ? 0 : augmentTargetStr.hashCode()); - result = prime * result + ((whenCondition == null) ? 0 : whenCondition.hashCode()); + result = prime * result + Objects.hashCode(augmentTargetStr); + result = prime * result + Objects.hashCode(whenCondition); result = prime * result + getChildNodeBuilders().hashCode(); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java index f91efd24f5..5386d444db 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaImpl.java @@ -15,6 +15,7 @@ import java.net.URI; import java.util.Date; import java.util.Iterator; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.NamespaceRevisionAware; @@ -77,8 +78,8 @@ final class AugmentationSchemaImpl extends AbstractDocumentedDataNodeContainer i public int hashCode() { final int prime = 17; int result = 1; - result = prime * result + ((targetPath == null) ? 0 : targetPath.hashCode()); - result = prime * result + ((whenCondition == null) ? 0 : whenCondition.hashCode()); + result = prime * result + Objects.hashCode(targetPath); + result = prime * result + Objects.hashCode(whenCondition); result = prime * result + getChildNodes().hashCode(); return result; } @@ -145,4 +146,4 @@ final class AugmentationSchemaImpl extends AbstractDocumentedDataNodeContainer i } return this.order - o.order; } -} \ No newline at end of file +} 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 52f6e24c31..5ec23d1000 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 @@ -13,6 +13,7 @@ import com.google.common.collect.ImmutableSet; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.TreeSet; import org.opendaylight.yangtools.yang.common.QName; @@ -254,7 +255,7 @@ AugmentationTargetBuilder { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(schemaPath); return result; } 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 16aff49cde..b6c6fcf6d3 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 @@ -12,6 +12,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; @@ -170,7 +171,7 @@ AugmentationTargetBuilder { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(schemaPath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java index 7e1b519303..ff96faf9bd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseNodeImpl.java @@ -12,6 +12,7 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; @@ -87,8 +88,8 @@ final class ChoiceCaseNodeImpl extends AbstractDocumentedDataNodeContainer imple public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -131,4 +132,4 @@ final class ChoiceCaseNodeImpl extends AbstractDocumentedDataNodeContainer imple return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java index 5c4d74020d..6a4a0a81d2 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceSchemaNodeImpl.java @@ -12,6 +12,7 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; @@ -145,8 +146,8 @@ final class ChoiceSchemaNodeImpl implements ChoiceSchemaNode, DerivableSchemaNod public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -188,4 +189,4 @@ final class ChoiceSchemaNodeImpl implements ChoiceSchemaNode, DerivableSchemaNod return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java index 8582b6ec38..da26783d4a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilderImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.collect.ImmutableSet; import java.util.Collections; import java.util.HashSet; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.MustDefinition; @@ -254,10 +255,10 @@ public final class ConstraintsBuilderImpl implements ConstraintsBuilder { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((whenCondition == null) ? 0 : whenCondition.hashCode()); - result = prime * result + ((mustConstraints == null) ? 0 : mustConstraints.hashCode()); - result = prime * result + ((minElements == null) ? 0 : minElements.hashCode()); - result = prime * result + ((maxElements == null) ? 0 : maxElements.hashCode()); + result = prime * result + Objects.hashCode(whenCondition); + result = prime * result + Objects.hashCode(mustConstraints); + result = prime * result + Objects.hashCode(minElements); + result = prime * result + Objects.hashCode(maxElements); result = prime * result + mandatory.hashCode(); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java index af91fd5b5e..61b7dab27b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java @@ -12,6 +12,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -184,7 +185,7 @@ public final class ContainerSchemaNodeBuilder extends AbstractDocumentedDataNode public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(path); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeImpl.java index 0905ba687a..fac9330d04 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeImpl.java @@ -12,6 +12,7 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; @@ -98,8 +99,8 @@ final class ContainerSchemaNodeImpl extends AbstractDocumentedDataNodeContainer public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -137,4 +138,4 @@ final class ContainerSchemaNodeImpl extends AbstractDocumentedDataNodeContainer return "container " + qname.getLocalName(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java index afc16c5c0b..698e3e5897 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.collect.ImmutableList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.model.api.Deviation; import org.opendaylight.yangtools.yang.model.api.Deviation.Deviate; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -111,9 +112,9 @@ public final class DeviationBuilder extends AbstractBuilder { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((targetPath == null) ? 0 : targetPath.hashCode()); - result = prime * result + ((deviate == null) ? 0 : deviate.hashCode()); - result = prime * result + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(targetPath); + result = prime * result + Objects.hashCode(deviate); + result = prime * result + Objects.hashCode(reference); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java index 564d11c8ed..42ce62cdd8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionDefinitionImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.collect.ImmutableList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -74,8 +75,8 @@ final class ExtensionDefinitionImpl implements ExtensionDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(schemaPath); return result; } @@ -120,4 +121,4 @@ final class ExtensionDefinitionImpl implements ExtensionDefinition { sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java index c2e9a6a689..0a6700af4d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.FeatureDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -95,8 +96,8 @@ public final class FeatureBuilder extends AbstractSchemaNodeBuilder { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java index ca1f39a4af..ce16624087 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java @@ -12,6 +12,7 @@ import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; @@ -137,8 +138,8 @@ public final class GroupingBuilderImpl extends AbstractDocumentedDataNodeContain public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((getParent() == null) ? 0 : getParent().hashCode()); - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(getParent()); + result = prime * result + Objects.hashCode(schemaPath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java index e86d9ed0ab..6d296aa61b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingDefinitionImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.collect.ImmutableList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -54,8 +55,8 @@ GroupingDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -96,4 +97,4 @@ GroupingDefinition { sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java index f67404d176..625d309595 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeImpl.java @@ -11,6 +11,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.collect.ImmutableList; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; @@ -79,8 +80,8 @@ final class IdentitySchemaNodeImpl implements IdentitySchemaNode { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -122,4 +123,4 @@ final class IdentitySchemaNodeImpl implements IdentitySchemaNode { sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java index b0debdfb66..937054ef90 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -196,7 +197,7 @@ public final class LeafListSchemaNodeBuilder extends AbstractTypeAwareBuilder im public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(schemaPath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java index 042907fb47..63d9141f3f 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; @@ -108,8 +109,8 @@ final class LeafListSchemaNodeImpl implements LeafListSchemaNode, DerivableSchem public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -150,4 +151,4 @@ final class LeafListSchemaNodeImpl implements LeafListSchemaNode, DerivableSchem sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java index a6120d4aa9..5778e8a9cd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -212,7 +213,7 @@ public final class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder implem public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(schemaPath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java index 827264c2bf..e4406164f8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; @@ -114,8 +115,8 @@ final class LeafSchemaNodeImpl implements LeafSchemaNode, DerivableSchemaNode { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -157,4 +158,4 @@ final class LeafSchemaNodeImpl implements LeafSchemaNode, DerivableSchemaNode { sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} 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 a906848037..d5eeba7e32 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 @@ -12,6 +12,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; @@ -222,7 +223,7 @@ public final class ListSchemaNodeBuilder extends AbstractDocumentedDataNodeConta public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(schemaPath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeImpl.java index a7a9c426c8..79ebe11b7e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeImpl.java @@ -12,6 +12,7 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; @@ -101,8 +102,8 @@ final class ListSchemaNodeImpl extends AbstractDocumentedDataNodeContainer imple public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -139,4 +140,4 @@ final class ListSchemaNodeImpl extends AbstractDocumentedDataNodeContainer imple public String toString() { return "list " + qname.getLocalName(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java index 52454a0199..07e1c9b605 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java @@ -23,6 +23,7 @@ import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.TreeSet; import org.opendaylight.yangtools.yang.common.QName; @@ -1070,9 +1071,9 @@ public class ModuleBuilder extends AbstractDocumentedDataNodeContainerBuilder im public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + Objects.hashCode(name); result = prime * result + qnameModule.hashCode(); - result = prime * result + ((prefix == null) ? 0 : prefix.hashCode()); + result = prime * result + Objects.hashCode(prefix); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java index 1bb6e5a8d0..bfd515b766 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java @@ -17,6 +17,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.NavigableSet; +import java.util.Objects; import java.util.Set; import java.util.TreeSet; import org.opendaylight.yangtools.concepts.Immutable; @@ -190,8 +191,8 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((yangVersion == null) ? 0 : yangVersion.hashCode()); + result = prime * result + Objects.hashCode(name); + result = prime * result + Objects.hashCode(yangVersion); result = prime * result + qnameModule.hashCode(); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java index 7ecf177365..bcf82252b6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationDefinitionImpl.java @@ -11,6 +11,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; @@ -57,8 +58,8 @@ NotificationDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -97,4 +98,4 @@ NotificationDefinition { sb.append("[qname=").append(qname).append(", path=").append(path).append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineHolderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineHolderImpl.java index 1f67963ed2..dc217958ce 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineHolderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineHolderImpl.java @@ -7,6 +7,7 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; +import java.util.Objects; import org.opendaylight.yangtools.yang.model.api.MustDefinition; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.parser.builder.api.RefineBuilder; @@ -187,18 +188,18 @@ public final class RefineHolderImpl extends AbstractBuilder implements RefineBui public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((addedUnknownNodes == null) ? 0 : addedUnknownNodes.hashCode()); - result = prime * result + ((config == null) ? 0 : config.hashCode()); - result = prime * result + ((defaultStr == null) ? 0 : defaultStr.hashCode()); - result = prime * result + ((description == null) ? 0 : description.hashCode()); - result = prime * result + ((mandatory == null) ? 0 : mandatory.hashCode()); - result = prime * result + ((maxElements == null) ? 0 : maxElements.hashCode()); - result = prime * result + ((minElements == null) ? 0 : minElements.hashCode()); - result = prime * result + ((must == null) ? 0 : must.hashCode()); - result = prime * result + ((targetPathString == null) ? 0 : targetPathString.hashCode()); - result = prime * result + ((getParent() == null) ? 0 : getParent().hashCode()); - result = prime * result + ((presence == null) ? 0 : presence.hashCode()); - result = prime * result + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(addedUnknownNodes); + result = prime * result + Objects.hashCode(config); + result = prime * result + Objects.hashCode(defaultStr); + result = prime * result + Objects.hashCode(description); + result = prime * result + Objects.hashCode(mandatory); + result = prime * result + Objects.hashCode(maxElements); + result = prime * result + Objects.hashCode(minElements); + result = prime * result + Objects.hashCode(must); + result = prime * result + Objects.hashCode(targetPathString); + result = prime * result + Objects.hashCode(getParent()); + result = prime * result + Objects.hashCode(presence); + result = prime * result + Objects.hashCode(reference); return result; } 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 1d035a125d..a20cfb2dad 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 @@ -11,6 +11,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.HashSet; +import java.util.Objects; import java.util.Set; import java.util.TreeSet; import org.opendaylight.yangtools.yang.common.QName; @@ -113,8 +114,8 @@ public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(schemaPath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java index 6ddde27ab7..fe19f9e0ee 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -99,8 +100,8 @@ final class RpcDefinitionImpl implements RpcDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -148,4 +149,4 @@ final class RpcDefinitionImpl implements RpcDefinition { sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java index d379126b9e..42104ddecc 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java @@ -11,6 +11,7 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; @@ -228,7 +229,7 @@ public final class TypeDefinitionBuilderImpl extends AbstractTypeAwareBuilder im public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(schemaPath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java index 89de6be9ae..c8c38b47cf 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilderImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.base.Preconditions; import java.util.Collections; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -74,10 +75,10 @@ public final class UnknownSchemaNodeBuilderImpl extends AbstractBuilder implemen public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); - result = prime * result + ((nodeType == null) ? 0 : nodeType.hashCode()); - result = prime * result + ((nodeParameter == null) ? 0 : nodeParameter.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(schemaPath); + result = prime * result + Objects.hashCode(nodeType); + result = prime * result + Objects.hashCode(nodeParameter); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java index 89c1a86f4f..4b5f554274 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.parser.builder.impl; import com.google.common.collect.ImmutableList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -115,10 +116,10 @@ final class UnknownSchemaNodeImpl implements UnknownSchemaNode { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); - result = prime * result + ((nodeType == null) ? 0 : nodeType.hashCode()); - result = prime * result + ((nodeParameter == null) ? 0 : nodeParameter.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); + result = prime * result + Objects.hashCode(nodeType); + result = prime * result + Objects.hashCode(nodeParameter); return result; } @@ -165,4 +166,4 @@ final class UnknownSchemaNodeImpl implements UnknownSchemaNode { return true; } -} \ No newline at end of file +} 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 b8a1f9f615..f5e0bb697a 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 @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; @@ -201,8 +202,8 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((groupingPath == null) ? 0 : groupingPath.hashCode()); - result = prime * result + ((parentBuilder == null) ? 0 : parentBuilder.hashCode()); + result = prime * result + Objects.hashCode(groupingPath); + result = prime * result + Objects.hashCode(parentBuilder); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java index 7100403525..4507c853e3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeImpl.java @@ -12,6 +12,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.SchemaNode; @@ -67,8 +68,8 @@ final class UsesNodeImpl implements UsesNode { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((groupingPath == null) ? 0 : groupingPath.hashCode()); - result = prime * result + ((augmentations == null) ? 0 : augmentations.hashCode()); + result = prime * result + Objects.hashCode(groupingPath); + result = prime * result + Objects.hashCode(augmentations); return result; } @@ -109,4 +110,4 @@ final class UsesNodeImpl implements UsesNode { sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractSchemaNodeBuilder.java index a76b7ef594..3d45c4ee74 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractSchemaNodeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/util/AbstractSchemaNodeBuilder.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.parser.builder.util; import com.google.common.base.Preconditions; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; @@ -77,8 +78,8 @@ public abstract class AbstractSchemaNodeBuilder extends AbstractBuilder implemen public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((getParent() == null) ? 0 : getParent().hashCode()); - result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(getParent()); + result = prime * result + Objects.hashCode(schemaPath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java index 49d6d986a3..ae97dd3495 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -469,11 +470,11 @@ public final class ParserListenerUtils { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); - result = prime * result + ((unknownNodes == null) ? 0 : unknownNodes.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((value == null) ? 0 : value.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); + result = prime * result + Objects.hashCode(unknownNodes); + result = prime * result + Objects.hashCode(name); + result = prime * result + Objects.hashCode(value); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java index 12d8305bd0..08d5b9f5fa 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/util/YangModelDependencyInfo.java @@ -15,6 +15,7 @@ import com.google.common.collect.ImmutableSet; import java.io.InputStream; import java.util.Date; import java.util.List; +import java.util.Objects; import org.antlr.v4.runtime.ParserRuleContext; import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Belongs_to_stmtContext; import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Import_stmtContext; @@ -112,8 +113,8 @@ public abstract class YangModelDependencyInfo { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((formattedRevision == null) ? 0 : formattedRevision.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + Objects.hashCode(formattedRevision); + result = prime * result + Objects.hashCode(name); return result; } @@ -341,8 +342,8 @@ public abstract class YangModelDependencyInfo { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((revision == null) ? 0 : revision.hashCode()); + result = prime * result + Objects.hashCode(name); + result = prime * result + Objects.hashCode(revision); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyXmlEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyXmlEffectiveStatementImpl.java index f69bc0dfde..98d65f0e8c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyXmlEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AnyXmlEffectiveStatementImpl.java @@ -7,22 +7,23 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; -import java.util.Collection; -import java.util.LinkedList; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; +import java.util.Collection; +import java.util.LinkedList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class AnyXmlEffectiveStatementImpl extends AbstractEffectiveDocumentedNode implements @@ -135,8 +136,8 @@ public class AnyXmlEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AugmentEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AugmentEffectiveStatementImpl.java index 9b790100db..0d004df4b1 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AugmentEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AugmentEffectiveStatementImpl.java @@ -9,27 +9,28 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; import static com.google.common.base.Preconditions.checkNotNull; -import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; -import java.util.Collection; -import java.util.LinkedList; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.net.URI; +import java.util.Collection; import java.util.Date; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.NamespaceRevisionAware; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class AugmentEffectiveStatementImpl extends @@ -132,10 +133,8 @@ public class AugmentEffectiveStatementImpl public int hashCode() { final int prime = 17; int result = 1; - result = prime * result - + ((targetPath == null) ? 0 : targetPath.hashCode()); - result = prime * result - + ((whenCondition == null) ? 0 : whenCondition.hashCode()); + result = prime * result + Objects.hashCode(targetPath); + result = prime * result + Objects.hashCode(whenCondition); result = prime * result + getChildNodes().hashCode(); return result; } @@ -204,4 +203,4 @@ public class AugmentEffectiveStatementImpl } return this.order - o.order; } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java index b57ae3c02f..46ba0c292d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseEffectiveStatementImpl.java @@ -7,26 +7,27 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedList; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.CaseStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; 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.DerivableSchemaNode; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.CaseStatement; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class CaseEffectiveStatementImpl extends AbstractEffectiveDocumentedDataNodeContainer @@ -143,8 +144,8 @@ public class CaseEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -188,4 +189,4 @@ public class CaseEffectiveStatementImpl extends return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java index 54d927f617..aaa78c178e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java @@ -7,27 +7,28 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; -import com.google.common.collect.ImmutableList; import com.google.common.base.Optional; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; -import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import java.util.Collections; import java.util.Arrays; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; -import org.opendaylight.yangtools.yang.model.api.Status; -import org.opendaylight.yangtools.yang.model.api.TypeDefinition; -import org.opendaylight.yangtools.yang.model.api.UsesNode; import java.util.Collection; +import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; 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.DerivableSchemaNode; +import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; +import org.opendaylight.yangtools.yang.model.api.SchemaNode; 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; public class CaseShorthandImpl implements ChoiceCaseNode, DerivableSchemaNode { @@ -169,8 +170,8 @@ public class CaseShorthandImpl implements ChoiceCaseNode, DerivableSchemaNode { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qName == null) ? 0 : qName.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qName); + result = prime * result + Objects.hashCode(path); return result; } @@ -214,4 +215,4 @@ public class CaseShorthandImpl implements ChoiceCaseNode, DerivableSchemaNode { return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java index 8afc483aa3..0be4b49db8 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java @@ -14,6 +14,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; @@ -251,8 +252,8 @@ public class ChoiceEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -295,4 +296,4 @@ public class ChoiceEffectiveStatementImpl extends return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ContainerEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ContainerEffectiveStatementImpl.java index 7f73373a1d..f91c1ce577 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ContainerEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ContainerEffectiveStatementImpl.java @@ -7,26 +7,27 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; -import com.google.common.collect.ImmutableSet; +import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; +import com.google.common.collect.ImmutableSet; +import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; -import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import com.google.common.base.Optional; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.ContainerStatement; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class ContainerEffectiveStatementImpl extends AbstractEffectiveDocumentedDataNodeContainer @@ -162,8 +163,8 @@ public class ContainerEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -200,4 +201,4 @@ public class ContainerEffectiveStatementImpl extends public String toString() { return "container " + qname.getLocalName(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeviationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeviationEffectiveStatementImpl.java index 66a19f22ab..88684db129 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeviationEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/DeviationEffectiveStatementImpl.java @@ -7,9 +7,10 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; +import com.google.common.collect.ImmutableList; import java.util.LinkedList; import java.util.List; - +import java.util.Objects; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.model.api.Deviation; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -19,8 +20,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.DeviationStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import com.google.common.collect.ImmutableList; - public class DeviationEffectiveStatementImpl extends EffectiveStatementBase implements Deviation, Immutable { @@ -76,9 +75,9 @@ public class DeviationEffectiveStatementImpl extends EffectiveStatementBase mustSubstatements = parent - .allSubstatementsOfType(MustDefinition.class); + Collection mustSubstatements = parent.allSubstatementsOfType(MustDefinition.class); this.mustConstraints = ImmutableSet.copyOf(mustSubstatements); } @@ -83,14 +77,10 @@ public class EffectiveConstraintDefinitionImpl implements ConstraintDefinition { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result - + ((whenCondition == null) ? 0 : whenCondition.hashCode()); - result = prime * result - + ((mustConstraints == null) ? 0 : mustConstraints.hashCode()); - result = prime * result - + ((minElements == null) ? 0 : minElements.hashCode()); - result = prime * result - + ((maxElements == null) ? 0 : maxElements.hashCode()); + result = prime * result + Objects.hashCode(whenCondition); + result = prime * result + Objects.hashCode(mustConstraints); + result = prime * result + Objects.hashCode(minElements); + result = prime * result + Objects.hashCode(maxElements); result = prime * result + mandatory.hashCode(); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java index 81e9f7bebf..51f4bec5d1 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java @@ -7,18 +7,19 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; +import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.LinkedList; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import com.google.common.collect.ImmutableList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionStatement; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class ExtensionEffectiveStatementImpl extends AbstractEffectiveDocumentedNode implements @@ -103,9 +104,8 @@ public class ExtensionEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result - + ((schemaPath == null) ? 0 : schemaPath.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(schemaPath); return result; } @@ -151,4 +151,4 @@ public class ExtensionEffectiveStatementImpl extends sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/FeatureEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/FeatureEffectiveStatementImpl.java index 8663a1bd98..a30457a268 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/FeatureEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/FeatureEffectiveStatementImpl.java @@ -7,21 +7,20 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; +import com.google.common.collect.ImmutableList; import java.util.LinkedList; import java.util.List; - +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.FeatureDefinition; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; -import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.FeatureStatement; +import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import com.google.common.collect.ImmutableList; - public class FeatureEffectiveStatementImpl extends EffectiveStatementBase implements FeatureDefinition { @@ -98,8 +97,8 @@ public class FeatureEffectiveStatementImpl extends EffectiveStatementBase implements @@ -116,8 +116,8 @@ public class IdentityEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -160,4 +160,4 @@ public class IdentityEffectiveStatementImpl extends sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ImportEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ImportEffectiveStatementImpl.java index 7eb4e6c03b..c9a2d2c359 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ImportEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ImportEffectiveStatementImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; import java.util.Date; +import java.util.Objects; import org.opendaylight.yangtools.yang.model.api.ModuleImport; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ImportStatement; @@ -57,9 +58,9 @@ public class ImportEffectiveStatementImpl extends EffectiveStatementBase @@ -154,8 +155,8 @@ public class InputEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java index 7926636dc1..60c3384017 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafEffectiveStatementImpl.java @@ -7,23 +7,24 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.TypeUtils; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.LeafStatement; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.LeafStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.TypeUtils; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class LeafEffectiveStatementImpl extends AbstractEffectiveDocumentedNode implements @@ -167,8 +168,8 @@ public class LeafEffectiveStatementImpl extends AbstractEffectiveDocumentedNode< public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -210,4 +211,4 @@ public class LeafEffectiveStatementImpl extends AbstractEffectiveDocumentedNode< sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java index 218e845f6b..96bc2ef825 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/LeafListEffectiveStatementImpl.java @@ -7,23 +7,24 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.TypeUtils; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import java.util.Collection; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.LeafListStatement; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.LeafListStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.TypeUtils; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class LeafListEffectiveStatementImpl extends AbstractEffectiveDocumentedNode implements @@ -156,8 +157,8 @@ public class LeafListEffectiveStatementImpl extends AbstractEffectiveDocumentedN public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -198,4 +199,4 @@ public class LeafListEffectiveStatementImpl extends AbstractEffectiveDocumentedN sb.append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ListEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ListEffectiveStatementImpl.java index 1f9644cf0b..303604f5d2 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ListEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ListEffectiveStatementImpl.java @@ -8,8 +8,6 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; -import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; - import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -17,17 +15,19 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; +import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.stmt.ListStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; +import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; @@ -203,8 +203,8 @@ public class ListEffectiveStatementImpl extends AbstractEffectiveDocumentedDataN public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -241,4 +241,4 @@ public class ListEffectiveStatementImpl extends AbstractEffectiveDocumentedDataN public String toString() { return "list " + qname.getLocalName(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java index a6aeb7ca92..e415ecbfda 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java @@ -19,6 +19,7 @@ import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.common.QName; @@ -96,20 +97,16 @@ public class ModuleEffectiveStatementImpl extends for (EffectiveStatement effectiveStatement : effectiveSubstatements()) { if (effectiveStatement instanceof PrefixEffectiveStatementImpl) { - prefix = ((PrefixEffectiveStatementImpl) effectiveStatement) - .argument(); + prefix = ((PrefixEffectiveStatementImpl) effectiveStatement).argument(); } if (effectiveStatement instanceof YangVersionEffectiveStatementImpl) { - yangVersion = ((YangVersionEffectiveStatementImpl) effectiveStatement) - .argument(); + yangVersion = ((YangVersionEffectiveStatementImpl) effectiveStatement).argument(); } if (effectiveStatement instanceof OrganizationEffectiveStatementImpl) { - organization = ((OrganizationEffectiveStatementImpl) effectiveStatement) - .argument(); + organization = ((OrganizationEffectiveStatementImpl) effectiveStatement).argument(); } if (effectiveStatement instanceof ContactEffectiveStatementImpl) { - contact = ((ContactEffectiveStatementImpl) effectiveStatement) - .argument(); + contact = ((ContactEffectiveStatementImpl) effectiveStatement).argument(); } } @@ -136,20 +133,17 @@ public class ModuleEffectiveStatementImpl extends return; } - Collection includedSubmodules = includedSubmodulesMap - .values(); + Collection includedSubmodules = includedSubmodulesMap.values(); Set submodulesInit = new HashSet<>(); List> substatementsOfSubmodulesInit = new LinkedList<>(); for (ModuleIdentifier submoduleIdentifier : includedSubmodules) { Mutable> submoduleCtx = (Mutable>) ctx - .getFromNamespace(SubmoduleNamespace.class, - submoduleIdentifier); + .getFromNamespace(SubmoduleNamespace.class, submoduleIdentifier); SubmoduleEffectiveStatementImpl submodule = (SubmoduleEffectiveStatementImpl) submoduleCtx .buildEffective(); submodulesInit.add(submodule); - substatementsOfSubmodulesInit.addAll(submodule - .effectiveSubstatements()); + substatementsOfSubmodulesInit.addAll(submodule.effectiveSubstatements()); } this.submodules = ImmutableSet.copyOf(submodulesInit); @@ -191,8 +185,7 @@ public class ModuleEffectiveStatementImpl extends importsInit.add((ModuleImport) effectiveStatement); } if (effectiveStatement instanceof NotificationDefinition) { - notificationsInit - .add((NotificationDefinition) effectiveStatement); + notificationsInit.add((NotificationDefinition) effectiveStatement); } if (effectiveStatement instanceof RpcDefinition) { rpcsInit.add((RpcDefinition) effectiveStatement); @@ -207,14 +200,12 @@ public class ModuleEffectiveStatementImpl extends featuresInit.add((FeatureDefinition) effectiveStatement); } if (effectiveStatement instanceof ExtensionDefinition) { - extensionNodesInit - .add((ExtensionDefinition) effectiveStatement); + extensionNodesInit.add((ExtensionDefinition) effectiveStatement); } if (effectiveStatement instanceof DataSchemaNode) { DataSchemaNode dataSchemaNode = (DataSchemaNode) effectiveStatement; if (!mutableChildNodes.containsKey(dataSchemaNode.getQName())) { - mutableChildNodes.put(dataSchemaNode.getQName(), - dataSchemaNode); + mutableChildNodes.put(dataSchemaNode.getQName(), dataSchemaNode); mutablePublicChildNodes.add(dataSchemaNode); } else { throw EffectiveStmtUtils @@ -433,9 +424,8 @@ public class ModuleEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result - + ((yangVersion == null) ? 0 : yangVersion.hashCode()); + result = prime * result + Objects.hashCode(name); + result = prime * result + Objects.hashCode(yangVersion); result = prime * result + qNameModule.hashCode(); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/MustEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/MustEffectiveStatementImpl.java index e9419896e8..bbb7437c23 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/MustEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/MustEffectiveStatementImpl.java @@ -7,6 +7,7 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; +import java.util.Objects; import org.opendaylight.yangtools.yang.model.api.MustDefinition; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; @@ -37,20 +38,16 @@ public class MustEffectiveStatementImpl extends for (final EffectiveStatement effectiveStatement : effectiveSubstatements()) { if (effectiveStatement instanceof DescriptionEffectiveStatementImpl) { - description = ((DescriptionEffectiveStatementImpl) effectiveStatement) - .argument(); + description = ((DescriptionEffectiveStatementImpl) effectiveStatement).argument(); } if (effectiveStatement instanceof ErrorAppTagEffectiveStatementImpl) { - errorAppTag = ((ErrorAppTagEffectiveStatementImpl) effectiveStatement) - .argument(); + errorAppTag = ((ErrorAppTagEffectiveStatementImpl) effectiveStatement).argument(); } if (effectiveStatement instanceof ErrorMessageEffectiveStatementImpl) { - errorMessage = ((ErrorMessageEffectiveStatementImpl) effectiveStatement) - .argument(); + errorMessage = ((ErrorMessageEffectiveStatementImpl) effectiveStatement).argument(); } if (effectiveStatement instanceof ReferenceEffectiveStatementImpl) { - reference = ((ReferenceEffectiveStatementImpl) effectiveStatement) - .argument(); + reference = ((ReferenceEffectiveStatementImpl) effectiveStatement).argument(); } } } @@ -84,11 +81,9 @@ public class MustEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((xPath == null) ? 0 : xPath.hashCode()); - result = prime * result - + ((description == null) ? 0 : description.hashCode()); - result = prime * result - + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(xPath); + result = prime * result + Objects.hashCode(description); + result = prime * result + Objects.hashCode(reference); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java index 8b2ec246cb..a29dba00f6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/NotificationEffectiveStatementImpl.java @@ -7,26 +7,26 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.NotificationStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.NotificationStatement; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class NotificationEffectiveStatementImpl - extends - AbstractEffectiveDocumentedDataNodeContainer + extends AbstractEffectiveDocumentedDataNodeContainer implements NotificationDefinition { private final QName qname; private final SchemaPath path; @@ -87,8 +87,8 @@ public class NotificationEffectiveStatementImpl public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } @@ -129,4 +129,4 @@ public class NotificationEffectiveStatementImpl .append("]"); return sb.toString(); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/OutputEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/OutputEffectiveStatementImpl.java index 56d74d17df..068596130b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/OutputEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/OutputEffectiveStatementImpl.java @@ -7,24 +7,25 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; -import java.util.HashSet; -import java.util.LinkedList; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.Set; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; -import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; -import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.OutputStatement; +import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class OutputEffectiveStatementImpl extends AbstractEffectiveDocumentedDataNodeContainer @@ -154,8 +155,8 @@ public class OutputEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((qname == null) ? 0 : qname.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + result = prime * result + Objects.hashCode(qname); + result = prime * result + Objects.hashCode(path); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RpcEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RpcEffectiveStatementImpl.java index 1fcecde23e..0eef258d30 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RpcEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/RpcEffectiveStatementImpl.java @@ -7,24 +7,25 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.model.api.stmt.RpcStatement; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; +import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.RpcStatement; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils; public class RpcEffectiveStatementImpl extends AbstractEffectiveDocumentedNode implements RpcDefinition { private final QName qname; @@ -126,8 +127,8 @@ public class RpcEffectiveStatementImpl extends AbstractEffectiveDocumentedNode implements BitsTypeDefinition.Bit { @@ -114,8 +113,8 @@ public class BitEffectiveStatementImpl extends EffectiveStatementBase implements LeafrefTypeDefinition, TypeDefinitionEffectiveBuilder { @@ -104,7 +104,7 @@ public class LeafrefSpecificationEffectiveStatementImpl extends public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((xpath == null) ? 0 : xpath.hashCode()); + result = prime * result + Objects.hashCode(xpath); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LengthConstraintEffectiveImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LengthConstraintEffectiveImpl.java index be0e5e2f33..2912bddcf2 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LengthConstraintEffectiveImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/LengthConstraintEffectiveImpl.java @@ -7,12 +7,10 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type; -import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; - import com.google.common.base.Optional; import com.google.common.base.Preconditions; - import java.util.Objects; +import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; public class LengthConstraintEffectiveImpl implements LengthConstraint { @@ -73,12 +71,12 @@ public class LengthConstraintEffectiveImpl implements LengthConstraint { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((description == null) ? 0 : description.hashCode()); + result = prime * result + Objects.hashCode(description); result = prime * result + errorAppTag.hashCode(); result = prime * result + errorMessage.hashCode(); result = prime * result + max.hashCode(); result = prime * result + min.hashCode(); - result = prime * result + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(reference); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/PatternConstraintEffectiveImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/PatternConstraintEffectiveImpl.java index e1bef18bb3..1b8bbc9126 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/PatternConstraintEffectiveImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/PatternConstraintEffectiveImpl.java @@ -7,10 +7,10 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type; -import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; - import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Objects; +import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; public class PatternConstraintEffectiveImpl implements PatternConstraint { @@ -63,10 +63,10 @@ public class PatternConstraintEffectiveImpl implements PatternConstraint { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((description == null) ? 0 : description.hashCode()); - result = prime * result + ((errorAppTag == null) ? 0 : errorAppTag.hashCode()); - result = prime * result + ((errorMessage == null) ? 0 : errorMessage.hashCode()); - result = prime * result + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(description); + result = prime * result + Objects.hashCode(errorAppTag); + result = prime * result + Objects.hashCode(errorMessage); + result = prime * result + Objects.hashCode(reference); result = prime * result + regEx.hashCode(); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/RangeConstraintEffectiveImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/RangeConstraintEffectiveImpl.java index 398b79e408..c2c98686b4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/RangeConstraintEffectiveImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/RangeConstraintEffectiveImpl.java @@ -7,10 +7,10 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type; -import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; - import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import java.util.Objects; +import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; public class RangeConstraintEffectiveImpl implements RangeConstraint { @@ -72,12 +72,12 @@ public class RangeConstraintEffectiveImpl implements RangeConstraint { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((description == null) ? 0 : description.hashCode()); + result = prime * result + Objects.hashCode(description); result = prime * result + errorAppTag.hashCode(); result = prime * result + errorMessage.hashCode(); result = prime * result + max.hashCode(); result = prime * result + min.hashCode(); - result = prime * result + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + Objects.hashCode(reference); return result; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/StringEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/StringEffectiveStatementImpl.java index 8a0b14c864..6a7207a6a6 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/StringEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/type/StringEffectiveStatementImpl.java @@ -11,6 +11,7 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type; import com.google.common.base.Optional; import java.util.Collections; import java.util.List; +import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -112,10 +113,10 @@ public class StringEffectiveStatementImpl extends EffectiveStatementBase