Skip to content

Commit 420b017

Browse files
committed
nit
1 parent 5f448ed commit 420b017

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestFactory.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939

4040
public final class NettyRequestFactory {
4141

42-
private static final String BROTLY_ACCEPT_ENCODING_SUFFIX = ", br";
43-
private static final String GZIP_DEFLATE = HttpHeaderValues.GZIP + "," + HttpHeaderValues.DEFLATE;
4442
private static final Integer ZERO_CONTENT_LENGTH = 0;
4543

4644
private final AsyncHttpClientConfig config;
@@ -154,9 +152,7 @@ public NettyRequest newNettyRequest(Request request, boolean performConnectReque
154152
String userDefinedAcceptEncoding = headers.get(ACCEPT_ENCODING);
155153
if (userDefinedAcceptEncoding != null) {
156154
// we don't support Brotly ATM
157-
if (userDefinedAcceptEncoding.endsWith(BROTLY_ACCEPT_ENCODING_SUFFIX)) {
158-
headers.set(ACCEPT_ENCODING, userDefinedAcceptEncoding.subSequence(0, userDefinedAcceptEncoding.length() - BROTLY_ACCEPT_ENCODING_SUFFIX.length()));
159-
}
155+
headers.set(ACCEPT_ENCODING, filterOutBrotliFromAcceptEncoding(userDefinedAcceptEncoding));
160156

161157
} else if (config.isCompressionEnforced()) {
162158
headers.set(ACCEPT_ENCODING, GZIP_DEFLATE);
@@ -211,7 +207,7 @@ public NettyRequest newNettyRequest(Request request, boolean performConnectReque
211207

212208
// Add default accept headers
213209
if (!headers.contains(ACCEPT)) {
214-
headers.set(ACCEPT, "*/*");
210+
headers.set(ACCEPT, ACCEPT_ALL_HEADER_VALUE);
215211
}
216212

217213
// Add default user agent

client/src/main/java/org/asynchttpclient/util/HttpUtils.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
*/
1313
package org.asynchttpclient.util;
1414

15+
import io.netty.handler.codec.http.HttpHeaderValues;
16+
import io.netty.util.AsciiString;
1517
import org.asynchttpclient.AsyncHttpClientConfig;
1618
import org.asynchttpclient.Param;
1719
import org.asynchttpclient.Request;
@@ -32,10 +34,16 @@
3234
*/
3335
public class HttpUtils {
3436

37+
public static final AsciiString ACCEPT_ALL_HEADER_VALUE = new AsciiString("*/*");
38+
39+
public static final AsciiString GZIP_DEFLATE = new AsciiString(HttpHeaderValues.GZIP + "," + HttpHeaderValues.DEFLATE);
40+
3541
private static final String CONTENT_TYPE_CHARSET_ATTRIBUTE = "charset=";
3642

3743
private static final String CONTENT_TYPE_BOUNDARY_ATTRIBUTE = "boundary=";
3844

45+
private static final String BROTLY_ACCEPT_ENCODING_SUFFIX = ", br";
46+
3947
private HttpUtils() {
4048
}
4149

@@ -194,4 +202,12 @@ private static void encodeAndAppendFormField(StringBuilder sb, String field, Cha
194202
}
195203
}
196204
}
205+
206+
public static CharSequence filterOutBrotliFromAcceptEncoding(String acceptEncoding) {
207+
// we don't support Brotly ATM
208+
if (acceptEncoding.endsWith(BROTLY_ACCEPT_ENCODING_SUFFIX)) {
209+
return acceptEncoding.subSequence(0, acceptEncoding.length() - BROTLY_ACCEPT_ENCODING_SUFFIX.length());
210+
}
211+
return acceptEncoding;
212+
}
197213
}

0 commit comments

Comments
 (0)