Simplify MultivaluedHashMap.getFirst()

[netconf.git] / restconf / restconf-common / src / main / java / org / opendaylight / restconf / common / util / MultivaluedHashMap.java

diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/MultivaluedHashMap.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/MultivaluedHashMap.java
index 4eedb93245726b268e183bb1d26eee4962ed75bb..d272d06d9404dd5e6946f8cf140835ec3fbc89a2 100644 (file)
--- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/MultivaluedHashMap.java
+++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/MultivaluedHashMap.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.restconf.common.util;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -44,19 +45,9 @@ public class MultivaluedHashMap<K, V> implements MultivaluedMap<K, V> {
     }
 
     @Override
-    public void addAll(K key, V... newValues) {
-        Objects.requireNonNull(newValues, "Supplied array of values must not be null.");
-
-        if (newValues.length == 0) {
-            return;
-        }
-
-        List<V> values = getValues(key);
-        for (V value : newValues) {
-            if (value != null) {
-                values.add(value);
-            }
-        }
+    @SafeVarargs
+    public final void addAll(K key, V... newValues) {
+        addAll(key, Arrays.asList(newValues));
     }
 
     @Override
@@ -87,11 +78,7 @@ public class MultivaluedHashMap<K, V> implements MultivaluedMap<K, V> {
     @Override
     public V getFirst(K key) {
         List<V> values = store.get(key);
-        if (values != null && values.size() > 0) {
-            return values.get(0);
-        } else {
-            return null;
-        }
+        return values == null || values.isEmpty() ? null : values.get(0);
     }
 
     @Override