Java: Delete deprecated data flow api.

Author: aschackmull

java/ql/lib/semmle/code/java/dataflow/DataFlow.qll

@@ -9,5 +9,5 @@ module DataFlow {
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<Location, JavaDataFlow>
-  import semmle.code.java.dataflow.internal.DataFlowImpl1
+  import Public
 }

java/ql/lib/semmle/code/java/dataflow/DataFlow2.qll

@@ -4,14 +4,12 @@
  */
 
 import semmle.code.java.dataflow.DataFlow
-import semmle.code.java.dataflow.DataFlow2
 import semmle.code.java.dataflow.internal.TaintTrackingUtil::StringBuilderVarModule
 
 module TaintTracking {
-  import semmle.code.java.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
+  import semmle.code.java.dataflow.internal.TaintTrackingUtil
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.java.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
   import TaintFlowMake<Location, JavaDataFlow, JavaTaintTracking>
-  import semmle.code.java.dataflow.internal.tainttracking1.TaintTrackingImpl
 }