Implement gen methods for MapDifference

joefarebrother · joefarebrother · commit 25d6e00b1a51 · 2021-09-21T16:30:12.000+01:00
diff --git a/java/ql/test/library-tests/frameworks/guava/generated/collect/Test.java b/java/ql/test/library-tests/frameworks/guava/generated/collect/Test.java
@@ -111,6 +111,7 @@ public class Test {
 	<T> T getElement(Iterator<T> it) { return it.next(); }
 	<T> T getElement(Optional<T> o) { return o.get(); }
 	<V> Map.Entry<?,V> newEntryWithMapValue(V value) { return Map.of(null, value).entrySet().iterator().next(); }
+	<V> MapDifference.ValueDifference newMapValueDifference(V l, V r) { return Maps.difference(Map.of(null, l), Map.of(null, r)).entriesDiffering().get(null); }
 	<V> V getMapValue(ImmutableMap.Builder<?,V> b) { return getMapValue(b.build()); }
 	<V> V getMapValue(ImmutableMultimap.Builder<?,V> b) { return getMapValue(b.build()); }
 	<V> V getMapValue(ImmutableTable.Builder<?,?,V> b) { return getMapValue(b.build()); }
@@ -125,8 +126,6 @@ public class Test {
 	Object getTable_columnKeyDefault(Object container) { return null; }
 	Object getTable_rowKeyDefault(Object container) { return null; }
 	Object newWithElementDefault(Object element) { return null; }
-	Object newWithMapDifference_leftDefault(Object element) { return null; }
-	Object newWithMapDifference_rightDefault(Object element) { return null; }
 	Object newWithMapKeyDefault(Object element) { return null; }
 	Object newWithMapValueDefault(Object element) { return null; }
 	Object source() { return null; }
@@ -5345,182 +5344,182 @@ public void test() throws Exception {
 		{
 			// "com.google.common.collect;MapDifference$ValueDifference;true;leftValue;();;SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];ReturnValue;value"
 			Object out = null;
-			MapDifference.ValueDifference in = (MapDifference.ValueDifference)newWithMapDifference_leftDefault(source());
+			MapDifference.ValueDifference in = (MapDifference.ValueDifference)newMapValueDifference(source(), null);
 			out = in.leftValue();
 			sink(out); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference$ValueDifference;true;rightValue;();;SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];ReturnValue;value"
 			Object out = null;
-			MapDifference.ValueDifference in = (MapDifference.ValueDifference)newWithMapDifference_rightDefault(source());
+			MapDifference.ValueDifference in = (MapDifference.ValueDifference)newMapValueDifference(null, source());
 			out = in.rightValue();
 			sink(out); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapKeyDefault(source()), null);
 			out = in.entriesDiffering();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference((Map)newWithMapKeyDefault(source()), null);
 			out = in.entriesDiffering();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapKeyDefault(source()));
 			out = in.entriesDiffering();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapKeyDefault(source()));
 			out = in.entriesDiffering();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];SyntheticField[com.google.common.collect.MapDifference.left] of MapValue of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapValueDefault(source()), null);
 			out = in.entriesDiffering();
 			sink(getMapDifference_leftDefault(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];SyntheticField[com.google.common.collect.MapDifference.left] of MapValue of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference((Map)newWithMapValueDefault(source()), null);
 			out = in.entriesDiffering();
 			sink(getMapDifference_leftDefault(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];SyntheticField[com.google.common.collect.MapDifference.right] of MapValue of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapValueDefault(source()));
 			out = in.entriesDiffering();
 			sink(getMapDifference_rightDefault(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];SyntheticField[com.google.common.collect.MapDifference.right] of MapValue of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapValueDefault(source()));
 			out = in.entriesDiffering();
 			sink(getMapDifference_rightDefault(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapKeyDefault(source()), null);
 			out = in.entriesInCommon();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference((Map)newWithMapKeyDefault(source()), null);
 			out = in.entriesInCommon();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapKeyDefault(source()));
 			out = in.entriesInCommon();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapKeyDefault(source()));
 			out = in.entriesInCommon();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapValue of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapValueDefault(source()), null);
 			out = in.entriesInCommon();
 			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapValue of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference((Map)newWithMapValueDefault(source()), null);
 			out = in.entriesInCommon();
 			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapValue of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapValueDefault(source()));
 			out = in.entriesInCommon();
 			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapValue of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapValueDefault(source()));
 			out = in.entriesInCommon();
 			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesOnlyOnLeft;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapKeyDefault(source()), null);
 			out = in.entriesOnlyOnLeft();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesOnlyOnLeft;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference((Map)newWithMapKeyDefault(source()), null);
 			out = in.entriesOnlyOnLeft();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesOnlyOnLeft;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapValue of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapValueDefault(source()), null);
 			out = in.entriesOnlyOnLeft();
 			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesOnlyOnLeft;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapValue of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference((Map)newWithMapValueDefault(source()), null);
 			out = in.entriesOnlyOnLeft();
 			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesOnlyOnRight;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapKeyDefault(source()));
 			out = in.entriesOnlyOnRight();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesOnlyOnRight;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapKeyDefault(source()));
 			out = in.entriesOnlyOnRight();
 			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesOnlyOnRight;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapValue of ReturnValue;value"
 			SortedMap out = null;
