Cleanup ValueTypes lookup

[controller.git] / opendaylight / md-sal / sal-clustering-commons / src / main / java / org / opendaylight / controller / cluster / datastore / node / utils / stream / ValueTypes.java

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/ValueTypes.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/ValueTypes.java
index 190f5969aaf395cc6e2ce1b9706d9203f655f8d1..2fd8055c15b8556122fe8ef59f3330c976e31636 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/ValueTypes.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/ValueTypes.java
@@ -5,15 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.cluster.datastore.node.utils.stream;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Map;
 import java.util.Set;
+import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
@@ -33,38 +33,33 @@ final class ValueTypes {
     public static final byte BIG_INTEGER_TYPE = 10;
     public static final byte BIG_DECIMAL_TYPE = 11;
     public static final byte BINARY_TYPE = 12;
+    // Leaf nodes no longer allow null values. The "empty" type is now represented as
+    // org.opendaylight.yangtools.yang.common.Empty. This is kept for backwards compatibility.
+    @Deprecated
     public static final byte NULL_TYPE = 13;
     public static final byte STRING_BYTES_TYPE = 14;
+    public static final byte EMPTY_TYPE = 15;
 
-    private static final Map<Class<?>, Byte> TYPES;
-
-    static {
-        final Builder<Class<?>, Byte> b = ImmutableMap.builder();
-
-        b.put(String.class, STRING_TYPE);
-        b.put(Byte.class, BYTE_TYPE);
-        b.put(Integer.class, INT_TYPE);
-        b.put(Long.class, LONG_TYPE);
-        b.put(Boolean.class, BOOL_TYPE);
-        b.put(QName.class, QNAME_TYPE);
-        b.put(Short.class, SHORT_TYPE);
-        b.put(BigInteger.class, BIG_INTEGER_TYPE);
-        b.put(BigDecimal.class, BIG_DECIMAL_TYPE);
-        b.put(byte[].class, BINARY_TYPE);
-
-        TYPES = b.build();
-    }
+    private static final ImmutableMap<Class<?>, Byte> TYPES = ImmutableMap.<Class<?>, Byte>builder()
+            .put(String.class, STRING_TYPE)
+            .put(Byte.class, BYTE_TYPE)
+            .put(Integer.class, INT_TYPE)
+            .put(Long.class, LONG_TYPE)
+            .put(Boolean.class, BOOL_TYPE)
+            .put(QName.class, QNAME_TYPE)
+            .put(Short.class, SHORT_TYPE)
+            .put(BigInteger.class, BIG_INTEGER_TYPE)
+            .put(BigDecimal.class, BIG_DECIMAL_TYPE)
+            .put(byte[].class, BINARY_TYPE)
+            .put(Empty.class, EMPTY_TYPE)
+            .build();
 
     private ValueTypes() {
         throw new UnsupportedOperationException("Utility class");
     }
 
-    public static byte getSerializableType(Object node) {
-        if (node == null) {
-            return NULL_TYPE;
-        }
-
-        final Byte type = TYPES.get(node.getClass());
+    static byte getSerializableType(final Object node) {
+        final Byte type = TYPES.get(requireNonNull(node).getClass());
         if (type != null) {
             if (type == STRING_TYPE && ((String) node).length() >= STRING_BYTES_LENGTH_THRESHOLD) {
                 return STRING_BYTES_TYPE;