Use deprecated method from base class instead of overriding

jakartaee · Oct 1, 2021 · 197e730 · 197e730
1 parent 77eed2e
commit 197e730
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 41 deletions.
diff --git a/api/src/main/java/jakarta/servlet/jsp/el/ImportELResolver.java b/api/src/main/java/jakarta/servlet/jsp/el/ImportELResolver.java
@@ -15,10 +15,6 @@
  */
 package jakarta.servlet.jsp.el;
 
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
-import java.util.Collections;
-
 import jakarta.el.ELContext;
 import jakarta.el.ELClass;
 import jakarta.el.ELResolver;
@@ -141,23 +137,6 @@ public boolean isReadOnly(ELContext context, Object base, Object property) {
         return false;
     }
 
-    /**
-     * Always returns an empty iterator since {@link ELResolver#getFeatureDescriptors} method has been deprecated.
-     * 
-     * @param context  Ignored
-     * @param base     Ignored
-     * @return An <code>Iterator</code> containing one <code>FeatureDescriptor</code> object for each scoped attribute,
-     *         or <code>null</code> if <code>base</code> is not <code>null</code>.
-     *         
-     * @deprecated This method is deprecated as of EL 5.0 and will be removed in EL 6.0 (Jakarta EE 11). Therefore it
-     *             will be removed here in JSP 4.0.
-     */
-    @Deprecated(forRemoval = true, since = "JSP 3.1")
-    @Override
-    public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
-        return Collections.emptyIterator();
-    }
-
     /**
      * Always returns {@code null} since in normal usage {@link ScopedAttributeELResolver} will handle calls to
      * {@link ELResolver#getCommonPropertyType(ELContext, Object)}.

diff --git a/api/src/main/java/jakarta/servlet/jsp/el/NotFoundELResolver.java b/api/src/main/java/jakarta/servlet/jsp/el/NotFoundELResolver.java
@@ -15,10 +15,7 @@
  */
 package jakarta.servlet.jsp.el;
 
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
 import java.util.ResourceBundle;
-import java.util.Collections;
 
 import jakarta.el.ELContext;
 import jakarta.el.ELResolver;
@@ -140,23 +137,6 @@ public boolean isReadOnly(ELContext context, Object base, Object property) {
         return false;
     }
 
-    /**
-     * Always returns an empty iterator since {@link ELResolver#getFeatureDescriptors} method has been deprecated.
-     * 
-     * @param context  Ignored
-     * @param base     Ignored
-     * @return An <code>Iterator</code> containing one <code>FeatureDescriptor</code> object for each scoped attribute,
-     *         or <code>null</code> if <code>base</code> is not <code>null</code>.
-     *         
-     * @deprecated This method is deprecated as of EL 5.0 and will be removed in EL 6.0 (Jakarta EE 11). Therefore it
-     *             will be removed here in JSP 4.0.
-     */
-    @Deprecated(forRemoval = true, since = "JSP 3.1")
-    @Override
-    public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
-        return Collections.emptyIterator();
-    }
-
     /**
      * Always returns {@code null} since in normal usage {@link ScopedAttributeELResolver} will handle calls to
      * {@link ELResolver#getCommonPropertyType(ELContext, Object)}.