ServletContextHandler.collectPropertyNames(HashSet, Object) is now typed

with generics

Author: garydgregory

src/changes/changes.xml

@@ -108,6 +108,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix" due-to="strangelookingnerd, Gary Gregory">Replace try-catch constructs in tests with assertThrows #215.</action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">Use generics internally.</action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">NodeSet.getPointers() is now typed with generics.</action>
+      <action dev="ggregory" type="fix" due-to="Gary Gregory">ServletContextHandler.collectPropertyNames(HashSet, Object) is now typed with generics.</action>
       <!-- ADD -->
       <action issue="JXPATH-123" dev="mbenson" type="add">
         XPath function "ends-with" is not implemented (although "starts-with" is).

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

@@ -30,12 +30,12 @@
 public class HttpSessionHandler extends ServletContextHandler {
 
     @Override
-    protected void collectPropertyNames(final HashSet set, final Object bean) {
+    protected void collectPropertyNames(final HashSet<String> set, final Object bean) {
         final HttpSessionAndServletContext handle = (HttpSessionAndServletContext) bean;
         super.collectPropertyNames(set, handle.getServletContext());
         final HttpSession session = handle.getSession();
         if (session != null) {
-            final Enumeration e = session.getAttributeNames();
+            final Enumeration<String> e = session.getAttributeNames();
             while (e.hasMoreElements()) {
                 set.add(e.nextElement());
             }

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

@@ -37,11 +37,11 @@ public class ServletContextHandler implements DynamicPropertyHandler {
      * @param set  destination
      * @param bean to read
      */
-    protected void collectPropertyNames(final HashSet set, Object bean) {
+    protected void collectPropertyNames(final HashSet<String> set, Object bean) {
         if (bean instanceof HttpSessionAndServletContext) {
             bean = ((HttpSessionAndServletContext) bean).getServletContext();
         }
-        final Enumeration e = ((ServletContext) bean).getAttributeNames();
+        final Enumeration<String> e = ((ServletContext) bean).getAttributeNames();
         while (e.hasMoreElements()) {
             set.add(e.nextElement());
         }
@@ -54,9 +54,9 @@ public Object getProperty(final Object context, final String property) {
 
     @Override
     public String[] getPropertyNames(final Object context) {
-        final HashSet list = new HashSet(DEFAULT_PROPERTY_COUNT);
-        collectPropertyNames(list, context);
-        return (String[]) list.toArray(new String[list.size()]);
+        final HashSet<String> set = new HashSet<>(DEFAULT_PROPERTY_COUNT);
+        collectPropertyNames(set, context);
+        return (String[]) set.toArray(new String[set.size()]);
     }
 
     @Override

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

@@ -29,11 +29,11 @@
 public class ServletRequestHandler extends HttpSessionHandler {
 
     @Override
-    protected void collectPropertyNames(final HashSet set, final Object bean) {
+    protected void collectPropertyNames(final HashSet<String> set, final Object bean) {
         super.collectPropertyNames(set, bean);
         final ServletRequestAndContext handle = (ServletRequestAndContext) bean;
         final ServletRequest servletRequest = handle.getServletRequest();
-        Enumeration e = servletRequest.getAttributeNames();
+        Enumeration<String> e = servletRequest.getAttributeNames();
         while (e.hasMoreElements()) {
             set.add(e.nextElement());
         }