Merge pull request #22 from anonyein/origin

Origin

Author: anonyein

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
         # choosing to run a reduced set of LTS, current, and next, to balance coverage and execution time
-        java: [8, 17, 21, 25]
+        java: [8, 17, 25]
       fail-fast: false
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
     steps:

CHANGES.md

@@ -11,9 +11,9 @@
     <version>1.8</version>
   </dependency>
  ```
-  (If you already have that dependency in your classpath, but you want to keep using the Java regex engine, you can disable re2j via `System.setProperty("jsoup.useRe2j", "false")`.) [#2407](https://github.com/jhy/jsoup/pull/2407)
+  (If you already have that dependency in your classpath, but you want to keep using the Java regex engine, you can disable re2j via `System.setProperty("jsoup.useRe2j", "false")`.) You can confirm that the re2j engine has been enabled correctly by calling `Regex.usingRe2j()`. [#2407](https://github.com/jhy/jsoup/pull/2407)
 
-* Added an instance method `Parser#unescape(String, boolean)` that unescapes HTML entities using the parser’s configuration (e.g. to support error tracking), complementing the existing static utility `Parser.unescapeEntities(String, boolean)`. [#2396](https://github.com/jhy/jsoup/pull/2396)
+* Added an instance method `Parser#unescape(String, boolean)` that unescapes HTML entities using the parser's configuration (e.g. to support error tracking), complementing the existing static utility `Parser.unescapeEntities(String, boolean)`. [#2396](https://github.com/jhy/jsoup/pull/2396)
 * Build: added CI coverage for JDK 25 [#2403](https://github.com/jhy/jsoup/pull/2403)
 * Build: added a CI fuzzer for contextual fragment parsing (in addition to existing full body HTML and XML fuzzers). [oss-fuzz #14041](https://github.com/google/oss-fuzz/pull/14041)
 
@@ -24,7 +24,10 @@
 * A ValidationException could be thrown in the adoption agency algorithm with particularly broken input. Now logged as a parse error. [#2393](https://github.com/jhy/jsoup/issues/2393)
 * Null characters in the HTML body were not consistently removed; and in foreign content were not correctly replaced. [#2395](https://github.com/jhy/jsoup/issues/2395)
 * An IndexOutOfBoundsException could be thrown when parsing a body fragment with crafted input. Now logged as a parse error. [#2397](https://github.com/jhy/jsoup/issues/2397), [#2406](https://github.com/jhy/jsoup/issues/2406)
+* When using StructuralEvaluators (e.g., a `parent child` selector) across many retained threads, their memoized results could also be retained, increasing memory use. These results are now cleared immediately after use, reducing overall memory consumption. [#2411](https://github.com/jhy/jsoup/issues/2411)
 
+### Internal Changes
+* Deprecated internal helper `org.jsoup.internal.Functions` (for removal in v1.23.1). This was previously used to support older Android API levels without full `java.util.function` coverage; jsoup now requires core library desugaring so this indirection is no longer necessary. [#2412](https://github.com/jhy/jsoup/pull/2412)
 
 ## 1.21.2 (2025-Aug-25)
 

pom.xml

@@ -319,7 +319,7 @@
       <plugin>
         <groupId>org.sonatype.central</groupId>
         <artifactId>central-publishing-maven-plugin</artifactId>
-        <version>0.8.0</version>
+        <version>0.9.0</version>
         <extensions>true</extensions>
         <configuration>
           <publishingServerId>central</publishingServerId>

src/main/java/org/jsoup/helper/Regex.java

@@ -33,7 +33,7 @@ public class Regex {
      @throws ValidationException if the regex is invalid
      */
     public static Regex compile(String regex) {
-        if (hasRe2j && wantsRe2j()) {
+        if (usingRe2j()) {
             return Re2jRegex.compile(regex);
         }
 
@@ -49,6 +49,14 @@ public static Regex fromPattern(Pattern pattern) {
         return new Regex(pattern);
     }
 
+    /**
+     Checks if re2j is available (on classpath) and enabled (via system property).
+     @return true if re2j is available and enabled
+     */
+    public static boolean usingRe2j() {
+        return hasRe2j && wantsRe2j();
+    }
+
     static boolean wantsRe2j() {
         return Boolean.parseBoolean(System.getProperty(SharedConstants.UseRe2j, "true"));
     }

src/main/java/org/jsoup/helper/UrlConnectionExecutor.java

@@ -1,7 +1,6 @@
 package org.jsoup.helper;
 
 import org.jsoup.Connection;
-import org.jsoup.internal.Functions;
 import org.jspecify.annotations.Nullable;
 
 import javax.net.ssl.HttpsURLConnection;
@@ -123,7 +122,7 @@ private static LinkedHashMap<String, List<String>> createHeaderMap(HttpURLConnec
             if (key == null || val == null)
                 continue; // skip http1.1 line
 
-            final List<String> vals = headers.computeIfAbsent(key, Functions.listFunction());
+            final List<String> vals = headers.computeIfAbsent(key, k -> new java.util.ArrayList<>());
             vals.add(val);
         }
         return headers;

src/main/java/org/jsoup/internal/Functions.java

@@ -11,8 +11,10 @@
 
 /**
  * An internal class containing functions for use with {@link Map#computeIfAbsent(Object, Function)}.
+ * @deprecated for removal in jsoup 1.23.1. Replace usages with direct constructor references / lambdas.
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
+@Deprecated
 public final class Functions {
     private static final Function ListFunction = key -> new ArrayList<>();
     private static final Function SetFunction = key -> new HashSet<>();

src/main/java/org/jsoup/safety/Safelist.java

@@ -6,7 +6,6 @@ Thank you to Ryan Grove (wonko.com) for the Ruby HTML cleaner http://github.com/
  */
 
 import org.jsoup.helper.Validate;
-import org.jsoup.internal.Functions;
 import org.jsoup.internal.Normalizer;
 import org.jsoup.nodes.Attribute;
 import org.jsoup.nodes.Attributes;
@@ -306,7 +305,7 @@ public Safelist addAttributes(String tag, String... attributes) {
             Validate.notEmpty(key);
             attributeSet.add(AttributeKey.valueOf(key));
         }
-        Set<AttributeKey> currentSet = this.attributes.computeIfAbsent(tagName, Functions.setFunction());
+        Set<AttributeKey> currentSet = this.attributes.computeIfAbsent(tagName, k -> new HashSet<>());
         currentSet.addAll(attributeSet);
         return this;
     }
@@ -380,7 +379,7 @@ public Safelist addEnforcedAttribute(String tag, String attribute, String value)
         AttributeKey attrKey = AttributeKey.valueOf(attribute);
         AttributeValue attrVal = AttributeValue.valueOf(value);
 
-        Map<AttributeKey, AttributeValue> attrMap = enforcedAttributes.computeIfAbsent(tagName, Functions.mapFunction());
+        Map<AttributeKey, AttributeValue> attrMap = enforcedAttributes.computeIfAbsent(tagName, k -> new HashMap<>());
         attrMap.put(attrKey, attrVal);
         return this;
     }
@@ -453,8 +452,8 @@ public Safelist addProtocols(String tag, String attribute, String... protocols)
 
         TagName tagName = TagName.valueOf(tag);
         AttributeKey attrKey = AttributeKey.valueOf(attribute);
-        Map<AttributeKey, Set<Protocol>> attrMap = this.protocols.computeIfAbsent(tagName, Functions.mapFunction());
-        Set<Protocol> protSet = attrMap.computeIfAbsent(attrKey, Functions.setFunction());
+        Map<AttributeKey, Set<Protocol>> attrMap = this.protocols.computeIfAbsent(tagName, k -> new HashMap<>());
+        Set<Protocol> protSet = attrMap.computeIfAbsent(attrKey, k -> new HashSet<>());
 
         for (String protocol : protocols) {
             Validate.notEmpty(protocol);

src/main/java/org/jsoup/select/Collector.java

@@ -31,8 +31,9 @@ public static Elements collect(Evaluator eval, Element root) {
         Stream<Element> stream = eval.wantsNodes() ?
             streamNodes(eval, root, Element.class) :
             stream(eval, root);
-
-        return stream.collect(toCollection(Elements::new));
+        Elements els = stream.collect(toCollection(Elements::new));
+        eval.reset(); // drops any held memos
+        return els;
     }
 
     /**

src/main/java/org/jsoup/select/StructuralEvaluator.java

@@ -1,6 +1,5 @@
 package org.jsoup.select;
 
-import org.jsoup.internal.Functions;
 import org.jsoup.internal.SoftPool;
 import org.jsoup.internal.StringUtil;
 import org.jsoup.nodes.Element;
@@ -10,8 +9,8 @@
 import org.jsoup.nodes.TextNode;
 
 import java.util.ArrayList;
-import java.util.IdentityHashMap;
 import java.util.Map;
+import java.util.WeakHashMap;
 
 /**
  * Base structural evaluator.
@@ -32,17 +31,16 @@ boolean wantsNodes() {
 
     // Memoize inner matches, to save repeated re-evaluations of parent, sibling etc.
     // root + element: Boolean matches. ThreadLocal in case the Evaluator is compiled then reused across multi threads
-    final ThreadLocal<IdentityHashMap<Node, IdentityHashMap<Node, Boolean>>>
-        threadMemo = ThreadLocal.withInitial(IdentityHashMap::new);
+    final ThreadLocal<Map<Node, Map<Node, Boolean>>> threadMemo = ThreadLocal.withInitial(WeakHashMap::new);
 
     boolean memoMatches(final Element root, final Node node) {
-        Map<Node, IdentityHashMap<Node, Boolean>> rootMemo = threadMemo.get();
-        Map<Node, Boolean> memo = rootMemo.computeIfAbsent(root, Functions.identityMapFunction());
-        return memo.computeIfAbsent(node, key -> evaluator.matches(root, key));
+        Map<Node, Map<Node, Boolean>> rootMemo = threadMemo.get();
+        Map<Node, Boolean> memo = rootMemo.computeIfAbsent(root, r -> new WeakHashMap<>());
+        return memo.computeIfAbsent(node, test -> evaluator.matches(root, test));
     }
 
     @Override protected void reset() {
-        threadMemo.get().clear();
+        threadMemo.remove();
         evaluator.reset();
         super.reset();
     }

src/test/java/org/jsoup/helper/RegexTest.java

@@ -28,6 +28,7 @@ void tearDown() {
     @ValueSource(booleans = {false, true})
     void testRegexDelegates(boolean useRe2j) {
         Regex.wantsRe2j(useRe2j);
+        assertEquals(Regex.usingRe2j(), useRe2j);
         String pattern = "(\\d+)";
         String input = "12345";