-			SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));
+			SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapValueDefault(source()));
 			out = in.entriesOnlyOnRight();
 			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "com.google.common.collect;MapDifference;true;entriesOnlyOnRight;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapValue of ReturnValue;value"
 			Map out = null;
-			MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));
+			MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapValueDefault(source()));
 			out = in.entriesOnlyOnRight();
 			sink(getMapValue(out)); // $ hasValueFlow
 		}
diff --git a/java/ql/test/library-tests/frameworks/guava/generated/collect/test.ql b/java/ql/test/library-tests/frameworks/guava/generated/collect/test.ql
@@ -14,9 +14,7 @@ class SummaryModelTest extends SummaryModelCsv {
         "generatedtest;Test;false;getMapValueDefault;(Object);;MapValue of Argument[0];ReturnValue;value",
         "generatedtest;Test;false;getTable_rowKeyDefault;(Object);;SyntheticField[com.google.common.collect.Table.rowKey] of Argument[0];ReturnValue;value",
         "generatedtest;Test;false;getTable_columnKeyDefault;(Object);;SyntheticField[com.google.common.collect.Table.columnKey] of Argument[0];ReturnValue;value",
-        "generatedtest;Test;false;newWithMapDifference_leftDefault;(Object);;Argument[0];SyntheticField[com.google.common.collect.MapDifference.left] of ReturnValue;value",
         "generatedtest;Test;false;getMapDifference_leftDefault;(Object);;SyntheticField[com.google.common.collect.MapDifference.left] of Argument[0];ReturnValue;value",
-        "generatedtest;Test;false;newWithMapDifference_rightDefault;(Object);;Argument[0];SyntheticField[com.google.common.collect.MapDifference.right] of ReturnValue;value",
         "generatedtest;Test;false;getMapDifference_rightDefault;(Object);;SyntheticField[com.google.common.collect.MapDifference.right] of Argument[0];ReturnValue;value"
       ]
   }

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ public class Test {`
`111`	`111`	`<T> T getElement(Iterator<T> it) { return it.next(); }`
`112`	`112`	`<T> T getElement(Optional<T> o) { return o.get(); }`
`113`	`113`	`<V> Map.Entry<?,V> newEntryWithMapValue(V value) { return Map.of(null, value).entrySet().iterator().next(); }`
	`114`	`+ <V> MapDifference.ValueDifference newMapValueDifference(V l, V r) { return Maps.difference(Map.of(null, l), Map.of(null, r)).entriesDiffering().get(null); }`
`114`	`115`	`<V> V getMapValue(ImmutableMap.Builder<?,V> b) { return getMapValue(b.build()); }`
`115`	`116`	`<V> V getMapValue(ImmutableMultimap.Builder<?,V> b) { return getMapValue(b.build()); }`
`116`	`117`	`<V> V getMapValue(ImmutableTable.Builder<?,?,V> b) { return getMapValue(b.build()); }`
`@@ -125,8 +126,6 @@ public class Test {`
`125`	`126`	`Object getTable_columnKeyDefault(Object container) { return null; }`
`126`	`127`	`Object getTable_rowKeyDefault(Object container) { return null; }`
`127`	`128`	`Object newWithElementDefault(Object element) { return null; }`
`128`		`- Object newWithMapDifference_leftDefault(Object element) { return null; }`
`129`		`- Object newWithMapDifference_rightDefault(Object element) { return null; }`
`130`	`129`	`Object newWithMapKeyDefault(Object element) { return null; }`
`131`	`130`	`Object newWithMapValueDefault(Object element) { return null; }`
`132`	`131`	`Object source() { return null; }`
`@@ -5345,182 +5344,182 @@ public void test() throws Exception {`
`5345`	`5344`	`{`
`5346`	`5345`	`// "com.google.common.collect;MapDifference$ValueDifference;true;leftValue;();;SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];ReturnValue;value"`
`5347`	`5346`	`Object out = null;`
`5348`		`- MapDifference.ValueDifference in = (MapDifference.ValueDifference)newWithMapDifference_leftDefault(source());`
	`5347`	`+ MapDifference.ValueDifference in = (MapDifference.ValueDifference)newMapValueDifference(source(), null);`
`5349`	`5348`	`out = in.leftValue();`
`5350`	`5349`	`sink(out); // $ hasValueFlow`
`5351`	`5350`	`}`
`5352`	`5351`	`{`
`5353`	`5352`	`// "com.google.common.collect;MapDifference$ValueDifference;true;rightValue;();;SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];ReturnValue;value"`
`5354`	`5353`	`Object out = null;`
`5355`		`- MapDifference.ValueDifference in = (MapDifference.ValueDifference)newWithMapDifference_rightDefault(source());`
	`5354`	`+ MapDifference.ValueDifference in = (MapDifference.ValueDifference)newMapValueDifference(null, source());`
`5356`	`5355`	`out = in.rightValue();`
`5357`	`5356`	`sink(out); // $ hasValueFlow`
`5358`	`5357`	`}`
`5359`	`5358`	`{`
`5360`	`5359`	`// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"`
`5361`	`5360`	`SortedMap out = null;`
`5362`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));`
	`5361`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapKeyDefault(source()), null);`
`5363`	`5362`	`out = in.entriesDiffering();`
`5364`	`5363`	`sink(getMapKey(out)); // $ hasValueFlow`
`5365`	`5364`	`}`
`5366`	`5365`	`{`
`5367`	`5366`	`// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"`
`5368`	`5367`	`Map out = null;`
`5369`		`- MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));`
	`5368`	`+ MapDifference in = (MapDifference)Maps.difference((Map)newWithMapKeyDefault(source()), null);`
`5370`	`5369`	`out = in.entriesDiffering();`
`5371`	`5370`	`sink(getMapKey(out)); // $ hasValueFlow`
`5372`	`5371`	`}`
`5373`	`5372`	`{`
`5374`	`5373`	`// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"`
`5375`	`5374`	`SortedMap out = null;`
`5376`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));`
	`5375`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapKeyDefault(source()));`
