(commons-jxpath) 09/10: Use generics internally

[ggregory]

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 06a46c098ee5ad5a26753578439b2520a90320f6
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Mar 16 20:07:09 2025 -0400

    Use generics internally
---
 .../commons/jxpath/ri/axes/PrecedingOrFollowingContext.java  | 10 +++++-----
 .../apache/commons/jxpath/ri/axes/SimplePathInterpreter.java | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java
 
b/src/main/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java
index 91dfcac..0d74658 100644
--- 
a/src/main/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java
+++ 
b/src/main/java/org/apache/commons/jxpath/ri/axes/PrecedingOrFollowingContext.java
@@ -31,7 +31,7 @@ public class PrecedingOrFollowingContext extends EvalContext {
 
     private final NodeTest nodeTest;
     private boolean setStarted;
-    private Stack stack;
+    private Stack<NodeIterator> stack;
     private NodePointer currentNodePointer;
     private NodePointer currentRootLocation;
     private final boolean reverse;
@@ -64,7 +64,7 @@ public class PrecedingOrFollowingContext extends EvalContext {
         if (!setStarted) {
             setStarted = true;
             if (stack == null) {
-                stack = new Stack();
+                stack = new Stack<>();
             } else {
                 stack.clear();
             }
@@ -88,7 +88,7 @@ public class PrecedingOrFollowingContext extends EvalContext {
             }
             while (!stack.isEmpty()) {
                 if (!reverse) {
-                    final NodeIterator it = (NodeIterator) stack.peek();
+                    final NodeIterator it = stack.peek();
                     if (it.setPosition(it.getPosition() + 1)) {
                         currentNodePointer = it.getNodePointer();
                         if (!currentNodePointer.isLeaf()) {
@@ -104,7 +104,7 @@ public class PrecedingOrFollowingContext extends 
EvalContext {
                         stack.pop();
                     }
                 } else {
-                    NodeIterator it = (NodeIterator) stack.peek();
+                    NodeIterator it = stack.peek();
                     if (it.setPosition(it.getPosition() + 1)) {
                         currentNodePointer = it.getNodePointer();
                         if (!currentNodePointer.isLeaf()) {
@@ -116,7 +116,7 @@ public class PrecedingOrFollowingContext extends 
EvalContext {
                     } else {
                         stack.pop();
                         if (!stack.isEmpty()) {
-                            it = (NodeIterator) stack.peek();
+                            it = stack.peek();
                             currentNodePointer = it.getNodePointer();
                             if (currentNodePointer.testNode(nodeTest)) {
                                 super.setPosition(getCurrentPosition() + 1);
diff --git 
a/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java 
b/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
index 71e5445..5ac98fe 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
@@ -290,7 +290,7 @@ public class SimplePathInterpreter {
      * @param currentPredicate int predicate number
      * @return NodePointer
      */
-    private static NodePointer doPredicatesStandard(final EvalContext context, 
final List parents, final Step[] steps, final int currentStep,
+    private static NodePointer doPredicatesStandard(final EvalContext context, 
final List<NodePointer> parents, final Step[] steps, final int currentStep,
             final Expression[] predicates, final int currentPredicate) {
         if (parents.isEmpty()) {
             return null;
@@ -299,15 +299,15 @@ public class SimplePathInterpreter {
         // element from the list of results and proceed to the
         // remaining steps with that element.
         if (currentPredicate == predicates.length) {
-            final NodePointer pointer = (NodePointer) parents.get(0);
+            final NodePointer pointer = parents.get(0);
             return doStep(context, pointer, steps, currentStep + 1);
         }
         final Expression predicate = predicates[currentPredicate];
         if (predicate instanceof NameAttributeTest) {
             final String key = keyFromPredicate(context, predicate);
-            final List newList = new ArrayList();
+            final List<NodePointer> newList = new ArrayList<>();
             for (int i = 0; i < parents.size(); i++) {
-                final NodePointer pointer = (NodePointer) parents.get(i);
+                final NodePointer pointer = parents.get(i);
                 if (isNameAttributeEqual(pointer, key)) {
                     newList.add(pointer);
                 }
@@ -324,7 +324,7 @@ public class SimplePathInterpreter {
         if (index < 0 || index >= parents.size()) {
             return null;
         }
-        final NodePointer ptr = (NodePointer) parents.get(index);
+        final NodePointer ptr = parents.get(index);
         return doPredicate(context, ptr, steps, currentStep, predicates, 
currentPredicate + 1);
     }
 
@@ -541,7 +541,7 @@ public class SimplePathInterpreter {
         } else {
             final NodeIterator it = getNodeIterator(context, parent, step);
             if (it != null) {
-                final List list = new ArrayList();
+                final List<NodePointer> list = new ArrayList<>();
                 for (int i = 1; it.setPosition(i); i++) {
                     list.add(it.getNodePointer());
                 }