Fix Quality Flaws: Remove deprecation flags on final feature from JDK…

… 21 (JEP-440 & JEP-441) (#4669)
SonarSource · Feb 19, 2024 · 6cd4836 · 6cd4836
1 parent 5c53492
commit 6cd4836
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 73 deletions.
diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/DefaultPatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/DefaultPatternTreeImpl.java
@@ -27,10 +27,8 @@
 import org.sonar.plugins.java.api.tree.TreeVisitor;
 
 /**
- * JDK 17 Preview feature  (JEP-406), deprecated by design until it will be final
- * java:S1874 = "@Deprecated" code should not be used
+ * JDK 17 Preview feature (JEP-406), finalized in JDK 21 (JEP-441).
  */
-@SuppressWarnings("java:S1874")
 public class DefaultPatternTreeImpl extends AbstractPatternTree implements DefaultPatternTree {
 
   private final SyntaxToken defaultToken;

diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/GuardedPatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/GuardedPatternTreeImpl.java
@@ -29,10 +29,8 @@
 import org.sonar.plugins.java.api.tree.TreeVisitor;
 
 /**
- * JDK 17 Preview feature  (JEP-406), deprecated by design until it will be final
- * java:S1874 = "@Deprecated" code should not be used
+ * JDK 17 Preview feature (JEP-406), finalized in JDK 21 (JEP-441).
  */
-@SuppressWarnings("java:S1874")
 public class GuardedPatternTreeImpl extends AbstractPatternTree implements GuardedPatternTree {
 
   private final PatternTree pattern;

diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/NullPatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/NullPatternTreeImpl.java
@@ -29,10 +29,8 @@
 import org.sonar.plugins.java.api.tree.TreeVisitor;
 
 /**
- * JDK 17 Preview feature  (JEP-406), deprecated by design until it will be final
- * java:S1874 = "@Deprecated" code should not be used
+ * JDK 17 Preview feature (JEP-406), finalized in JDK 21 (JEP-441).
  */
-@SuppressWarnings("java:S1874")
 public class NullPatternTreeImpl extends AbstractPatternTree implements NullPatternTree {
 
   private final LiteralTree nullLiteral;

diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/RecordPatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/RecordPatternTreeImpl.java
@@ -28,6 +28,9 @@
 import org.sonar.plugins.java.api.tree.TypeTree;
 import org.sonarsource.analyzer.commons.collections.ListUtils;
 
+/**
+ * JDK 19 Preview feature (JEP-405), finalized in JDK 21 (JEP-440).
+ */
 public class RecordPatternTreeImpl extends AbstractPatternTree implements RecordPatternTree {
 
   private final TypeTree type;

diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/TypePatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/TypePatternTreeImpl.java
@@ -28,10 +28,8 @@
 import org.sonar.plugins.java.api.tree.VariableTree;
 
 /**
- * JDK 17 Preview feature  (JEP-406), deprecated by design until it will be final
- * java:S1874 = "@Deprecated" code should not be used
+ * JDK 17 Preview feature (JEP-406), finalized in JDK 21 (JEP-441).
  */
-@SuppressWarnings("java:S1874")
 public class TypePatternTreeImpl extends AbstractPatternTree implements TypePatternTree {
 
   private final VariableTree patternVariable;

diff --git a/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/DefaultPatternTree.java b/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/DefaultPatternTree.java
@@ -22,18 +22,18 @@
 import org.sonar.java.annotations.Beta;
 
 /**
- * Default pattern tree, introduced with Java 17 and JEP-406.
+ * Default pattern tree.
+ * Introduced with Java 17 and JEP-406.
+ * Finalized with Java 21 and JEP-441.
  *
  * <pre>
  *   case {@link #defaultToken()} : ...
  *   case {@link #defaultToken()} -> ...
  * </pre>
  *
  * @since Java 17
- * @deprecated Preview Feature
  */
 @Beta
-@Deprecated(since = "7.7", forRemoval = false)
 public interface DefaultPatternTree extends PatternTree {
 
   SyntaxToken defaultToken();

diff --git a/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/GuardedPatternTree.java b/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/GuardedPatternTree.java
@@ -22,18 +22,18 @@
 import org.sonar.java.annotations.Beta;
 
 /**
- * Guarded pattern tree, introduced with Java 17 and JEP-406.
+ * Guarded pattern tree
+ * Introduced with Java 17 and JEP-406.
+ * Finalized with Java 21 and JEP-441.
  *
  * <pre>
  *   case {@link #pattern()} {@link #whenOperator()} {@link #expression()} : ...
  *   case {@link #pattern()} {@link #whenOperator()} {@link #expression()} -> ...
  * </pre>
  *
  * @since Java 17
- * @deprecated Preview Feature
  */
 @Beta
-@Deprecated(since = "7.7", forRemoval = false)
 public interface GuardedPatternTree extends PatternTree {
 
   PatternTree pattern();

diff --git a/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/NullPatternTree.java b/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/NullPatternTree.java
@@ -22,18 +22,18 @@
 import org.sonar.java.annotations.Beta;
 
 /**
- * Null pattern tree, introduced with Java 17 and JEP-406.
+ * Null pattern tree.
+ * Introduced with Java 17 and JEP-406.
+ * Finalized with Java 21 and JEP-441.
  *
  * <pre>
  *   case {@link #nullLiteral()} : ...
  *   case {@link #nullLiteral()} -> ...
  * </pre>
  *
  * @since Java 17
- * @deprecated Preview Feature
  */
 @Beta
-@Deprecated(since = "7.7", forRemoval = false)
 public interface NullPatternTree extends PatternTree {
 
   LiteralTree nullLiteral();

diff --git a/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/RecordPatternTree.java b/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/RecordPatternTree.java
@@ -23,18 +23,18 @@
 import org.sonar.java.annotations.Beta;
 
 /**
- * Record pattern tree, introduced with Java 19 and JEP-405.
+ * Record pattern tree.
+ * Introduced with Java 19 and JEP-405.
+ * Finalized with Java 21 and JEP-440.
  *
  * <pre>
  *   case {@link #type()} ( {@link #patterns()} ) : ...
  *   case {@link #type()} ( {@link #patterns()} ) -> ...
  * </pre>
  *
  * @since Java 19
- * @deprecated Preview Feature
  */
 @Beta
-@Deprecated(since = "7.19", forRemoval = false)
 public interface RecordPatternTree extends PatternTree {
   TypeTree type();
 

diff --git a/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/Tree.java b/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/Tree.java
@@ -708,51 +708,40 @@ enum Kind implements GrammarRuleKey {
     /**
      * {@link TypePatternTree}
      *
-     * @since Java 17
-     * @deprecated Preview Feature
+     * @since Java 17 (Preview Feature) and Java 21 (Final)
      */
-    @Deprecated(since = "7.7", forRemoval = false)
     TYPE_PATTERN(TypePatternTree.class),
 
     /**
      * {@link GuardedPatternTree}
      *
-     * @since Java 17
-     * @deprecated Preview Feature
+     * @since Java 17 (Preview Feature) and Java 21 (Final)
      */
-    @Deprecated(since = "7.7", forRemoval = false)
     GUARDED_PATTERN(GuardedPatternTree.class),
 
     /**
      * {@link NullPatternTree}
      *
-     * @since Java 17
-     * @deprecated Preview Feature
+     * @since Java 17 (Preview Feature) and Java 21 (Final)
      */
-    @Deprecated(since = "7.7", forRemoval = false)
     NULL_PATTERN(NullPatternTree.class),
 
     /**
      * {@link DefaultPatternTree}
      *
-     * @since Java 17
-     * @deprecated Preview Feature
+     * @since Java 17 (Preview Feature) and Java 21 (Final)
      */
-    @Deprecated(since = "7.7", forRemoval = false)
     DEFAULT_PATTERN(DefaultPatternTree.class),
 
     /**
      * {@link RecordPatternTree}
      *
-     * @since Java 19
-     * @deprecated Preview feature
+     * @since Java 19 (Preview Feature) and Java 21 (Final)
      */
-    @Deprecated(since = "7.19", forRemoval = false)
     RECORD_PATTERN(RecordPatternTree.class),
 
     /**
-     *An implementation-reserved node.
-     *
+     * An implementation-reserved node.
      */
     OTHER(Tree.class),
 

diff --git a/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/TreeVisitor.java b/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/TreeVisitor.java
@@ -157,38 +157,13 @@ public interface TreeVisitor {
 
   void visitArrayDimension(ArrayDimensionTree tree);
 
-  /**
-   * @since Java 17
-   * @deprecated Preview Feature
-   */
-  @Deprecated(since = "7.7", forRemoval = false)
-  void visitTypePattern(TypePatternTree tree);
-
-  /**
-   * @since Java 17
-   * @deprecated Preview Feature
-   */
-  @Deprecated(since = "7.7", forRemoval = false)
+   void visitTypePattern(TypePatternTree tree);
+
   void visitNullPattern(NullPatternTree tree);
 
-  /**
-   * @since Java 17
-   * @deprecated Preview Feature
-   */
-  @Deprecated(since = "7.7", forRemoval = false)
-  void visitDefaultPattern(DefaultPatternTree tree);
-
-  /**
-   * @since Java 17
-   * @deprecated Preview Feature
-   */
-  @Deprecated(since = "7.7", forRemoval = false)
+   void visitDefaultPattern(DefaultPatternTree tree);
+
   void visitGuardedPattern(GuardedPatternTree tree);
 
-  /**
-   * @since Java 19
-   * @deprecated Preview feature
-   */
-  @Deprecated(since = "7.19", forRemoval = false)
   void visitRecordPattern(RecordPatternTree tree);
 }
diff --git a/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/TypePatternTree.java b/java-frontend/src/main/java/org/sonar/plugins/java/api/tree/TypePatternTree.java
@@ -22,7 +22,9 @@
 import org.sonar.java.annotations.Beta;
 
 /**
- * Typed Pattern tree, introduced with Java 17 and JEP-406
+ * Typed Pattern tree.
+ * Introduced with Java 17 and JEP-406.
+ * Finalized with Java 21 and JEP-441.
  *
  * <pre>
  *   switch(o) {
@@ -32,10 +34,8 @@
  * </pre>
  *
  * @since Java 17
- * @deprecated Preview Feature
  */
 @Beta
-@Deprecated(since = "7.7", forRemoval = false)
 public interface TypePatternTree extends PatternTree {
 
   VariableTree patternVariable();