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 663ed24afb3e99d8cc0720af7b2458c8aa2e1e44 Author: Gary D. Gregory <[email protected]> AuthorDate: Sun Mar 16 14:52:26 2025 -0400 Use generics internally --- src/changes/changes.xml | 1 + src/main/java/org/apache/commons/jxpath/BasicNodeSet.java | 6 +++--- src/main/java/org/apache/commons/jxpath/NodeSet.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index fa07d92..70c9b77 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -106,6 +106,7 @@ The <action> type attribute can be add,update,fix,remove. <action dev="ggregory" type="fix" due-to="Gary Gregory">Add generics to JXPathContext.decimalFormats.</action> <action dev="ggregory" type="fix" due-to="strangelookingnerd">Migrate tests to JUnit5 #214.</action> <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> <!-- 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/BasicNodeSet.java b/src/main/java/org/apache/commons/jxpath/BasicNodeSet.java index d9e8f4c..edf943b 100644 --- a/src/main/java/org/apache/commons/jxpath/BasicNodeSet.java +++ b/src/main/java/org/apache/commons/jxpath/BasicNodeSet.java @@ -26,7 +26,7 @@ import java.util.List; */ public class BasicNodeSet implements NodeSet { - private final List pointers = new ArrayList(); + private final List<Pointer> pointers = new ArrayList<>(); private List readOnlyPointers; private List nodes; private List values; @@ -65,7 +65,7 @@ public class BasicNodeSet implements NodeSet { @Override public synchronized List getNodes() { if (nodes == null) { - nodes = new ArrayList(); + nodes = new ArrayList<>(); for (int i = 0; i < pointers.size(); i++) { final Pointer pointer = (Pointer) pointers.get(i); nodes.add(pointer.getNode()); @@ -86,7 +86,7 @@ public class BasicNodeSet implements NodeSet { @Override public synchronized List getValues() { if (values == null) { - values = new ArrayList(); + values = new ArrayList<>(); for (int i = 0; i < pointers.size(); i++) { final Pointer pointer = (Pointer) pointers.get(i); values.add(pointer.getValue()); diff --git a/src/main/java/org/apache/commons/jxpath/NodeSet.java b/src/main/java/org/apache/commons/jxpath/NodeSet.java index 2b05501..2e47b88 100644 --- a/src/main/java/org/apache/commons/jxpath/NodeSet.java +++ b/src/main/java/org/apache/commons/jxpath/NodeSet.java @@ -37,7 +37,7 @@ public interface NodeSet { * * @return List */ - List getPointers(); + List<Pointer> getPointers(); /** * Returns a list of values of all contained pointers.
