You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2025/04/01 19:03:09 UTC
(httpcomponents-core) branch master updated: Support for parsing of headers representing a list of complex elements
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
The following commit(s) were added to refs/heads/master by this push:
new 99630f411 Support for parsing of headers representing a list of complex elements
99630f411 is described below
commit 99630f4118550eeedf19ba75b3400e6e1c035c9f
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Tue Apr 1 20:47:18 2025 +0200
Support for parsing of headers representing a list of complex elements
---
.../hc/core5/http/message/MessageSupport.java | 68 ++++++++++++----------
1 file changed, 38 insertions(+), 30 deletions(-)
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
index 10bf96d03..6f383073a 100644
--- 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,16 +358,8 @@ 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));
}
/**
@@ -357,10 +367,8 @@ public static void parseElements(final Header header, final Consumer<HeaderEleme
*/
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));
}
/**