X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-model-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2FAbstractSignedInteger.java;h=b9234e9d903e0530dd5a94ee08d8d0b0fcff9f61;hb=aa0d59e9afecc484e8d0e219d3156e7817266e28;hp=6cfa27e6d3096df806fbf056f1529cac63d28993;hpb=64bcda2b7effc1e3e01a059500747bfa8b99d04d;p=yangtools.git 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 6cfa27e6d3..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 @@ -7,9 +7,10 @@ */ 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; @@ -17,8 +18,6 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; -import com.google.common.base.Optional; - /** * The Abstract Integer class defines implementation of IntegerTypeDefinition * interface which represents SIGNED Integer values defined in Yang language.
@@ -49,13 +48,13 @@ abstract class AbstractSignedInteger implements IntegerTypeDefinition { * @param name Name of type * @param description Description of type * @param minRange Minimal range - * @param maxRange Maxium range + * @param maxRange Maximum range * @param units Units */ protected AbstractSignedInteger(final QName name, final String description, final Number minRange, final Number maxRange, final String units) { this.name = name; - this.path = SchemaPath.create(Collections.singletonList(name), true); + this.path = SchemaPath.create(true, name); this.description = description; this.units = units; final String rangeDescription = "Integer values between " + minRange + " and " + maxRange + ", inclusively."; @@ -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; }