Merge pull request #1623 from aschackmull/java/delete-deprecated

Java: Delete old deprecated code.

Author: yh-semmle

java/ql/src/semmle/code/java/Expr.qll

@@ -798,16 +798,6 @@ class LogicExpr extends Expr {
  * `<=`, `>=`, `<` or `>`.
  */
 abstract class ComparisonExpr extends BinaryExpr {
-  /**
-   * DEPRECATED: use `getLesserOperand()` instead.
-   */
-  deprecated Expr getLesser() { result = getLesserOperand() }
-
-  /**
-   * DEPRECATED: use `getGreaterOperand()` instead.
-   */
-  deprecated Expr getGreater() { result = getGreaterOperand() }
-
   /**
    * Gets the lesser operand of this comparison expression.
    *

java/ql/src/semmle/code/java/Type.qll

@@ -216,15 +216,15 @@ private predicate typeArgumentContainsAux1(RefType s, RefType t, int n) {
   |
     exists(RefType tUpperBound | tUpperBound = t.(Wildcard).getUpperBound().getType() |
       // ? extends T <= ? extends S if T <: S
-      hasSubtypeStar0(s.(Wildcard).getUpperBound().getType(), tUpperBound)
+      hasSubtypeStar(s.(Wildcard).getUpperBound().getType(), tUpperBound)
       or
       // ? extends T <= ?
       s.(Wildcard).isUnconstrained()
     )
     or
     exists(RefType tLowerBound | tLowerBound = t.(Wildcard).getLowerBound().getType() |
       // ? super T <= ? super S if s <: T
-      hasSubtypeStar0(tLowerBound, s.(Wildcard).getLowerBound().getType())
+      hasSubtypeStar(tLowerBound, s.(Wildcard).getLowerBound().getType())
       or
       // ? super T <= ?
       s.(Wildcard).isUnconstrained()
@@ -237,10 +237,10 @@ private predicate typeArgumentContainsAux1(RefType s, RefType t, int n) {
     s = t
     or
     // T <= ? extends T
-    hasSubtypeStar0(s.(Wildcard).getUpperBound().getType(), t)
+    hasSubtypeStar(s.(Wildcard).getUpperBound().getType(), t)
     or
     // T <= ? super T
-    hasSubtypeStar0(t, s.(Wildcard).getLowerBound().getType())
+    hasSubtypeStar(t, s.(Wildcard).getLowerBound().getType())
   )
 }
 
@@ -249,17 +249,12 @@ private predicate wildcardExtendsObject(Wildcard wc) {
   wc.getUpperBound().getType() instanceof TypeObject
 }
 
-/**
- * DEPRECATED: Use `hasSubtype*` instead.
- */
-deprecated predicate hasSubtypeStar(RefType t, RefType sub) { hasSubtype*(t, sub) }
-
-private predicate hasSubtypeStar0(RefType t, RefType sub) {
+private predicate hasSubtypeStar(RefType t, RefType sub) {
   sub = t
   or
   hasSubtype(t, sub)
   or
-  exists(RefType mid | hasSubtypeStar0(t, mid) and hasSubtype(mid, sub))
+  exists(RefType mid | hasSubtypeStar(t, mid) and hasSubtype(mid, sub))
 }
 
 /** Holds if type `t` declares member `m`. */

java/ql/src/semmle/code/java/dataflow/FlowSources.qll

@@ -150,70 +150,6 @@ abstract class UserInput extends DataFlow::Node { }
  */
 deprecated class RemoteUserInput extends UserInput {
   RemoteUserInput() { this instanceof RemoteFlowSource }
-
-  /**
-   * DEPRECATED: Use a configuration with a defined sink instead.
-   *
-   * Holds if taint can flow from this `RemoteUserInput` to `sink`.
-   *
-   * In addition to the basic taint flow, this allows a path to end in a number
-   * of steps through instance fields.
-   */
-  deprecated predicate flowsTo(DataFlow::Node sink) { remoteUserInputFlow(this, sink) }
-}
-
-/**
- * Holds if taint can flow from `node1` to `node2` in either one local step or
- * through an instance field.
- */
-private predicate localInstanceFieldStep(DataFlow::Node node1, DataFlow::Node node2) {
-  TaintTracking::localTaintStep(node1, node2)
-  or
-  exists(InstanceField field |
-    node1.asExpr() = field.getAnAssignedValue()
-    or
-    exists(Assignment assign | assign.getRhs() = node1.asExpr() |
-      assign.getDest().(ArrayAccess).getArray() = field.getAnAccess()
-    )
-  |
-    node2.asExpr() = field.getAnAccess()
-  )
-}
-
-private module RemoteUserInputFlow {
-  private import semmle.code.java.dataflow.internal.DataFlowImplDepr
-  private import semmle.code.java.security.SecurityTests
-  private import semmle.code.java.security.Validation
-
-  deprecated class RemoteUserInputConfig extends Configuration {
-    RemoteUserInputConfig() { this = "FlowSources.qll:RemoteUserInputConfig" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof RemoteUserInput }
-
-    override predicate isSink(DataFlow::Node sink) { any() }
-
-    override int fieldFlowBranchLimit() { result = 0 }
-
-    override predicate isBarrier(DataFlow::Node node) {
-      // Ignore paths through test code.
-      node.getEnclosingCallable().getDeclaringType() instanceof NonSecurityTestClass or
-      exists(ValidatedVariable var | node.asExpr() = var.getAnAccess())
-    }
-
-    override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-      TaintTracking::localAdditionalTaintStep(node1, node2)
-    }
-  }
-}
-
-cached
-deprecated private predicate remoteUserInputFlow(RemoteUserInput src, DataFlow::Node sink) {
-  any(RemoteUserInputFlow::RemoteUserInputConfig config).hasFlow(src, sink)
-  or
-  exists(DataFlow::Node mid |
-    remoteUserInputFlow(src, mid) and
-    localInstanceFieldStep(mid, sink)
-  )
 }
 
 /** Input that may be controlled by a local user. */