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 bf7c051 Use String#isEmpty() bf7c051 is described below commit bf7c05135b704159e0e69538dbd53acd424aff1d Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Nov 28 11:16:01 2023 -0500 Use String#isEmpty() --- .../commons/jxpath/ri/model/dom/DOMAttributePointer.java | 2 +- .../apache/commons/jxpath/ri/model/dom/DOMNodePointer.java | 12 ++++++------ .../commons/jxpath/ri/model/jdom/JDOMAttributePointer.java | 2 +- .../apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java index e05daed..90ac734 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/dom/DOMAttributePointer.java @@ -59,7 +59,7 @@ public class DOMAttributePointer extends NodePointer { @Override public Object getValue() { final String value = attr.getValue(); - if (value == null || value.equals("") && !attr.getSpecified()) { + if (value == null || value.isEmpty() && !attr.getSpecified()) { return null; } return value; 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 6efad9c..a2ea3a8 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 @@ -227,7 +227,7 @@ public class DOMNodePointer extends NodePointer { @Override public String getNamespaceURI(final String prefix) { - if (prefix == null || prefix.equals("")) { + if (prefix == null || prefix.isEmpty()) { return getDefaultNamespaceURI(); } @@ -263,7 +263,7 @@ public class DOMNodePointer extends NodePointer { } aNode = aNode.getParentNode(); } - if (namespace == null || namespace.equals("")) { + if (namespace == null || namespace.isEmpty()) { namespace = NodePointer.UNKNOWN_NAMESPACE; } } @@ -299,7 +299,7 @@ public class DOMNodePointer extends NodePointer { defaultNamespace = ""; } // TBD: We are supposed to resolve relative URIs to absolute ones. - return defaultNamespace.equals("") ? null : defaultNamespace; + return defaultNamespace.isEmpty() ? null : defaultNamespace; } @Override @@ -358,7 +358,7 @@ public class DOMNodePointer extends NodePointer { if (n.getNodeType() == Node.ELEMENT_NODE) { final Element e = (Element) n; final String attr = e.getAttribute(attrName); - if (attr != null && !attr.equals("")) { + if (attr != null && !attr.isEmpty()) { return attr; } } @@ -387,7 +387,7 @@ public class DOMNodePointer extends NodePointer { if (node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.CDATA_SECTION_NODE) { final String string = (String) TypeUtils.convert(value, String.class); - if (string != null && !string.equals("")) { + if (string != null && !string.isEmpty()) { node.setNodeValue(string); } else { @@ -418,7 +418,7 @@ public class DOMNodePointer extends NodePointer { } else { final String string = (String) TypeUtils.convert(value, String.class); - if (string != null && !string.equals("")) { + if (string != null && !string.isEmpty()) { final Node textNode = node.getOwnerDocument().createTextNode(string); node.appendChild(textNode); diff --git a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java index 05dd873..01da802 100644 --- a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java +++ b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java @@ -49,7 +49,7 @@ public class JDOMAttributePointer extends NodePointer { @Override public String getNamespaceURI() { String uri = attr.getNamespaceURI(); - if (uri != null && uri.equals("")) { + if (uri != null && uri.isEmpty()) { uri = null; } return uri; 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 e3de51e..78827e7 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 @@ -248,7 +248,7 @@ public class JDOMNodePointer extends NodePointer { String ln = null; if (node instanceof Element) { ns = ((Element) node).getNamespacePrefix(); - if (ns != null && ns.equals("")) { + if (ns != null && ns.isEmpty()) { ns = null; } ln = ((Element) node).getName(); @@ -298,7 +298,7 @@ public class JDOMNodePointer extends NodePointer { public void setValue(final Object value) { if (node instanceof Text) { final String string = (String) TypeUtils.convert(value, String.class); - if (string != null && !string.equals("")) { + if (string != null && !string.isEmpty()) { ((Text) node).setText(string); } else { @@ -333,7 +333,7 @@ public class JDOMNodePointer extends NodePointer { } else { final String string = (String) TypeUtils.convert(value, String.class); - if (string != null && !string.equals("")) { + if (string != null && !string.isEmpty()) { element.addContent(new Text(string)); } } @@ -459,11 +459,11 @@ public class JDOMNodePointer extends NodePointer { public static String getPrefix(final Object node) { if (node instanceof Element) { final String prefix = ((Element) node).getNamespacePrefix(); - return prefix == null || prefix.equals("") ? null : prefix; + return prefix == null || prefix.isEmpty() ? null : prefix; } if (node instanceof Attribute) { final String prefix = ((Attribute) node).getNamespacePrefix(); - return prefix == null || prefix.equals("") ? null : prefix; + return prefix == null || prefix.isEmpty() ? null : prefix; } return null; } @@ -518,7 +518,7 @@ public class JDOMNodePointer extends NodePointer { if (n instanceof Element) { final Element e = (Element) n; final String attr = e.getAttributeValue(attrName, ns); - if (attr != null && !attr.equals("")) { + if (attr != null && !attr.isEmpty()) { return attr; } }