Remove superfluous (Object) casts

smowton · smowton · commit 916c7c576db6 · 2021-06-29T12:28:42.000+01:00
diff --git a/java/ql/test/library-tests/frameworks/spring/util/Test.java b/java/ql/test/library-tests/frameworks/spring/util/Test.java
@@ -453,42 +453,42 @@ public void test() throws Exception {
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMapAdapter out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.add(in, null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.add(in, null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.add(in, (Object)null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[-1];value"
 			MultiValueMapAdapter out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.add(null, in);
 			sink(getElement((List)getMapValue(out))); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.add(null, in);
 			sink(getElement((List)getMapValue(out))); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.add((Object)null, in);
 			sink(getElement((List)getMapValue(out))); // $hasValueFlow
 		}
@@ -530,14 +530,14 @@ public void test() throws Exception {
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMapAdapter out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.addAll(in, 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();
+			Object in = source();
 			out.addAll(in, (List)null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
@@ -560,28 +560,28 @@ public void test() throws Exception {
 		{
 			// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.addIfAbsent(in, null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.addIfAbsent(in, (Object)null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[1];Element of MapValue of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.addIfAbsent(null, in);
 			sink(getElement((List)getMapValue(out))); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[1];Element of MapValue of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.addIfAbsent((Object)null, in);
 			sink(getElement((List)getMapValue(out))); // $hasValueFlow
 		}
@@ -609,42 +609,42 @@ public void test() throws Exception {
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMapAdapter out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.set(in, null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.set(in, null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[0];MapKey of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.set(in, (Object)null);
 			sink(getMapKey(out)); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[-1];value"
 			MultiValueMapAdapter out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.set(null, in);
 			sink(getElement((List)getMapValue(out))); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.set(null, in);
 			sink(getElement((List)getMapValue(out))); // $hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[-1];value"
 			MultiValueMap out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out.set((Object)null, in);
 			sink(getElement((List)getMapValue(out))); // $hasValueFlow
 		}
@@ -984,7 +984,7 @@ public void test() throws Exception {
 		{
 			// "org.springframework.util;SerializationUtils;false;serialize;;;Argument[0];ReturnValue;taint"
 			byte[] out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out = SerializationUtils.serialize(in);
 			sink(out); // $hasTaintFlow
 		}
@@ -1243,7 +1243,7 @@ public void test() throws Exception {
 		{
 			// "org.springframework.util;StringUtils;false;quoteIfString;;;Argument[0];ReturnValue;taint"
 			Object out = null;
-			Object in = (Object)source();
+			Object in = source();
 			out = StringUtils.quoteIfString(in);
 			sink(out); // $hasTaintFlow
 		}

Original file line number	Diff line number	Diff line change
`@@ -453,42 +453,42 @@ public void test() throws Exception {`
`453`	`453`	`{`
`454`	`454`	`// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value"`
`455`	`455`	`MultiValueMapAdapter out = null;`
`456`		`- Object in = (Object)source();`
	`456`	`+ Object in = source();`
`457`	`457`	`out.add(in, null);`
`458`	`458`	`sink(getMapKey(out)); // $hasValueFlow`
`459`	`459`	`}`
`460`	`460`	`{`
`461`	`461`	`// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value"`
`462`	`462`	`MultiValueMap out = null;`
`463`		`- Object in = (Object)source();`
	`463`	`+ Object in = source();`
`464`	`464`	`out.add(in, null);`
`465`	`465`	`sink(getMapKey(out)); // $hasValueFlow`
`466`	`466`	`}`
`467`	`467`	`{`
`468`	`468`	`// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value"`
`469`	`469`	`MultiValueMap out = null;`
`470`		`- Object in = (Object)source();`
	`470`	`+ Object in = source();`
`471`	`471`	`out.add(in, (Object)null);`
`472`	`472`	`sink(getMapKey(out)); // $hasValueFlow`
`473`	`473`	`}`
`474`	`474`	`{`
`475`	`475`	`// "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[-1];value"`
`476`	`476`	`MultiValueMapAdapter out = null;`
`477`		`- Object in = (Object)source();`
	`477`	`+ Object in = source();`
`478`	`478`	`out.add(null, in);`
`479`	`479`	`sink(getElement((List)getMapValue(out))); // $hasValueFlow`
`480`	`480`	`}`
`481`	`481`	`{`
`482`	`482`	`// "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[-1];value"`
`483`	`483`	`MultiValueMap out = null;`
`484`		`- Object in = (Object)source();`
	`484`	`+ Object in = source();`
`485`	`485`	`out.add(null, in);`
`486`	`486`	`sink(getElement((List)getMapValue(out))); // $hasValueFlow`
`487`	`487`	`}`
`488`	`488`	`{`
`489`	`489`	`// "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[-1];value"`
`490`	`490`	`MultiValueMap out = null;`
`491`		`- Object in = (Object)source();`
	`491`	`+ Object in = source();`
`492`	`492`	`out.add((Object)null, in);`
`493`	`493`	`sink(getElement((List)getMapValue(out))); // $hasValueFlow`
`494`	`494`	`}`
`@@ -530,14 +530,14 @@ public void test() throws Exception {`
`530`	`530`	`{`
`531`	`531`	`// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"`
`532`	`532`	`MultiValueMapAdapter out = null;`
`533`		`- Object in = (Object)source();`
	`533`	`+ Object in = source();`
`534`	`534`	`out.addAll(in, null);`
`535`	`535`	`sink(getMapKey(out)); // $hasValueFlow`
`536`	`536`	`}`
`537`	`537`	`{`
`538`	`538`	`// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"`
`539`	`539`	`MultiValueMap out = null;`
`540`		`- Object in = (Object)source();`
	`540`	`+ Object in = source();`
`541`	`541`	`out.addAll(in, (List)null);`
`542`	`542`	`sink(getMapKey(out)); // $hasValueFlow`
`543`	`543`	`}`
`@@ -560,28 +560,28 @@ public void test() throws Exception {`
`560`	`560`	`{`
`561`	`561`	`// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[0];MapKey of Argument[-1];value"`
`562`	`562`	`MultiValueMap out = null;`
`563`		`- Object in = (Object)source();`
	`563`	`+ Object in = source();`
`564`	`564`	`out.addIfAbsent(in, null);`
`565`	`565`	`sink(getMapKey(out)); // $hasValueFlow`
`566`	`566`	`}`
`567`	`567`	`{`
`568`	`568`	`// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[0];MapKey of Argument[-1];value"`
`569`	`569`	`MultiValueMap out = null;`
`570`		`- Object in = (Object)source();`
	`570`	`+ Object in = source();`
`571`	`571`	`out.addIfAbsent(in, (Object)null);`
`572`	`572`	`sink(getMapKey(out)); // $hasValueFlow`
`573`	`573`	`}`
`574`	`574`	`{`
`575`	`575`	`// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[1];Element of MapValue of Argument[-1];value"`
`576`	`576`	`MultiValueMap out = null;`
`577`		`- Object in = (Object)source();`
	`577`	`+ Object in = source();`
`578`	`578`	`out.addIfAbsent(null, in);`
`579`	`579`	`sink(getElement((List)getMapValue(out))); // $hasValueFlow`
`580`	`580`	`}`
`581`	`581`	`{`
`582`	`582`	`// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[1];Element of MapValue of Argument[-1];value"`
`583`	`583`	`MultiValueMap out = null;`
`584`		`- Object in = (Object)source();`
	`584`	`+ Object in = source();`
`585`	`585`	`out.addIfAbsent((Object)null, in);`
`586`	`586`	`sink(getElement((List)getMapValue(out))); // $hasValueFlow`
`587`	`587`	`}`
`@@ -609,42 +609,42 @@ public void test() throws Exception {`
`609`	`609`	`{`
`610`	`610`	`// "org.springframework.util;MultiValueMap;true;set;;;Argument[0];MapKey of Argument[-1];value"`
`611`	`611`	`MultiValueMapAdapter out = null;`
`612`		`- Object in = (Object)source();`
	`612`	`+ Object in = source();`
`613`	`613`	`out.set(in, null);`
`614`	`614`	`sink(getMapKey(out)); // $hasValueFlow`
`615`	`615`	`}`
`616`	`616`	`{`
`617`	`617`	`// "org.springframework.util;MultiValueMap;true;set;;;Argument[0];MapKey of Argument[-1];value"`
`618`	`618`	`MultiValueMap out = null;`
`619`		`- Object in = (Object)source();`
	`619`	`+ Object in = source();`
`620`	`620`	`out.set(in, null);`
`621`	`621`	`sink(getMapKey(out)); // $hasValueFlow`
`622`	`622`	`}`
`623`	`623`	`{`
`624`	`624`	`// "org.springframework.util;MultiValueMap;true;set;;;Argument[0];MapKey of Argument[-1];value"`
`625`	`625`	`MultiValueMap out = null;`
`626`		`- Object in = (Object)source();`
	`626`	`+ Object in = source();`
`627`	`627`	`out.set(in, (Object)null);`
`628`	`628`	`sink(getMapKey(out)); // $hasValueFlow`
`629`	`629`	`}`
`630`	`630`	`{`
`631`	`631`	`// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[-1];value"`
`632`	`632`	`MultiValueMapAdapter out = null;`
`633`		`- Object in = (Object)source();`
	`633`	`+ Object in = source();`
`634`	`634`	`out.set(null, in);`
`635`	`635`	`sink(getElement((List)getMapValue(out))); // $hasValueFlow`
`636`	`636`	`}`
`637`	`637`	`{`
`638`	`638`	`// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[-1];value"`
`639`	`639`	`MultiValueMap out = null;`
`640`		`- Object in = (Object)source();`
	`640`	`+ Object in = source();`
`641`	`641`	`out.set(null, in);`
`642`	`642`	`sink(getElement((List)getMapValue(out))); // $hasValueFlow`
`643`	`643`	`}`
`644`	`644`	`{`
`645`	`645`	`// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[-1];value"`
`646`	`646`	`MultiValueMap out = null;`
`647`		`- Object in = (Object)source();`
	`647`	`+ Object in = source();`
`648`	`648`	`out.set((Object)null, in);`
`649`	`649`	`sink(getElement((List)getMapValue(out))); // $hasValueFlow`
`650`	`650`	`}`
`@@ -984,7 +984,7 @@ public void test() throws Exception {`
`984`	`984`	`{`
`985`	`985`	`// "org.springframework.util;SerializationUtils;false;serialize;;;Argument[0];ReturnValue;taint"`
`986`	`986`	`byte[] out = null;`
`987`		`- Object in = (Object)source();`
	`987`	`+ Object in = source();`
`988`	`988`	`out = SerializationUtils.serialize(in);`
`989`	`989`	`sink(out); // $hasTaintFlow`
`990`	`990`	`}`
`@@ -1243,7 +1243,7 @@ public void test() throws Exception {`
`1243`	`1243`	`{`
`1244`	`1244`	`// "org.springframework.util;StringUtils;false;quoteIfString;;;Argument[0];ReturnValue;taint"`
`1245`	`1245`	`Object out = null;`
`1246`		`- Object in = (Object)source();`
	`1246`	`+ Object in = source();`
`1247`	`1247`	`out = StringUtils.quoteIfString(in);`
`1248`	`1248`	`sink(out); // $hasTaintFlow`
`1249`	`1249`	`}`