Fixes #4808 - Review HttpClient Request header APIs.

Updates after review. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · May 8, 2020 · b6c6684 · b6c6684
1 parent a93b2c6
commit b6c6684
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
@@ -472,7 +472,7 @@ protected Request copyRequest(HttpRequest oldRequest, URI newURI)
                 continue;
 
             if (!newRequest.getHeaders().contains(field))
-                newRequest.header(field);
+                newRequest.addHeader(field);
         }
         return newRequest;
     }

diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
@@ -153,7 +153,7 @@ protected void normalizeRequest(HttpRequest request)
         if (version.getVersion() <= 11)
         {
             if (!headers.contains(HttpHeader.HOST))
-            request.header(getHttpDestination().getHostField());
+                request.addHeader(getHttpDestination().getHostField());
         }
 
         // Add content headers
@@ -172,14 +172,14 @@ protected void normalizeRequest(HttpRequest request)
                 if (contentType != null)
                 {
                     HttpField field = new HttpField(HttpHeader.CONTENT_TYPE, contentType);
-                    request.header(field);
+                    request.addHeader(field);
                 }
             }
             long contentLength = content.getLength();
             if (contentLength >= 0)
             {
                 if (!headers.contains(HttpHeader.CONTENT_LENGTH))
-                    request.header(new HttpField.LongValueHttpField(HttpHeader.CONTENT_LENGTH, contentLength));
+                    request.addHeader(new HttpField.LongValueHttpField(HttpHeader.CONTENT_LENGTH, contentLength));
             }
         }
 
@@ -194,7 +194,7 @@ protected void normalizeRequest(HttpRequest request)
             if (cookies != null)
             {
                 HttpField cookieField = new HttpField(HttpHeader.COOKIE, cookies.toString());
-                request.header(cookieField);
+                request.addHeader(cookieField);
             }
         }
 

diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java b/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.header(field);
+            response.addHeader(field);
             HttpHeader fieldHeader = field.getHeader();
             if (fieldHeader != null)
             {

diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java
@@ -307,6 +307,7 @@ public Request accept(String... accepts)
     }
 
     @Override
+    @Deprecated
     public Request header(String name, String value)
     {
         if (value == null)
@@ -317,6 +318,7 @@ public Request header(String name, String value)
     }
 
     @Override
+    @Deprecated
     public Request header(HttpHeader header, String value)
     {
         if (value == null)
@@ -382,7 +384,7 @@ public Request headers(Consumer<HttpFields.Mutable> consumer)
         return this;
     }
 
-    public HttpRequest header(HttpField header)
+    public HttpRequest addHeader(HttpField header)
     {
         headers.add(header);
         return this;

diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java
@@ -92,7 +92,7 @@ public HttpFields getHeaders()
         return headers.asImmutable();
     }
 
-    public HttpResponse header(HttpField header)
+    public HttpResponse addHeader(HttpField header)
     {
         headers.add(header);
         return this;