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=8bfe5607e75cc9dee292fe77e10d1c8c06ab3163;hb=d911236c08d1b2cba6d65d9954f3ab48cff5f61e;hp=8dd79e6a2d82f68802f60998751a30fe4c858842;hpb=c5b6f823ad2fa88bb1d76751a97a9cdf3e310e99;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 8dd79e6a2d..8bfe5607e7 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,10 +7,10 @@
*/
package org.opendaylight.yangtools.yang.model.util;
-import java.util.ArrayList;
+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;
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
* interface which represents SIGNED Integer values defined in Yang language.
* The integer built-in types in Yang are int8, int16, int32, int64. They
* represent signed integers of different sizes:
- *
+ *
*
* - int8 - represents integer values between -128 and 127, inclusively.
* - int16 - represents integer values between -32768 and 32767, inclusively.
@@ -32,9 +32,11 @@ import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
* - int64 - represents integer values between -9223372036854775808 and
* 9223372036854775807, inclusively.
*
- *
+ *
+ * @deprecated Used only by deprecated {@link Int8} and friends.
*/
-public abstract class AbstractSignedInteger implements IntegerTypeDefinition {
+@Deprecated
+abstract class AbstractSignedInteger implements IntegerTypeDefinition {
private final QName name;
private final SchemaPath path;
private final String description;
@@ -43,22 +45,28 @@ public abstract class AbstractSignedInteger implements IntegerTypeDefinition {
private final List rangeStatements;
/**
- * @param name
- * @param description
- * @param minRange
- * @param maxRange
- * @param units
+ * Construct SignedInteger
+ *
+ * @param name Name of type
+ * @param description Description of type
+ * @param minRange Minimal range
+ * @param maxRange Maximum range
+ * @param units Units
*/
- public AbstractSignedInteger(final QName name, final String description, final Number minRange,
+ protected AbstractSignedInteger(final QName name, final String description, final Number minRange,
final Number maxRange, final String units) {
this.name = name;
- this.path = new SchemaPath(Collections.singletonList(name), true);
+ this.path = SchemaPath.create(true, name);
this.description = description;
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,
- "https://tools.ietf.org/html/rfc6020#section-9.2.4"));
+ this.rangeStatements = Collections.singletonList(BaseConstraints.newRangeConstraint(minRange, maxRange, Optional.of(rangeDescription),
+ Optional.of("https://tools.ietf.org/html/rfc6020#section-9.2.4")));
+ }
+
+ @Override
+ public IntegerTypeDefinition getBaseType() {
+ return null;
}
@Override
@@ -92,7 +100,7 @@ public abstract class AbstractSignedInteger implements IntegerTypeDefinition {
}
@Override
- public List getRangeStatements() {
+ public List getRangeConstraints() {
return rangeStatements;
}
@@ -105,16 +113,16 @@ public 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;
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -125,39 +133,19 @@ public abstract class AbstractSignedInteger implements IntegerTypeDefinition {
return false;
}
AbstractSignedInteger other = (AbstractSignedInteger) obj;
- if (description == null) {
- if (other.description != null) {
- return false;
- }
- } else if (!description.equals(other.description)) {
+ if (!Objects.equals(description, other.description)) {
return false;
}
- if (name == null) {
- if (other.name != null) {
- return false;
- }
- } else if (!name.equals(other.name)) {
+ if (!Objects.equals(name, other.name)) {
return false;
}
- if (path == null) {
- if (other.path != null) {
- return false;
- }
- } else if (!path.equals(other.path)) {
+ if (!Objects.equals(path, other.path)) {
return false;
}
- if (rangeStatements == null) {
- if (other.rangeStatements != null) {
- return false;
- }
- } else if (!rangeStatements.equals(other.rangeStatements)) {
+ if (!Objects.equals(rangeStatements, other.rangeStatements)) {
return false;
}
- if (units == null) {
- if (other.units != null) {
- return false;
- }
- } else if (!units.equals(other.units)) {
+ if (!Objects.equals(units, other.units)) {
return false;
}
return true;