Skip to content

Commit

Permalink
Update to EL 6.0.0-SNAPSHOT and remove the deprecated EL methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@markt-asf
markt-asf committed Oct 19, 2022
1 parent b72a978 commit e30d237
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 293 deletions.
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>5.0.0</version>
<version>6.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
178 changes: 1 addition & 177 deletions api/src/main/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021 Oracle and/or its affiliates and others.
* Copyright (c) 1997, 2022 Oracle and/or its affiliates and others.
* All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
Expand All @@ -18,8 +18,6 @@

package jakarta.servlet.jsp.el;

import java.beans.FeatureDescriptor;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
Expand Down Expand Up @@ -256,180 +254,6 @@ public boolean isReadOnly(ELContext context, Object base, Object property) {
return false; // Doesn't matter
}

/**
* If the base object is <code>null</code>, and the property matches the name of a JSP implicit object, returns an
* <code>Iterator</code> containing <code>FeatureDescriptor</code> objects with information about each JSP implicit
* object resolved by this resolver. Otherwise, returns <code>null</code>.
*
* <p>
* The <code>Iterator</code> returned must contain one instance of {@link java.beans.FeatureDescriptor} for each of
* the EL implicit objects defined by the JSP spec. Each info object contains information about a single implicit
* object, and is initialized as follows:
* </p>
* <dl>
* <dt>displayName</dt><dd>- The name of the implicit object.</dd>
* <dt>name</dt><dd>- Same as displayName property.</dd>
* <dt>shortDescription</dt><dd>- A suitable description for the implicit object. Will vary by implementation.</dd>
* <dt>expert</dt><dd>- <code>false</code></dd>
* <dt>hidden</dt><dd>- <code>false</code></dd>
* <dt>preferred</dt><dd>- <code>true</code></dd>
* </dl>
* In addition, the following named attributes must be set in the returned <code>FeatureDescriptor</code>s:
* <dl>
* <dt>{@link ELResolver#TYPE}</dt><dd>- The runtime type of the implicit object.</dd>
* <dt>{@link ELResolver#RESOLVABLE_AT_DESIGN_TIME}</dt><dd>- <code>true</code>.</dd>
* </dl>
*
* @param context The context of this evaluation.
* @param base Only <code>null</code> is handled by this resolver. Other values will result in a
* <code>null</code> return value.
* @return An <code>Iterator</code> containing one <code>FeatureDescriptor</code> object for each implicit object,
* 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) {

ArrayList<FeatureDescriptor> list = new ArrayList<>(11);

// pageContext
FeatureDescriptor descriptor = new FeatureDescriptor();
descriptor.setName("pageContext");
descriptor.setDisplayName("pageContext");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", PageContext.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// pageScope
descriptor = new FeatureDescriptor();
descriptor.setName("pageScope");
descriptor.setDisplayName("pageScope");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// requestScope
descriptor = new FeatureDescriptor();
descriptor.setName("requestScope");
descriptor.setDisplayName("requestScope");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// sessionScope
descriptor = new FeatureDescriptor();
descriptor.setName("sessionScope");
descriptor.setDisplayName("sessionScope");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// applicationScope
descriptor = new FeatureDescriptor();
descriptor.setName("applicationScope");
descriptor.setDisplayName("applicationScope");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// param
descriptor = new FeatureDescriptor();
descriptor.setName("param");
descriptor.setDisplayName("param");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// paramValues
descriptor = new FeatureDescriptor();
descriptor.setName("paramValues");
descriptor.setDisplayName("paramValues");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// header
descriptor = new FeatureDescriptor();
descriptor.setName("header");
descriptor.setDisplayName("header");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// headerValues
descriptor = new FeatureDescriptor();
descriptor.setName("headerValues");
descriptor.setDisplayName("headerValues");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// cookie
descriptor = new FeatureDescriptor();
descriptor.setName("cookie");
descriptor.setDisplayName("cookie");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

// initParam
descriptor = new FeatureDescriptor();
descriptor.setName("initParam");
descriptor.setDisplayName("initParam");
// descriptor.setShortDescription("");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", Map.class);
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);

return list.iterator();
}

/**
* If the base object is <code>null</code>, returns <code>String.class</code>. Otherwise, returns <code>null</code>.
*
Expand Down
115 changes: 1 addition & 114 deletions api/src/main/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021 Oracle and/or its affiliates and others.
* Copyright (c) 1997, 2022 Oracle and/or its affiliates and others.
* All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
Expand All @@ -18,11 +18,6 @@

package jakarta.servlet.jsp.el;

import java.beans.FeatureDescriptor;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.Enumeration;

import jakarta.servlet.jsp.PageContext;
import jakarta.servlet.jsp.JspContext;

Expand Down Expand Up @@ -204,114 +199,6 @@ public boolean isReadOnly(ELContext context, Object base, Object property) {
return false;
}

/**
* If the base object is <code>null</code>, returns an <code>Iterator</code> containing
* <code>FeatureDescriptor</code> objects with information about each scoped attribute resolved by this resolver.
* Otherwise, returns <code>null</code>.
*
* <p>
* The <code>Iterator</code> returned must contain one instance of {@link java.beans.FeatureDescriptor} for each
* scoped attribute found in any scope. Each info object contains information about a single scoped attribute, and
* is initialized as follows:
* </p>
*
* <dl>
* <dt>displayName</dt><dd>- The name of the scoped attribute.</dd>
* <dt>name</dt><dd>- Same as displayName property.</dd>
* <dt>shortDescription</dt><dd>- A suitable description for the scoped attribute. Should include the attribute's current
* scope (page, request, session, application). Will vary by implementation.</dd>
* <dt>expert</dt><dd>- <code>false</code></dd>
* <dt>hidden</dt><dd>- <code>false</code></dd>
* <dt>preferred</dt><dd>- <code>true</code></dd>
* </dl>
* In addition, the following named attributes must be set in the returned <code>FeatureDescriptor</code>s:
* <dl>
* <dt>{@link ELResolver#TYPE}</dt><dd>- The current runtime type of the scoped attribute.</dd>
* <dt>{@link ELResolver#RESOLVABLE_AT_DESIGN_TIME}</dt><dd>- <code>true</code>.</dd>
* </dl>
*
* @param context The context of this evaluation.
* @param base Only <code>null</code> is handled by this resolver. Other values will result in a
* <code>null</code> return value.
* @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) {
Enumeration<String> attrs;
ArrayList<FeatureDescriptor> list = new ArrayList<>();
PageContext ctxt = (PageContext) context.getContext(JspContext.class);

attrs = ctxt.getAttributeNamesInScope(PageContext.PAGE_SCOPE);
while (attrs.hasMoreElements()) {
String name = attrs.nextElement();
Object value = ctxt.getAttribute(name, PageContext.PAGE_SCOPE);
FeatureDescriptor descriptor = new FeatureDescriptor();
descriptor.setName(name);
descriptor.setDisplayName(name);
descriptor.setShortDescription("page scope attribute");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", value.getClass());
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);
}

attrs = ctxt.getAttributeNamesInScope(PageContext.REQUEST_SCOPE);
while (attrs.hasMoreElements()) {
String name = attrs.nextElement();
Object value = ctxt.getAttribute(name, PageContext.REQUEST_SCOPE);
FeatureDescriptor descriptor = new FeatureDescriptor();
descriptor.setName(name);
descriptor.setDisplayName(name);
descriptor.setShortDescription("request scope attribute");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", value.getClass());
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);
}

attrs = ctxt.getAttributeNamesInScope(PageContext.SESSION_SCOPE);
while (attrs.hasMoreElements()) {
String name = attrs.nextElement();
Object value = ctxt.getAttribute(name, PageContext.SESSION_SCOPE);
FeatureDescriptor descriptor = new FeatureDescriptor();
descriptor.setName(name);
descriptor.setDisplayName(name);
descriptor.setShortDescription("session scope attribute");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", value.getClass());
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);
}

attrs = ctxt.getAttributeNamesInScope(PageContext.APPLICATION_SCOPE);
while (attrs.hasMoreElements()) {
String name = attrs.nextElement();
Object value = ctxt.getAttribute(name, PageContext.APPLICATION_SCOPE);
FeatureDescriptor descriptor = new FeatureDescriptor();
descriptor.setName(name);
descriptor.setDisplayName(name);
descriptor.setShortDescription("application scope attribute");
descriptor.setExpert(false);
descriptor.setHidden(false);
descriptor.setPreferred(true);
descriptor.setValue("type", value.getClass());
descriptor.setValue("resolvableAtDesignTime", Boolean.TRUE);
list.add(descriptor);
}
return list.iterator();
}

/**
* If the base object is <code>null</code>, returns <code>String.class</code>. Otherwise, returns <code>null</code>.
*
Expand Down
3 changes: 2 additions & 1 deletion spec/src/main/asciidoc/ServerPages.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11549,7 +11549,8 @@ Jakarta Server Pages specification. This appendix is non-normative.

=== Changes between JSP 4.0 and JSP 3.1

* TBD
* Remove the methods that implemented `ELResolver.getFeatureDescriptors()` as
those methods have been removed as of EL 6.0.

=== Changes between JSP 3.1 and JSP 3.0

Expand Down

0 comments on commit e30d237

Please sign in to comment.