Remove redundant XmlUtils.elementValue()

Author: alexeysemenyukoracle

src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java

@@ -286,7 +286,7 @@ private static  Map<String, String> queryProperties(Element e, XPath xPath, Stri
             return XmlUtils.queryNodes(e, xPath, xpathExpr)
                     .map(Element.class::cast)
                     .collect(toMap(Node::getNodeName, selectedElement -> {
-                        return XmlUtils.elementValue(selectedElement, xPath);
+                        return selectedElement.getTextContent();
                     }, (a, b) -> b));
         }
 

src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/XmlUtils.java

@@ -31,7 +31,6 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import javax.xml.parsers.DocumentBuilder;
@@ -48,7 +47,6 @@
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
-import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -137,13 +135,4 @@ public static Stream<Node> toStream(NamedNodeMap nodes) {
             return IntStream.range(0, v.getLength()).mapToObj(v::item);
         }).orElseGet(Stream::of);
     }
-
-    public static String elementValue(Element e, XPath xPath) {
-        try {
-            return queryNodes(e, xPath, "text()").map(Node::getNodeValue).collect(Collectors.joining());
-        } catch (XPathExpressionException ex) {
-            // Should never happen
-            throw new RuntimeException(ex);
-        }
-    }
 }

test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java

@@ -229,7 +229,7 @@ private static Stream<Arguments> testValidXml() {
                         "<with-comment>a<!-- This is a comment -->b</with-comment>",
                         "<add-launcher name='a'><name>foo</name><bar>foo</bar><service>true</service></add-launcher>",
                         "<other><nested>false</nested></other>",
-                        "<another-other><child/></another-other>")
+                        "<another-other>A<child/>B</another-other>")
                 )
         );
     }