Skip to content

Allow setting headers using a Map with a subclass of CharSequence as the key type #1587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 19, 2018
Merged

Allow setting headers using a Map with a subclass of CharSequence as the key type #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/src/main/java/org/asynchttpclient/RequestBuilderBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public T setHeaders(HttpHeaders headers) {
* @param headers map of header names as the map keys and header values {@link Iterable} as the map values
* @return {@code this}
*/
public T setHeaders(Map<CharSequence, ? extends Iterable<?>> headers) {
public T setHeaders(Map<? extends CharSequence, ? extends Iterable<?>> headers) {
clearHeaders();
if (headers != null) {
headers.forEach((name, values) -> this.headers.add(name, values));
Expand All @@ -282,7 +282,7 @@ public T setHeaders(Map<CharSequence, ? extends Iterable<?>> headers) {
* @param headers map of header names as the map keys and header values as the map values
* @return {@code this}
*/
public T setSingleHeaders(Map<CharSequence, ?> headers) {
public T setSingleHeaders(Map<? extends CharSequence, ?> headers) {
clearHeaders();
if (headers != null) {
headers.forEach((name, value) -> this.headers.add(name, value));
Expand Down
15 changes: 12 additions & 3 deletions client/src/test/java/org/asynchttpclient/RequestBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
import io.netty.handler.codec.http.cookie.DefaultCookie;
import org.testng.annotations.Test;

import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.*;
import java.util.concurrent.ExecutionException;

import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Collections.singletonList;
Expand Down Expand Up @@ -174,4 +171,16 @@ public void testSettingQueryParamsBeforeUrlShouldNotProduceNPE() {
Request request = requestBuilder.build();
assertEquals(request.getUrl(), "http://localhost?key=value");
}

@Test
public void testSettingHeadersUsingMapWithStringKeys() {
Map<String, List<String>> headers = new HashMap<>();
headers.put("X-Forwarded-For", singletonList("10.0.0.1"));

RequestBuilder requestBuilder = new RequestBuilder();
requestBuilder.setHeaders(headers);
requestBuilder.setUrl("http://localhost");
Request request = requestBuilder.build();
assertEquals(request.getHeaders().get("X-Forwarded-For"), "10.0.0.1");
}
}
4 changes: 2 additions & 2 deletions extras/simple/src/main/java/org/asynchttpclient/extras/simple/SimpleAsyncHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ public interface DerivedBuilder {

DerivedBuilder setFormParams(Map<String, List<String>> params);

DerivedBuilder setHeaders(Map<CharSequence, Collection<?>> headers);
DerivedBuilder setHeaders(Map<? extends CharSequence, Collection<?>> headers);

DerivedBuilder setHeaders(HttpHeaders headers);

Expand Down Expand Up @@ -465,7 +465,7 @@ public Builder setHeaders(HttpHeaders headers) {
return this;
}

public Builder setHeaders(Map<CharSequence, Collection<?>> headers) {
public Builder setHeaders(Map<? extends CharSequence, Collection<?>> headers) {
requestBuilder.setHeaders(headers);
return this;
}
Expand Down