Add missing models

Author: joefarebrother

java/ql/lib/semmle/code/java/frameworks/guava/Collections.qll

@@ -290,6 +290,9 @@ private class GuavaCollectCsv extends SummaryModelCsv {
         "com.google.common.collect;TreeBasedTable;true;create;(TreeBasedTable);;SyntheticField[com.google.common.collect.Table.rowKey] of Argument[0];SyntheticField[com.google.common.collect.Table.rowKey] of ReturnValue;value",
         "com.google.common.collect;TreeBasedTable;true;create;(TreeBasedTable);;SyntheticField[com.google.common.collect.Table.columnKey] of Argument[0];SyntheticField[com.google.common.collect.Table.columnKey] of ReturnValue;value",
         "com.google.common.collect;TreeBasedTable;true;create;(TreeBasedTable);;MapValue of Argument[0];MapValue of ReturnValue;value",
+        "com.google.common.collect;ArrayTable;true;create;(Table);;SyntheticField[com.google.common.collect.Table.rowKey] of Argument[0];SyntheticField[com.google.common.collect.Table.rowKey] of ReturnValue;value",
+        "com.google.common.collect;ArrayTable;true;create;(Table);;SyntheticField[com.google.common.collect.Table.columnKey] of Argument[0];SyntheticField[com.google.common.collect.Table.columnKey] of ReturnValue;value",
+        "com.google.common.collect;ArrayTable;true;create;(Table);;MapValue of Argument[0];MapValue of ReturnValue;value",
         "com.google.common.collect;ArrayTable;true;create;(Iterable,Iterable);;Element of Argument[0];SyntheticField[com.google.common.collect.Table.rowKey] of ReturnValue;value",
         "com.google.common.collect;ArrayTable;true;create;(Iterable,Iterable);;Element of Argument[1];SyntheticField[com.google.common.collect.Table.columnKey] of ReturnValue;value",
         // Utility classes (a few methods depending on lambda flow are not included)

java/ql/test/library-tests/frameworks/guava/generated/collect/Methods.java

@@ -161,6 +161,27 @@ public void test() throws Exception {
 			out = ArrayTable.create(null, in);
 			sink(getTable_columnKey(out)); // $ hasValueFlow
 		}
+		{
+			// "com.google.common.collect;ArrayTable;true;create;(Table);;MapValue of Argument[0];MapValue of ReturnValue;value"
+			ArrayTable out = null;
+			Table in = (Table)ArrayTable.create(ImmutableTable.of(null, null, source()));
+			out = ArrayTable.create(in);
+			sink(getMapValue(out)); // $ hasValueFlow
+		}
+		{
+			// "com.google.common.collect;ArrayTable;true;create;(Table);;SyntheticField[com.google.common.collect.Table.columnKey] of Argument[0];SyntheticField[com.google.common.collect.Table.columnKey] of ReturnValue;value"
+			ArrayTable out = null;
+			Table in = (Table)ArrayTable.create(ImmutableTable.of(null, source(), null));
+			out = ArrayTable.create(in);
+			sink(getTable_columnKey(out)); // $ hasValueFlow
+		}
+		{
+			// "com.google.common.collect;ArrayTable;true;create;(Table);;SyntheticField[com.google.common.collect.Table.rowKey] of Argument[0];SyntheticField[com.google.common.collect.Table.rowKey] of ReturnValue;value"
+			ArrayTable out = null;
+			Table in = (Table)ArrayTable.create(ImmutableTable.of(source(), null, null));
+			out = ArrayTable.create(in);
+			sink(getTable_rowKey(out)); // $ hasValueFlow
+		}
 		{
 			// "com.google.common.collect;BiMap;true;forcePut;(Object,Object);;Argument[0];MapKey of Argument[-1];value"
 			ImmutableBiMap out = null;