Convert yang-common to a JPMS module

[yangtools.git] / yang / yang-common / src / main / java / org / opendaylight / yangtools / yang / common / Uint8.java

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint8.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint8.java
index ecd1b11b08e4bcdb5cf7d67ef0187da68d131c80..e627168d5f165e10a2efdc7d04a6796e69b31ead 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint8.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint8.java
@@ -7,14 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.common;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.kohsuke.MetaInfServices;
 import org.opendaylight.yangtools.concepts.Variant;
 
 /**
@@ -25,7 +23,6 @@ import org.opendaylight.yangtools.concepts.Variant;
 @Beta
 @NonNullByDefault
 public class Uint8 extends Number implements CanonicalValue<Uint8> {
-    @MetaInfServices(value = CanonicalValueSupport.class)
     public static final class Support extends AbstractCanonicalValueSupport<Uint8> {
         public Support() {
             super(Uint8.class);
@@ -43,8 +40,8 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
 
     private static final CanonicalValueSupport<Uint8> SUPPORT = new Support();
 
-    private static final short MIN_VALUE_SHORT = 0;
     private static final short MAX_VALUE_SHORT = 255;
+    private static final String MAX_VALUE_STR = "255";
 
     private static final long serialVersionUID = 1L;
 
@@ -52,13 +49,13 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
 
     static {
         final Uint8[] c = new Uint8[MAX_VALUE_SHORT + 1];
-        for (int i = MIN_VALUE_SHORT; i <= MAX_VALUE_SHORT; ++i) {
+        for (int i = 0; i <= MAX_VALUE_SHORT; ++i) {
             c[i] = new Uint8((byte)i);
         }
         CACHE = c;
     }
 
-    public static final Uint8 ZERO = valueOf(MIN_VALUE_SHORT);
+    public static final Uint8 ZERO = valueOf(0);
     public static final Uint8 ONE = valueOf(1);
     public static final Uint8 MAX_VALUE = valueOf(MAX_VALUE_SHORT);
 
@@ -95,7 +92,7 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
      * @throws IllegalArgumentException if byteVal is less than zero
      */
     public static Uint8 valueOf(final byte byteVal) {
-        checkArgument(byteVal >= MIN_VALUE_SHORT, "Negative values are not allowed");
+        UintConversions.checkNonNegative(byteVal, MAX_VALUE_STR);
         return instanceFor(byteVal);
     }
 
@@ -108,9 +105,8 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
      * @throws IllegalArgumentException if shortVal is less than zero or greater than 255.
      */
     public static Uint8 valueOf(final short shortVal) {
-        checkArgument(shortVal >= MIN_VALUE_SHORT && shortVal <= MAX_VALUE_SHORT,
-                "Value %s is outside of allowed range", shortVal);
-        return instanceFor((byte)(shortVal & 0xff));
+        UintConversions.checkRange(shortVal, MAX_VALUE_SHORT);
+        return instanceFor((byte)shortVal);
     }
 
     /**
@@ -121,9 +117,8 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
      * @throws IllegalArgumentException if intVal is less than zero or greater than 255.
      */
     public static Uint8 valueOf(final int intVal) {
-        checkArgument(intVal >= MIN_VALUE_SHORT && intVal <= MAX_VALUE_SHORT,
-                "Value %s is outside of allowed range", intVal);
-        return instanceFor((byte)(intVal & 0xff));
+        UintConversions.checkRange(intVal, MAX_VALUE_SHORT);
+        return instanceFor((byte)intVal);
     }
 
     /**
@@ -135,9 +130,8 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
      * @throws IllegalArgumentException if intVal is less than zero or greater than 255.
      */
     public static Uint8 valueOf(final long longVal) {
-        checkArgument(longVal >= MIN_VALUE_SHORT && longVal <= MAX_VALUE_SHORT,
-                "Value %s is outside of allowed range", longVal);
-        return instanceFor((byte)(longVal & 0xff));
+        UintConversions.checkRange(longVal, MAX_VALUE_SHORT);
+        return instanceFor((byte)longVal);
     }
 
     /**