10000 Remove AsyncHttpClientConfig parameter from HttpResponseStatus constr… · chakra-coder/async-http-client@08dcc79 · GitHub
[go: up one dir, main page]
Skip to content

Commit 08dcc79

Browse files
slandelleslandelle
committed
Remove AsyncHttpClientConfig parameter from HttpResponseStatus constructor, close AsyncHttpClient#1340
Motivation: This parameter is never being used (remnant of AHC1). Modifications: Remove from `HttpResponseStatus` and `NettyResponseStatus` and `HttpStatusWrapper` descendants constructors. Result: Unused parameter dropped
1 parent 3692a0c commit 08dcc79

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@
2626
public abstract class HttpResponseStatus {
2727

2828
private final Uri uri;
29-
protected final AsyncHttpClientConfig config;
3029

31-
public HttpResponseStatus(Uri uri, AsyncHttpClientConfig config) {
30+
public HttpResponseStatus(Uri uri) {
3231
this.uri = uri;
33-
this.config = config;
3432
}
3533

3634
/**

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import java.net.SocketAddress;
2020

21-
import org.asynchttpclient.AsyncHttpClientConfig;
2221
import org.asynchttpclient.HttpResponseStatus;
2322
import org.asynchttpclient.uri.Uri;
2423

@@ -31,8 +30,8 @@ public class NettyResponseStatus extends HttpResponseStatus {
3130
private final SocketAddress remoteAddress;
3231
private final SocketAddress localAddress;
3332

34-
public NettyResponseStatus(Uri uri, AsyncHttpClientConfig config, HttpResponse response, Channel channel) {
35-
super(uri, config);
33+
public NettyResponseStatus(Uri uri, HttpResponse response, Channel channel) {
34+
super(uri);
3635
this.response = response;
3736
if (channel != null) {
3837
remoteAddress = channel.remoteAddress();

‎client/src/main/java/org/asynchttpclient/netty/handler/HttpHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private void handleHttpResponse(final HttpResponse response, final Channel chann
125125

126126
future.setKeepAlive(config.getKeepAliveStrategy().keepAlive(future.getTargetRequest(), httpRequest, response));
127127

128-
NettyResponseStatus status = new NettyResponseStatus(future.getUri(), config, response, channel);
128+
NettyResponseStatus status = new NettyResponseStatus(future.getUri(), response, channel);
129129
HttpResponseHeaders responseHeaders = new HttpResponseHeaders(response.headers());
130130

131131
if (!interceptors.exitAfterIntercept(channel, future, handler, response, status, responseHeaders)) {

‎client/src/main/java/org/asynchttpclient/netty/handler/WebSocketHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void handleRead(Channel channel, NettyResponseFuture<?> future, Object e)
136136
}
137137

138138
WebSocketUpgradeHandler handler = WebSocketUpgradeHandler.class.cast(future.getAsyncHandler());
139-
HttpResponseStatus status = new NettyResponseStatus(future.getUri(), config, response, channel);
139+
HttpResponseStatus status = new NettyResponseStatus(future.getUri(), response, channel);
140140
HttpResponseHeaders responseHeaders = new HttpResponseHeaders(response.headers());
141141

142142
if (!interceptors.exitAfterIntercept(channel, future, handler, response, status, responseHeaders)) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private class HttpStatusWrapper extends HttpResponseStatus {
151151
private final int statusCode;
152152

153153
public HttpStatusWrapper(HttpResponseStatus wrapper, String statusText, int statusCode) {
154-
super(wrapper.getUri(), null);
154+
super(wrapper.getUri());
155155
this.wrapped = wrapper;
156156
this.statusText = statusText;
157157
this.statusCode = statusCode;

‎client/src/test/java/org/asynchttpclient/netty/NettyAsyncResponseTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void testCookieParseExpires() {
3838
final String cookieDef = String.format("efmembercheck=true; expires=%s; path=/; domain=.eclipse.org", sdf.format(date));
3939

4040
HttpResponseHeaders responseHeaders = new HttpResponseHeaders(new DefaultHttpHeaders().add(SET_COOKIE, cookieDef));
41-
NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null, null), responseHeaders, null);
41+
NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null), responseHeaders, null);
4242

4343
List<Cookie> cookies = response.getCookies();
4444
assertEquals(cookies.size(), 1);
@@ -52,7 +52,7 @@ public void testCookieParseMaxAge() {
5252
final String cookieDef = "efmembercheck=true; max-age=60; path=/; domain=.eclipse.org";
5353

5454
HttpResponseHeaders responseHeaders = new HttpResponseHeaders(new DefaultHttpHeaders().add(SET_COOKIE, cookieDef));
55-
NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null, null), responseHeaders, null);
55+
NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null), responseHeaders, null);
5656
List<Cookie> cookies = response.getCookies();
5757
assertEquals(cookies.size(), 1);
5858

@@ -64,7 +64,7 @@ public void testCookieParseMaxAge() {
6464
public void testCookieParseWeirdExpiresValue() {
6565
final String cookieDef = "efmembercheck=true; expires=60; path=/; domain=.eclipse.org";
6666
HttpResponseHeaders responseHeaders = new HttpResponseHeaders(new DefaultHttpHeaders().add(SET_COOKIE, cookieDef));
67-
NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null, null), responseHeaders, null);
67+
NettyResponse response = new NettyResponse(new NettyResponseStatus(null, null, null), responseHeaders, null);
6868

6969
List<Cookie> cookies = response.getCookies();
7070
assertEquals(cookies.size(), 1);

0 commit comments

Comments
 (0)
0