Functions.getUsedNamespaces() is now typed with generics

Author: garydgregory

src/changes/changes.xml

@@ -115,6 +115,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix" due-to="Gary Gregory">Deprecate TypeUtils.TypeUtils().</action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">Deprecate ValueUtils.ValueUtils().</action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">PageScopeContext.getAttributeNames() is now typed with generics.</action>
+      <action dev="ggregory" type="fix" due-to="Gary Gregory">Functions.getUsedNamespaces() 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/ClassFunctions.java

@@ -111,7 +111,7 @@ public Function getFunction(final String namespace, final String name, Object[]
      * @return a singleton
      */
     @Override
-    public Set getUsedNamespaces() {
+    public Set<String> getUsedNamespaces() {
         return Collections.singleton(namespace);
     }
 }

src/main/java/org/apache/commons/jxpath/FunctionLibrary.java

@@ -56,9 +56,9 @@ private synchronized Map functionCache() {
             final int count = allFunctions.size();
             for (int i = 0; i < count; i++) {
                 final Functions funcs = (Functions) allFunctions.get(i);
-                final Set namespaces = funcs.getUsedNamespaces();
-                for (final Iterator it = namespaces.iterator(); it.hasNext();) {
-                    final String ns = (String) it.next();
+                final Set<String> namespaces = funcs.getUsedNamespaces();
+                for (final Iterator<String> it = namespaces.iterator(); it.hasNext();) {
+                    final String ns = it.next();
                     final Object candidates = byNamespace.get(ns);
                     if (candidates == null) {
                         byNamespace.put(ns, funcs);
@@ -109,7 +109,7 @@ public Function getFunction(final String namespace, final String name, final Obj
      * @return Set
      */
     @Override
-    public Set getUsedNamespaces() {
+    public Set<String> getUsedNamespaces() {
         return functionCache().keySet();
     }
 

src/main/java/org/apache/commons/jxpath/Functions.java

@@ -26,7 +26,7 @@
 public interface Functions {
 
     /**
-     * Returns a Function, if any, for the specified namespace, name and parameter types.
+     * Gets a Function, if any, for the specified namespace, name and parameter types.
      * 
      * @param namespace  ns
      * @param name       function name
@@ -36,9 +36,9 @@ public interface Functions {
     Function getFunction(String namespace, String name, Object[] parameters);
 
     /**
-     * Returns all namespaces in which this function collection defines functions.
-     * 
-     * @return Set
+     * Gets all namespaces in which this function collection defines functions.
+     *
+     * @return all namespaces in which this function collection defines functions.
      */
-    Set getUsedNamespaces();
+    Set<String> getUsedNamespaces();
 }

src/main/java/org/apache/commons/jxpath/PackageFunctions.java

@@ -170,7 +170,7 @@ public Function getFunction(final String namespace, final String name, Object[]
      * @return (singleton) namespace Set
      */
     @Override
-    public Set getUsedNamespaces() {
+    public Set<String> getUsedNamespaces() {
         return Collections.singleton(namespace);
     }
 }