Adapt to static methods and nested types returning unbound declaring types

smowton · smowton · commit 74feaf2893c2 · 2021-06-23T16:03:18.000+01:00
Previously these returned raw declaring types instead
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/ContainerFlow.qll b/java/ql/src/semmle/code/java/dataflow/internal/ContainerFlow.qll
@@ -7,11 +7,11 @@ private import semmle.code.java.dataflow.ExternalFlow
 
 private class EntryType extends RefType {
   EntryType() {
-    this.getSourceDeclaration().getASourceSupertype*().hasQualifiedName("java.util", "Map<>$Entry")
+    this.getSourceDeclaration().getASourceSupertype*().hasQualifiedName("java.util", "Map$Entry")
   }
 
   RefType getValueType() {
-    exists(GenericType t | t.hasQualifiedName("java.util", "Map<>$Entry") |
+    exists(GenericType t | t.hasQualifiedName("java.util", "Map$Entry") |
       indirectlyInstantiates(this, t, 1, result)
     )
   }
@@ -95,10 +95,10 @@ private class ContainerFlowSummaries extends SummaryModelCsv {
   override predicate row(string row) {
     row =
       [
-        "java.util;Map<>$Entry;true;getKey;;;MapKey of Argument[-1];ReturnValue;value",
-        "java.util;Map<>$Entry;true;getValue;;;MapValue of Argument[-1];ReturnValue;value",
-        "java.util;Map<>$Entry;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",
-        "java.util;Map<>$Entry;true;setValue;;;Argument[0];MapValue of Argument[-1];value",
+        "java.util;Map$Entry;true;getKey;;;MapKey of Argument[-1];ReturnValue;value",
+        "java.util;Map$Entry;true;getValue;;;MapValue of Argument[-1];ReturnValue;value",
+        "java.util;Map$Entry;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",
+        "java.util;Map$Entry;true;setValue;;;Argument[0];MapValue of Argument[-1];value",
         "java.lang;Iterable;true;iterator;();;Element of Argument[-1];Element of ReturnValue;value",
         "java.lang;Iterable;true;spliterator;();;Element of Argument[-1];Element of ReturnValue;value",
         "java.util;Iterator;true;next;;;Element of Argument[-1];ReturnValue;value",
diff --git a/java/ql/src/semmle/code/java/frameworks/play/Play.qll b/java/ql/src/semmle/code/java/frameworks/play/Play.qll
@@ -26,10 +26,10 @@ class PlayMvcHttpRequestHeader extends RefType {
 }
 
 /**
- * A `play.mvc.BodyParser<>$Of` annotation.
+ * A `play.mvc.BodyParser$Of` annotation.
  */
 class PlayBodyParserAnnotation extends Annotation {
-  PlayBodyParserAnnotation() { this.getType().hasQualifiedName("play.mvc", "BodyParser<>$Of") }
+  PlayBodyParserAnnotation() { this.getType().hasQualifiedName("play.mvc", "BodyParser$Of") }
 }
 
 /**
diff --git a/java/ql/test/library-tests/dataflow/collections/B.java b/java/ql/test/library-tests/dataflow/collections/B.java
@@ -49,22 +49,22 @@ static void sink(Object obj) { }
 
   void foo() throws InterruptedException {
     {
-      // "java.util;Map<>$Entry;true;getKey;;;MapKey of Argument[-1];ReturnValue;value",
+      // "java.util;Map$Entry;true;getKey;;;MapKey of Argument[-1];ReturnValue;value",
       Object out = null;
       Object in = storeMapKeyEntry(source()); out = ((Map.Entry)in).getKey(); sink(out); // $ hasValueFlow
     }
     {
-      // "java.util;Map<>$Entry;true;getValue;;;MapValue of Argument[-1];ReturnValue;value",
+      // "java.util;Map$Entry;true;getValue;;;MapValue of Argument[-1];ReturnValue;value",
       Object out = null;
       Object in = storeMapValueEntry(source()); out = ((Map.Entry)in).getValue(); sink(out); // $ hasValueFlow
     }
     {
-      // "java.util;Map<>$Entry;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",
+      // "java.util;Map$Entry;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",
       Object out = null;
       Object in = storeMapValueEntry(source()); out = ((Map.Entry)in).setValue(null); sink(out); // $ hasValueFlow
     }
     {
-      // "java.util;Map<>$Entry;true;setValue;;;Argument[0];MapValue of Argument[-1];value",
+      // "java.util;Map$Entry;true;setValue;;;Argument[0];MapValue of Argument[-1];value",
       Map.Entry out = null;
       Object in = source(); out.setValue(in); sink(readMapValue(out)); // $ hasValueFlow
     }
diff --git a/java/ql/test/library-tests/frameworks/play/PlayBodyParserAnnotation.expected b/java/ql/test/library-tests/frameworks/play/PlayBodyParserAnnotation.expected
@@ -1 +1 @@
-| play.mvc.BodyParser<>$Of |
+| play.mvc.BodyParser$Of |

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ class PlayMvcHttpRequestHeader extends RefType {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
`29`		- * A `play.mvc.BodyParser<>$Of` annotation.
	`29`	+ * A `play.mvc.BodyParser$Of` annotation.
`30`	`30`	`*/`
`31`	`31`	`class PlayBodyParserAnnotation extends Annotation {`
`32`		`- PlayBodyParserAnnotation() { this.getType().hasQualifiedName("play.mvc", "BodyParser<>$Of") }`
	`32`	`+ PlayBodyParserAnnotation() { this.getType().hasQualifiedName("play.mvc", "BodyParser$Of") }`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -49,22 +49,22 @@ static void sink(Object obj) { }`
`49`	`49`
`50`	`50`	`void foo() throws InterruptedException {`
`51`	`51`	`{`
`52`		`- // "java.util;Map<>$Entry;true;getKey;;;MapKey of Argument[-1];ReturnValue;value",`
	`52`	`+ // "java.util;Map$Entry;true;getKey;;;MapKey of Argument[-1];ReturnValue;value",`
`53`	`53`	`Object out = null;`
`54`	`54`	`Object in = storeMapKeyEntry(source()); out = ((Map.Entry)in).getKey(); sink(out); // $ hasValueFlow`
`55`	`55`	`}`
`56`	`56`	`{`
`57`		`- // "java.util;Map<>$Entry;true;getValue;;;MapValue of Argument[-1];ReturnValue;value",`
	`57`	`+ // "java.util;Map$Entry;true;getValue;;;MapValue of Argument[-1];ReturnValue;value",`
`58`	`58`	`Object out = null;`
`59`	`59`	`Object in = storeMapValueEntry(source()); out = ((Map.Entry)in).getValue(); sink(out); // $ hasValueFlow`
`60`	`60`	`}`
`61`	`61`	`{`
`62`		`- // "java.util;Map<>$Entry;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",`
	`62`	`+ // "java.util;Map$Entry;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",`
`63`	`63`	`Object out = null;`
`64`	`64`	`Object in = storeMapValueEntry(source()); out = ((Map.Entry)in).setValue(null); sink(out); // $ hasValueFlow`
`65`	`65`	`}`
`66`	`66`	`{`
`67`		`- // "java.util;Map<>$Entry;true;setValue;;;Argument[0];MapValue of Argument[-1];value",`
	`67`	`+ // "java.util;Map$Entry;true;setValue;;;Argument[0];MapValue of Argument[-1];value",`
`68`	`68`	`Map.Entry out = null;`
`69`	`69`	`Object in = source(); out.setValue(in); sink(readMapValue(out)); // $ hasValueFlow`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| play.mvc.BodyParser<>$Of \|`
	`1`	`+\| play.mvc.BodyParser$Of \|`