Add more missing models

And corresponding tests

Author: owen-mc

java/ql/src/semmle/code/java/frameworks/apache/Collections.qll

@@ -42,6 +42,7 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
           ";ArrayStack;true;peek;;;Element of Argument[-1];ReturnValue;value",
           ";ArrayStack;true;pop;;;Element of Argument[-1];ReturnValue;value",
           ";ArrayStack;true;push;;;Argument[0];Element of Argument[-1];value",
+          ";ArrayStack;true;push;;;Argument[0];ReturnValue;value",
           ";Bag;true;add;;;Argument[0];Element of Argument[-1];value",
           ";Bag;true;uniqueSet;;;Element of Argument[-1];Element of ReturnValue;value",
           ";BidiMap;true;getKey;;;MapKey of Argument[-1];ReturnValue;value",
@@ -100,6 +101,8 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
           ";MultiSet;true;entrySet;;;Element of Argument[-1];Element of Element of ReturnValue;value",
           ";MultiValuedMap;true;asMap;;;MapKey of Argument[-1];MapKey of ReturnValue;value",
           ";MultiValuedMap;true;asMap;;;Element of MapValue of Argument[-1];Element of MapValue of ReturnValue;value",
+          ";MultiValuedMap;true;entries;;;MapKey of Argument[-1];MapKey of Element of ReturnValue;value",
+          ";MultiValuedMap;true;entries;;;Element of MapValue of Argument[-1];MapValue of Element of ReturnValue;value",
           ";MultiValuedMap;true;get;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
           ";MultiValuedMap;true;keys;;;MapKey of Argument[-1];Element of ReturnValue;value",
           ";MultiValuedMap;true;keySet;;;MapKey of Argument[-1];Element of ReturnValue;value",

java/ql/test/library-tests/frameworks/apache-collections/Test.java

@@ -1087,6 +1087,14 @@ public void test() {
 			out.push(in);
 			sink(getElement(out)); // $ hasValueFlow
 		}
+		{
+			// "org.apache.commons.collections4;ArrayStack;true;push;;;Argument[0];ReturnValue;value"
+			Object out = null;
+			Object in = source();
+			ArrayStack instance = null;
+			out = instance.push(in);
+			sink(out); // $ hasValueFlow
+		}
 		{
 			// "org.apache.commons.collections4;Bag;true;add;;;Argument[0];Element of Argument[-1];value"
 			Bag out = null;
@@ -2913,6 +2921,20 @@ public void test() {
 			out = MultiMapUtils.emptyIfNull(in);
 			sink(out); // $ hasValueFlow
 		}
+		{
+			// "org.apache.commons.collections4;MultiValuedMap;true;entries;;;MapKey of Argument[-1];MapKey of Element of ReturnValue;value"
+			Collection<Map.Entry> out = null;
+			MultiValuedMap in = newALVHMWithMapKey((String)source());
+			out = in.entries();
+			sink(getMapKeyFromEntry(getElement(out))); // $ hasValueFlow
+		}
+		{
+			// "org.apache.commons.collections4;MultiValuedMap;true;entries;;;Element of MapValue of Argument[-1];MapValue of Element of ReturnValue;value"
+			Collection<Map.Entry> out = null;
+			MultiValuedMap in = newALVHMWithMapValue((String)source());
+			out = in.entries();
+			sink(getMapValueFromEntry(getElement(out))); // $ hasValueFlow
+		}
 		{
 			// "org.apache.commons.collections4;MultiMapUtils;true;getCollection;;;MapValue of Argument[0];ReturnValue;value"
 			Collection out = null;