Simplify MultivaluedHashMap.addAll(Object, Object...)

This method is a copy of addAll(Object, List) and it induces
a varargs warnings. Make it final, annotate it with @SafeVarArgs
and use Arrays.asList() to forward to addAll(Object, List).

This saves some code and fixes the warning.

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

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..158b846b28b5b3934534aa27991794d3832f6494 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