You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/11/16 16:13:05 UTC
(commons-jxpath) branch master updated: Add generics to JXPathContext.iteratePointers(String)
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
The following commit(s) were added to refs/heads/master by this push:
new 226d4c8 Add generics to JXPathContext.iteratePointers(String)
226d4c8 is described below
commit 226d4c8a2a3019d488676fd61fa6a843b4947c7f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 16 11:13:01 2024 -0500
Add generics to JXPathContext.iteratePointers(String)
---
src/changes/changes.xml | 1 +
.../org/apache/commons/jxpath/JXPathContext.java | 6 +++---
.../apache/commons/jxpath/AbstractJXPathTest.java | 4 ++--
.../org/apache/commons/jxpath/BasicNodeSetTest.java | 8 ++++----
.../apache/commons/jxpath/issues/JXPath118Test.java | 8 ++++----
.../jxpath/ri/model/AbstractBeanModelTest.java | 20 ++++++++++----------
.../commons/jxpath/ri/model/MixedModelTest.java | 12 ++++++------
.../jxpath/servlet/JXPathServletContextTest.java | 6 +++---
8 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index dcaa9c3..cca2edb 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -102,6 +102,7 @@ The <action> type attribute can be add,update,fix,remove.
</action>
<action dev="ggregory" type="fix" due-to="Gary Gregory">Fix PMD UnnecessaryFullyQualifiedName.</action>
<action dev="ggregory" type="fix" due-to="Gary Gregory">Add generics to JXPathContext.iterate(String).</action>
+ <action dev="ggregory" type="fix" due-to="Gary Gregory">Add generics to JXPathContext.iteratePointers(String).</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/JXPathContext.java b/src/main/java/org/apache/commons/jxpath/JXPathContext.java
index c77cff0..63d02c7 100644
--- a/src/main/java/org/apache/commons/jxpath/JXPathContext.java
+++ b/src/main/java/org/apache/commons/jxpath/JXPathContext.java
@@ -701,9 +701,9 @@ public abstract class JXPathContext {
*/
public List selectNodes(final String xpath) {
final ArrayList list = new ArrayList();
- final Iterator iterator = iteratePointers(xpath);
+ final Iterator<Pointer> iterator = iteratePointers(xpath);
while (iterator.hasNext()) {
- final Pointer pointer = (Pointer) iterator.next();
+ final Pointer pointer = iterator.next();
list.add(pointer.getNode());
}
return list;
@@ -819,7 +819,7 @@ public abstract class JXPathContext {
* @param xpath to iterate
* @return Iterator
*/
- public abstract Iterator iteratePointers(String xpath);
+ public abstract Iterator<Pointer> iteratePointers(String xpath);
/**
* Install an identity manager that will be used by the context
diff --git a/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java b/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java
index 5ff5d41..9c01726 100644
--- a/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java
+++ b/src/test/java/org/apache/commons/jxpath/AbstractJXPathTest.java
@@ -166,9 +166,9 @@ public abstract class AbstractJXPathTest extends TestCase {
else {
actual = new HashSet();
}
- final Iterator it = ctx.iteratePointers(xpath);
+ final Iterator<Pointer> it = ctx.iteratePointers(xpath);
while (it.hasNext()) {
- final Pointer pointer = (Pointer) it.next();
+ final Pointer pointer = it.next();
actual.add(pointer.toString());
}
assertEquals(
diff --git a/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java b/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java
index f711133..941113f 100644
--- a/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java
+++ b/src/test/java/org/apache/commons/jxpath/BasicNodeSetTest.java
@@ -45,8 +45,8 @@ public class BasicNodeSetTest extends AbstractJXPathTest {
* @param xpath
*/
protected void addPointers(final String xpath) {
- for (final Iterator iter = context.iteratePointers(xpath); iter.hasNext();) {
- nodeSet.add((Pointer) iter.next());
+ for (final Iterator<Pointer> iter = context.iteratePointers(xpath); iter.hasNext();) {
+ nodeSet.add(iter.next());
}
nudge();
}
@@ -57,8 +57,8 @@ public class BasicNodeSetTest extends AbstractJXPathTest {
* @param xpath
*/
protected void removePointers(final String xpath) {
- for (final Iterator iter = context.iteratePointers(xpath); iter.hasNext();) {
- nodeSet.remove((Pointer) iter.next());
+ for (final Iterator<Pointer> iter = context.iteratePointers(xpath); iter.hasNext();) {
+ nodeSet.remove(iter.next());
}
nudge();
}
diff --git a/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java b/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
index 93c9c3f..e317bd6 100644
--- a/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
+++ b/src/test/java/org/apache/commons/jxpath/issues/JXPath118Test.java
@@ -34,10 +34,10 @@ public class JXPath118Test extends TestCase
{
final Object contextBean = new SomeChildClass();
final JXPathContext context = JXPathContext.newContext(contextBean);
- final Iterator iteratePointers = context.iteratePointers("//*");
- Assert.assertEquals("/bar", ((Pointer) iteratePointers.next()).asPath());
- Assert.assertEquals("/baz", ((Pointer) iteratePointers.next()).asPath());
- Assert.assertEquals("/foo", ((Pointer) iteratePointers.next()).asPath());
+ final Iterator<Pointer> iteratePointers = context.iteratePointers("//*");
+ Assert.assertEquals("/bar", iteratePointers.next().asPath());
+ Assert.assertEquals("/baz", iteratePointers.next().asPath());
+ Assert.assertEquals("/foo", iteratePointers.next().asPath());
}
public static class SomeChildClass
diff --git a/src/test/java/org/apache/commons/jxpath/ri/model/AbstractBeanModelTest.java b/src/test/java/org/apache/commons/jxpath/ri/model/AbstractBeanModelTest.java
index 6d3d39e..5483435 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/AbstractBeanModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/AbstractBeanModelTest.java
@@ -186,10 +186,10 @@ public abstract class AbstractBeanModelTest extends AbstractJXPathTest {
public void testIteratePropertyArrayWithHasNext() {
final JXPathContext context = JXPathContext.newContext(createContextBean());
- final Iterator it = context.iteratePointers("/integers");
- final List actual = new ArrayList();
+ final Iterator<Pointer> it = context.iteratePointers("/integers");
+ final List<String> actual = new ArrayList<>();
while (it.hasNext()) {
- actual.add(((Pointer) it.next()).asPath());
+ actual.add(it.next().asPath());
}
assertEquals(
"Iterating 'hasNext'/'next'<" + "/integers" + ">",
@@ -203,8 +203,8 @@ public abstract class AbstractBeanModelTest extends AbstractJXPathTest {
public void testIteratePropertyArrayWithoutHasNext() {
final JXPathContext context = JXPathContext.newContext(createContextBean());
- final Iterator it = context.iteratePointers("/integers");
- final List actual = new ArrayList();
+ final Iterator<Pointer> it = context.iteratePointers("/integers");
+ final List<String> actual = new ArrayList<>();
for (int i = 0; i < 4; i++) {
actual.add(it.next().toString());
}
@@ -221,7 +221,7 @@ public abstract class AbstractBeanModelTest extends AbstractJXPathTest {
public void testIterateAndSet() {
final JXPathContext context = JXPathContext.newContext(createContextBean());
- Iterator it = context.iteratePointers("beans/int");
+ Iterator<Pointer> it = context.iteratePointers("beans/int");
int i = 5;
while (it.hasNext()) {
final NodePointer pointer = (NodePointer) it.next();
@@ -229,9 +229,9 @@ public abstract class AbstractBeanModelTest extends AbstractJXPathTest {
}
it = context.iteratePointers("beans/int");
- final List actual = new ArrayList();
+ final List<Object> actual = new ArrayList<>();
while (it.hasNext()) {
- actual.add(((Pointer) it.next()).getValue());
+ actual.add(it.next().getValue());
}
assertEquals(
"Iterating <" + "beans/int" + ">",
@@ -257,10 +257,10 @@ public abstract class AbstractBeanModelTest extends AbstractJXPathTest {
assertXPathValue(context, "/beans[2]/name", "Name 2");
int iterCount = 0;
- final Iterator iter = context.iteratePointers("/beans/name");
+ final Iterator<Pointer> iter = context.iteratePointers("/beans/name");
while (iter.hasNext()) {
iterCount++;
- final Pointer pointer = (Pointer) iter.next();
+ final Pointer pointer = iter.next();
String s = (String) pointer.getValue();
s += "suffix";
pointer.setValue(s);
diff --git a/src/test/java/org/apache/commons/jxpath/ri/model/MixedModelTest.java b/src/test/java/org/apache/commons/jxpath/ri/model/MixedModelTest.java
index faf8d66..4be4082 100644
--- a/src/test/java/org/apache/commons/jxpath/ri/model/MixedModelTest.java
+++ b/src/test/java/org/apache/commons/jxpath/ri/model/MixedModelTest.java
@@ -364,10 +364,10 @@ public class MixedModelTest extends AbstractJXPathTest {
final JXPathContext context = JXPathContext.newContext(map);
- final Iterator it = context.iteratePointers("foo");
- final List actual = new ArrayList();
+ final Iterator<Pointer> it = context.iteratePointers("foo");
+ final List<Object> actual = new ArrayList<>();
while (it.hasNext()) {
- final Pointer ptr = (Pointer) it.next();
+ final Pointer ptr = it.next();
actual.add(context.getValue(ptr.asPath()));
}
assertEquals(
@@ -382,10 +382,10 @@ public class MixedModelTest extends AbstractJXPathTest {
final JXPathContext context = JXPathContext.newContext(map);
context.getVariables().declareVariable("x", Integer.valueOf(2));
- final Iterator it = context.iteratePointers("foo[$x]");
- final List actual = new ArrayList();
+ final Iterator<Pointer> it = context.iteratePointers("foo[$x]");
+ final List<Object> actual = new ArrayList<>();
while (it.hasNext()) {
- final Pointer ptr = (Pointer) it.next();
+ final Pointer ptr = it.next();
actual.add(context.getValue(ptr.asPath()));
}
assertEquals("Iterating pointers <" + "foo" + ">", list("b"), actual);
diff --git a/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java b/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
index a4c2a88..ec6bb71 100644
--- a/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
+++ b/src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
@@ -123,11 +123,11 @@ public class JXPathServletContextTest extends TestCase {
}
private void checkPointerIterator(final JXPathContext context) {
- final Iterator it = context.iteratePointers("/*");
+ final Iterator<Pointer> it = context.iteratePointers("/*");
assertTrue("Empty context", it.hasNext());
while (it.hasNext())
{
- final Pointer pointer = (Pointer) it.next();
+ final Pointer pointer = it.next();
assertNotNull("null pointer", pointer);
assertNotNull("null path", pointer.asPath());
}
@@ -172,7 +172,7 @@ public class JXPathServletContextTest extends TestCase {
assertEquals("Explicit Application Scope", "app", context.getValue("$application/app"));
// iterate through the elements of page context only (two elements expected, 'page' and the context)
- final Iterator it = context.iteratePointers("$page/*");
+ final Iterator<Pointer> it = context.iteratePointers("$page/*");
assertTrue("element not found", it.hasNext());
it.next();
it.next();