Skip to content

Commit 7e9b7d8

Browse files
committed
PageScopeContext.getAttributeNames() is now typed with generics
1 parent 128d4d3 commit 7e9b7d8

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/changes/changes.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ The <action> type attribute can be add,update,fix,remove.
114114
<action dev="ggregory" type="fix" due-to="Gary Gregory">Deprecate KeyManagerUtils.KeyManagerUtils().</action>
115115
<action dev="ggregory" type="fix" due-to="Gary Gregory">Deprecate TypeUtils.TypeUtils().</action>
116116
<action dev="ggregory" type="fix" due-to="Gary Gregory">Deprecate ValueUtils.ValueUtils().</action>
117+
<action dev="ggregory" type="fix" due-to="Gary Gregory">PageScopeContext.getAttributeNames() is now typed with generics.</action>
117118
<!-- ADD -->
118119
<action issue="JXPATH-123" dev="mbenson" type="add">
119120
XPath function "ends-with" is not implemented (although "starts-with" is).

src/main/java/org/apache/commons/jxpath/servlet/PageScopeContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public Object getAttribute(final String attribute) {
5353
*
5454
* @return Enumeration of attribute names
5555
*/
56-
public Enumeration getAttributeNames() {
56+
public Enumeration<String> getAttributeNames() {
5757
return pageContext.getAttributeNamesInScope(PageContext.PAGE_SCOPE);
5858
}
5959

src/main/java/org/apache/commons/jxpath/servlet/PageScopeContextHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public Object getProperty(final Object pageScope, final String property) {
3636

3737
@Override
3838
public String[] getPropertyNames(final Object pageScope) {
39-
final Enumeration e = ((PageScopeContext) pageScope).getAttributeNames();
40-
final ArrayList list = new ArrayList(DEFAULT_LIST_SIZE);
39+
final Enumeration<String> e = ((PageScopeContext) pageScope).getAttributeNames();
40+
final ArrayList<String> list = new ArrayList<>(DEFAULT_LIST_SIZE);
4141
while (e.hasMoreElements()) {
4242
list.add(e.nextElement());
4343
}
44-
return (String[]) list.toArray(new String[list.size()]);
44+
return list.toArray(new String[list.size()]);
4545
}
4646

4747
@Override

0 commit comments

Comments
 (0)