Fix the remaining TCK signature test failures.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@899653 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/javax/servlet/jsp/el/ELException.java b/java/javax/servlet/jsp/el/ELException.java
index b0e23ec..8beb718 100644 (file)
--- a/java/javax/servlet/jsp/el/ELException.java
+++ b/java/javax/servlet/jsp/el/ELException.java
@@ -24,7 +24,7 @@ package javax.servlet.jsp.el;
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public class ELException extends Exception {
 
     /**

diff --git a/java/javax/servlet/jsp/el/ELParseException.java b/java/javax/servlet/jsp/el/ELParseException.java
index 898d0cf..c9ea437 100644 (file)
--- a/java/javax/servlet/jsp/el/ELParseException.java
+++ b/java/javax/servlet/jsp/el/ELParseException.java
@@ -24,8 +24,7 @@ package javax.servlet.jsp.el;
  * @since 2.0
  * @deprecated
  */
-
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public class ELParseException extends ELException {
 
  //-------------------------------------

diff --git a/java/javax/servlet/jsp/el/Expression.java b/java/javax/servlet/jsp/el/Expression.java
index ee66477..b1ceb35 100644 (file)
--- a/java/javax/servlet/jsp/el/Expression.java
+++ b/java/javax/servlet/jsp/el/Expression.java
@@ -32,7 +32,7 @@ package javax.servlet.jsp.el;
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public abstract class Expression {
 
     /** 

diff --git a/java/javax/servlet/jsp/el/ExpressionEvaluator.java b/java/javax/servlet/jsp/el/ExpressionEvaluator.java
index 8b827c7..332a9f5 100644 (file)
--- a/java/javax/servlet/jsp/el/ExpressionEvaluator.java
+++ b/java/javax/servlet/jsp/el/ExpressionEvaluator.java
@@ -53,7 +53,7 @@ package javax.servlet.jsp.el;
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public abstract class ExpressionEvaluator {
 
     /**
@@ -77,9 +77,10 @@ public abstract class ExpressionEvaluator {
      *
      * @exception ELException Thrown if parsing errors were found.
      */ 
-    public abstract Expression parseExpression( String expression, 
-                                      Class<?> expectedType, 
-                                      FunctionMapper fMapper ) 
+    public abstract Expression parseExpression( String expression,
+            @SuppressWarnings("unchecked") // TCK signature fails with generics
+            Class expectedType,
+               FunctionMapper fMapper) 
       throws ELException; 
 
 
@@ -99,11 +100,12 @@ public abstract class ExpressionEvaluator {
      * @return The result of the expression evaluation.
      *
      * @exception ELException Thrown if the expression evaluation failed.
-     */ 
-    public abstract Object evaluate( String expression, 
-                           Class<?> expectedType, 
-                           VariableResolver vResolver,
-                           FunctionMapper fMapper ) 
+     */
+    public abstract Object evaluate( String expression,
+            @SuppressWarnings("unchecked") // TCK signature fails with generics
+                   Class expectedType,
+                   VariableResolver vResolver,
+                   FunctionMapper fMapper)
       throws ELException; 
 }
 

diff --git a/java/javax/servlet/jsp/el/FunctionMapper.java b/java/javax/servlet/jsp/el/FunctionMapper.java
index 4d83394..5b8b83d 100644 (file)
--- a/java/javax/servlet/jsp/el/FunctionMapper.java
+++ b/java/javax/servlet/jsp/el/FunctionMapper.java
@@ -26,7 +26,7 @@ package javax.servlet.jsp.el;
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public interface FunctionMapper {
   /**
    * Resolves the specified local name and prefix into a Java.lang.Method.

diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index d8b50ca..b3bbf98 100644 (file)
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -121,7 +121,8 @@ public class ImplicitObjectELResolver extends ELResolver {
     }
 
     @Override
-    public Class<?> getType(ELContext context, Object base, Object property)
+    @SuppressWarnings("unchecked") // TCK signature test fails with generics
+    public Class getType(ELContext context, Object base, Object property)
             throws NullPointerException, PropertyNotFoundException, ELException {
         if (context == null) {
             throw new NullPointerException();

diff --git a/java/javax/servlet/jsp/el/VariableResolver.java b/java/javax/servlet/jsp/el/VariableResolver.java
index 40df675..f42d236 100644 (file)
--- a/java/javax/servlet/jsp/el/VariableResolver.java
+++ b/java/javax/servlet/jsp/el/VariableResolver.java
@@ -31,7 +31,7 @@ package javax.servlet.jsp.el;
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public interface VariableResolver
 {
   //-------------------------------------

diff --git a/java/javax/servlet/jsp/tagext/BodyTag.java b/java/javax/servlet/jsp/tagext/BodyTag.java
index 35749bf..297a0d2 100644 (file)
--- a/java/javax/servlet/jsp/tagext/BodyTag.java
+++ b/java/javax/servlet/jsp/tagext/BodyTag.java
@@ -122,8 +122,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
+    @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
     public final static int EVAL_BODY_TAG = 2;
 
     /**

diff --git a/java/javax/servlet/jsp/tagext/TagSupport.java b/java/javax/servlet/jsp/tagext/TagSupport.java
index 2c350c9..46e0c44 100644 (file)
--- a/java/javax/servlet/jsp/tagext/TagSupport.java
+++ b/java/javax/servlet/jsp/tagext/TagSupport.java
@@ -71,7 +71,10 @@ public class TagSupport implements IterationTag, Serializable {
      * @return the nearest ancestor that implements the interface
      * or is an instance of the class specified
      */
-    public static final Tag findAncestorWithClass(Tag from, Class<?> klass) {
+    public static final Tag findAncestorWithClass(Tag from,
+            // TCK signature test fails with generics
+            @SuppressWarnings("unchecked")
+            Class klass) {
         boolean isInterface = false;
 
         if (from == null ||

diff --git a/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java b/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
index 6eea32b..3f83217 100644 (file)
--- a/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
+++ b/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
@@ -35,7 +35,9 @@ public final class ExpressionEvaluatorImpl extends ExpressionEvaluator {
        }
 
        @Override
-    public Expression parseExpression(String expression, Class<?> expectedType,
+    public Expression parseExpression(String expression,
+            @SuppressWarnings("unchecked") // API does not use generics
+            Class expectedType,
                        FunctionMapper fMapper) throws ELException {
                try {
                        ELContextImpl ctx =
@@ -51,7 +53,9 @@ public final class ExpressionEvaluatorImpl extends ExpressionEvaluator {
        }
 
        @Override
-    public Object evaluate(String expression, Class<?> expectedType,
+    public Object evaluate(String expression,
+            @SuppressWarnings("unchecked") // API does not use generics
+            Class expectedType,
                        VariableResolver vResolver, FunctionMapper fMapper)
                        throws ELException {
                return this.parseExpression(expression, expectedType, fMapper).evaluate(vResolver);