This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 3db55ed Jakarta Server Pages 3.0 API updates (clean-up)
3db55ed is described below
commit 3db55edfaf08729365397a21de1ace23d7301a64
Author: Mark Thomas <[email protected]>
AuthorDate: Tue May 26 15:18:54 2020 +0100
Jakarta Server Pages 3.0 API updates (clean-up)
Use of generics and addition of @Deprecated annotations. No new /
changed methods.
---
java/jakarta/servlet/jsp/JspContext.java | 4 ++--
java/jakarta/servlet/jsp/JspException.java | 2 +-
java/jakarta/servlet/jsp/el/ELException.java | 2 +-
java/jakarta/servlet/jsp/el/ELParseException.java | 2 +-
java/jakarta/servlet/jsp/el/Expression.java | 2 +-
java/jakarta/servlet/jsp/el/ExpressionEvaluator.java | 13 ++++---------
java/jakarta/servlet/jsp/el/FunctionMapper.java | 2 +-
java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java | 3 +--
java/jakarta/servlet/jsp/el/VariableResolver.java | 3 +--
java/jakarta/servlet/jsp/tagext/BodyTag.java | 3 +--
java/jakarta/servlet/jsp/tagext/TagSupport.java | 5 +----
webapps/docs/changelog.xml | 9 +++++++++
12 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/java/jakarta/servlet/jsp/JspContext.java
b/java/jakarta/servlet/jsp/JspContext.java
index 855417b..774ba9c 100644
--- a/java/jakarta/servlet/jsp/JspContext.java
+++ b/java/jakarta/servlet/jsp/JspContext.java
@@ -224,7 +224,7 @@ public abstract class JspContext {
* @deprecated As of JSP 2.1, replaced by
* JspApplicationContext.getExpressionFactory()
*/
- @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
+ @Deprecated
public abstract jakarta.servlet.jsp.el.ExpressionEvaluator
getExpressionEvaluator();
@@ -242,7 +242,7 @@ public abstract class JspContext {
* which can be obtained by
* jspContext.getELContext().getELResolver()
*/
- @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
+ @Deprecated
public abstract jakarta.servlet.jsp.el.VariableResolver
getVariableResolver();
/**
diff --git a/java/jakarta/servlet/jsp/JspException.java
b/java/jakarta/servlet/jsp/JspException.java
index 4e7accc..62450d6 100644
--- a/java/jakarta/servlet/jsp/JspException.java
+++ b/java/jakarta/servlet/jsp/JspException.java
@@ -94,7 +94,7 @@ public class JspException extends Exception {
* @deprecated As of JSP 2.1, replaced by
* <code>java.lang.Throwable.getCause()</code>
*/
- @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
+ @Deprecated
public Throwable getRootCause() {
return getCause();
}
diff --git a/java/jakarta/servlet/jsp/el/ELException.java
b/java/jakarta/servlet/jsp/el/ELException.java
index 0149507..f06bdeb 100644
--- a/java/jakarta/servlet/jsp/el/ELException.java
+++ b/java/jakarta/servlet/jsp/el/ELException.java
@@ -24,7 +24,7 @@ package jakarta.servlet.jsp.el;
* @since 2.0
* @deprecated As of JSP 2.1, replaced by jakarta.el.ELException
*/
-@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
+@Deprecated
public class ELException extends Exception {
private static final long serialVersionUID = 1L;
diff --git a/java/jakarta/servlet/jsp/el/ELParseException.java
b/java/jakarta/servlet/jsp/el/ELParseException.java
index 43678eb..0c32cc1 100644
--- a/java/jakarta/servlet/jsp/el/ELParseException.java
+++ b/java/jakarta/servlet/jsp/el/ELParseException.java
@@ -24,7 +24,7 @@ package jakarta.servlet.jsp.el;
* @since 2.0
* @deprecated As of JSP 2.1, replaced by jakarta.el.ELException
*/
-@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
+@Deprecated
public class ELParseException extends ELException {
private static final long serialVersionUID = 1L;
diff --git a/java/jakarta/servlet/jsp/el/Expression.java
b/java/jakarta/servlet/jsp/el/Expression.java
index ffe3c58..5964e07 100644
--- a/java/jakarta/servlet/jsp/el/Expression.java
+++ b/java/jakarta/servlet/jsp/el/Expression.java
@@ -32,7 +32,7 @@ package jakarta.servlet.jsp.el;
* @since 2.0
* @deprecated As of JSP 2.1, replaced by jakarta.el.ValueExpression
*/
-@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
+@Deprecated
public abstract class Expression {
/**
diff --git a/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java
b/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java
index 7c4e6e8..4e1897e 100644
--- a/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java
+++ b/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java
@@ -54,8 +54,7 @@ package jakarta.servlet.jsp.el;
* @since 2.0
* @deprecated As of JSP 2.1, replaced by jakarta.el.ExpressionFactory
*/
-@SuppressWarnings("dep-ann")
-// TCK signature test fails with annotation
+@Deprecated
public abstract class ExpressionEvaluator {
/**
@@ -82,9 +81,8 @@ public abstract class ExpressionEvaluator {
* @exception ELException
* Thrown if parsing errors were found.
*/
- public abstract Expression parseExpression(String expression,
- @SuppressWarnings("rawtypes")// TCK signature fails with generics
- Class expectedType, FunctionMapper fMapper) throws ELException;
+ public abstract Expression parseExpression(String expression, Class<?>
expectedType,
+ FunctionMapper fMapper) throws ELException;
/**
* Evaluates an expression. This method may perform some syntactic
@@ -107,9 +105,6 @@ public abstract class ExpressionEvaluator {
* @exception ELException
* Thrown if the expression evaluation failed.
*/
- public abstract Object evaluate(
- String expression,
- @SuppressWarnings("rawtypes")// TCK signature fails with generics
- Class expectedType, VariableResolver vResolver,
+ public abstract Object evaluate(String expression, Class<?> expectedType,
VariableResolver vResolver,
FunctionMapper fMapper) throws ELException;
}
diff --git a/java/jakarta/servlet/jsp/el/FunctionMapper.java
b/java/jakarta/servlet/jsp/el/FunctionMapper.java
index 1242e54..83f14cf 100644
--- a/java/jakarta/servlet/jsp/el/FunctionMapper.java
+++ b/java/jakarta/servlet/jsp/el/FunctionMapper.java
@@ -26,7 +26,7 @@ package jakarta.servlet.jsp.el;
* @since 2.0
* @deprecated As of JSP 2.1, replaced by jakarta.el.FunctionMapper
*/
-@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
+@Deprecated
public interface FunctionMapper {
/**
* Resolves the specified local name and prefix into a Java.lang.Method.
diff --git a/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
b/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
index 8ebd74d..a7ba18a 100644
--- a/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -117,8 +117,7 @@ public class ImplicitObjectELResolver extends ELResolver {
}
@Override
- @SuppressWarnings({ "unchecked", "rawtypes" }) // TCK signature test fails
with generics
- public Class getType(ELContext context, Object base, Object property) {
+ public Class<?> getType(ELContext context, Object base, Object property) {
Objects.requireNonNull(context);
if (base == null && property != null) {
diff --git a/java/jakarta/servlet/jsp/el/VariableResolver.java
b/java/jakarta/servlet/jsp/el/VariableResolver.java
index d7352b2..752a11c 100644
--- a/java/jakarta/servlet/jsp/el/VariableResolver.java
+++ b/java/jakarta/servlet/jsp/el/VariableResolver.java
@@ -32,8 +32,7 @@ package jakarta.servlet.jsp.el;
* @since 2.0
* @deprecated As of JSP 2.1, replaced by jakarta.el.ELResolver
*/
-@SuppressWarnings("dep-ann")
-// TCK signature test fails with annotation
+@Deprecated
public interface VariableResolver {
/**
diff --git a/java/jakarta/servlet/jsp/tagext/BodyTag.java
b/java/jakarta/servlet/jsp/tagext/BodyTag.java
index 4a6ade5..abee1c1 100644
--- a/java/jakarta/servlet/jsp/tagext/BodyTag.java
+++ b/java/jakarta/servlet/jsp/tagext/BodyTag.java
@@ -108,8 +108,7 @@ public interface BodyTag extends IterationTag {
* @deprecated As of Java JSP API 1.2, use BodyTag.EVAL_BODY_BUFFERED or
* IterationTag.EVAL_BODY_AGAIN.
*/
- @SuppressWarnings("dep-ann")
- // TCK signature test fails with annotation
+ @Deprecated
public static final int EVAL_BODY_TAG = 2;
/**
diff --git a/java/jakarta/servlet/jsp/tagext/TagSupport.java
b/java/jakarta/servlet/jsp/tagext/TagSupport.java
index 6652822..58cdf52 100644
--- a/java/jakarta/servlet/jsp/tagext/TagSupport.java
+++ b/java/jakarta/servlet/jsp/tagext/TagSupport.java
@@ -73,10 +73,7 @@ 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,
- // TCK signature test fails with generics
- @SuppressWarnings("rawtypes")
- Class klass) {
+ public static final Tag findAncestorWithClass(Tag from, Class<?> klass) {
boolean isInterface = false;
if (from == null ||
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6927e4c..0f4a2a6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -77,6 +77,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <update>
+ Update the Jakarta Server Pages API implementation to align with
+ specification updates to use generics and add missing
+ <code>@Deprecated</code> annotations. (markt)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
