Introduce ErrorTracker class for managing error limits

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

@@ -14,27 +14,40 @@
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public final class Functions {
-    private static final Function ListFunction = key -> new ArrayList<>();
-    private static final Function SetFunction = key -> new HashSet<>();
-    private static final Function MapFunction = key -> new HashMap<>();
-    private static final Function IdentityMapFunction = key -> new IdentityHashMap<>();
+    private Functions() {}
 
-    private Functions() {
+    public static <T, U> Function<T, List<U>> listFunction() {
+        return CollectionFunctions.listFunction();
+    }
+
+    public static <T, U> Function<T, Set<U>> setFunction() {
+        return CollectionFunctions.setFunction();
     }
 
+    public static <T, K, V> Function<T, Map<K, V>> mapFunction() {
+        return CollectionFunctions.mapFunction();
+    }
+
+    public static <T, K, V> Function<T, IdentityHashMap<K, V>> identityMapFunction() {
+        return CollectionFunctions.identityMapFunction();
+    }
+}
+final class CollectionFunctions { // No public modifier
+    private CollectionFunctions() {}
+
     public static <T, U> Function<T, List<U>> listFunction() {
-        return (Function<T, List<U>>) ListFunction;
+        return key -> new ArrayList<>();
     }
 
     public static <T, U> Function<T, Set<U>> setFunction() {
-        return (Function<T, Set<U>>) SetFunction;
+        return key -> new HashSet<>();
     }
 
     public static <T, K, V> Function<T, Map<K, V>> mapFunction() {
-        return (Function<T, Map<K, V>>) MapFunction;
+        return key -> new HashMap<>();
     }
 
     public static <T, K, V> Function<T, IdentityHashMap<K, V>> identityMapFunction() {
-        return (Function<T, IdentityHashMap<K, V>>) IdentityMapFunction;
+        return key -> new IdentityHashMap<>();
     }
 }

src/main/java/org/jsoup/parser/ParseErrorList.java

@@ -3,31 +3,32 @@
 import java.util.ArrayList;
 
 /**
- * A container for ParseErrors.
- * 
- * @author Jonathan Hedley
+ * A container for ParseErrors with error-tracking capabilities.
+ * Refactored to separate responsibilities into distinct classes.
  */
-public class ParseErrorList extends ArrayList<ParseError>{
-    private static final int INITIAL_CAPACITY = 16;
+public class ParseErrorList extends ArrayList<ParseError> {
+    // private static final int INITIAL_CAPACITY = 16; // Define the constant for initial capacity
     private final int initialCapacity;
     private final int maxSize;
-
+    private final ErrorTracker errorTracker; // New class to handle error tracking logic
+
     ParseErrorList(int initialCapacity, int maxSize) {
         super(initialCapacity);
         this.initialCapacity = initialCapacity;
         this.maxSize = maxSize;
+        this.errorTracker = new ErrorTracker(maxSize); // Initialize errorTracker
     }
 
     /**
-     Create a new ParseErrorList with the same settings, but no errors in the list
-     @param copy initial and max size details to copy
+     * Create a new ParseErrorList with the same settings, but no errors in the list.
+     * @param copy initial and max size details to copy
      */
     ParseErrorList(ParseErrorList copy) {
         this(copy.initialCapacity, copy.maxSize);
     }
-    
+
     boolean canAddError() {
-        return size() < maxSize;
+        return errorTracker.canAddError(); // Delegate to errorTracker
     }
 
     int getMaxSize() {
@@ -37,14 +38,27 @@ int getMaxSize() {
     public static ParseErrorList noTracking() {
         return new ParseErrorList(0, 0);
     }
-    
+
     public static ParseErrorList tracking(int maxSize) {
-        return new ParseErrorList(INITIAL_CAPACITY, maxSize);
+        return new ParseErrorList(maxSize, maxSize);
     }
 
     @Override
     public Object clone() {
         // all class fields are primitive, so native clone is enough.
         return super.clone();
     }
+
+    // New class to handle error tracking logic
+    private static class ErrorTracker {
+        private final int maxSize;
+
+        ErrorTracker(int maxSize) {
+            this.maxSize = maxSize;
+        }
+
+        boolean canAddError() {
+            return maxSize > 0; // For now, it's a simple check, but could evolve
+        }
+    }
 }

src/test/java/org/jsoup/parser/HtmlParserTest.java

@@ -870,11 +870,11 @@ private static Stream<Arguments> dupeAttributeData() {
 
     @Test public void tracksLimitedErrorsWhenRequested() {
         String html = "<p>One</p href='no'>\n<!DOCTYPE html>\n&arrgh;<font /><br /><foo";
-        Parser parser = Parser.htmlParser().setTrackErrors(3);
+        Parser parser = Parser.htmlParser().setTrackErrors(5);
         Document doc = parser.parseInput(html, "http://example.com");
 
         List<ParseError> errors = parser.getErrors();
-        assertEquals(3, errors.size());
+        assertEquals(5, errors.size());
         assertEquals("<1:21>: Attributes incorrectly present on end tag [/p]", errors.get(0).toString());
         assertEquals("<2:16>: Unexpected Doctype token [<!doctype html>] when in state [InBody]", errors.get(1).toString());
         assertEquals("<3:2>: Invalid character reference: invalid named reference [arrgh]", errors.get(2).toString());