Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita691620

Browse files
committed
Make HTTP headers related methods accept CharSequence names and Object values,closeAsyncHttpClient#1307
1 parent468b6f1 commita691620

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

‎client/src/main/java/org/asynchttpclient/RequestBuilderBase.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
importstaticorg.asynchttpclient.util.HttpUtils.*;
1919
importstaticorg.asynchttpclient.util.MiscUtils.isNonEmpty;
2020
importio.netty.handler.codec.http.DefaultHttpHeaders;
21+
importio.netty.handler.codec.http.HttpHeaderNames;
2122
importio.netty.handler.codec.http.HttpHeaders;
2223
importio.netty.resolver.DefaultNameResolver;
2324
importio.netty.resolver.NameResolver;
@@ -185,7 +186,7 @@ public T clearHeaders() {
185186
* @param value header value to set
186187
* @return {@code this}
187188
*/
188-
publicTsetHeader(CharSequencename,Stringvalue) {
189+
publicTsetHeader(CharSequencename,Objectvalue) {
189190
this.headers.set(name,value);
190191
returnasDerivedType();
191192
}
@@ -197,7 +198,7 @@ public T setHeader(CharSequence name, String value) {
197198
* @param values {@code Iterable} with multiple header values to set
198199
* @return {@code this}
199200
*/
200-
publicTsetHeader(CharSequencename,Iterable<String>values) {
201+
publicTsetHeader(CharSequencename,Iterable<?>values) {
201202
this.headers.set(name,values);
202203
returnasDerivedType();
203204
}
@@ -210,7 +211,7 @@ public T setHeader(CharSequence name, Iterable<String> values) {
210211
* @param value header value to add
211212
* @return {@code this}
212213
*/
213-
publicTaddHeader(CharSequencename,Stringvalue) {
214+
publicTaddHeader(CharSequencename,Objectvalue) {
214215
if (value ==null) {
215216
LOGGER.warn("Value was null, set to\"\"");
216217
value ="";
@@ -228,7 +229,7 @@ public T addHeader(CharSequence name, String value) {
228229
* @param values {@code Iterable} with multiple header values to add
229230
* @return {@code}
230231
*/
231-
publicTaddHeader(CharSequencename,Iterable<String>values) {
232+
publicTaddHeader(CharSequencename,Iterable<?>values) {
232233
this.headers.add(name,values);
233234
returnasDerivedType();
234235
}
@@ -248,7 +249,7 @@ public T setHeaders(HttpHeaders headers) {
248249
* @param headers map of header names as the map keys and header values {@link Iterable} as the map values
249250
* @return {@code this}
250251
*/
251-
publicTsetHeaders(Map<String, ?extendsIterable<String>>headers) {
252+
publicTsetHeaders(Map<CharSequence, ?extendsIterable<?>>headers) {
252253
clearHeaders();
253254
if (headers !=null) {
254255
headers.forEach((name,values) ->this.headers.add(name,values));
@@ -263,7 +264,7 @@ public T setHeaders(Map<String, ? extends Iterable<String>> headers) {
263264
* @param headers map of header names as the map keys and header values as the map values
264265
* @return {@code this}
265266
*/
266-
publicTsetSingleHeaders(Map<String,String>headers) {
267+
publicTsetSingleHeaders(Map<CharSequence, ?>headers) {
267268
clearHeaders();
268269
if (headers !=null) {
269270
headers.forEach((name,value) ->this.headers.add(name,value));
@@ -559,7 +560,7 @@ private RequestBuilderBase<?> executeSignatureCalculator() {
559560
privateCharsetcomputeCharset() {
560561
if (this.charset ==null) {
561562
try {
562-
finalStringcontentType =this.headers.get(HttpHeaders.Names.CONTENT_TYPE);
563+
finalStringcontentType =this.headers.get(HttpHeaderNames.CONTENT_TYPE);
563564
if (contentType !=null) {
564565
finalCharsetcharset =parseCharset(contentType);
565566
if (charset !=null) {

‎client/src/main/java/org/asynchttpclient/Response.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ public interface Response {
101101
* @param name the header name
102102
* @return the first response header value
103103
*/
104-
StringgetHeader(Stringname);
104+
StringgetHeader(CharSequencename);
105105

106106
/**
107107
* Return a {@link List} of the response header value.
108108
*
109109
* @param name the header name
110110
* @return the response header value
111111
*/
112-
List<String>getHeaders(Stringname);
112+
List<String>getHeaders(CharSequencename);
113113

114114
HttpHeadersgetHeaders();
115115

‎client/src/main/java/org/asynchttpclient/netty/NettyResponse.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
*/
1414
packageorg.asynchttpclient.netty;
1515

16-
importstaticio.netty.handler.codec.http.HttpHeaders.Names.*;
16+
importstaticio.netty.handler.codec.http.HttpHeaderNames.*;
1717
importstaticorg.asynchttpclient.util.HttpUtils.*;
1818
importstaticorg.asynchttpclient.util.MiscUtils.isNonEmpty;
19+
importio.netty.handler.codec.http.EmptyHttpHeaders;
1920
importio.netty.handler.codec.http.HttpHeaders;
2021

2122
importjava.io.ByteArrayInputStream;
@@ -106,18 +107,18 @@ public final String getContentType() {
106107
}
107108

108109
@Override
109-
publicfinalStringgetHeader(Stringname) {
110+
publicfinalStringgetHeader(CharSequencename) {
110111
returnheaders !=null ?getHeaders().get(name) :null;
111112
}
112113

113114
@Override
114-
publicfinalList<String>getHeaders(Stringname) {
115+
publicfinalList<String>getHeaders(CharSequencename) {
115116
returnheaders !=null ?getHeaders().getAll(name) :Collections.<String>emptyList();
116117
}
117118

118119
@Override
119120
publicfinalHttpHeadersgetHeaders() {
120-
returnheaders !=null ?headers.getHeaders() :HttpHeaders.EMPTY_HEADERS;
121+
returnheaders !=null ?headers.getHeaders() :EmptyHttpHeaders.INSTANCE;
121122
}
122123

123124
@Override

‎client/src/main/java/org/asynchttpclient/webdav/WebDavResponse.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ public String getContentType() {
7575
returnresponse.getContentType();
7676
}
7777

78-
publicStringgetHeader(Stringname) {
78+
publicStringgetHeader(CharSequencename) {
7979
returnresponse.getHeader(name);
8080
}
8181

82-
publicList<String>getHeaders(Stringname) {
82+
publicList<String>getHeaders(CharSequencename) {
8383
returnresponse.getHeaders(name);
8484
}
8585

‎client/src/test/java/org/asynchttpclient/RequestBuilderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public void testSetHeaders() {
125125
RequestBuilderrequestBuilder =newRequestBuilder();
126126
assertTrue(requestBuilder.headers.isEmpty(),"Headers should be empty by default.");
127127

128-
Map<String,Collection<String>>headers =newHashMap<>();
128+
Map<CharSequence,Collection<?>>headers =newHashMap<>();
129129
headers.put("Content-Type",Collections.singleton("application/json"));
130130
requestBuilder.setHeaders(headers);
131131
assertTrue(requestBuilder.headers.contains("Content-Type"),"headers set by setHeaders have not been set");

‎extras/simple/src/main/java/org/asynchttpclient/extras/simple/SimpleAsyncHttpClient.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,17 +391,17 @@ public interface DerivedBuilder {
391391

392392
DerivedBuildersetFormParams(Map<String,List<String>>params);
393393

394-
DerivedBuildersetHeaders(Map<String,Collection<String>>headers);
394+
DerivedBuildersetHeaders(Map<CharSequence,Collection<?>>headers);
395395

396396
DerivedBuildersetHeaders(HttpHeadersheaders);
397397

398-
DerivedBuildersetHeader(Stringname,Stringvalue);
398+
DerivedBuildersetHeader(CharSequencename,Objectvalue);
399399

400400
DerivedBuilderaddQueryParam(Stringname,Stringvalue);
401401

402402
DerivedBuilderaddFormParam(Stringkey,Stringvalue);
403403

404-
DerivedBuilderaddHeader(Stringname,Stringvalue);
404+
DerivedBuilderaddHeader(CharSequencename,Objectvalue);
405405

406406
DerivedBuilderaddCookie(Cookiecookie);
407407

@@ -451,7 +451,7 @@ public Builder addCookie(Cookie cookie) {
451451
returnthis;
452452
}
453453

454-
publicBuilderaddHeader(Stringname,Stringvalue) {
454+
publicBuilderaddHeader(CharSequencename,Objectvalue) {
455455
requestBuilder.addHeader(name,value);
456456
returnthis;
457457
}
@@ -466,7 +466,7 @@ public Builder addQueryParam(String name, String value) {
466466
returnthis;
467467
}
468468

469-
publicBuildersetHeader(Stringname,Stringvalue) {
469+
publicBuildersetHeader(CharSequencename,Objectvalue) {
470470
requestBuilder.setHeader(name,value);
471471
returnthis;
472472
}
@@ -476,7 +476,7 @@ public Builder setHeaders(HttpHeaders headers) {
476476
returnthis;
477477
}
478478

479-
publicBuildersetHeaders(Map<String,Collection<String>>headers) {
479+
publicBuildersetHeaders(Map<CharSequence,Collection<?>>headers) {
480480
requestBuilder.setHeaders(headers);
481481
returnthis;
482482
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp