Merge pull request #1758 from aschackmull/java/silly-dataflow-perf-fix

Java: Improve performance in all dataflow queries.

Author: yh-semmle

java/ql/src/semmle/code/java/frameworks/google/GoogleHttpClientApi.qll

@@ -1,6 +1,7 @@
 import java
 import semmle.code.java.Serializability
 import semmle.code.java.dataflow.DataFlow
+import semmle.code.java.dataflow.DataFlow5
 
 /** The method `parseAs` in `com.google.api.client.http.HttpResponse`. */
 private class ParseAsMethod extends Method {
@@ -10,7 +11,7 @@ private class ParseAsMethod extends Method {
   }
 }
 
-private class TypeLiteralToParseAsFlowConfiguration extends DataFlow::Configuration {
+private class TypeLiteralToParseAsFlowConfiguration extends DataFlow5::Configuration {
   TypeLiteralToParseAsFlowConfiguration() {
     this = "GoogleHttpClientApi::TypeLiteralToParseAsFlowConfiguration"
   }

java/ql/src/semmle/code/java/frameworks/jackson/JacksonSerializability.qll

@@ -7,6 +7,7 @@ import java
 import semmle.code.java.Serializability
 import semmle.code.java.Reflection
 import semmle.code.java.dataflow.DataFlow
+import semmle.code.java.dataflow.DataFlow5
 
 class JacksonJSONIgnoreAnnotation extends NonReflectiveAnnotation {
   JacksonJSONIgnoreAnnotation() {
@@ -52,7 +53,7 @@ library class FieldReferencedJacksonSerializableType extends JacksonSerializable
 
 abstract class JacksonDeserializableType extends Type { }
 
-private class TypeLiteralToJacksonDatabindFlowConfiguration extends DataFlow::Configuration {
+private class TypeLiteralToJacksonDatabindFlowConfiguration extends DataFlow5::Configuration {
   TypeLiteralToJacksonDatabindFlowConfiguration() {
     this = "TypeLiteralToJacksonDatabindFlowConfiguration"
   }