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 0cdd3f64df56f0b8f2c0a49e9f901423366e6cf6 Author: Gary D. Gregory <[email protected]> AuthorDate: Sun Mar 16 19:48:52 2025 -0400 Use generics internally --- .../java/org/apache/commons/jxpath/ri/model/NodePointer.java | 2 +- .../commons/jxpath/ri/model/beans/CollectionNodeIterator.java | 4 ++-- .../commons/jxpath/ri/model/dom/DOMNamespaceIterator.java | 6 +++--- .../org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java | 6 +++--- .../jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java | 2 +- .../commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java | 10 +++++----- .../apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java index 3684c01..de757fd 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/NodePointer.java @@ -292,7 +292,7 @@ public abstract class NodePointer implements Pointer { // Task 1: find the common parent int depth1 = 0; NodePointer p1 = this; - final HashSet parents1 = new HashSet(); + final HashSet<NodePointer> parents1 = new HashSet<>(); while (p1 != null) { depth1++; p1 = p1.parent; diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionNodeIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionNodeIterator.java index 472f6e8..4ff6065 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionNodeIterator.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/beans/CollectionNodeIterator.java @@ -33,7 +33,7 @@ public abstract class CollectionNodeIterator implements NodeIterator { private final boolean reverse; private final NodePointer startWith; private int position; - private List collection; + private List<NodePointer> collection; /** * Create a new CollectionNodeIterator. @@ -73,7 +73,7 @@ public abstract class CollectionNodeIterator implements NodeIterator { * Prepare... */ private void prepare() { - collection = new ArrayList(); + collection = new ArrayList<>(); final NodePointer ptr = (NodePointer) pointer.clone(); final int length = ptr.getLength(); for (int i = 0; i < length; i++) { diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java index 489de6b..56252ae 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNamespaceIterator.java @@ -33,7 +33,7 @@ import org.w3c.dom.Node; public class DOMNamespaceIterator implements NodeIterator { private final NodePointer parent; - private final List attributes; + private final List<Attr> attributes; private int position = 0; /** @@ -43,7 +43,7 @@ public class DOMNamespaceIterator implements NodeIterator { */ public DOMNamespaceIterator(final NodePointer parent) { this.parent = parent; - attributes = new ArrayList(); + attributes = new ArrayList<>(); collectNamespaces(attributes, (Node) parent.getNode()); } @@ -53,7 +53,7 @@ public class DOMNamespaceIterator implements NodeIterator { * @param attributes attribute list * @param node target node */ - private void collectNamespaces(final List attributes, Node node) { + private void collectNamespaces(final List<Attr> attributes, Node node) { final Node parent = node.getParentNode(); if (parent != null) { collectNamespaces(attributes, parent); diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java index 6681306..33d00d7 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java @@ -208,7 +208,7 @@ public class DOMNodePointer extends NodePointer { } private final Node node; - private Map namespaces; + private Map<String, String> namespaces; private String defaultNamespace; private String id; private NamespaceResolver localNamespaceResolver; @@ -508,9 +508,9 @@ public class DOMNodePointer extends NodePointer { } String namespace = null; if (namespaces == null) { - namespaces = new HashMap(); + namespaces = new HashMap<>(); } else { - namespace = (String) namespaces.get(prefix); + namespace = namespaces.get(prefix); } if (namespace == null) { final String qname = "xmlns:" + prefix; diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java index 633d2c4..0eb25d8 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/dynabeans/DynaBeanPropertyPointer.java @@ -165,7 +165,7 @@ public class DynaBeanPropertyPointer extends PropertyPointer { if (names == null) { final DynaClass dynaClass = dynaBean.getDynaClass(); final DynaProperty[] dynaProperties = dynaClass.getDynaProperties(); - final ArrayList properties = new ArrayList(dynaProperties.length); + final ArrayList<String> properties = new ArrayList<>(dynaProperties.length); for (final DynaProperty element : dynaProperties) { final String name = element.getName(); if (!CLASS.equals(name)) { diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java index e0b2a41..1f2dbcf 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java @@ -34,7 +34,7 @@ import org.jdom.Namespace; public class JDOMAttributeIterator implements NodeIterator { private NodePointer parent; - private List attributes; + private List<Attribute> attributes; private int position = 0; /** @@ -68,16 +68,16 @@ public class JDOMAttributeIterator implements NodeIterator { } final String lname = name.getName(); if (!lname.equals("*")) { - attributes = new ArrayList(); + attributes = new ArrayList<>(); final Attribute attr = element.getAttribute(lname, ns); if (attr != null) { attributes.add(attr); } } else { - attributes = new ArrayList(); - final List allAttributes = element.getAttributes(); + attributes = new ArrayList<>(); + final List<Attribute> allAttributes = element.getAttributes(); for (int i = 0; i < allAttributes.size(); i++) { - final Attribute attr = (Attribute) allAttributes.get(i); + final Attribute attr = allAttributes.get(i); if (ns == Namespace.NO_NAMESPACE || attr.getNamespace().equals(ns)) { attributes.add(attr); } diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java index a471176..fcf32e0 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java @@ -376,7 +376,7 @@ public class JDOMNodePointer extends NodePointer { return 0; // Should not happen } if (!(node instanceof Element)) { - throw new IllegalStateException("JXPath internal error: " + "compareChildNodes called for " + node); + throw new IllegalStateException("JXPath internal error: compareChildNodes called for " + node); } final List children = ((Element) node).getContent(); final int length = children.size(); @@ -436,7 +436,7 @@ public class JDOMNodePointer extends NodePointer { return it.getNodePointer(); } } - throw new JXPathAbstractFactoryException("Factory could not create " + "a child node for path: " + asPath() + "/" + name + "[" + (index + 1) + "]"); + throw new JXPathAbstractFactoryException("Factory could not create a child node for path: " + asPath() + "/" + name + "[" + (index + 1) + "]"); } @Override