`5377`	`5376`	`out = in.entriesDiffering();`
`5378`	`5377`	`sink(getMapKey(out)); // $ hasValueFlow`
`5379`	`5378`	`}`
`5380`	`5379`	`{`
`5381`	`5380`	`// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"`
`5382`	`5381`	`Map out = null;`
`5383`		`- MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));`
	`5382`	`+ MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapKeyDefault(source()));`
`5384`	`5383`	`out = in.entriesDiffering();`
`5385`	`5384`	`sink(getMapKey(out)); // $ hasValueFlow`
`5386`	`5385`	`}`
`5387`	`5386`	`{`
`5388`	`5387`	`// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];SyntheticField[com.google.common.collect.MapDifference.left] of MapValue of ReturnValue;value"`
`5389`	`5388`	`SortedMap out = null;`
`5390`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));`
	`5389`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapValueDefault(source()), null);`
`5391`	`5390`	`out = in.entriesDiffering();`
`5392`	`5391`	`sink(getMapDifference_leftDefault(getMapValue(out))); // $ hasValueFlow`
`5393`	`5392`	`}`
`5394`	`5393`	`{`
`5395`	`5394`	`// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];SyntheticField[com.google.common.collect.MapDifference.left] of MapValue of ReturnValue;value"`
`5396`	`5395`	`Map out = null;`
`5397`		`- MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));`
	`5396`	`+ MapDifference in = (MapDifference)Maps.difference((Map)newWithMapValueDefault(source()), null);`
