Skip to content

Commit a6d659e

Browse files
committed
Drop own Cookie in favor of Netty's one, close #1297
Motivation: AHC’s fast Cookie parser has been contributed to Netty. Let’s drop our own implementation so: * I don’t have to maintain both implementations * people using Netty as HTTP server don’t have so many implementations to deal with. Modifications: *Drop AHC’s Cookie, CookieDecoder and CookieEncoder Result: Less code to maintain, one single implementation around for Netty + AHC users
1 parent b5a8541 commit a6d659e

21 files changed

+75
-1205
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
1717
import io.netty.handler.codec.http.HttpHeaders;
18+
import io.netty.handler.codec.http.cookie.Cookie;
1819
import io.netty.resolver.NameResolver;
1920

2021
import java.io.File;
@@ -28,7 +29,6 @@
2829
import java.util.Map;
2930

3031
import org.asynchttpclient.channel.ChannelPoolPartitioning;
31-
import org.asynchttpclient.cookie.Cookie;
3232
import org.asynchttpclient.proxy.ProxyServer;
3333
import org.asynchttpclient.request.body.generator.BodyGenerator;
3434
import org.asynchttpclient.request.body.multipart.Part;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.asynchttpclient;
1818

1919
import io.netty.handler.codec.http.HttpHeaders;
20+
import io.netty.handler.codec.http.cookie.Cookie;
2021
import io.netty.resolver.NameResolver;
2122

2223
import java.io.File;
@@ -27,7 +28,6 @@
2728
import java.util.List;
2829

2930
import org.asynchttpclient.channel.ChannelPoolPartitioning;
30-
import org.asynchttpclient.cookie.Cookie;
3131
import org.asynchttpclient.proxy.ProxyServer;
3232
import org.asynchttpclient.request.body.generator.BodyGenerator;
3333
import org.asynchttpclient.request.body.multipart.Part;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
2121
import io.netty.handler.codec.http.DefaultHttpHeaders;
2222
import io.netty.handler.codec.http.HttpHeaders;
23+
import io.netty.handler.codec.http.cookie.Cookie;
2324
import io.netty.resolver.DefaultNameResolver;
2425
import io.netty.resolver.NameResolver;
2526
import io.netty.util.concurrent.ImmediateEventExecutor;
@@ -36,7 +37,6 @@
3637
import java.util.Map;
3738

3839
import org.asynchttpclient.channel.ChannelPoolPartitioning;
39-
import org.asynchttpclient.cookie.Cookie;
4040
import org.asynchttpclient.proxy.ProxyServer;
4141
import org.asynchttpclient.request.body.generator.BodyGenerator;
4242
import org.asynchttpclient.request.body.generator.ReactiveStreamsBodyGenerator;
@@ -290,12 +290,12 @@ public T addCookie(Cookie cookie) {
290290
}
291291

292292
public T addOrReplaceCookie(Cookie cookie) {
293-
String cookieKey = cookie.getName();
293+
String cookieKey = cookie.name();
294294
boolean replace = false;
295295
int index = 0;
296296
lazyInitCookies();
297297
for (Cookie c : this.cookies) {
298-
if (c.getName().equals(cookieKey)) {
298+
if (c.name().equals(cookieKey)) {
299299
replace = true;
300300
break;
301301
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.asynchttpclient;
1818

1919
import io.netty.handler.codec.http.HttpHeaders;
20+
import io.netty.handler.codec.http.cookie.Cookie;
2021

2122
import java.io.InputStream;
2223
import java.net.SocketAddress;
@@ -25,7 +26,6 @@
2526
import java.util.ArrayList;
2627
import java.util.List;
2728

28-
import org.asynchttpclient.cookie.Cookie;
2929
import org.asynchttpclient.netty.NettyResponse;
3030
import org.asynchttpclient.uri.Uri;
3131

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

-105
This file was deleted.

0 commit comments

Comments
 (0)