codec-http2: move the accessors from Http2Headers to DefaultHttp2Headers (#16217)

bryce-anderson · web-flow · commit 85a3a0ee8d67 · 2026-02-03T11:42:43.000+01:00
#### Motivation

These helpers might be better in the DefaultHttp2Headers object since
they expose types from the DefaultHttpHeaders.

 #### Modifications

Move them.
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2Headers.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2Headers.java
@@ -37,7 +37,7 @@ public boolean process(byte value) {
             return !isUpperCase(value);
         }
     };
-    static final NameValidator<CharSequence> HTTP2_NAME_VALIDATOR = new NameValidator<CharSequence>() {
+    private static final NameValidator<CharSequence> HTTP2_NAME_VALIDATOR = new NameValidator<CharSequence>() {
         @Override
         public void validateName(CharSequence name) {
             if (name == null || name.length() == 0) {
@@ -82,7 +82,7 @@ public void validateName(CharSequence name) {
         }
     };
 
-    static final ValueValidator<CharSequence> VALUE_VALIDATOR = new ValueValidator<CharSequence>() {
+    private static final ValueValidator<CharSequence> VALUE_VALIDATOR = new ValueValidator<CharSequence>() {
         @Override
         public void validate(CharSequence value) {
             int index = HttpHeaderValidationUtil.validateValidHeaderValue(value);
@@ -299,4 +299,18 @@ protected void remove() {
             super.remove();
         }
     }
+
+    /**
+     * Default {@link io.netty.handler.codec.DefaultHeaders.NameValidator} used for HTTP/2.
+     */
+    public static NameValidator<CharSequence> defaultHtt2NameValidator() {
+        return HTTP2_NAME_VALIDATOR;
+    }
+
+    /**
+     * Default {@link io.netty.handler.codec.DefaultHeaders.ValueValidator} used for HTTP/2.
+     */
+    public static ValueValidator<CharSequence> defaultHttp2ValueValidator() {
+        return VALUE_VALIDATOR;
+    }
 }
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Headers.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/Http2Headers.java
@@ -288,18 +288,4 @@ public boolean isRequestOnly() {
      * otherwise a case sensitive compare is run to compare values.
      */
     boolean contains(CharSequence name, CharSequence value, boolean caseInsensitive);
-
-    /**
-     * Default {@link io.netty.handler.codec.DefaultHeaders.NameValidator} used for HTTP/2.
-     */
-    static DefaultHeaders.NameValidator<CharSequence> defaultHtt2NameValidator() {
-        return DefaultHttp2Headers.HTTP2_NAME_VALIDATOR;
-    }
-
-    /**
-     * Default {@link io.netty.handler.codec.DefaultHeaders.ValueValidator} used for HTTP/2.
-     */
-    static DefaultHeaders.ValueValidator<CharSequence> defaultHttp2ValueValidator() {
-        return DefaultHttp2Headers.VALUE_VALIDATOR;
-    }
 }
diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/ReadOnlyHttp2Headers.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/ReadOnlyHttp2Headers.java
@@ -140,7 +140,7 @@ private static void validateHeaders(AsciiString[] pseudoHeaders, AsciiString...
         final int otherHeadersEnd = otherHeaders.length - 1;
         for (int i = 0; i < otherHeadersEnd; i += 2) {
             AsciiString name = otherHeaders[i];
-            HTTP2_NAME_VALIDATOR.validateName(name);
+            defaultHtt2NameValidator().validateName(name);
             if (!seenNonPseudoHeader && !name.isEmpty() && name.byteAt(0) != PSEUDO_HEADER_TOKEN) {
                 seenNonPseudoHeader = true;
             } else if (seenNonPseudoHeader && !name.isEmpty() && name.byteAt(0) == PSEUDO_HEADER_TOKEN) {