`5398`	`5397`	`out = in.entriesDiffering();`
`5399`	`5398`	`sink(getMapDifference_leftDefault(getMapValue(out))); // $ hasValueFlow`
`5400`	`5399`	`}`
`5401`	`5400`	`{`
`5402`	`5401`	`// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];SyntheticField[com.google.common.collect.MapDifference.right] of MapValue of ReturnValue;value"`
`5403`	`5402`	`SortedMap out = null;`
`5404`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));`
	`5403`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapValueDefault(source()));`
`5405`	`5404`	`out = in.entriesDiffering();`
`5406`	`5405`	`sink(getMapDifference_rightDefault(getMapValue(out))); // $ hasValueFlow`
`5407`	`5406`	`}`
`5408`	`5407`	`{`
`5409`	`5408`	`// "com.google.common.collect;MapDifference;true;entriesDiffering;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];SyntheticField[com.google.common.collect.MapDifference.right] of MapValue of ReturnValue;value"`
`5410`	`5409`	`Map out = null;`
`5411`		`- MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));`
	`5410`	`+ MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapValueDefault(source()));`
`5412`	`5411`	`out = in.entriesDiffering();`
`5413`	`5412`	`sink(getMapDifference_rightDefault(getMapValue(out))); // $ hasValueFlow`
`5414`	`5413`	`}`
`5415`	`5414`	`{`
`5416`	`5415`	`// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"`
`5417`	`5416`	`SortedMap out = null;`
`5418`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));`
	`5417`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapKeyDefault(source()), null);`
`5419`	`5418`	`out = in.entriesInCommon();`
`5420`	`5419`	`sink(getMapKey(out)); // $ hasValueFlow`
`5421`	`5420`	`}`
`5422`	`5421`	`{`
`5423`	`5422`	`// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"`
`5424`	`5423`	`Map out = null;`
`5425`		`- MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));`
	`5424`	`+ MapDifference in = (MapDifference)Maps.difference((Map)newWithMapKeyDefault(source()), null);`
`5426`	`5425`	`out = in.entriesInCommon();`
`5427`	`5426`	`sink(getMapKey(out)); // $ hasValueFlow`
`5428`	`5427`	`}`
`5429`	`5428`	`{`
`5430`	`5429`	`// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"`
`5431`	`5430`	`SortedMap out = null;`
`5432`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));`
	`5431`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapKeyDefault(source()));`
`5433`	`5432`	`out = in.entriesInCommon();`
`5434`	`5433`	`sink(getMapKey(out)); // $ hasValueFlow`
`5435`	`5434`	`}`
`5436`	`5435`	`{`
`5437`	`5436`	`// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"`
`5438`	`5437`	`Map out = null;`
`5439`		`- MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));`
	`5438`	`+ MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapKeyDefault(source()));`
`5440`	`5439`	`out = in.entriesInCommon();`
`5441`	`5440`	`sink(getMapKey(out)); // $ hasValueFlow`
`5442`	`5441`	`}`
`5443`	`5442`	`{`
`5444`	`5443`	`// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapValue of ReturnValue;value"`
`5445`	`5444`	`SortedMap out = null;`
`5446`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));`
	`5445`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapValueDefault(source()), null);`
