Merge pull request #12345 from erik-krogh/delOldDeps

delete old deprecations

java/ql/lib/change-notes/2023-03-03-delete-deps.md

@@ -0,0 +1,7 @@
+---
+category: minorAnalysis
+---
+* Deleted the deprecated `getPath` and `getFolder` predicates from the `XmlFile` class.
+* Deleted the deprecated `getRepresentedString` predicate from the `StringLiteral` class.
+* Deleted the deprecated `ServletWriterSource` class.
+* Deleted the deprecated `getGroupID`, `getArtefactID`, and `artefactMatches` predicates from the `MavenRepoJar` class.

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

@@ -701,14 +701,6 @@ class StringLiteral extends Literal, @stringliteral {
    */
   override string getValue() { result = super.getValue() }
 
-  /**
-   * DEPRECATED: This predicate will be removed in a future version because
-   * it is just an alias for `getValue()`; that predicate should be used instead.
-   *
-   * Gets the literal string without the quotes.
-   */
-  deprecated string getRepresentedString() { result = this.getValue() }
-
   /** Holds if this string literal is a text block (`""" ... """`). */
   predicate isTextBlock() { this.getLiteral().matches("\"\"\"%") }
 

java/ql/lib/semmle/code/java/security/XSS.qll

@@ -104,11 +104,6 @@ class XssVulnerableWriterSource extends MethodAccess {
   }
 }
 
-/**
- * DEPRECATED: Use `XssVulnerableWriterSource` instead.
- */
-deprecated class ServletWriterSource = XssVulnerableWriterSource;
-
 /**
  * Holds if `s` is an HTTP Content-Type vulnerable to XSS.
  */

java/ql/lib/semmle/code/xml/MavenPom.qll

@@ -454,21 +454,11 @@ class MavenRepoJar extends File {
     )
   }
 
-  /**
-   * DEPRECATED: name changed to `getGroupId` for consistent use of camel-case.
-   */
-  deprecated string getGroupID() { result = this.getGroupId() }
-
   /**
    * Gets the `artifactId` of this jar.
    */
   string getArtifactId() { result = this.getParentContainer().getParentContainer().getBaseName() }
 
-  /**
-   * DEPRECATED: name changed to `getArtifactId` for consistent casing and consistent spelling with Maven.
-   */
-  deprecated string getArtefactID() { result = this.getArtifactId() }
-
   /**
    * Gets the artifact version string of this jar.
    */
@@ -482,11 +472,6 @@ class MavenRepoJar extends File {
     pom.getArtifact().getValue() = this.getArtifactId()
   }
 
-  /**
-   * DEPRECATED: name changed to `artifactMatches` for consistent spelling with Maven.
-   */
-  deprecated predicate artefactMatches(ProtoPom pom) { this.artifactMatches(pom) }
-
   /**
    * Holds if this jar is both an artifact for the POM, and has a version string that matches the POM
    * version string. Only soft and hard version matches are supported.

java/ql/lib/semmle/code/xml/XML.qll

@@ -108,20 +108,6 @@ class XmlFile extends XmlParent, File {
   /** Gets the name of this XML file. */
   override string getName() { result = File.super.getAbsolutePath() }
 
-  /**
-   * DEPRECATED: Use `getAbsolutePath()` instead.
-   *
-   * Gets the path of this XML file.
-   */
-  deprecated string getPath() { result = this.getAbsolutePath() }
-
-  /**
-   * DEPRECATED: Use `getParentContainer().getAbsolutePath()` instead.
-   *
-   * Gets the path of the folder that contains this XML file.
-   */
-  deprecated string getFolder() { result = this.getParentContainer().getAbsolutePath() }
-
   /** Gets the encoding of this XML file. */
   string getEncoding() { xmlEncoding(this, result) }