Include Uint.ZERO in lower saturation bounds

This is a slight performance optimization, use constant zero for
zero values.

Change-Id: I4cc3e2e8656746b8fce7a43ddb42df8865221653
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 390508b6c2cffb9c8089f641758bc39e2ee19f2d)

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint16.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint16.java
index d9b6ad974be2dd0f6295977b8875f3d44ae2ce98..cfc5c744572660651b963d84b50fee47c814e54e 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint16.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint16.java
@@ -242,7 +242,7 @@ public class Uint16 extends Number implements CanonicalValue<Uint16> {
      * @return A Uint16 instance
      */
     public static Uint16 saturatedOf(final byte byteVal) {
-        return byteVal < 0 ? Uint16.ZERO : instanceFor(byteVal);
+        return byteVal <= 0 ? Uint16.ZERO : instanceFor(byteVal);
     }
 
     /**
@@ -253,7 +253,7 @@ public class Uint16 extends Number implements CanonicalValue<Uint16> {
      * @return A Uint16 instance
      */
     public static Uint16 saturatedOf(final short shortVal) {
-        return shortVal < 0 ? Uint16.ZERO : instanceFor(shortVal);
+        return shortVal <= 0 ? Uint16.ZERO : instanceFor(shortVal);
     }
 
     /**
@@ -264,7 +264,7 @@ public class Uint16 extends Number implements CanonicalValue<Uint16> {
      * @return A Uint16 instance
      */
     public static Uint16 saturatedOf(final int intVal) {
-        if (intVal < 0) {
+        if (intVal <= 0) {
             return Uint16.ZERO;
         }
         if (intVal >= MAX_VALUE_INT) {
@@ -281,7 +281,7 @@ public class Uint16 extends Number implements CanonicalValue<Uint16> {
      * @return A Uint16 instance
      */
     public static Uint16 saturatedOf(final long longVal) {
-        if (longVal < 0) {
+        if (longVal <= 0) {
             return Uint16.ZERO;
         }
         if (longVal >= MAX_VALUE_INT) {

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint32.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint32.java
index 5fa071378de0f3c5f47b163984ebecea9f9c46ad..5b3e6c2b6a739b6e0193b689848ba0ce87bf0797 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint32.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint32.java
@@ -253,7 +253,7 @@ public class Uint32 extends Number implements CanonicalValue<Uint32> {
      * @return A Uint32 instance
      */
     public static Uint32 saturatedOf(final byte byteVal) {
-        return byteVal < 0 ? Uint32.ZERO : instanceFor(byteVal);
+        return byteVal <= 0 ? Uint32.ZERO : instanceFor(byteVal);
     }
 
     /**
@@ -264,7 +264,7 @@ public class Uint32 extends Number implements CanonicalValue<Uint32> {
      * @return A Uint32 instance
      */
     public static Uint32 saturatedOf(final short shortVal) {
-        return shortVal < 0 ? Uint32.ZERO : instanceFor(shortVal);
+        return shortVal <= 0 ? Uint32.ZERO : instanceFor(shortVal);
     }
 
     /**
@@ -275,7 +275,7 @@ public class Uint32 extends Number implements CanonicalValue<Uint32> {
      * @return A Uint32 instance
      */
     public static Uint32 saturatedOf(final int intVal) {
-        return intVal < 0 ? Uint32.ZERO : instanceFor(intVal);
+        return intVal <= 0 ? Uint32.ZERO : instanceFor(intVal);
     }
 
     /**
@@ -287,7 +287,7 @@ public class Uint32 extends Number implements CanonicalValue<Uint32> {
      * @return A Uint32 instance
      */
     public static Uint32 saturatedOf(final long longVal) {
-        if (longVal < 0) {
+        if (longVal <= 0) {
             return Uint32.ZERO;
         }
         if (longVal >= MAX_VALUE_LONG) {

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint64.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint64.java
index 6ff71de790a101b6f2692a847b16f514dd550695..4a1f8bd519fdb39eda77a8bb1b22b36edd849645 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint64.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Uint64.java
@@ -268,7 +268,7 @@ public class Uint64 extends Number implements CanonicalValue<Uint64> {
      * @return A Uint64 instance
      */
     public static Uint64 saturatedOf(final byte byteVal) {
-        return byteVal < 0 ? Uint64.ZERO : instanceFor(byteVal);
+        return byteVal <= 0 ? Uint64.ZERO : instanceFor(byteVal);
     }
 
     /**
@@ -279,7 +279,7 @@ public class Uint64 extends Number implements CanonicalValue<Uint64> {
      * @return A Uint32 instance
      */
     public static Uint64 saturatedOf(final short shortVal) {
-        return shortVal < 0 ? Uint64.ZERO : instanceFor(shortVal);
+        return shortVal <= 0 ? Uint64.ZERO : instanceFor(shortVal);
     }
 
     /**
@@ -290,7 +290,7 @@ public class Uint64 extends Number implements CanonicalValue<Uint64> {
      * @return A Uint64 instance
      */
     public static Uint64 saturatedOf(final int intVal) {
-        return intVal < 0 ? Uint64.ZERO : instanceFor(intVal);
+        return intVal <= 0 ? Uint64.ZERO : instanceFor(intVal);
     }
 
     /**
@@ -301,7 +301,7 @@ public class Uint64 extends Number implements CanonicalValue<Uint64> {
      * @return A Uint64 instance
      */
     public static Uint64 saturatedOf(final long longVal) {
-        return longVal < 0 ? Uint64.ZERO : instanceFor(longVal);
+        return longVal <= 0 ? Uint64.ZERO : instanceFor(longVal);
     }
 
     /**
@@ -314,7 +314,7 @@ public class Uint64 extends Number implements CanonicalValue<Uint64> {
      * @throws NullPointerException if bigInt is null
      */
     public static Uint64 saturatedOf(final BigInteger bigInt) {
-        if (bigInt.signum() < 0) {
+        if (bigInt.signum() <= 0) {
             return Uint64.ZERO;
         }
         return bigInt.bitLength() > Long.SIZE ? Uint64.MAX_VALUE : instanceFor(bigInt.longValue());

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 7766d5e4cc10e71914d1c6dc77959e65b35708b0..6664927357869de0b92880d056b85e33edcb3da5 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
@@ -225,7 +225,7 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
      * @return A Uint8 instance
      */
     public static Uint8 saturatedOf(final byte byteVal) {
-        return byteVal < 0 ? Uint8.ZERO : instanceFor(byteVal);
+        return byteVal <= 0 ? Uint8.ZERO : instanceFor(byteVal);
     }
 
     /**
@@ -236,7 +236,7 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
      * @return A Uint8 instance
      */
     public static Uint8 saturatedOf(final short shortVal) {
-        if (shortVal < 0) {
+        if (shortVal <= 0) {
             return Uint8.ZERO;
         }
         if (shortVal >= MAX_VALUE_SHORT) {
@@ -253,7 +253,7 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
      * @return A Uint8 instance
      */
     public static Uint8 saturatedOf(final int intVal) {
-        if (intVal < 0) {
+        if (intVal <= 0) {
             return Uint8.ZERO;
         }
         if (intVal >= MAX_VALUE_SHORT) {
@@ -270,7 +270,7 @@ public class Uint8 extends Number implements CanonicalValue<Uint8> {
      * @return A Uint8 instance
      */
     public static Uint8 saturatedOf(final long longVal) {
-        if (longVal < 0) {
+        if (longVal <= 0) {
             return Uint8.ZERO;
         }
         if (longVal >= MAX_VALUE_SHORT) {