Java: delete old deprecations

JanKallman · Nov 17, 2022 · a4e5d75 · a4e5d75
1 parent d5ec781
commit a4e5d75
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 24 deletions.
diff --git a/java/ql/lib/change-notes/2022-11-17-deleted-deps.md b/java/ql/lib/change-notes/2022-11-17-deleted-deps.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* Deleted the deprecated `LocalClassDeclStmtNode` and `LocalClassDeclStmt` classes from `PrintAst.qll` and `Statement.qll` respectively.
+* Deleted the deprecated `getLocalClass` predicate from `LocalTypeDeclStmt`, and the deprecated `getLocalClassDeclStmt` predicate from `LocalClassOrInterface`.
diff --git a/java/ql/lib/semmle/code/java/PrintAst.qll b/java/ql/lib/semmle/code/java/PrintAst.qll
@@ -393,12 +393,6 @@ final class LocalTypeDeclStmtNode extends ExprStmtNode {
  }
 }
 
-/**
- * DEPRECATED: Renamed `LocalTypeDeclStmtNode` to reflect the fact that
- * as of Java 16 interfaces can also be declared locally, not just classes.
- */
-deprecated class LocalClassDeclStmtNode = LocalTypeDeclStmtNode;
-
 /**
  * A node representing a `ForStmt`.
  */

diff --git a/java/ql/lib/semmle/code/java/Statement.qll b/java/ql/lib/semmle/code/java/Statement.qll
@@ -781,12 +781,6 @@ class LocalTypeDeclStmt extends Stmt, @localtypedeclstmt {
  /** Gets the local type declared by this statement. */
  LocalClassOrInterface getLocalType() { isLocalClassOrInterface(result, this) }
 
- /**
- * DEPRECATED: Renamed `getLocalType` to reflect the fact that
- * as of Java 16 interfaces can also be declared locally, not just classes.
- */
- deprecated LocalClassOrInterface getLocalClass() { result = this.getLocalType() }
-
  private string getDeclKeyword() {
  result = "class" and this.getLocalType() instanceof Class
  or
@@ -802,12 +796,6 @@ class LocalTypeDeclStmt extends Stmt, @localtypedeclstmt {
  override string getAPrimaryQlClass() { result = "LocalTypeDeclStmt" }
 }
 
-/**
- * DEPRECATED: Renamed `LocalTypeDeclStmt` to reflect the fact that
- * as of Java 16 interfaces can also be declared locally, not just classes.
- */
-deprecated class LocalClassDeclStmt = LocalTypeDeclStmt;
-
 /** An explicit `this(...)` constructor invocation. */
 class ThisConstructorInvocationStmt extends Stmt, ConstructorCall, @constructorinvocationstmt {
  /** Gets an argument of this constructor invocation. */

diff --git a/java/ql/lib/semmle/code/java/Type.qll b/java/ql/lib/semmle/code/java/Type.qll
@@ -828,12 +828,6 @@ class LocalClassOrInterface extends NestedType, ClassOrInterface {
  /** Gets the statement that declares this local class. */
  LocalTypeDeclStmt getLocalTypeDeclStmt() { isLocalClassOrInterface(this, result) }
 
- /**
- * DEPRECATED: renamed `getLocalTypeDeclStmt` to reflect the fact that
- * as of Java 16 interfaces can also be declared locally.
- */
- deprecated LocalTypeDeclStmt getLocalClassDeclStmt() { result = this.getLocalTypeDeclStmt() }
-
  override string getAPrimaryQlClass() { result = "LocalClassOrInterface" }
 }