From 5f678b7a400e9626922857a7629ff6cbcc2743f2 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 15 Jan 2010 15:00:50 +0000 Subject: [PATCH] Fix the remaining TCK signature test failures. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@899653 13f79535-47bb-0310-9956-ffa450edef68 --- java/javax/servlet/jsp/el/ELException.java | 2 +- java/javax/servlet/jsp/el/ELParseException.java | 3 +-- java/javax/servlet/jsp/el/Expression.java | 2 +- java/javax/servlet/jsp/el/ExpressionEvaluator.java | 20 +++++++++++--------- java/javax/servlet/jsp/el/FunctionMapper.java | 2 +- .../servlet/jsp/el/ImplicitObjectELResolver.java | 3 ++- java/javax/servlet/jsp/el/VariableResolver.java | 2 +- java/javax/servlet/jsp/tagext/BodyTag.java | 3 +-- java/javax/servlet/jsp/tagext/TagSupport.java | 5 ++++- .../apache/jasper/el/ExpressionEvaluatorImpl.java | 8 ++++++-- 10 files changed, 29 insertions(+), 21 deletions(-) diff --git a/java/javax/servlet/jsp/el/ELException.java b/java/javax/servlet/jsp/el/ELException.java index b0e23ec60..8beb7186d 100644 --- 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 898d0cfd9..c9ea437bf 100644 --- 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 ee6647720..b1ceb35ce 100644 --- 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 8b827c71d..332a9f537 100644 --- 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 4d83394dd..5b8b83da6 100644 --- 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 d8b50ca70..b3bbf9887 100644 --- 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 40df675d3..f42d23634 100644 --- 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 35749bffe..297a0d2bc 100644 --- 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 2c350c99e..46e0c44e7 100644 --- 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 6eea32b1b..3f83217bd 100644 --- 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); -- 2.11.0