`5447`	`5446`	`out = in.entriesInCommon();`
`5448`	`5447`	`sink(getMapValue(out)); // $ hasValueFlow`
`5449`	`5448`	`}`
`5450`	`5449`	`{`
`5451`	`5450`	`// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapValue of ReturnValue;value"`
`5452`	`5451`	`Map out = null;`
`5453`		`- MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));`
	`5452`	`+ MapDifference in = (MapDifference)Maps.difference((Map)newWithMapValueDefault(source()), null);`
`5454`	`5453`	`out = in.entriesInCommon();`
`5455`	`5454`	`sink(getMapValue(out)); // $ hasValueFlow`
`5456`	`5455`	`}`
`5457`	`5456`	`{`
`5458`	`5457`	`// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapValue of ReturnValue;value"`
`5459`	`5458`	`SortedMap out = null;`
`5460`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));`
	`5459`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapValueDefault(source()));`
`5461`	`5460`	`out = in.entriesInCommon();`
`5462`	`5461`	`sink(getMapValue(out)); // $ hasValueFlow`
`5463`	`5462`	`}`
`5464`	`5463`	`{`
`5465`	`5464`	`// "com.google.common.collect;MapDifference;true;entriesInCommon;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapValue of ReturnValue;value"`
`5466`	`5465`	`Map out = null;`
`5467`		`- MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));`
	`5466`	`+ MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapValueDefault(source()));`
`5468`	`5467`	`out = in.entriesInCommon();`
`5469`	`5468`	`sink(getMapValue(out)); // $ hasValueFlow`
`5470`	`5469`	`}`
`5471`	`5470`	`{`
`5472`	`5471`	`// "com.google.common.collect;MapDifference;true;entriesOnlyOnLeft;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"`
`5473`	`5472`	`SortedMap out = null;`
`5474`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));`
	`5473`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapKeyDefault(source()), null);`
`5475`	`5474`	`out = in.entriesOnlyOnLeft();`
`5476`	`5475`	`sink(getMapKey(out)); // $ hasValueFlow`
`5477`	`5476`	`}`
`5478`	`5477`	`{`
`5479`	`5478`	`// "com.google.common.collect;MapDifference;true;entriesOnlyOnLeft;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapKey of ReturnValue;value"`
`5480`	`5479`	`Map out = null;`
`5481`		`- MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapKeyDefault(source()));`
	`5480`	`+ MapDifference in = (MapDifference)Maps.difference((Map)newWithMapKeyDefault(source()), null);`
`5482`	`5481`	`out = in.entriesOnlyOnLeft();`
`5483`	`5482`	`sink(getMapKey(out)); // $ hasValueFlow`
`5484`	`5483`	`}`
`5485`	`5484`	`{`
`5486`	`5485`	`// "com.google.common.collect;MapDifference;true;entriesOnlyOnLeft;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapValue of ReturnValue;value"`
`5487`	`5486`	`SortedMap out = null;`
`5488`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));`
	`5487`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference((SortedMap)newWithMapValueDefault(source()), null);`
`5489`	`5488`	`out = in.entriesOnlyOnLeft();`
`5490`	`5489`	`sink(getMapValue(out)); // $ hasValueFlow`
`5491`	`5490`	`}`
`5492`	`5491`	`{`
`5493`	`5492`	`// "com.google.common.collect;MapDifference;true;entriesOnlyOnLeft;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.left] of Argument[-1];MapValue of ReturnValue;value"`
`5494`	`5493`	`Map out = null;`
`5495`		`- MapDifference in = (MapDifference)newWithMapDifference_leftDefault(newWithMapValueDefault(source()));`
	`5494`	`+ MapDifference in = (MapDifference)Maps.difference((Map)newWithMapValueDefault(source()), null);`
