diff --git a/java/ql/lib/semmle/code/java/Annotation.qll b/java/ql/lib/semmle/code/java/Annotation.qll index fa010ec88c0..de7dd47a93e 100644 --- a/java/ql/lib/semmle/code/java/Annotation.qll +++ b/java/ql/lib/semmle/code/java/Annotation.qll @@ -46,20 +46,6 @@ class Annotation extends @annotation, Expr { result = this.getType().getAnnotationElement(name) } - /** - * DEPRECATED: Getting the value of _any_ annotation element is error-prone because - * it could lead to selecting the value of the wrong element by accident (for example - * when an annotation type is extended in the future). Prefer the predicate `getValue(string)` - * and explicitly specify the element name. Use `getValue(_)` if it is really desired to - * get the value of any element. - * - * Gets a value of an annotation element. This includes default values in case - * no explicit value is specified. For elements with an array value type this - * might have an `ArrayInit` as result. To properly handle array values, prefer - * the predicate `getAnArrayValue`. - */ - deprecated Expr getAValue() { filteredAnnotValue(this, _, result) } - /** * Gets the value of the annotation element with the specified `name`. * This includes default values in case no explicit value is specified. @@ -157,11 +143,6 @@ class Annotation extends @annotation, Expr { */ Expr getAnArrayValue(string name) { result = this.getArrayValue(name, _) } - /** - * DEPRECATED: Predicate has been renamed to `getAnArrayValue` - */ - deprecated Expr getAValue(string name) { result = this.getAnArrayValue(name) } - /** * Gets a value of the annotation element with the specified `name`, which must be declared as an enum * type array. This includes default values in case no explicit value is specified. diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll index 81c5dc64aea..c1097c67ce5 100644 --- a/java/ql/lib/semmle/code/java/Expr.qll +++ b/java/ql/lib/semmle/code/java/Expr.qll @@ -609,9 +609,6 @@ class LongLiteral extends Literal, @longliteral { override string getAPrimaryQlClass() { result = "LongLiteral" } } -/** DEPRECATED: Alias for FloatLiteral */ -deprecated class FloatingPointLiteral = FloatLiteral; - /** * A float literal. For example, `4.2f`. * diff --git a/java/ql/lib/semmle/code/java/JDKAnnotations.qll b/java/ql/lib/semmle/code/java/JDKAnnotations.qll index 502aef09075..13a5aeff9c3 100644 --- a/java/ql/lib/semmle/code/java/JDKAnnotations.qll +++ b/java/ql/lib/semmle/code/java/JDKAnnotations.qll @@ -18,14 +18,6 @@ class OverrideAnnotation extends Annotation { class SuppressWarningsAnnotation extends Annotation { SuppressWarningsAnnotation() { this.getType().hasQualifiedName("java.lang", "SuppressWarnings") } - /** - * DEPRECATED: This predicate restricts the results to `StringLiteral`; prefer `getASuppressedWarning()` - * to get the name of a suppressed warning. - * - * Gets the `StringLiteral` of a warning suppressed by this annotation. - */ - deprecated StringLiteral getASuppressedWarningLiteral() { result = this.getAnArrayValue("value") } - /** Gets the name of a warning suppressed by this annotation. */ string getASuppressedWarning() { result = this.getAStringArrayValue("value") } } @@ -34,17 +26,6 @@ class SuppressWarningsAnnotation extends Annotation { class TargetAnnotation extends Annotation { TargetAnnotation() { this.getType().hasQualifiedName("java.lang.annotation", "Target") } - /** - * DEPRECATED: Getting the field access expression is rarely useful. Use `getATargetElementType()` - * to get the name of the target element. - * - * Gets a target expression within this annotation. - * - * For example, the field access `ElementType.FIELD` is a target expression in - * `@Target({ElementType.FIELD, ElementType.METHOD})`. - */ - deprecated Expr getATargetExpression() { result = this.getAnArrayValue("value") } - /** * Gets the name of a target element type. * @@ -58,17 +39,6 @@ class TargetAnnotation extends Annotation { class RetentionAnnotation extends Annotation { RetentionAnnotation() { this.getType().hasQualifiedName("java.lang.annotation", "Retention") } - /** - * DEPRECATED: Getting the field access expression is rarely useful. Use `getRetentionPolicy()` - * to get the name of the retention policy. - * - * Gets the retention policy expression within this annotation. - * - * For example, the field access `RetentionPolicy.RUNTIME` is the - * retention policy expression in `@Retention(RetentionPolicy.RUNTIME)`. - */ - deprecated Expr getRetentionPolicyExpression() { result = this.getValue("value") } - /** * Gets the name of the retention policy of this annotation. * diff --git a/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll b/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll index 3563176f4b0..180d99e7e71 100644 --- a/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll +++ b/java/ql/lib/semmle/code/java/controlflow/internal/Preconditions.qll @@ -96,15 +96,6 @@ private predicate condtionCheckMethodTestingFramework(Method m, int argument, bo ) } -/** - * DEPRECATED: Use `conditionCheckArgument` instead. - * Holds if `ma` is an access to a non-overridable method that checks that its - * first argument is equal to `checkTrue` and throws otherwise. - */ -deprecated predicate conditionCheck(MethodAccess ma, boolean checkTrue) { - conditionCheckArgument(ma, 0, checkTrue) -} - /** * Holds if `ma` is an access to a non-overridable method that checks that its * zero-indexed `argument` is equal to `checkTrue` and throws otherwise. diff --git a/java/ql/src/Telemetry/ExternalApi.qll b/java/ql/src/Telemetry/ExternalApi.qll index d0ba2fce7d7..b6e0de2f842 100644 --- a/java/ql/src/Telemetry/ExternalApi.qll +++ b/java/ql/src/Telemetry/ExternalApi.qll @@ -90,9 +90,6 @@ class ExternalApi extends Callable { } } -/** DEPRECATED: Alias for ExternalApi */ -deprecated class ExternalAPI = ExternalApi; - /** * Gets the limit for the number of results produced by a telemetry query. */