Java: Use shared SuccessorType.

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

@@ -140,7 +140,7 @@ private predicate isNonFallThroughPredecessor(SwitchCase sc, ControlFlowNode pre
 }
 
 private module SuccessorTypes implements SharedGuards::SuccessorTypesSig<SuccessorType> {
-  import SuccessorType
+  import codeql.controlflow.SuccessorType
 }
 
 private module GuardsInput implements SharedGuards::InputSig<Location, ControlFlowNode, BasicBlock> {

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

@@ -1,74 +0,0 @@
-/**
- * Provides different types of control flow successor types.
- */
-overlay[local?]
-module;
-
-import java
-private import codeql.util.Boolean
-
-private newtype TSuccessorType =
-  TNormalSuccessor() or
-  TBooleanSuccessor(Boolean branch) or
-  TExceptionSuccessor()
-
-/** The type of a control flow successor. */
-class SuccessorType extends TSuccessorType {
-  /** Gets a textual representation of successor type. */
-  string toString() { result = "SuccessorType" }
-}
-
-/** A normal control flow successor. */
-class NormalSuccessor extends SuccessorType, TNormalSuccessor { }
-
-/**
- * An exceptional control flow successor.
- *
- * This marks control flow edges that are taken when an exception is thrown.
- */
-class ExceptionSuccessor extends SuccessorType, TExceptionSuccessor { }
-
-/**
- * A conditional control flow successor.
- *
- * This currently only includes boolean successors (`BooleanSuccessor`).
- */
-class ConditionalSuccessor extends SuccessorType, TBooleanSuccessor {
-  /** Gets the Boolean value of this successor. */
-  boolean getValue() { this = TBooleanSuccessor(result) }
-}
-
-/**
- * A Boolean control flow successor.
- *
- * For example, this program fragment:
- *
- * ```java
- * if (x < 0)
- *     return 0;
- * else
- *     return 1;
- * ```
- *
- * has a control flow graph containing Boolean successors:
- *
- * ```
- *        if
- *        |
- *      x < 0
- *       / \
- *      /   \
- *     /     \
- *  true    false
- *    |        \
- * return 0   return 1
- * ```
- */
-class BooleanSuccessor = ConditionalSuccessor;
-
-/**
- * A nullness control flow successor. This is currently unused for Java.
- */
-class NullnessSuccessor extends ConditionalSuccessor {
-  NullnessSuccessor() { none() }
-}