This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jxpath.git
commit c3008daf0fc4358f7d9f250934e62e8cd2b3795c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Mar 17 14:45:47 2025 -0400
Functions.getUsedNamespaces() is now typed with generics
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/jxpath/ClassFunctions.java | 2 +-
src/main/java/org/apache/commons/jxpath/FunctionLibrary.java | 8 ++++----
src/main/java/org/apache/commons/jxpath/Functions.java | 10 +++++-----
src/main/java/org/apache/commons/jxpath/PackageFunctions.java | 2 +-
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 360ee7d..84de454 100644
--- a/src/changes/changes.xml
+++ b/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).
diff --git a/src/main/java/org/apache/commons/jxpath/ClassFunctions.java
b/src/main/java/org/apache/commons/jxpath/ClassFunctions.java
index a5c8af3..d5c9cf6 100644
--- a/src/main/java/org/apache/commons/jxpath/ClassFunctions.java
+++ b/src/main/java/org/apache/commons/jxpath/ClassFunctions.java
@@ -111,7 +111,7 @@ public class ClassFunctions implements Functions {
* @return a singleton
*/
@Override
- public Set getUsedNamespaces() {
+ public Set<String> getUsedNamespaces() {
return Collections.singleton(namespace);
}
}
diff --git a/src/main/java/org/apache/commons/jxpath/FunctionLibrary.java
b/src/main/java/org/apache/commons/jxpath/FunctionLibrary.java
index fec869c..8530f5e 100644
--- a/src/main/java/org/apache/commons/jxpath/FunctionLibrary.java
+++ b/src/main/java/org/apache/commons/jxpath/FunctionLibrary.java
@@ -56,9 +56,9 @@ public class FunctionLibrary implements Functions {
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 class FunctionLibrary implements Functions {
* @return Set
*/
@Override
- public Set getUsedNamespaces() {
+ public Set<String> getUsedNamespaces() {
return functionCache().keySet();
}
diff --git a/src/main/java/org/apache/commons/jxpath/Functions.java
b/src/main/java/org/apache/commons/jxpath/Functions.java
index fde11c8..c55d733 100644
--- a/src/main/java/org/apache/commons/jxpath/Functions.java
+++ b/src/main/java/org/apache/commons/jxpath/Functions.java
@@ -26,7 +26,7 @@ import java.util.Set;
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();
}
diff --git a/src/main/java/org/apache/commons/jxpath/PackageFunctions.java
b/src/main/java/org/apache/commons/jxpath/PackageFunctions.java
index e23ea81..089cd42 100644
--- a/src/main/java/org/apache/commons/jxpath/PackageFunctions.java
+++ b/src/main/java/org/apache/commons/jxpath/PackageFunctions.java
@@ -170,7 +170,7 @@ public class PackageFunctions implements Functions {
* @return (singleton) namespace Set
*/
@Override
- public Set getUsedNamespaces() {
+ public Set<String> getUsedNamespaces() {
return Collections.singleton(namespace);
}
}
