Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #4808 - Review HttpClient Request header APIs. 

Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2020-05-08 17:52:27 +02:00
parent a93b2c6084
commit b6c6684c70
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
View File

@ -472,7 +472,7 @@ public class HttpClient extends ContainerLifeCycle
continue; continue;
if (!newRequest.getHeaders().contains(field)) if (!newRequest.getHeaders().contains(field))
newRequest.header(field); newRequest.addHeader(field);
} }
return newRequest; return newRequest;
} }

8
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
View File

@ -153,7 +153,7 @@ public abstract class HttpConnection implements IConnection
if (version.getVersion() <= 11) if (version.getVersion() <= 11)
{ {
if (!headers.contains(HttpHeader.HOST)) if (!headers.contains(HttpHeader.HOST))
request.header(getHttpDestination().getHostField()); request.addHeader(getHttpDestination().getHostField());
} }
// Add content headers // Add content headers
@ -172,14 +172,14 @@ public abstract class HttpConnection implements IConnection
if (contentType != null) if (contentType != null)
{ {
HttpField field = new HttpField(HttpHeader.CONTENT_TYPE, contentType); HttpField field = new HttpField(HttpHeader.CONTENT_TYPE, contentType);
request.header(field); request.addHeader(field);
} }
} }
long contentLength = content.getLength(); long contentLength = content.getLength();
if (contentLength >= 0) if (contentLength >= 0)
{ {
if (!headers.contains(HttpHeader.CONTENT_LENGTH)) 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 @@ public abstract class HttpConnection implements IConnection
if (cookies != null) if (cookies != null)
{ {
HttpField cookieField = new HttpField(HttpHeader.COOKIE, cookies.toString()); HttpField cookieField = new HttpField(HttpHeader.COOKIE, cookies.toString());
request.header(cookieField); request.addHeader(cookieField);
} }
} }

2
jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java
View File

@ -242,7 +242,7 @@ public abstract class HttpReceiver
boolean process = notifier.notifyHeader(exchange.getConversation().getResponseListeners(), response, field); boolean process = notifier.notifyHeader(exchange.getConversation().getResponseListeners(), response, field);
if (process) if (process)
{ {
response.header(field); response.addHeader(field);
HttpHeader fieldHeader = field.getHeader(); HttpHeader fieldHeader = field.getHeader();
if (fieldHeader != null) if (fieldHeader != null)
{ {

4
jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java
View File

@ -307,6 +307,7 @@ public class HttpRequest implements Request
} }
@Override @Override
@Deprecated
public Request header(String name, String value) public Request header(String name, String value)
{ {
if (value == null) if (value == null)
@ -317,6 +318,7 @@ public class HttpRequest implements Request
} }
@Override @Override
@Deprecated
public Request header(HttpHeader header, String value) public Request header(HttpHeader header, String value)
{ {
if (value == null) if (value == null)
@ -382,7 +384,7 @@ public class HttpRequest implements Request
return this; return this;
} }
public HttpRequest header(HttpField header) public HttpRequest addHeader(HttpField header)
{ {
headers.add(header); headers.add(header);
return this; return this;

2
jetty-client/src/main/java/org/eclipse/jetty/client/HttpResponse.java
View File

@ -92,7 +92,7 @@ public class HttpResponse implements Response
return headers.asImmutable(); return headers.asImmutable();
} }
public HttpResponse header(HttpField header) public HttpResponse addHeader(HttpField header)
{ {
headers.add(header); headers.add(header);
return this; return this;