Support for parsing of headers representing a list of complex elements

ok2c · ok2c · commit 99630f411855 · 2025-04-01T20:59:01.000+02:00
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
@@ -35,6 +35,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import org.apache.hc.core5.http.EntityDetails;
@@ -167,6 +168,35 @@ public static Header format(final String name, final String... tokens) {
         return headerOfTokens(name, Arrays.asList(tokens));
     }
 
+    /**
+     * @since 5.3
+     */
+    public static void parseHeader(final Header header, final BiConsumer<CharSequence, ParserCursor> consumer) {
+        Args.notNull(header, "Header");
+        if (header instanceof FormattedHeader) {
+            final CharArrayBuffer buf = ((FormattedHeader) header).getBuffer();
+            final ParserCursor cursor = new ParserCursor(0, buf.length());
+            cursor.updatePos(((FormattedHeader) header).getValuePos());
+            consumer.accept(buf, cursor);
+        } else {
+            final String value = header.getValue();
+            final ParserCursor cursor = new ParserCursor(0, value.length());
+            consumer.accept(value, cursor);
+        }
+    }
+
+    /**
+     * @since 5.3
+     */
+    public static void parseHeaders(final MessageHeaders headers, final String name, final BiConsumer<CharSequence, ParserCursor> consumer) {
+        Args.notNull(headers, "Message headers");
+        Args.notBlank(name, "Header name");
+        final Iterator<Header> it = headers.headerIterator(name);
+        while (it.hasNext()) {
+            parseHeader(it.next(), consumer);
+        }
+    }
+
     /**
      * @since 5.4
      */
@@ -200,17 +230,8 @@ public static void parseTokens(final CharSequence src, final ParserCursor cursor
     public static void parseTokens(final Header header,
                                    final Tokenizer.Delimiter delimiterPredicate,
                                    final Consumer<String> consumer) {
-        Args.notNull(header, "Header");
-        if (header instanceof FormattedHeader) {
-            final CharArrayBuffer buf = ((FormattedHeader) header).getBuffer();
-            final ParserCursor cursor = new ParserCursor(0, buf.length());
-            cursor.updatePos(((FormattedHeader) header).getValuePos());
-            parseTokens(buf, cursor, delimiterPredicate, consumer);
-        } else {
-            final String value = header.getValue();
-            final ParserCursor cursor = new ParserCursor(0, value.length());
-            parseTokens(value, cursor, delimiterPredicate, consumer);
-        }
+        parseHeader(header, (sequence, cursor) ->
+                parseTokens(sequence, cursor, delimiterPredicate, consumer));
     }
 
     /**
@@ -227,11 +248,8 @@ public static void parseTokens(final MessageHeaders headers,
                                    final String headerName,
                                    final Tokenizer.Delimiter delimiterPredicate,
                                    final Consumer<String> consumer) {
-        Args.notNull(headers, "Headers");
-        final Iterator<Header> it = headers.headerIterator(headerName);
-        while (it.hasNext()) {
-            parseTokens(it.next(), delimiterPredicate, consumer);
-        }
+        parseHeaders(headers, headerName, (sequence, cursor) ->
+                parseTokens(sequence, cursor, delimiterPredicate, consumer));
     }
 
     /**
@@ -340,27 +358,17 @@ public static void parseElements(final CharSequence buffer, final ParserCursor c
      */
     public static void parseElements(final Header header, final Consumer<HeaderElement> consumer) {
         Args.notNull(header, "Header");
-        if (header instanceof FormattedHeader) {
-            final CharArrayBuffer buf = ((FormattedHeader) header).getBuffer();
-            final ParserCursor cursor = new ParserCursor(0, buf.length());
-            cursor.updatePos(((FormattedHeader) header).getValuePos());
-            parseElements(buf, cursor, consumer);
-        } else {
-            final String value = header.getValue();
-            final ParserCursor cursor = new ParserCursor(0, value.length());
-            parseElements(value, cursor, consumer);
-        }
+        parseHeader(header, (sequence, cursor) ->
+                parseElements(sequence, cursor, consumer));
     }
 
     /**
      * @since 5.3
      */
     public static void parseElements(final MessageHeaders headers, final String headerName, final Consumer<HeaderElement> consumer) {
         Args.notNull(headers, "Headers");
-        final Iterator<Header> it = headers.headerIterator(headerName);
-        while (it.hasNext()) {
-            parseElements(it.next(), consumer);
-        }
+        parseHeaders(headers, headerName, (sequence, cursor) ->
+                parseElements(sequence, cursor, consumer));
     }
 
     /**
