Java: Remove dataflow imports for java.qll.

michaelnebel · michaelnebel · commit 8e60073d5a8f · 2022-03-29T11:07:58.000+02:00
diff --git a/java/ql/lib/java.qll b/java/ql/lib/java.qll
@@ -28,9 +28,6 @@ import semmle.code.java.Type
 import semmle.code.java.UnitTests
 import semmle.code.java.Variable
 import semmle.code.java.controlflow.BasicBlocks
-import semmle.code.java.dataflow.DataFlow
-import semmle.code.java.dataflow.TaintTracking
-import semmle.code.java.dataflow.SSA
 import semmle.code.java.metrics.MetricCallable
 import semmle.code.java.metrics.MetricElement
 import semmle.code.java.metrics.MetricField
diff --git a/java/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll b/java/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll
@@ -6,13 +6,15 @@ private import java as J
 private import semmle.code.java.dataflow.internal.DataFlowNodes
 private import semmle.code.java.dataflow.internal.DataFlowPrivate
 private import semmle.code.java.dataflow.internal.ContainerFlow as ContainerFlow
+private import semmle.code.java.dataflow.DataFlow as Df
+private import semmle.code.java.dataflow.TaintTracking as Tt
 import semmle.code.java.dataflow.ExternalFlow as ExternalFlow
 import semmle.code.java.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
 import semmle.code.java.dataflow.internal.DataFlowPrivate as DataFlowPrivate
 
-module DataFlow = J::DataFlow;
+module DataFlow = Df::DataFlow;
 
-module TaintTracking = J::TaintTracking;
+module TaintTracking = Tt::TaintTracking;
 
 class Type = J::Type;
 