`5496`	`5495`	`out = in.entriesOnlyOnLeft();`
`5497`	`5496`	`sink(getMapValue(out)); // $ hasValueFlow`
`5498`	`5497`	`}`
`5499`	`5498`	`{`
`5500`	`5499`	`// "com.google.common.collect;MapDifference;true;entriesOnlyOnRight;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"`
`5501`	`5500`	`SortedMap out = null;`
`5502`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));`
	`5501`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapKeyDefault(source()));`
`5503`	`5502`	`out = in.entriesOnlyOnRight();`
`5504`	`5503`	`sink(getMapKey(out)); // $ hasValueFlow`
`5505`	`5504`	`}`
`5506`	`5505`	`{`
`5507`	`5506`	`// "com.google.common.collect;MapDifference;true;entriesOnlyOnRight;();;MapKey of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapKey of ReturnValue;value"`
`5508`	`5507`	`Map out = null;`
`5509`		`- MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapKeyDefault(source()));`
	`5508`	`+ MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapKeyDefault(source()));`
`5510`	`5509`	`out = in.entriesOnlyOnRight();`
`5511`	`5510`	`sink(getMapKey(out)); // $ hasValueFlow`
`5512`	`5511`	`}`
`5513`	`5512`	`{`
`5514`	`5513`	`// "com.google.common.collect;MapDifference;true;entriesOnlyOnRight;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapValue of ReturnValue;value"`
`5515`	`5514`	`SortedMap out = null;`
`5516`		`- SortedMapDifference in = (SortedMapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));`
	`5515`	`+ SortedMapDifference in = (SortedMapDifference)Maps.difference(null, (SortedMap)newWithMapValueDefault(source()));`
`5517`	`5516`	`out = in.entriesOnlyOnRight();`
`5518`	`5517`	`sink(getMapValue(out)); // $ hasValueFlow`
`5519`	`5518`	`}`
`5520`	`5519`	`{`
`5521`	`5520`	`// "com.google.common.collect;MapDifference;true;entriesOnlyOnRight;();;MapValue of SyntheticField[com.google.common.collect.MapDifference.right] of Argument[-1];MapValue of ReturnValue;value"`
`5522`	`5521`	`Map out = null;`
`5523`		`- MapDifference in = (MapDifference)newWithMapDifference_rightDefault(newWithMapValueDefault(source()));`
	`5522`	`+ MapDifference in = (MapDifference)Maps.difference(null, (Map)newWithMapValueDefault(source()));`
`5524`	`5523`	`out = in.entriesOnlyOnRight();`
`5525`	`5524`	`sink(getMapValue(out)); // $ hasValueFlow`
`5526`	`5525`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,7 @@ class SummaryModelTest extends SummaryModelCsv {`
`14`	`14`	`"generatedtest;Test;false;getMapValueDefault;(Object);;MapValue of Argument[0];ReturnValue;value",`
`15`	`15`	`"generatedtest;Test;false;getTable_rowKeyDefault;(Object);;SyntheticField[com.google.common.collect.Table.rowKey] of Argument[0];ReturnValue;value",`
`16`	`16`	`"generatedtest;Test;false;getTable_columnKeyDefault;(Object);;SyntheticField[com.google.common.collect.Table.columnKey] of Argument[0];ReturnValue;value",`
`17`		`- "generatedtest;Test;false;newWithMapDifference_leftDefault;(Object);;Argument[0];SyntheticField[com.google.common.collect.MapDifference.left] of ReturnValue;value",`
`18`	`17`	`"generatedtest;Test;false;getMapDifference_leftDefault;(Object);;SyntheticField[com.google.common.collect.MapDifference.left] of Argument[0];ReturnValue;value",`
`19`		`- "generatedtest;Test;false;newWithMapDifference_rightDefault;(Object);;Argument[0];SyntheticField[com.google.common.collect.MapDifference.right] of ReturnValue;value",`
`20`	`18`	`"generatedtest;Test;false;getMapDifference_rightDefault;(Object);;SyntheticField[com.google.common.collect.MapDifference.right] of Argument[0];ReturnValue;value"`
`21`	`19`	`]`
`22`	`20`	`}`