Skip to content

Commit e521b54

Browse files
committed
Revert cookie store implementation
1 parent 72ed867 commit e521b54

File tree

9 files changed

+10
-751
lines changed

9 files changed

+10
-751
lines changed

client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.netty.util.Timer;
2323
import org.asynchttpclient.channel.ChannelPool;
2424
import org.asynchttpclient.channel.KeepAliveStrategy;
25-
import org.asynchttpclient.cookie.CookieStore;
2625
import org.asynchttpclient.filter.IOExceptionFilter;
2726
import org.asynchttpclient.filter.RequestFilter;
2827
import org.asynchttpclient.filter.ResponseFilter;
@@ -183,13 +182,6 @@ public interface AsyncHttpClientConfig {
183182
*/
184183
List<IOExceptionFilter> getIoExceptionFilters();
185184

186-
/**
187-
* Return cookie store that is used to store and retrieve cookies
188-
*
189-
* @return {@link CookieStore} object
190-
*/
191-
CookieStore getCookieStore();
192-
193185
/**
194186
* Return the number of time the library will retry when an {@link java.io.IOException} is throw by the remote server
195187
*

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClient.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.asynchttpclient;
1818

1919
import io.netty.channel.EventLoopGroup;
20-
import io.netty.handler.codec.http.cookie.Cookie;
2120
import io.netty.util.HashedWheelTimer;
2221
import io.netty.util.Timer;
2322
import io.netty.util.concurrent.DefaultThreadFactory;
@@ -31,7 +30,6 @@
3130
import org.slf4j.Logger;
3231
import org.slf4j.LoggerFactory;
3332

34-
import java.util.List;
3533
import java.util.concurrent.ThreadFactory;
3634
import java.util.concurrent.atomic.AtomicBoolean;
3735
import java.util.function.Predicate;
@@ -190,22 +188,6 @@ public BoundRequestBuilder prepareRequest(RequestBuilder requestBuilder) {
190188

191189
@Override
192190
public <T> ListenableFuture<T> executeRequest(Request request, AsyncHandler<T> handler) {
193-
if (config.getCookieStore() != null) {
194-
try {
195-
List<Cookie> cookies = config.getCookieStore().get(request.getUri());
196-
if (!cookies.isEmpty()) {
197-
RequestBuilder requestBuilder = new RequestBuilder(request);
198-
for (Cookie cookie : cookies) {
199-
requestBuilder.addOrReplaceCookie(cookie);
200-
}
201-
request = requestBuilder.build();
202-
}
203-
} catch (Exception e) {
204-
handler.onThrowable(e);
205-
return new ListenableFuture.CompletedFailure<>("Failed to set cookies of request", e);
206-
}
207-
}
208-
209191
if (noRequestFilters) {
210192
return execute(request, handler);
211193
} else {

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClientConfig.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import org.asynchttpclient.channel.DefaultKeepAliveStrategy;
2626
import org.asynchttpclient.channel.KeepAliveStrategy;
2727
import org.asynchttpclient.config.AsyncHttpClientConfigDefaults;
28-
import org.asynchttpclient.cookie.CookieStore;
29-
import org.asynchttpclient.cookie.ThreadSafeCookieStore;
3028
import org.asynchttpclient.filter.IOExceptionFilter;
3129
import org.asynchttpclient.filter.RequestFilter;
3230
import org.asynchttpclient.filter.ResponseFilter;
@@ -106,9 +104,6 @@ public class DefaultAsyncHttpClientConfig implements AsyncHttpClientConfig {
106104
private final List<ResponseFilter> responseFilters;
107105
private final List<IOExceptionFilter> ioExceptionFilters;
108106

109-
// cookie store
110-
private final CookieStore cookieStore;
111-
112107
// internals
113108
private final String threadPoolName;
114109
private final int httpClientCodecMaxInitialLineLength;
@@ -185,9 +180,6 @@ private DefaultAsyncHttpClientConfig(// http
185180
List<ResponseFilter> responseFilters,
186181
List<IOExceptionFilter> ioExceptionFilters,
187182

188-
// cookie store
189-
CookieStore cookieStore,
190-
191183
// tuning
192184
boolean tcpNoDelay,
193185
boolean soReuseAddress,
@@ -272,9 +264,6 @@ private DefaultAsyncHttpClientConfig(// http
272264
this.responseFilters = responseFilters;
273265
this.ioExceptionFilters = ioExceptionFilters;
274266

275-
// cookie store
276-
this.cookieStore = cookieStore;
277-
278267
// tuning
279268
this.tcpNoDelay = tcpNoDelay;
280269
this.soReuseAddress = soReuseAddress;
@@ -537,12 +526,6 @@ public List<IOExceptionFilter> getIoExceptionFilters() {
537526
return ioExceptionFilters;
538527
}
539528

540-
// cookie store
541-
@Override
542-
public CookieStore getCookieStore() {
543-
return cookieStore;
544-
}
545-
546529
// tuning
547530
@Override
548531
public boolean isTcpNoDelay() {
@@ -713,9 +696,6 @@ public static class Builder {
713696
private SslContext sslContext;
714697
private SslEngineFactory sslEngineFactory;
715698

716-
// cookie store
717-
private CookieStore cookieStore = new ThreadSafeCookieStore();
718-
719699
// tuning
720700
private boolean tcpNoDelay = defaultTcpNoDelay();
721701
private boolean soReuseAddress = defaultSoReuseAddress();
@@ -1092,12 +1072,6 @@ public Builder removeIOExceptionFilter(IOExceptionFilter ioExceptionFilter) {
10921072
return this;
10931073
}
10941074

1095-
// cookie store
1096-
public Builder setCookieStore(CookieStore cookieStore) {
1097-
this.cookieStore = cookieStore;
1098-
return this;
1099-
}
1100-
11011075
// tuning
11021076
public Builder setTcpNoDelay(boolean tcpNoDelay) {
11031077
this.tcpNoDelay = tcpNoDelay;
@@ -1265,7 +1239,6 @@ public DefaultAsyncHttpClientConfig build() {
12651239
requestFilters.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(requestFilters),
12661240
responseFilters.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(responseFilters),
12671241
ioExceptionFilters.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(ioExceptionFilters),
1268-
cookieStore,
12691242
tcpNoDelay,
12701243
soReuseAddress,
12711244
soLinger,

client/src/main/java/org/asynchttpclient/cookie/CookieStore.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)