Add uses of StringUtil.joining()

jhy · Feb 15, 2024 · 0f59026 · 0f59026
1 parent 1f1f72d
commit 0f59026
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 39 deletions.
diff --git a/src/main/java/org/jsoup/nodes/Element.java b/src/main/java/org/jsoup/nodes/Element.java
@@ -1430,17 +1430,20 @@ public void tail(Node node, int depth) {
      @see #wholeOwnText()
      */
     public String wholeText() {
-        final StringBuilder accum = StringUtil.borrowBuilder();
-        nodeStream().forEach(node -> appendWholeText(node, accum));
-        return StringUtil.releaseBuilder(accum);
+        return getWholeText(nodeStream());
     }
 
-    private static void appendWholeText(Node node, StringBuilder accum) {
-        if (node instanceof TextNode) {
-            accum.append(((TextNode) node).getWholeText());
-        } else if (node.nameIs("br")) {
-            accum.append("\n");
-        }
+    private static String getWholeText(Stream<Node> stream) {
+        return stream.map(node -> {
+                    if (node instanceof TextNode) {
+                        return ((TextNode) node).getWholeText();
+                    } else if (node.nameIs("br")) {
+                        return "\n";
+                    } else {
+                        return "";
+                    }
+                })
+                .collect(StringUtil.joining(""));
     }
 
     /**
@@ -1453,14 +1456,7 @@ private static void appendWholeText(Node node, StringBuilder accum) {
      @since 1.15.1
      */
     public String wholeOwnText() {
-        final StringBuilder accum = StringUtil.borrowBuilder();
-        final int size = childNodeSize();
-        for (int i = 0; i < size; i++) {
-            Node node = childNodes.get(i);
-            appendWholeText(node, accum);
-        }
-
-        return StringUtil.releaseBuilder(accum);
+        return getWholeText(childNodes.stream());
     }
 
     /**
@@ -1603,7 +1599,7 @@ public Set<String> classNames() {
     	Set<String> classNames = new LinkedHashSet<>(Arrays.asList(names));
     	classNames.remove(""); // if classNames() was empty, would include an empty class
 
-        return classNames;
+    	return classNames;
     }
 
     /**

diff --git a/src/main/java/org/jsoup/select/Elements.java b/src/main/java/org/jsoup/select/Elements.java
@@ -214,13 +214,9 @@ public Elements val(String value) {
      * @see #eachText()
      */
     public String text() {
-        StringBuilder sb = StringUtil.borrowBuilder();
-        for (Element element : this) {
-            if (sb.length() != 0)
-                sb.append(" ");
-            sb.append(element.text());
-        }
-        return StringUtil.releaseBuilder(sb);
+        return stream()
+                .map(Element::text)
+                .collect(StringUtil.joining(" "));
     }
 
     /**
@@ -260,13 +256,9 @@ public List<String> eachText() {
      * @see #outerHtml()
      */
     public String html() {
-        StringBuilder sb = StringUtil.borrowBuilder();
-        for (Element element : this) {
-            if (sb.length() != 0)
-                sb.append("\n");
-            sb.append(element.html());
-        }
-        return StringUtil.releaseBuilder(sb);
+        return stream()
+                .map(Element::html)
+                .collect(StringUtil.joining("\n"));
     }
 
     /**
@@ -276,13 +268,9 @@ public String html() {
      * @see #html()
      */
     public String outerHtml() {
-        StringBuilder sb = StringUtil.borrowBuilder();
-        for (Element element : this) {
-            if (sb.length() != 0)
-                sb.append("\n");
-            sb.append(element.outerHtml());
-        }
-        return StringUtil.releaseBuilder(sb);
+        return stream()
+                .map(Element::outerHtml)
+                .collect(StringUtil.joining("\n"));
     }
 
     /**