Remove references to getFeatureDescriptors()
Method was removed in EL 6.0
diff --git a/tck/docs/assertions/ELJavadocAssertions.xml b/tck/docs/assertions/ELJavadocAssertions.xml
index 7fa11d5..184e08d 100644
--- a/tck/docs/assertions/ELJavadocAssertions.xml
+++ b/tck/docs/assertions/ELJavadocAssertions.xml
@@ -2,7 +2,7 @@
<!DOCTYPE javadoc SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/javadoc_assertions.dtd">
<!--
- Copyright (c) 2018, 2022 Oracle and/or its affiliates and others.
+ Copyright (c) 2018, 2025 Oracle and/or its affiliates and others.
All rights reserved.
This program and the accompanying materials are made available under the
@@ -61,18 +61,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>4</id>
- <description>Always returns null, since there is no reason to iterate through set set of all integers. The #getCommonPropertyType method returns sufficient information about what properties this resolver accepts.</description>
- <package>jakarta.el</package>
- <class-interface>ArrayELResolver</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>5</id>
<description>If the base object is an array, returns the most general acceptable type for a value in this array. If the base is a array, the propertyResolved property of the ELContext object must be set to true by this resolver, before returning. If this property is not true after this method is called, the caller should ignore the return value. Assuming the base is an array, this method will always return base.getClass().getComponentType(), which is the most general type of component that can be stored at any given index in the array.</description>
<package>jakarta.el</package>
@@ -156,18 +144,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>12</id>
- <description>If the base object is not null, returns an Iterator containing the set of JavaBeans properties available on the given object. Otherwise, returns null. The Iterator returned must contain zero or more instances of java.beans.FeatureDescriptor. Each info object contains information about a property in the bean, as obtained by calling the BeanInfo.getPropertyDescriptors method. The FeatureDescriptor is initialized using the same fields as are present in the PropertyDescriptor, with the additional required named attributes "type" and "resolvableAtDesignTime" set as follows: ELResolver#TYPE - The runtime type of the property, from PropertyDescriptor.getPropertyType(). ELResolver#RESOLVABLE_AT_DESIGN_TIME - true.</description>
- <package>jakarta.el</package>
- <class-interface>BeanELResolver</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>13</id>
<description>If the base object is not null, returns the most general acceptable type that can be set on this bean property. If the base is not null, the propertyResolved property of the ELContext object must be set to true by this resolver, before returning. If this property is not true after this method is called, the caller should ignore the return value. The provided property will first be coerced to a String. If there is a BeanInfoProperty for this property and there were no errors retrieving it, the propertyType of the propertyDescriptor is returned. Otherwise, a PropertyNotFoundException is thrown.</description>
<package>jakarta.el</package>
@@ -251,18 +227,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>27</id>
- <description>Returns information about the set of variables or properties that can be resolved for the given base object. One use for this method is to assist tools in auto-completion. The results are collected from all component resolvers. The propertyResolved property of the ELContext is not relevant to this method. The results of all ELResolvers are concatenated. The Iterator returned is an iterator over the collection of FeatureDescriptor objects returned by the iterators returned by each component resolver's getFeatureDescriptors method. If null is returned by a resolver, it is skipped.</description>
- <package>jakarta.el</package>
- <class-interface>CompositeELResolver</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>28</id>
<description>For a given base and property, attempts to identify the most general type that is acceptable for an object to be passed as the value parameter in a future call to the #setValue method. The result is obtained by querying all component resolvers. If this resolver handles the given (base, property) pair, the propertyResolved property of the ELContext object must be set to true by the resolver, before returning. If this property is not true after this method is called, the caller should ignore the return value. First, propertyResolved is set to false on the provided ELContext. Next, for each component resolver in this composite: The getType() method is called, passing in the provided context, base and property. If the ELContext's propertyResolved flag is false then iteration continues. Otherwise, iteration stops and no more component resolvers are considered. The value returned by getType() is returned by this method. If none of the component resolvers were able to perform this operation, the value null is returned and the propertyResolved flag remains set to false. Any exception thrown by component resolvers during the iteration is propagated to the caller of this method.</description>
<package>jakarta.el</package>
@@ -470,18 +434,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>51</id>
- <description>Returns information about the set of variables or properties that can be resolved for the given base object. One use for this method is to assist tools in auto-completion. If the base parameter is null, the resolver must enumerate the list of top-level variables it can resolve. The Iterator returned must contain zero or more instances of java.beans.FeatureDescriptor, in no guaranteed order. In the case of primitive types such as int, the value null must be returned. This is to prevent the useless iteration through all possible primitive values. A return value of null indicates that this resolver does not handle the given base object or that the results are too complex to represent with this method and the #getCommonPropertyType method should be used instead. Each FeatureDescriptor will contain information about a single variable or property. In addition to the standard properties, the FeatureDescriptor must have two named attributes (as set by the setValue method): #TYPE - The value of this named attribute must be an instance of java.lang.Class and specify the runtime type of the variable or property. #RESOLVABLE_AT_DESIGN_TIME - The value of this named attribute must be an instance of java.lang.Boolean and indicates whether it is safe to attempt to resolve this property at design-time. For instance, it may be unsafe to attempt a resolution at design time if the ELResolver needs access to a resource that is only available at runtime and no acceptable simulated value can be provided. The caller should be aware that the Iterator returned might iterate through a very large or even infinitely large set of properties. Care should be taken by the caller to not get stuck in an infinite loop. This is a "best-effort" list. Not all ELResolvers will return completely accurate results, but all must be callable at both design-time and runtime (i.e. whether or not Beans.isDesignTime() returns true), without causing errors. The propertyResolved property of the ELContext is not relevant to this method. The results of all ELResolvers are concatenated in the case of composite resolvers.</description>
- <package>jakarta.el</package>
- <class-interface>ELResolver</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>52</id>
<description>For a given base and property, attempts to identify the most general type that is acceptable for an object to be passed as the value parameter in a future call to the #setValue method. If this resolver handles the given (base, property) pair, the propertyResolved property of the ELContext object must be set to true by the resolver, before returning. If this property is not true after this method is called, the caller should ignore the return value. This is not always the same as getValue().getClass(). For example, in the case of an ArrayELResolver, the getType method will return the element type of the array, which might be a superclass of the type of the actual element that is currently in the specified array element.</description>
<package>jakarta.el</package>
@@ -651,18 +603,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>69</id>
- <description>Always returns null, since there is no reason to iterate through set set of all integers. The #getCommonPropertyType method returns sufficient information about what properties this resolver accepts.</description>
- <package>jakarta.el</package>
- <class-interface>ListELResolver</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>70</id>
<description>If the base object is a list, returns the most general acceptable type for a value in this list. If the base is a List, the propertyResolved property of the ELContext object must be set to true by this resolver, before returning. If this property is not true after this method is called, the caller should ignore the return value. Assuming the base is a List, this method will always return Object.class. This is because Lists accept any object as an element.</description>
<package>jakarta.el</package>
@@ -746,18 +686,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>77</id>
- <description>If the base object is a map, returns an Iterator containing the set of keys available in the Map. Otherwise, returns null. The Iterator returned must contain zero or more instances of java.beans.FeatureDescriptor. Each info object contains information about a key in the Map, and is initialized as follows: displayName - The return value of calling the toString method on this key, or "null" if the key is null. name - Same as displayName property. shortDescription - Empty string expert - false hidden - false preferred - true In addition, the following named attributes must be set in the returned FeatureDescriptors: ELResolver#TYPE - The return value of calling the getClass() method on this key, or null if the key is null. ELResolver#RESOLVABLE_AT_DESIGN_TIME - true</description>
- <package>jakarta.el</package>
- <class-interface>MapELResolver</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>78</id>
<description>If the base object is a map, returns the most general acceptable type for a value in this map. If the base is a Map, the propertyResolved property of the ELContext object must be set to true by this resolver, before returning. If this property is not true after this method is called, the caller should ignore the return value. Assuming the base is a Map, this method will always return Object.class. This is because Maps accept any object as the value for a given key.</description>
<package>jakarta.el</package>
@@ -1016,31 +944,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>104</id>
- <description>If the base object is a ResourceBundle, returns an Iterator containing the set of keys available in the ResourceBundle. Otherwise, returns null. The Iterator returned must contain zero or more instances of java.beans.FeatureDescriptor. Each info object contains information about a key in the ResourceBundle, and is initialized as follows: displayName - The String key name - Same as displayName property. shortDescription - Empty string expert - false hidden - false preferred - true In addition, the following named attributes must be set in the returned FeatureDescriptors: ELResolver#TYPE - String.class ELResolver#RESOLVABLE_AT_DESIGN_TIME - true</description>
- <package>jakarta.el</package>
- <class-interface>ResourceBundleELResolver</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
- <id>105</id>
- <description>If the base object is an instance of ResourceBundle, return null, since the resolver is read only. If the base is ResourceBundle, the propertyResolved property of the ELContext object must be set to true by this resolver, before returning. If this property is not true after this method is called, the caller should ignore the return value.</description>
- <package>jakarta.el</package>
- <class-interface>ResourceBundleELResolver</class-interface>
- <method name="getType" return-type="java.lang.Class">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>106</id>
<description>If the base object is an instance of ResourceBundle, the provided property will first be coerced to a String. The Object returned by getObject on the base ResourceBundle will be returned. If the base is ResourceBundle, the propertyResolved property of the ELContext object must be set to true by this resolver, before returning. If this property is not true after this method is called, the caller should ignore the return value.</description>
<package>jakarta.el</package>
@@ -1672,18 +1575,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>EL:JAVADOC:154</id>
- <description>Always returns null, since there is no reason to iterate through a list of one element: bean name.</description>
- <package>jakarta.el</package>
- <class-interface>BeanNameELResolver</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>EL:JAVADOC:155</id>
<description>If the base is null and the property is a name resolvable by the BeanNameResolver, return the type of the bean. If the name is resolvable by the BeanNameResolver, the propertyResolved property of the ELContext object must be set to true by the resolver, before returning. If this property is not true after this method is called, the caller can safely assume no value has been set.</description>
<package>jakarta.el</package>
@@ -3603,18 +3494,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>EL:JAVADOC:331</id>
- <description>Returns the properties that can be resolved. Always returns null, since there is no reason to iterate through a list of one element: field name.</description>
- <package>jakarta.el</package>
- <class-interface>StaticFieldELResolver</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>EL:JAVADOC:332</id>
<description>Returns the type of a static field. If the base object is an instance of ELClassand the property is a String, the propertyResolved property of the ELContext object must be set to true by the resolver, before returning. If this property is not true after this method is called, the caller can safely assume no value has been set. If the property is the string "class", returns java.lang.Class.class. If the property string is a public static field of class specified in ELClass, return the type of the static field.</description>
<package>jakarta.el</package>
@@ -3833,18 +3712,6 @@
</method>
</assertion>
<assertion required="true" impl-spec="false" status="active" testable="true">
- <id>EL:JAVADOC:350</id>
- <description>Returns information about the set of variables or properties that can be resolved for the given base object. One use for this method is to assist tools in auto-completion. If the base parameter is null, the resolver must enumerate the list of top-level variables it can resolve. The Iterator returned must contain zero or more instances of java.beans.FeatureDescriptor, in no guaranteed order. In the case of primitive types such as int, the value null must be returned. This is to prevent the useless iteration through all possible primitive values. A return value of null indicates that this resolver does not handle the given base object or that the results are too complex to represent with this method and the #getCommonPropertyType method should be used instead. Each FeatureDescriptor will contain information about a single variable or property. In addition to the standard properties, the FeatureDescriptor must have two named attributes (as set by the setValue method): #TYPE - The value of this named attribute must be an instance of java.lang.Class and specify the runtime type of the variable or property. #RESOLVABLE_AT_DESIGN_TIME - The value of this named attribute must be an instance of java.lang.Boolean and indicates whether it is safe to attempt to resolve this property at design-time. For instance, it may be unsafe to attempt a resolution at design time if the ELResolver needs access to a resource that is only available at runtime and no acceptable simulated value can be provided. The caller should be aware that the Iterator returned might iterate through a very large or even infinitely large set of properties. Care should be taken by the caller to not get stuck in an infinite loop. This is a "best-effort" list. Not all ELResolvers will return completely accurate results, but all must be callable at both design-time and runtime (i.e. whether or not Beans.isDesignTime() returns true), without causing errors. The propertyResolved property of the ELContext is not relevant to this method. The results of all ELResolvers are concatenated in the case of composite resolvers.</description>
- <package>jakarta.el</package>
- <class-interface>TypeConverter</class-interface>
- <method name="getFeatureDescriptors" return-type="java.util.Iterator">
- <parameters>
- <parameter>jakarta.el.ELContext</parameter>
- <parameter>java.lang.Object</parameter>
- </parameters>
- </method>
- </assertion>
- <assertion required="true" impl-spec="false" status="active" testable="true">
<id>EL:JAVADOC:351</id>
<description>For a given base and property, attempts to identify the most general type that is acceptable for an object to be passed as the value parameter in a future call to the #setValue method. If this resolver handles the given (base, property) pair, the propertyResolved property of the ELContext object must be set to true by the resolver, before returning. If this property is not true after this method is called, the caller should ignore the return value. This is not always the same as getValue().getClass(). For example, in the case of an ArrayELResolver, the getType method will return the element type of the array, which might be a superclass of the type of the actual element that is currently in the specified array element.</description>
<package>jakarta.el</package>
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/arrayelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/arrayelresolver/ELClientIT.java
index 78dd1aa..09a5448 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/arrayelresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/arrayelresolver/ELClientIT.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2024 Oracle and/or its affiliates and others.
+ * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others.
* All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -61,13 +61,13 @@
/**
* @testName: arrayELResolverTest
- *
+ *
* @assertion_ids: EL:JAVADOC:1; EL:JAVADOC:3; EL:JAVADOC:4; EL:JAVADOC:5;
* EL:JAVADOC:6; EL:JAVADOC:7; EL:JAVADOC:8
- *
+ *
* @test_Strategy: Verify that API calls work as expected: arrayELResolver()
* getValue() getType() setValue() isReadOnly()
- * getCommonPropertyType() getFeatureDescriptors()
+ * getCommonPropertyType()
*/
@Test
public void arrayELResolverTest() throws Exception {
@@ -95,14 +95,14 @@
/**
* @testName: arrayELResolverNPETest
- *
+ *
* @assertion_ids: EL:JAVADOC:1; EL:JAVADOC:5; EL:JAVADOC:6; EL:JAVADOC:7;
* EL:JAVADOC:8; EL:JAVADOC:122; EL:JAVADOC:125;
* EL:JAVADOC:128; EL:JAVADOC:131
- *
+ *
* @test_Strategy: Verify that the following methods throw a
* NullPointerException, if context is null:
- *
+ *
* getValue() getType() setValue() isReadOnly()
*/
@Test
@@ -128,14 +128,14 @@
/**
* @testName: arrayELResolverPNFETest
- *
+ *
* @assertion_ids: EL:JAVADOC:1; EL:JAVADOC:5; EL:JAVADOC:7; EL:JAVADOC:8;
* EL:JAVADOC:121; EL:JAVADOC:127; EL:JAVADOC:134
- *
+ *
* @test_Strategy: Verify that the following methods throw a
* PropertyNotFoundException, if the given index is out of
* bounds for this array :
- *
+ *
* getType() isReadOnly() setValue()
*/
@Test
@@ -164,14 +164,14 @@
/**
* @testName: arrayELResolverIAETest
- *
+ *
* @assertion_ids: EL:JAVADOC:1; EL:JAVADOC:6; EL:JAVADOC:8; EL:JAVADOC:124;
* EL:JAVADOC:132
- *
+ *
* @test_Strategy: Verify that the following methods throw an
* IllegalArgumentException, if the property could not be
* coerced into an integer:
- *
+ *
* getValue() setValue()
*/
@Test
@@ -199,15 +199,15 @@
/**
* @testName: arrayELResolverPNWETest
- *
+ *
* @assertion_ids: EL:JAVADOC:2; EL:JAVADOC:8; EL:JAVADOC:127; EL:JAVADOC:133
- *
+ *
* @test_Strategy: Verify that the single-parameter constructor for
* arrayELResolver can be used to construct a read-only
* resolver, and that the setValue() method throws a
* PropertyNotWritableException, if the resolver was
* constructed in read-only mode.
- *
+ *
* ArrayELResolver(boolean) setValue()
*/
@Test
@@ -236,12 +236,12 @@
/*
* @testName: arrayELResolverOBETest
- *
+ *
* @assertion_ids: EL:JAVADOC:1; EL:JAVADOC:6
- *
+ *
* @test_Strategy: Verify that if the index is out of bounds, null is
* returned.
- *
+ *
* getValue()
*/
@Test
@@ -275,12 +275,12 @@
/*
* @testName: arrayELResolverCCETest
- *
+ *
* @assertion_ids: EL:JAVADOC:1; EL:JAVADOC:8; EL:JAVADOC:130
- *
+ *
* @test_Strategy: Verify that if the class of a specified object prevents it
* from being added to the array, a ClassCastException is thrown.
- *
+ *
* setValue()
*/
@Test
@@ -312,7 +312,7 @@
/*
* @testName: arrayELResolverLengthTest
- *
+ *
* @test_Strategy: Verify that the length of an array is available as a read-only property.
*/
@Test
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beanelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beanelresolver/ELClientIT.java
index 9c72c12..d607e86 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beanelresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beanelresolver/ELClientIT.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2024 Oracle and/or its affiliates and others.
+ * Copyright (c) 2009, 2025 Oracle and/or its affiliates and others.
* All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -61,13 +61,13 @@
/**
* @testName: beanELResolverTest
- *
+ *
* @assertion_ids: EL:JAVADOC:9; EL:JAVADOC:11; EL:JAVADOC:12; EL:JAVADOC:13;
* EL:JAVADOC:14; EL:JAVADOC:15; EL:JAVADOC:16
- *
+ *
* @test_Strategy: Verify that API calls work as expected: beanELResolver()
* getValue() getType() setValue() isReadOnly()
- * getCommonPropertyType() getFeatureDescriptors()
+ * getCommonPropertyType()
*/
@Test
public void beanELResolverTest() throws Exception {
@@ -95,10 +95,10 @@
/**
* @testName: beanELResolverDefaultMethodReadOnlyTest
- *
+ *
* @assertion_ids: EL:JAVADOC:9; EL:JAVADOC:11; EL:JAVADOC:12; EL:JAVADOC:13;
* EL:JAVADOC:14; EL:JAVADOC:15; EL:JAVADOC:16
- *
+ *
* @test_Strategy: Verify that API calls work as expected when accessing
* read-only properties defined via a default interface method
*/
@@ -130,13 +130,13 @@
logger.log(Logger.Level.TRACE, buf.toString());
}
-
+
/**
* @testName: beanELResolverDefaultMethodReadWriteTest
- *
+ *
* @assertion_ids: EL:JAVADOC:9; EL:JAVADOC:11; EL:JAVADOC:12; EL:JAVADOC:13;
* EL:JAVADOC:14; EL:JAVADOC:15; EL:JAVADOC:16
- *
+ *
* @test_Strategy: Verify that API calls work as expected when accessing
* writable properties defined via a default interface method
*/
@@ -284,14 +284,14 @@
/**
* @testName: beanELResolverNPETest
- *
+ *
* @assertion_ids: EL:JAVADOC:9; EL:JAVADOC:13; EL:JAVADOC:14; EL:JAVADOC:15;
* EL:JAVADOC:16; EL:JAVADOC:136; EL:JAVADOC:139;
* EL:JAVADOC:145; EL:JAVADOC:148
- *
+ *
* @test_Strategy: Verify that the following methods throw a
* NullPointerException, if context is null:
- *
+ *
* getType() getValue() isReadOnly() setValue()
*/
@Test
@@ -318,15 +318,15 @@
/**
* @testName: beanELResolverPNFETest
- *
+ *
* @assertion_ids: EL:JAVADOC:9; EL:JAVADOC:13; EL:JAVADOC:14; EL:JAVADOC:15;
* EL:JAVADOC:16; EL:JAVADOC:137; EL:JAVADOC:140;
* EL:JAVADOC:146; EL:JAVADOC:149
- *
+ *
* @test_Strategy: Verify that the following methods throw a
* PropertyNotFoundException, if the base is not null and the
* specified property does not exist.
- *
+ *
* getType() isReadOnly() setValue() getValue()
*/
@Test
@@ -356,15 +356,15 @@
/**
* @testName: beanELResolverPNWETest
- *
+ *
* @assertion_ids: EL:JAVADOC:10; EL:JAVADOC:16; EL:JAVADOC:150
- *
+ *
* @test_Strategy: Verify that the single-parameter constructor for
* beanELResolver can be used to construct a read-only
* resolver, and that the setValue() method throws a
* PropertyNotWritableException, if the resolver was
* constructed in read-only mode.
- *
+ *
* BeanELResolver(boolean) setValue()
*/
@Test
@@ -389,14 +389,13 @@
}
logger.log(Logger.Level.TRACE, buf.toString());
}
-
+
/**
* @testName: beanELResolverMethodVisibilityTest
- *
+ *
* @test_Strategy: Verify that API calls work as expected for a property that is not visible via the implementing
* class (it is in an internal, non-exported class) but is visible via an interface method:
* beanELResolver() getValue() getType() setValue() isReadOnly() getCommonPropertyType()
- * getFeatureDescriptors()
*/
@Test
public void beanELResolverMethodVisibilityTest() throws Exception {
@@ -404,7 +403,7 @@
boolean pass = false;
StringBuffer buf = new StringBuffer();
TimeZone tz = TimeZone.getDefault();
-
+
try {
BeanELResolver beanResolver = new BeanELResolver();
BareBonesELContext barebonesContext = new BareBonesELContext();
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beannameelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beannameelresolver/ELClientIT.java
index 3045757..a73bf85 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beannameelresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/beannameelresolver/ELClientIT.java
@@ -65,7 +65,7 @@
*
* @test_Strategy: Verify the following method calls work as expected:
* getValue() getType() setValue() isReadOnly()
- * getCommonPropertyType() getFeatureDescriptors()
+ * getCommonPropertyType()
*/
@Test
public void beanNameELResolverTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/compositeelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/compositeelresolver/ELClientIT.java
index 996bfab..b470c98 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/compositeelresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/compositeelresolver/ELClientIT.java
@@ -71,7 +71,7 @@
* @test_Strategy: Verify that API calls work as expected:
* CompositeELResolver() add() getValue() getType() setValue()
* isReadOnly() getCommonPropertyType()
- * getFeatureDescriptors() ELContext.getELResolver()
+ * ELContext.getELResolver()
*/
@Test
public void compositeELResolverTest() throws Exception {
@@ -192,7 +192,6 @@
*
* @test_Strategy: Verify that API calls work as expected: getValue()
* getType() setValue() isReadOnly() getCommonPropertyType()
- * getFeatureDescriptors()
*/
@Test
public void compositeELResolverNPETest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java
index b2f78b7..432ce65 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/elresolver/ELClientIT.java
@@ -72,7 +72,6 @@
* @test_Strategy: Create an ELContext and get its ELResolver. Verify that API
* calls work as expected: getValue() getType() setValue()
* isReadOnly() getCommonPropertyType()
- * getFeatureDescriptors()
*/
@Test
public void elResolverTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/listelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/listelresolver/ELClientIT.java
index 6b8cc3f..be91de6 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/listelresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/listelresolver/ELClientIT.java
@@ -76,7 +76,7 @@
*
* @test_Strategy: Verify that API calls work as expected: ListELResolver()
* getValue() getType() setValue() isReadOnly()
- * getCommonPropertyType() getFeatureDescriptors()
+ * getCommonPropertyType()
*/
@Test
public void listELResolverTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/mapelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/mapelresolver/ELClientIT.java
index 8de37cb..d0f9610 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/mapelresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/mapelresolver/ELClientIT.java
@@ -75,7 +75,7 @@
* EL:JAVADOC:80; EL:JAVADOC:81; EL:JAVADOC:83
* @test_Strategy: Verify that API calls work as expected: MapELResolver()
* getValue() getType() setValue() isReadOnly()
- * getCommonPropertyType() getFeatureDescriptors()
+ * getCommonPropertyType()
*/
@Test
public void mapELResolverTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/recordelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/recordelresolver/ELClientIT.java
index 8d9306d..a09dd6c 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/recordelresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/recordelresolver/ELClientIT.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024 Contributors to the Eclipse Foundation
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -52,7 +52,7 @@
* @testName: recordELResolverTest
*
* @test_Strategy: Verify that API calls work as expected for: arrayELResolver() getValue() getType() setValue()
- * isReadOnly() getCommonPropertyType() getFeatureDescriptors(). Records should behave similarly to read-only beans.
+ * isReadOnly() getCommonPropertyType(). Records should behave similarly to read-only beans.
*/
@Test
public void recordELResolverTest() throws Exception {
@@ -76,7 +76,7 @@
}
logger.log(Logger.Level.TRACE, buf.toString());
}
-
-
+
+
public record TestRecord(String propertyA, String propertyB) { }
}
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/resourcebundleelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/resourcebundleelresolver/ELClientIT.java
index f50aa8d..4f39701 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/resourcebundleelresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/resourcebundleelresolver/ELClientIT.java
@@ -77,7 +77,6 @@
* @test_Strategy: Verify that API calls work as expected:
* ResourceBundleELResolver() setValue() getValue() getType()
* isReadOnly() getCommonPropertyType()
- * getFeatureDescriptors()
*/
@Test
public void resourceBundleELResolverTest() throws Exception {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/staticfieldelresolver/ELClientIT.java b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/staticfieldelresolver/ELClientIT.java
index a227277..21f3d7e 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/staticfieldelresolver/ELClientIT.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/api/jakarta_el/staticfieldelresolver/ELClientIT.java
@@ -158,14 +158,6 @@
buf.append("getCommonPropertyType() returns " + commonPropertyType.getName()
+ ELTestUtil.NL);
- // getFeatureDescriptors() commenting below as the method is deprecated in EL 6.0
- // context.setPropertyResolved(false);
- // Iterator<?> i = resolver.getFeatureDescriptors(context, base);
-
- // if (i == null) {
- // buf.append("getFeatureDescriptors() returns null" + ELTestUtil.NL);
- // }
-
if (!pass) {
throw new Exception(ELTestUtil.FAIL + ELTestUtil.NL + buf.toString());
}
diff --git a/tck/src/main/java/com/sun/ts/tests/el/common/api/resolver/BarELResolver.java b/tck/src/main/java/com/sun/ts/tests/el/common/api/resolver/BarELResolver.java
index 87e02ec..a4d50bc 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/common/api/resolver/BarELResolver.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/common/api/resolver/BarELResolver.java
@@ -17,8 +17,6 @@
package com.sun.ts.tests.el.common.api.resolver;
-import java.util.Iterator;
-
import jakarta.el.ELContext;
import jakarta.el.ELException;
import jakarta.el.ELResolver;
@@ -88,12 +86,6 @@
return true;
}
- public Iterator getFeatureDescriptors(ELContext context, Object base) {
- if (context == null)
- throw new NullPointerException();
- return null;
- }
-
@Override
public Class getCommonPropertyType(ELContext context, Object base) {
if (context == null)
diff --git a/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/EmployeeELResolver.java b/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/EmployeeELResolver.java
index 0242f90..95e40b0 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/EmployeeELResolver.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/EmployeeELResolver.java
@@ -21,8 +21,6 @@
package com.sun.ts.tests.el.common.elresolver;
-import java.util.Iterator;
-
import jakarta.el.ELContext;
import jakarta.el.ELException;
import jakarta.el.ELResolver;
@@ -106,10 +104,6 @@
return true;
}
- public Iterator getFeatureDescriptors(ELContext context, Object base) {
- return null;
- }
-
@Override
public Class<?> getCommonPropertyType(ELContext context, Object base) {
if (base == null)
diff --git a/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/FunctionELResolver.java b/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/FunctionELResolver.java
index 2cd3e75..4186299 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/FunctionELResolver.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/FunctionELResolver.java
@@ -21,8 +21,6 @@
package com.sun.ts.tests.el.common.elresolver;
-import java.util.Iterator;
-
import com.sun.ts.tests.el.common.functionmapper.TCKFunctionMapper;
import jakarta.el.ELContext;
@@ -86,10 +84,6 @@
return false;
}
- public Iterator getFeatureDescriptors(ELContext context, Object base) {
- return null;
- }
-
@Override
public Class getCommonPropertyType(ELContext context, Object base) {
if (base == null)
diff --git a/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/VariableELResolver.java b/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/VariableELResolver.java
index a3cb3e6..6c32fed 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/VariableELResolver.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/VariableELResolver.java
@@ -21,10 +21,7 @@
package com.sun.ts.tests.el.common.elresolver;
-import java.beans.FeatureDescriptor;
import java.util.Hashtable;
-import java.util.Iterator;
-
import jakarta.el.ELContext;
import jakarta.el.ELException;
import jakarta.el.ELResolver;
@@ -103,11 +100,6 @@
return false;
}
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
- Object base) {
- return null;
- }
-
@Override
public Class<Object> getCommonPropertyType(ELContext context, Object base) {
if (base == null) {
diff --git a/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/VectELResolver.java b/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/VectELResolver.java
index 7fef947..2fdbab3 100644
--- a/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/VectELResolver.java
+++ b/tck/src/main/java/com/sun/ts/tests/el/common/elresolver/VectELResolver.java
@@ -21,7 +21,6 @@
package com.sun.ts.tests.el.common.elresolver;
-import java.util.Iterator;
import java.util.Vector;
import jakarta.el.ELContext;
@@ -81,10 +80,6 @@
return true;
}
- public Iterator getFeatureDescriptors(ELContext context, Object base) {
- return null;
- }
-
@Override
public Class getCommonPropertyType(ELContext context, Object base) {
return null;
