Merge pull request #4718 from aschackmull/java/cleanup-deprecated

yo-h · web-flow · commit 54d7cac46dfc · 2020-12-04T11:17:14.000-05:00
Java: Remove some deprecated classes.
diff --git a/java/ql/src/semmle/code/java/dataflow/FlowSources.qll b/java/ql/src/semmle/code/java/dataflow/FlowSources.qll
@@ -202,11 +202,9 @@ private class BeanValidationSource extends RemoteFlowSource {
 abstract class UserInput extends DataFlow::Node { }
 
 /**
- * DEPRECATED: Use `RemoteFlowSource` instead.
- *
  * Input that may be controlled by a remote user.
  */
-deprecated class RemoteUserInput extends UserInput {
+private class RemoteUserInput extends UserInput {
   RemoteUserInput() { this instanceof RemoteFlowSource }
 }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/TaintTracking.qll b/java/ql/src/semmle/code/java/dataflow/TaintTracking.qll
@@ -9,10 +9,4 @@ import semmle.code.java.dataflow.internal.TaintTrackingUtil::StringBuilderVarMod
 
 module TaintTracking {
   import semmle.code.java.dataflow.internal.tainttracking1.TaintTrackingImpl
-  private import semmle.code.java.dataflow.TaintTracking2
-
-  /**
-   * DEPRECATED: Use TaintTracking2::Configuration instead.
-   */
-  deprecated class Configuration2 = TaintTracking2::Configuration;
 }
diff --git a/java/ql/src/semmle/code/java/security/Validation.qll b/java/ql/src/semmle/code/java/security/Validation.qll
@@ -63,18 +63,3 @@ private predicate validatedAccess(VarAccess va) {
 class ValidatedVariableAccess extends VarAccess {
   ValidatedVariableAccess() { validatedAccess(this) }
 }
-
-/**
- * DEPRECATED: Use ValidatedVariableAccess instead.
- *
- * A variable that is ever passed to a string verification method.
- */
-deprecated class ValidatedVariable extends Variable {
-  ValidatedVariable() {
-    exists(MethodAccess call, int arg, VarAccess access |
-      validationMethod(call.getMethod(), arg) and
-      call.getArgument(arg) = access and
-      access.getVariable() = this
-    )
-  }
-}
