Trivial clean-up. Add missing @deprecated annotations

This is a binary compatible change to the API. Signed-off-by: Mark Thomas <markt@apache.org>
jakartaee · Feb 6, 2020 · 3e7cd25 · 3e7cd25
1 parent 332a575
commit 3e7cd25
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 0 deletions.
diff --git a/api/src/main/java/jakarta/servlet/jsp/JspContext.java b/api/src/main/java/jakarta/servlet/jsp/JspContext.java
@@ -184,6 +184,7 @@ public JspContext() {
      * @return A valid instance of an ExpressionEvaluator.
      * @since JSP 2.0
      */
+    @Deprecated
     public abstract jakarta.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator();
 
     /**
@@ -195,6 +196,7 @@ public JspContext() {
      * @return A valid instance of a VariableResolver.
      * @since JSP 2.0
      */
+    @Deprecated
     public abstract jakarta.servlet.jsp.el.VariableResolver getVariableResolver();
 
     /**

diff --git a/api/src/main/java/jakarta/servlet/jsp/JspException.java b/api/src/main/java/jakarta/servlet/jsp/JspException.java
@@ -75,6 +75,7 @@ public JspException(Throwable cause) {
      *
      * @deprecated As of JSP 2.1, replaced by {@link #getCause()}
      */
+    @Deprecated
     public Throwable getRootCause() {
         return getCause();
     }

diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ELException.java b/api/src/main/java/jakarta/servlet/jsp/el/ELException.java
@@ -24,6 +24,7 @@
  * @deprecated As of JSP 2.1, replaced by {@link jakarta.el.ELException}
  * @since JSP 2.0
  */
+@Deprecated
 public class ELException extends Exception {
     private static final long serialVersionUID = -3920470039225321534L;
 

diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ELParseException.java b/api/src/main/java/jakarta/servlet/jsp/el/ELParseException.java
@@ -24,6 +24,7 @@
  * @deprecated As of JSP 2.1, replaced by {@link jakarta.el.ELException}
  * @since JSP 2.0
  */
+@Deprecated
 public class ELParseException extends ELException {
 
     private static final long serialVersionUID = 3521581805886060118L;

diff --git a/api/src/main/java/jakarta/servlet/jsp/el/Expression.java b/api/src/main/java/jakarta/servlet/jsp/el/Expression.java
@@ -35,6 +35,7 @@
  * @deprecated As of JSP 2.1, replaced by {@link jakarta.el.ValueExpression}
  * @since JSP 2.0
  */
+@Deprecated
 public abstract class Expression {
 
     /**

diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java b/api/src/main/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java
@@ -55,6 +55,7 @@
  * @deprecated As of JSP 2.1, replaced by {@link jakarta.el.ExpressionFactory}
  * @since JSP 2.0
  */
+@Deprecated
 public abstract class ExpressionEvaluator {
 
     /**

diff --git a/api/src/main/java/jakarta/servlet/jsp/el/FunctionMapper.java b/api/src/main/java/jakarta/servlet/jsp/el/FunctionMapper.java
@@ -30,6 +30,7 @@
  * @deprecated As of JSP 2.1, replaced by {@link jakarta.el.FunctionMapper}
  * @since JSP 2.0
  */
+@Deprecated
 public interface FunctionMapper {
     /**
      * Resolves the specified local name and prefix into a Java.lang.Method. Returns null if the prefix and local name

diff --git a/api/src/main/java/jakarta/servlet/jsp/el/VariableResolver.java b/api/src/main/java/jakarta/servlet/jsp/el/VariableResolver.java
@@ -33,6 +33,7 @@
  * @deprecated As of JSP 2.1, replaced by {@link jakarta.el.ELResolver}
  * @since JSP 2.0
  */
+@Deprecated
 public interface VariableResolver {
 
     /**

diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTag.java b/api/src/main/java/jakarta/servlet/jsp/tagext/BodyTag.java
@@ -103,6 +103,7 @@ public interface BodyTag extends IterationTag {
      *
      * @deprecated As of Java JSP API 1.2, use BodyTag.EVAL_BODY_BUFFERED or IterationTag.EVAL_BODY_AGAIN.
      */
+    @Deprecated
     public final static int EVAL_BODY_TAG = 2;
 
     /**