Java: Use shared SuccessorType.

Author: aschackmull

java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll

@@ -9,7 +9,7 @@ import Dominance
 private import codeql.controlflow.BasicBlock as BB
 
 private module Input implements BB::InputSig<Location> {
-  import SuccessorType
+  import codeql.controlflow.SuccessorType
 
   /** Hold if `t` represents a conditional successor type. */
   predicate successorTypeIsCondition(SuccessorType t) { none() }
@@ -34,7 +34,7 @@ private module Input implements BB::InputSig<Location> {
     result = getASpecificSuccessor(node, t)
     or
     node.getASuccessor() = result and
-    t instanceof NormalSuccessor and
+    t instanceof DirectSuccessor and
     not result = getASpecificSuccessor(node, _)
   }
 

java/ql/lib/semmle/code/java/controlflow/Guards.qll

@@ -143,7 +143,7 @@ private module GuardsInput implements SharedGuards::InputSig<Location> {
   private import java as J
   private import semmle.code.java.dataflow.internal.BaseSSA
   private import semmle.code.java.dataflow.NullGuards as NullGuards
-  import SuccessorType
+  import codeql.controlflow.SuccessorType
 
   class ControlFlowNode = J::ControlFlowNode;