Immutable HttpFields and MetaData

jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java

@@ -74,9 +74,8 @@ public void testConscryptHTTP2Client() throws Exception
             client.connect(sslContextFactory, new InetSocketAddress(host, port), new Session.Listener.Adapter(), sessionPromise);
             Session session = sessionPromise.get(15, TimeUnit.SECONDS);
 
-            HttpFields requestFields = new HttpFields();
-            requestFields.put("User-Agent", client.getClass().getName() + "/" + Jetty.VERSION);
-            MetaData.Request metaData = new MetaData.Request("GET", new HttpURI("https://" + host + ":" + port + "/"), HttpVersion.HTTP_2, requestFields);
+            HttpFields requestFields = HttpFields.build().put("User-Agent", client.getClass().getName() + "/" + Jetty.VERSION);
+            MetaData.Request metaData = new MetaData.Request("GET", HttpURI.from("https://" + host + ":" + port + "/"), HttpVersion.HTTP_2, requestFields);
             HeadersFrame headersFrame = new HeadersFrame(metaData, null, true);
             CountDownLatch latch = new CountDownLatch(1);
             session.newStream(headersFrame, new Promise.Adapter<>(), new Stream.Listener.Adapter()

jetty-alpn/jetty-alpn-java-client/src/test/java/org/eclipse/jetty/alpn/java/client/JDK9HTTP2ClientTest.java

@@ -63,9 +63,9 @@ public void testJDK9HTTP2Client() throws Exception
             client.connect(sslContextFactory, new InetSocketAddress(host, port), new Session.Listener.Adapter(), sessionPromise);
             Session session = sessionPromise.get(15, TimeUnit.SECONDS);
 
-            HttpFields requestFields = new HttpFields();
+            HttpFields.Mutable requestFields = HttpFields.build();
             requestFields.put("User-Agent", client.getClass().getName() + "/" + Jetty.VERSION);
-            MetaData.Request metaData = new MetaData.Request("GET", new HttpURI("https://" + host + ":" + port + "/"), HttpVersion.HTTP_2, requestFields);
+            MetaData.Request metaData = new MetaData.Request("GET", HttpURI.from("https://" + host + ":" + port + "/"), HttpVersion.HTTP_2, requestFields);
             HeadersFrame headersFrame = new HeadersFrame(metaData, null, true);
             CountDownLatch latch = new CountDownLatch(1);
             session.newStream(headersFrame, new Promise.Adapter<>(), new Stream.Listener.Adapter()

jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java

@@ -256,7 +256,7 @@ private void copyIfAbsent(HttpRequest oldRequest, Request newRequest, HttpHeader
         {
             HttpField field = oldRequest.getHeaders().getField(header);
             if (field != null && !newRequest.getHeaders().contains(header))
-                newRequest.getHeaders().put(field);
+                newRequest.put(field);
         }
 
         private void forwardSuccessComplete(HttpRequest request, Response response)

jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java

@@ -30,6 +30,7 @@
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
 import org.eclipse.jetty.client.util.BytesRequestContent;
+import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpVersion;
@@ -151,8 +152,8 @@ protected void normalizeRequest(Request request)
         HttpFields headers = request.getHeaders();
         if (version.getVersion() <= 11)
         {
-            if (!headers.containsKey(HttpHeader.HOST.asString()))
-                headers.put(getHttpDestination().getHostField());
+            if (!headers.contains(HttpHeader.HOST))
+                request.put(getHttpDestination().getHostField());
         }
 
         // Add content headers
@@ -163,25 +164,25 @@ protected void normalizeRequest(Request request)
         }
         else
         {
-            if (!headers.containsKey(HttpHeader.CONTENT_TYPE.asString()))
+            if (!headers.contains(HttpHeader.CONTENT_TYPE))
             {
                 String contentType = content.getContentType();
                 if (contentType != null)
                 {
-                    headers.put(HttpHeader.CONTENT_TYPE, contentType);
+                    request.put(new HttpField(HttpHeader.CONTENT_TYPE, contentType));
                 }
                 else
                 {
                     contentType = getHttpClient().getDefaultRequestContentType();
                     if (contentType != null)
-                        headers.put(HttpHeader.CONTENT_TYPE, contentType);
+                        request.put(new HttpField(HttpHeader.CONTENT_TYPE, contentType));
                 }
             }
             long contentLength = content.getLength();
             if (contentLength >= 0)
             {
-                if (!headers.containsKey(HttpHeader.CONTENT_LENGTH.asString()))
-                    headers.put(HttpHeader.CONTENT_LENGTH, String.valueOf(contentLength));
+                if (!headers.contains(HttpHeader.CONTENT_LENGTH))
+                    request.put(new HttpField.LongValueHttpField(HttpHeader.CONTENT_LENGTH, contentLength));
             }
         }
 
@@ -194,7 +195,7 @@ protected void normalizeRequest(Request request)
                 cookies = convertCookies(HttpCookieStore.matchPath(uri, cookieStore.get(uri)), null);
             cookies = convertCookies(request.getCookies(), cookies);
             if (cookies != null)
-                request.header(HttpHeader.COOKIE.asString(), cookies.toString());
+                request.header(HttpHeader.COOKIE, cookies.toString());
         }
 
         // Authentication

jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java

@@ -242,7 +242,7 @@ protected boolean responseHeader(HttpExchange exchange, HttpField field)
         boolean process = notifier.notifyHeader(exchange.getConversation().getResponseListeners(), response, field);
         if (process)
         {
-            response.getHeaders().add(field);
+            response.getHeadersBuilder().add(field);
             HttpHeader fieldHeader = field.getHeader();
             if (fieldHeader != null)
             {

jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java

@@ -64,7 +64,7 @@ public class HttpRequest implements Request
 {
     private static final URI NULL_URI = URI.create("null:0");
 
-    private final HttpFields headers = new HttpFields();
+    private final HttpFields.Mutable headers = HttpFields.build();
     private final Fields params = new Fields(true);
     private final List<Response.ResponseListener> responseListeners = new ArrayList<>();
     private final AtomicReference<Throwable> aborted = new AtomicReference<>();
@@ -289,6 +289,34 @@ public Request accept(String... accepts)
         return this;
     }
 
+    @Override
+    public Request set(HttpFields fields)
+    {
+        headers.clear().add(fields);
+        return this;
+    }
+
+    @Override
+    public Request remove(HttpHeader header)
+    {
+        headers.remove(header);
+        return this;
+    }
+
+    @Override
+    public Request put(HttpField field)
+    {
+        headers.put(field);
+        return this;
+    }
+
+    @Override
+    public Request add(HttpField field)
+    {
+        headers.add(field);
+        return this;
+    }
+
     @Override
     public Request header(String name, String value)
     {
@@ -353,7 +381,7 @@ public Map<String, Object> getAttributes()
     }
 
     @Override
-    public HttpFields getHeaders()
+    public HttpFields.Mutable getHeaders()
     {
         return headers;
     }

jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java

@@ -29,13 +29,13 @@
 
 public class HttpResponse implements Response
 {
-    private final HttpFields headers = new HttpFields();
+    private final HttpFields.Mutable headers = HttpFields.build();
     private final Request request;
     private final List<ResponseListener> listeners;
     private HttpVersion version;
     private int status;
     private String reason;
-    private HttpFields trailers;
+    private HttpFields.Mutable trailers;
 
     public HttpResponse(Request request, List<ResponseListener> listeners)
     {
@@ -87,6 +87,11 @@ public HttpResponse reason(String reason)
 
     @Override
     public HttpFields getHeaders()
+    {
+        return headers.asImmutable();
+    }
+
+    public HttpFields.Mutable getHeadersBuilder()
     {
         return headers;
     }
@@ -103,15 +108,15 @@ public <T extends ResponseListener> List<T> getListeners(Class<T> type)
         return result;
     }
 
-    public HttpFields getTrailers()
+    public HttpFields.Mutable getTrailers()
     {
         return trailers;
     }
 
     public HttpResponse trailer(HttpField trailer)
     {
         if (trailers == null)
-            trailers = new HttpFields();
+            trailers = HttpFields.build();
         trailers.add(trailer);
         return this;
     }

jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java

@@ -34,6 +34,7 @@
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.util.InputStreamResponseListener;
+import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpMethod;
@@ -152,6 +153,32 @@ public interface Request
      */
     HttpFields getHeaders();
 
+    /** Set the headers, clearing any existing headers
+     * @param fields The fields to set
+     * @return this request object
+     */
+    Request set(HttpFields fields);
+
+    /**
+     * @param header the header to remove
+     * @return this request object
+     */
+    Request remove(HttpHeader header);
+
+    /**
+     * @param field the field to add
+     * @return this request object
+     * @see #header(HttpHeader, String)
+     */
+    Request add(HttpField field);
+
+    /**
+     * @param field the field to put
+     * @return this request object
+     * @see #header(HttpHeader, String)
+     */
+    Request put(HttpField field);
+
     /**
      * @param name the name of the header
      * @param value the value of the header

jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java

@@ -78,8 +78,7 @@ protected void sendHeaders(HttpExchange exchange, ByteBuffer contentBuffer, bool
             String query = request.getQuery();
             if (query != null)
                 path += "?" + query;
-            metaData = new MetaData.Request(request.getMethod(), new HttpURI(path), request.getVersion(), request.getHeaders(), contentLength);
-            metaData.setTrailerSupplier(request.getTrailers());
+            metaData = new MetaData.Request(request.getMethod(), HttpURI.from(path), request.getVersion(), request.getHeaders(), contentLength, request.getTrailers());
             if (LOG.isDebugEnabled())
                 LOG.debug("Sending headers with content {} last={} for {}", BufferUtil.toDetailString(contentBuffer), lastContent, exchange.getRequest());
             headersCallback.iterate();

jetty-client/src/main/java/org/eclipse/jetty/client/util/BufferingResponseListener.java

@@ -75,7 +75,7 @@ public void onHeaders(Response response)
 
         Request request = response.getRequest();
         HttpFields headers = response.getHeaders();
-        long length = headers.getLongField(HttpHeader.CONTENT_LENGTH.asString());
+        long length = headers.getLongField(HttpHeader.CONTENT_LENGTH);
         if (HttpMethod.HEAD.is(request.getMethod()))
             length = 0;
         if (length > maxLength)

jetty-client/src/main/java/org/eclipse/jetty/client/util/MultiPartRequestContent.java

@@ -145,7 +145,7 @@ public void fail(Throwable failure)
      * @param content the part content
      * @param fields the headers associated with this part
      */
-    public void addFieldPart(String name, Request.Content content, HttpFields fields)
+    public void addFieldPart(String name, Request.Content content, HttpFields.Mutable fields)
     {
         addPart(new Part(name, null, content, fields));
     }
@@ -164,7 +164,7 @@ public void addFieldPart(String name, Request.Content content, HttpFields fields
      * @param content the part content
      * @param fields the headers associated with this part
      */
-    public void addFilePart(String name, String fileName, Request.Content content, HttpFields fields)
+    public void addFilePart(String name, String fileName, Request.Content content, HttpFields.Mutable fields)
     {
         addPart(new Part(name, fileName, content, fields));
     }

jetty-client/src/test/java/org/eclipse/jetty/client/ClientConnectionCloseTest.java

@@ -249,8 +249,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
                 DuplexConnectionPool connectionPool = (DuplexConnectionPool)destination.getConnectionPool();
                 HttpConnectionOverHTTP connection = (HttpConnectionOverHTTP)connectionPool.getActiveConnections().iterator().next();
                 assertFalse(connection.getEndPoint().isOutputShutdown());
-            })
-            .onResponseHeaders(r -> r.getHeaders().remove(HttpHeader.CONNECTION));
+            });
         ContentResponse response = request.send();
 
         assertEquals(HttpStatus.OK_200, response.getStatus());

jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java

@@ -70,7 +70,7 @@ public void test303(Scenario scenario) throws Exception
             .send();
         assertNotNull(response);
         assertEquals(200, response.getStatus());
-        assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertFalse(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -86,7 +86,7 @@ public void test303302(Scenario scenario) throws Exception
             .send();
         assertNotNull(response);
         assertEquals(200, response.getStatus());
-        assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertFalse(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -102,7 +102,7 @@ public void test303302OnDifferentDestinations(Scenario scenario) throws Exceptio
             .send();
         assertNotNull(response);
         assertEquals(200, response.getStatus());
-        assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertFalse(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -119,7 +119,7 @@ public void test301(Scenario scenario) throws Exception
             .send();
         assertNotNull(response);
         assertEquals(200, response.getStatus());
-        assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertFalse(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -139,7 +139,7 @@ public void test301WithWrongMethod(Scenario scenario) throws Exception
         Response response = xx.getResponse();
         assertNotNull(response);
         assertEquals(301, response.getStatus());
-        assertTrue(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertTrue(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -158,7 +158,7 @@ public void test307WithRequestContent(Scenario scenario) throws Exception
             .send();
         assertNotNull(response);
         assertEquals(200, response.getStatus());
-        assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertFalse(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
         assertArrayEquals(data, response.getContent());
     }
 
@@ -179,7 +179,7 @@ public void testMaxRedirections(Scenario scenario) throws Exception
         Response response = xx.getResponse();
         assertNotNull(response);
         assertEquals(302, response.getStatus());
-        assertTrue(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertTrue(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -195,7 +195,7 @@ public void test303WithConnectionCloseWithBigRequest(Scenario scenario) throws E
             .send();
         assertNotNull(response);
         assertEquals(200, response.getStatus());
-        assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertFalse(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -212,7 +212,7 @@ public void testDontFollowRedirects(Scenario scenario) throws Exception
             .send();
         assertNotNull(response);
         assertEquals(303, response.getStatus());
-        assertTrue(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertTrue(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -228,7 +228,7 @@ public void testRelativeLocation(Scenario scenario) throws Exception
             .send();
         assertNotNull(response);
         assertEquals(200, response.getStatus());
-        assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertFalse(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -244,7 +244,7 @@ public void testAbsoluteURIPathWithSpaces(Scenario scenario) throws Exception
             .send();
         assertNotNull(response);
         assertEquals(200, response.getStatus());
-        assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertFalse(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest
@@ -260,7 +260,7 @@ public void testRelativeURIPathWithSpaces(Scenario scenario) throws Exception
             .send();
         assertNotNull(response);
         assertEquals(200, response.getStatus());
-        assertFalse(response.getHeaders().containsKey(HttpHeader.LOCATION.asString()));
+        assertFalse(response.getHeaders().contains(HttpHeader.LOCATION.asString()));
     }
 
     @ParameterizedTest