BUG-7464: use Verify.verifyNonNull instead of assert

Asserts are generally not enabled, a verify is better
in that marks a reference clearly as non-nullable.

Change-Id: Ib9913ebcc08a130004e8760e6a7807e166439786
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/CNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/CNode.java
index b16355d67e965b345956328b32c4e41813ad34eb..2f25b6cc16dfd461af497b31f1f581a36b37499a 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/CNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/CNode.java
@@ -15,6 +15,7 @@
  */
 package org.opendaylight.yangtools.triemap;
 
+import com.google.common.base.Verify;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 final class CNode<K, V> extends MainNode<K, V> {
@@ -137,15 +138,15 @@ final class CNode<K, V> extends MainNode<K, V> {
      */
     CNode<K, V> renewed(final Gen ngen, final TrieMap<K, V> ct) {
         int i = 0;
-        BasicNode[] arr = array;
-        int len = arr.length;
-        BasicNode[] narr = new BasicNode[len];
+        final BasicNode[] arr = array;
+        final int len = arr.length;
+        final BasicNode[] narr = new BasicNode[len];
         while (i < len) {
-            BasicNode elem = arr[i];
+            final BasicNode elem = arr[i];
             if (elem instanceof INode) {
-                narr [i] = ((INode<?, ?>) elem).copyToGen(ngen, ct);
+                narr[i] = ((INode<?, ?>) elem).copyToGen(ngen, ct);
             } else if (elem != null) {
-                narr [i] = elem;
+                narr[i] = elem;
             }
             i += 1;
         }
@@ -178,8 +179,7 @@ final class CNode<K, V> extends MainNode<K, V> {
             BasicNode sub = arr[i];
             if (sub instanceof INode) {
                 final INode<?, ?> in = (INode<?, ?>) sub;
-                final MainNode<?, ?> inodemain = in.gcasRead(ct);
-                assert (inodemain != null);
+                final MainNode<?, ?> inodemain = Verify.verifyNotNull(in.gcasRead(ct));
                 tmparray [i] = resurrect(in, inodemain);
             } else if (sub instanceof SNode) {
                 tmparray [i] = sub;