Amend models of MultiValueMap.addAll overloads

Author: smowton

java/ql/src/semmle/code/java/frameworks/spring/SpringUtil.qll

@@ -58,8 +58,9 @@ private class FlowSummaries extends SummaryModelCsv {
         "org.springframework.util;LinkedMultiValueMap;false;deepCopy;;;MapValue of Argument[-1];MapValue of ReturnValue;value",
         "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value",
         "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[-1];value",
-        "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value",
+        "org.springframework.util;MultiValueMap;true;addAll;(java.lang.Object,java.util.List);;Argument[0];MapKey of Argument[-1];value",
         "org.springframework.util;MultiValueMap;true;addAll;(java.lang.Object,java.util.List);;Element of Argument[1];Element of MapValue of Argument[-1];value",
+        "org.springframework.util;MultiValueMap;true;addAll;(org.springframework.util.MultiValueMap);;MapKey of Argument[0];MapKey of Argument[-1];value",
         "org.springframework.util;MultiValueMap;true;addAll;(org.springframework.util.MultiValueMap);;Element of MapValue of Argument[0];Element of MapValue of Argument[-1];value",
         "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[0];MapKey of Argument[-1];value",
         "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[1];Element of MapValue of Argument[-1];value",

java/ql/test/library-tests/frameworks/spring/util/Test.java

@@ -536,32 +536,27 @@ public void test() throws Exception {
 			out.addAll(in, null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
-		{
-			// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
-			MultiValueMapAdapter out = null;
-			MultiValueMap in = (MultiValueMap)source();
-			out.addAll(in);
-			sink(getMapKey(out)); // $hasValueFlow
-		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMap out = null;
 			Object in = (Object)source();
-			out.addAll(in, null);
+			out.addAll(in, (List)null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
-			MultiValueMap out = null;
-			Object in = (Object)source();
-			out.addAll(in, (List)null);
+			MultiValueMapAdapter out = null;
+			MultiValueMap<Object, Object> mvm = null;
+			mvm.set(source(), "someValue");
+			out.addAll(mvm);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMap out = null;
-			MultiValueMap in = (MultiValueMap)source();
-			out.addAll(in);
+			MultiValueMap<Object, Object> mvm = null;
+			mvm.set(source(), "someValue");
+			out.addAll(mvm);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{