This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cdb2b439c8dbcdb88ba10cddb2b2887328008c84
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 6 19:56:57 2021 +0100
ELResolver.getFeatureDescriptors() has been deprecated
The long term plan is to remove this in Jakarta EE 11 to remove the
dependency on the java.desktop module
---
java/jakarta/el/ArrayELResolver.java | 1 +
java/jakarta/el/BeanELResolver.java | 1 +
java/jakarta/el/BeanNameELResolver.java | 1 +
java/jakarta/el/CompositeELResolver.java | 2 ++
java/jakarta/el/ELResolver.java | 4 ++++
java/jakarta/el/ListELResolver.java | 1 +
java/jakarta/el/MapELResolver.java | 1 +
java/jakarta/el/ResourceBundleELResolver.java | 1 +
java/jakarta/el/StaticFieldELResolver.java | 4 ++++
java/jakarta/el/TypeConverter.java | 1 +
java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java | 1 +
java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java | 1 +
java/org/apache/el/stream/StreamELResolverImpl.java | 1 +
test/jakarta/el/TestArrayELResolver.java | 1 +
test/jakarta/el/TestBeanELResolver.java | 2 ++
test/jakarta/el/TestBeanNameELResolver.java | 2 ++
test/jakarta/el/TestMapELResolver.java | 2 ++
test/jakarta/el/TestResourceBundleELResolver.java | 2 ++
webapps/docs/changelog.xml | 8 ++++++++
19 files changed, 37 insertions(+)
diff --git a/java/jakarta/el/ArrayELResolver.java
b/java/jakarta/el/ArrayELResolver.java
index ce3d95b..24e32d6 100644
--- a/java/jakarta/el/ArrayELResolver.java
+++ b/java/jakarta/el/ArrayELResolver.java
@@ -109,6 +109,7 @@ public class ArrayELResolver extends ELResolver {
return this.readOnly;
}
+ @Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
return null;
diff --git a/java/jakarta/el/BeanELResolver.java
b/java/jakarta/el/BeanELResolver.java
index 61156a7..07c7f24 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -170,6 +170,7 @@ public class BeanELResolver extends ELResolver {
return this.readOnly || this.property(context, base,
property).isReadOnly(base);
}
+ @Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
if (base == null) {
diff --git a/java/jakarta/el/BeanNameELResolver.java
b/java/jakarta/el/BeanNameELResolver.java
index 4dac042..814c6f5 100644
--- a/java/jakarta/el/BeanNameELResolver.java
+++ b/java/jakarta/el/BeanNameELResolver.java
@@ -142,6 +142,7 @@ public class BeanNameELResolver extends ELResolver {
return false;
}
+ @Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
Object base) {
diff --git a/java/jakarta/el/CompositeELResolver.java
b/java/jakarta/el/CompositeELResolver.java
index 2ff04fa..40821f5 100644
--- a/java/jakarta/el/CompositeELResolver.java
+++ b/java/jakarta/el/CompositeELResolver.java
@@ -132,6 +132,7 @@ public class CompositeELResolver extends ELResolver {
return false;
}
+ @Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
return new FeatureIterator(context, base, this.resolvers, this.size);
@@ -163,6 +164,7 @@ public class CompositeELResolver extends ELResolver {
return null;
}
+ @Deprecated(forRemoval = true, since = "EL 5.0")
private static final class FeatureIterator implements
Iterator<FeatureDescriptor> {
private final ELContext context;
diff --git a/java/jakarta/el/ELResolver.java b/java/jakarta/el/ELResolver.java
index a031c4a..e3e387d 100644
--- a/java/jakarta/el/ELResolver.java
+++ b/java/jakarta/el/ELResolver.java
@@ -127,7 +127,11 @@ public abstract class ELResolver {
*
* @return An iterator, possibly empty, of feature descriptors of the given
* object
+ *
+ * @deprecated This method will be removed, without replacement, in EL 6.0
/
+ * Tomcat 11.
*/
+ @Deprecated(forRemoval = true, since = "EL 5.0")
public abstract Iterator<java.beans.FeatureDescriptor>
getFeatureDescriptors(ELContext context, Object base);
/**
diff --git a/java/jakarta/el/ListELResolver.java
b/java/jakarta/el/ListELResolver.java
index 0184bdf..b79659b 100644
--- a/java/jakarta/el/ListELResolver.java
+++ b/java/jakarta/el/ListELResolver.java
@@ -121,6 +121,7 @@ public class ListELResolver extends ELResolver {
return this.readOnly;
}
+ @Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
return null;
diff --git a/java/jakarta/el/MapELResolver.java
b/java/jakarta/el/MapELResolver.java
index 9c214b9..6ce3422 100644
--- a/java/jakarta/el/MapELResolver.java
+++ b/java/jakarta/el/MapELResolver.java
@@ -99,6 +99,7 @@ public class MapELResolver extends ELResolver {
return this.readOnly;
}
+ @Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
if (base instanceof Map<?, ?>) {
diff --git a/java/jakarta/el/ResourceBundleELResolver.java
b/java/jakarta/el/ResourceBundleELResolver.java
index 814df35..9f2563a 100644
--- a/java/jakarta/el/ResourceBundleELResolver.java
+++ b/java/jakarta/el/ResourceBundleELResolver.java
@@ -86,6 +86,7 @@ public class ResourceBundleELResolver extends ELResolver {
return false;
}
+ @Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(
ELContext context, Object base) {
diff --git a/java/jakarta/el/StaticFieldELResolver.java
b/java/jakarta/el/StaticFieldELResolver.java
index e5e950b..9083a5e 100644
--- a/java/jakarta/el/StaticFieldELResolver.java
+++ b/java/jakarta/el/StaticFieldELResolver.java
@@ -187,7 +187,11 @@ public class StaticFieldELResolver extends ELResolver {
/**
* Always returns <code>null</code>.
+ *
+ * @deprecated This method will be removed, without replacement, in EL 6.0
/
+ * Tomcat 11.
*/
+ @Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
Object base) {
diff --git a/java/jakarta/el/TypeConverter.java
b/java/jakarta/el/TypeConverter.java
index abbae0e..7481396 100644
--- a/java/jakarta/el/TypeConverter.java
+++ b/java/jakarta/el/TypeConverter.java
@@ -45,6 +45,7 @@ public abstract class TypeConverter extends ELResolver {
return false;
}
+ @Deprecated(forRemoval = true, since = "EL 5.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
Object base) {
diff --git a/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
b/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
index 3ed47eb..29a29c7 100644
--- a/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/jakarta/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -160,6 +160,7 @@ public class ImplicitObjectELResolver extends ELResolver {
return false;
}
+ @Deprecated(forRemoval = true, since = "JSP 3.1")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
List<FeatureDescriptor> feats = new ArrayList<>(SCOPE_NAMES.length);
diff --git a/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
b/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
index 10fdd0a..25c14c2 100644
--- a/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
+++ b/java/jakarta/servlet/jsp/el/ScopedAttributeELResolver.java
@@ -151,6 +151,7 @@ public class ScopedAttributeELResolver extends ELResolver {
return false;
}
+ @Deprecated(forRemoval = true, since = "JSP 3.1")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
diff --git a/java/org/apache/el/stream/StreamELResolverImpl.java
b/java/org/apache/el/stream/StreamELResolverImpl.java
index 29c97e2..78b874b 100644
--- a/java/org/apache/el/stream/StreamELResolverImpl.java
+++ b/java/org/apache/el/stream/StreamELResolverImpl.java
@@ -48,6 +48,7 @@ public class StreamELResolverImpl extends ELResolver {
return false;
}
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
@Override
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
Object base) {
diff --git a/test/jakarta/el/TestArrayELResolver.java
b/test/jakarta/el/TestArrayELResolver.java
index c7dd96c..00dda1c 100644
--- a/test/jakarta/el/TestArrayELResolver.java
+++ b/test/jakarta/el/TestArrayELResolver.java
@@ -519,6 +519,7 @@ public class TestArrayELResolver {
}
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
@Test
public void testGetFeatureDescriptors() {
// Should always return null
diff --git a/test/jakarta/el/TestBeanELResolver.java
b/test/jakarta/el/TestBeanELResolver.java
index 29078ae..88fd6ff 100644
--- a/test/jakarta/el/TestBeanELResolver.java
+++ b/test/jakarta/el/TestBeanELResolver.java
@@ -368,6 +368,7 @@ public class TestBeanELResolver {
* Tests that a valid FeatureDescriptors are not returned if base is not
* Map.
*/
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
@Test
public void testGetFeatureDescriptors01() {
BeanELResolver resolver = new BeanELResolver();
@@ -381,6 +382,7 @@ public class TestBeanELResolver {
/**
* Tests that a valid FeatureDescriptors are returned.
*/
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
@Test
public void testGetFeatureDescriptors02() {
BeanELResolver resolver = new BeanELResolver();
diff --git a/test/jakarta/el/TestBeanNameELResolver.java
b/test/jakarta/el/TestBeanNameELResolver.java
index f80455e..ca9ca22 100644
--- a/test/jakarta/el/TestBeanNameELResolver.java
+++ b/test/jakarta/el/TestBeanNameELResolver.java
@@ -471,6 +471,7 @@ public class TestBeanNameELResolver {
/**
* Confirm it returns null for 'valid' input.
*/
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
public void testGetFeatureDescriptors01() {
BeanNameELResolver resolver = createBeanNameELResolver();
ELContext context =
@@ -486,6 +487,7 @@ public class TestBeanNameELResolver {
/**
* Confirm it returns null for invalid input.
*/
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
public void testGetFeatureDescriptors02() {
BeanNameELResolver resolver = createBeanNameELResolver();
diff --git a/test/jakarta/el/TestMapELResolver.java
b/test/jakarta/el/TestMapELResolver.java
index 0889a04..e2d0c9e 100644
--- a/test/jakarta/el/TestMapELResolver.java
+++ b/test/jakarta/el/TestMapELResolver.java
@@ -239,6 +239,7 @@ public class TestMapELResolver {
* Tests that a valid FeatureDescriptors are not returned if base is not
* Map.
*/
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
@Test
public void testGetFeatureDescriptors01() {
MapELResolver mapELResolver = new MapELResolver();
@@ -254,6 +255,7 @@ public class TestMapELResolver {
/**
* Tests that a valid FeatureDescriptors are returned.
*/
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
@Test
public void testGetFeatureDescriptors02() {
MapELResolver mapELResolver = new MapELResolver();
diff --git a/test/jakarta/el/TestResourceBundleELResolver.java
b/test/jakarta/el/TestResourceBundleELResolver.java
index 27abd67..6e49c37 100644
--- a/test/jakarta/el/TestResourceBundleELResolver.java
+++ b/test/jakarta/el/TestResourceBundleELResolver.java
@@ -229,6 +229,7 @@ public class TestResourceBundleELResolver {
* Tests that a valid FeatureDescriptors are not returned if base is not
* ResourceBundle.
*/
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
@Test
public void testGetFeatureDescriptors01() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
@@ -244,6 +245,7 @@ public class TestResourceBundleELResolver {
/**
* Tests that a valid FeatureDescriptors are returned.
*/
+ @Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
@Test
public void testGetFeatureDescriptors02() {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61c0c1e..6bb894b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.1.0-M6 (markt)" rtext="in development">
+ <subsection name="Jasper">
+ <changelog>
+ <scode>
+ Deprecate <code>ELResolver.getFeatureDescriptors</code> to align Tomcat
+ with recent updates in the Jakarta EL specification project. (markt)
+ </scode>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.0-M5 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
