XmlHandler Method Reorganization

rikkarth · Dec 1, 2023 · 4cd760d · 4cd760d
1 parent 1da7a65
commit 4cd760d
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/src/main/java/org/toolertools/xml/XmlHandler.java b/src/main/java/org/toolertools/xml/XmlHandler.java
@@ -24,6 +24,25 @@ private XmlHandler() {
         throw new AssertionError("XmlHandler should not be instantiated.");
     }
 
+    public static String getStringFromXPath(String expression, Document document) {
+        try {
+            XPathExpression xPathExpression = createXPathExpression(expression);
+            return xPathExpression.evaluate(document);
+        } catch (XPathExpressionException | NullPointerException e) {
+            return "";
+        }
+    }
+
+    public static NodeList getNodeListFromXPath(String expression, Document document) {
+        try {
+            XPathExpression xPathExpression = createXPathExpression(expression);
+            return (NodeList) xPathExpression.evaluate(document, XPathConstants.NODESET);
+        } catch (XPathExpressionException | NullPointerException e) {
+            Document doc = createEmptyDocument();
+            return doc.createDocumentFragment().getChildNodes();
+        }
+    }
+
     public static Optional<Document> getOptionalDomFromFile(final File file) {
         try {
             DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
@@ -48,25 +67,6 @@ private static XPathExpression createXPathExpression(String expression) throws X
         return xpath.compile(expression);
     }
 
-    public static String getStringFromXPath(String expression, Document document) {
-        try {
-            XPathExpression xPathExpression = createXPathExpression(expression);
-            return xPathExpression.evaluate(document);
-        } catch (XPathExpressionException | NullPointerException e) {
-            return "";
-        }
-    }
-
-    public static NodeList getNodeListFromXPath(String expression, Document document) {
-        try {
-            XPathExpression xPathExpression = createXPathExpression(expression);
-            return (NodeList) xPathExpression.evaluate(document, XPathConstants.NODESET);
-        } catch (XPathExpressionException | NullPointerException e) {
-            Document doc = createEmptyDocument();
-            return doc.createDocumentFragment().getChildNodes();
-        }
-    }
-
     private static Document createEmptyDocument() {
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();