From 9d2f76849b01ebd586a6ed9b871d1ac3242df4db Mon Sep 17 00:00:00 2001
From: yo-h <55373593+yo-h@users.noreply.github.com>
Date: Mon, 17 Feb 2020 23:05:00 -0500
Subject: [PATCH] Java 14: switch expressions are no longer in preview

---
 java/ql/src/semmle/code/java/Expr.qll       |  2 --
 java/ql/src/semmle/code/java/Statement.qll  | 12 ------------
 java/ql/test/library-tests/guards12/options |  2 +-
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/java/ql/src/semmle/code/java/Expr.qll b/java/ql/src/semmle/code/java/Expr.qll
index 37cc608d878..eff4928fd46 100755
--- a/java/ql/src/semmle/code/java/Expr.qll
+++ b/java/ql/src/semmle/code/java/Expr.qll
@@ -1076,8 +1076,6 @@ class ConditionalExpr extends Expr, @conditionalexpr {
 }
 
 /**
- * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
- *
  * A `switch` expression.
  */
 class SwitchExpr extends Expr, @switchexpr {
diff --git a/java/ql/src/semmle/code/java/Statement.qll b/java/ql/src/semmle/code/java/Statement.qll
index 2a5f94ef781..fa303a7c3ee 100755
--- a/java/ql/src/semmle/code/java/Statement.qll
+++ b/java/ql/src/semmle/code/java/Statement.qll
@@ -417,8 +417,6 @@ class SwitchCase extends Stmt, @case {
   SwitchStmt getSwitch() { result.getACase() = this }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Gets the switch expression to which this case belongs, if any.
    */
   SwitchExpr getSwitchExpr() { result.getACase() = this }
@@ -432,8 +430,6 @@ class SwitchCase extends Stmt, @case {
   }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Holds if this `case` is a switch labeled rule of the form `... -> ...`.
    */
   predicate isRule() {
@@ -443,15 +439,11 @@ class SwitchCase extends Stmt, @case {
   }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Gets the expression on the right-hand side of the arrow, if any.
    */
   Expr getRuleExpression() { result.getParent() = this and result.getIndex() = -1 }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Gets the statement on the right-hand side of the arrow, if any.
    */
   Stmt getRuleStatement() { result.getParent() = this and result.getIndex() = -1 }
@@ -465,8 +457,6 @@ class ConstCase extends SwitchCase {
   Expr getValue() { result.getParent() = this and result.getIndex() = 0 }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Gets the `case` constant at the specified index.
    */
   Expr getValue(int i) { result.getParent() = this and result.getIndex() = i and i >= 0 }
@@ -624,8 +614,6 @@ class BreakStmt extends Stmt, @breakstmt {
 }
 
 /**
- * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
- *
  * A `yield` statement.
  */
 class YieldStmt extends Stmt, @yieldstmt {
diff --git a/java/ql/test/library-tests/guards12/options b/java/ql/test/library-tests/guards12/options
index 99827347b32..3f12170222c 100644
--- a/java/ql/test/library-tests/guards12/options
+++ b/java/ql/test/library-tests/guards12/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args --enable-preview -source 13 -target 13
+//semmle-extractor-options: --javac-args -source 14 -target 14