Trivial clean-up. Add missing generics

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

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java b/api/src/main/java/jakarta/servlet/jsp/el/ExpressionEvaluator.java
@@ -74,7 +74,7 @@ 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, Class<?> expectedType, FunctionMapper fMapper)
             throws ELException;
 
     /**
@@ -92,6 +92,6 @@ public abstract Expression parseExpression(String expression, Class expectedType
      *
      * @exception ELException Thrown if the expression evaluation failed.
      */
-    public abstract Object evaluate(String expression, Class expectedType, VariableResolver vResolver,
+    public abstract Object evaluate(String expression, Class<?> expectedType, VariableResolver vResolver,
             FunctionMapper fMapper) throws ELException;
 }
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java b/api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -171,7 +171,7 @@ public Object getValue(ELContext context, Object base, Object property) {
      * @throws NullPointerException if context is <code>null</code>
      */
     @Override
-    public Class getType(ELContext context, Object base, Object property) {
+    public Class<?> getType(ELContext context, Object base, Object property) {
 
         if (context == null) {
             throw new NullPointerException();

diff --git a/api/src/main/java/jakarta/servlet/jsp/tagext/TagSupport.java b/api/src/main/java/jakarta/servlet/jsp/tagext/TagSupport.java
@@ -63,7 +63,7 @@ public class TagSupport implements IterationTag, Serializable {
      * @param klass The subclass of Tag or interface to be matched
      * @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, Class<?> klass) {
         boolean isInterface = false;
 
         if (from == null || klass == null