X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fyang%2Fyang-model-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fmodel%2Futil%2FAbstractUnsignedInteger.java;h=ad903e9e52c45e7e0f74ad950f487fee35fb3930;hb=e830ca8fc7550bddb87dc3d1141a53e9b20c53f7;hp=76048519e7f226653f220aa73aff85dae7ed5681;hpb=650881665d632280824523b05a2ab699e6932bfb;p=controller.git diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractUnsignedInteger.java b/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractUnsignedInteger.java index 76048519e7..ad903e9e52 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractUnsignedInteger.java +++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractUnsignedInteger.java @@ -3,10 +3,8 @@ */ package org.opendaylight.controller.yang.model.util; -import java.net.URI; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.List; import org.opendaylight.controller.yang.common.QName; @@ -32,36 +30,35 @@ import org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefini * * */ -public abstract class AbstractUnsignedInteger implements - UnsignedIntegerTypeDefinition { +public abstract class AbstractUnsignedInteger implements UnsignedIntegerTypeDefinition { + private static final long MIN_VALUE = 0; private final QName name; private final SchemaPath path; private final String description; private final String reference = "https://tools.ietf.org/html/rfc6020#section-9.2"; - private final String units; private final List rangeStatements; /** + * + * @param actualPath + * @param namespace + * @param revision * @param name * @param description - * @param minRange + * @param MIN_VALUE * @param maxRange * @param units */ - public AbstractUnsignedInteger(final List actualPath, - final URI namespace, final Date revision, final QName name, - final String description, final Number minRange, + public AbstractUnsignedInteger(final SchemaPath path, final QName name, final String description, final Number maxRange, final String units) { this.name = name; this.description = description; - this.path = BaseTypes.schemaPath(actualPath, namespace, revision); + this.path = path; this.units = units; this.rangeStatements = new ArrayList(); - final String rangeDescription = "Integer values between " + minRange - + " and " + maxRange + ", inclusively."; - this.rangeStatements.add(BaseConstraints.rangeConstraint(minRange, - maxRange, rangeDescription, + final String rangeDescription = "Integer values between " + MIN_VALUE + " and " + maxRange + ", inclusively."; + this.rangeStatements.add(BaseConstraints.rangeConstraint(MIN_VALUE, maxRange, rangeDescription, "https://tools.ietf.org/html/rfc6020#section-9.2.4")); } @@ -71,13 +68,11 @@ public abstract class AbstractUnsignedInteger implements * @param rangeStatements * @param units */ - public AbstractUnsignedInteger(final List actualPath, - final URI namespace, final Date revision, final QName name, - final String description, + public AbstractUnsignedInteger(final SchemaPath path, final QName name, final String description, final List rangeStatements, final String units) { this.name = name; this.description = description; - this.path = BaseTypes.schemaPath(actualPath, namespace, revision); + this.path = path; this.units = units; this.rangeStatements = rangeStatements; } @@ -126,14 +121,11 @@ public abstract class AbstractUnsignedInteger implements public int hashCode() { final int prime = 31; int result = 1; - result = prime * result - + ((description == null) ? 0 : description.hashCode()); + 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 - + ((reference == null) ? 0 : reference.hashCode()); + result = prime * result + ((rangeStatements == null) ? 0 : rangeStatements.hashCode()); + result = prime * result + ((reference == null) ? 0 : reference.hashCode()); result = prime * result + ((units == null) ? 0 : units.hashCode()); return result; }