Skip to content

Commit

Permalink
Drop own Cookie in favor of Netty's one, close #1297
Browse files Browse the repository at this point in the history
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
  • Loading branch information
slandelle committed Jan 5, 2017
1 parent b5a8541 commit a6d659e
Show file tree
Hide file tree
Showing 21 changed files with 75 additions and 1,205 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.cookie.Cookie;
import io.netty.resolver.NameResolver;

import java.io.File;
Expand All @@ -28,7 +29,6 @@
import java.util.Map;

import org.asynchttpclient.channel.ChannelPoolPartitioning;
import org.asynchttpclient.cookie.Cookie;
import org.asynchttpclient.proxy.ProxyServer;
import org.asynchttpclient.request.body.generator.BodyGenerator;
import org.asynchttpclient.request.body.multipart.Part;
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/org/asynchttpclient/Request.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.asynchttpclient;

import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.cookie.Cookie;
import io.netty.resolver.NameResolver;

import java.io.File;
Expand All @@ -27,7 +28,6 @@
import java.util.List;

import org.asynchttpclient.channel.ChannelPoolPartitioning;
import org.asynchttpclient.cookie.Cookie;
import org.asynchttpclient.proxy.ProxyServer;
import org.asynchttpclient.request.body.generator.BodyGenerator;
import org.asynchttpclient.request.body.multipart.Part;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
import io.netty.handler.codec.http.DefaultHttpHeaders;
import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.cookie.Cookie;
import io.netty.resolver.DefaultNameResolver;
import io.netty.resolver.NameResolver;
import io.netty.util.concurrent.ImmediateEventExecutor;
Expand All @@ -36,7 +37,6 @@
import java.util.Map;

import org.asynchttpclient.channel.ChannelPoolPartitioning;
import org.asynchttpclient.cookie.Cookie;
import org.asynchttpclient.proxy.ProxyServer;
import org.asynchttpclient.request.body.generator.BodyGenerator;
import org.asynchttpclient.request.body.generator.ReactiveStreamsBodyGenerator;
Expand Down Expand Up @@ -290,12 +290,12 @@ public T addCookie(Cookie cookie) {
}

public T addOrReplaceCookie(Cookie cookie) {
String cookieKey = cookie.getName();
String cookieKey = cookie.name();
boolean replace = false;
int index = 0;
lazyInitCookies();
for (Cookie c : this.cookies) {
if (c.getName().equals(cookieKey)) {
if (c.name().equals(cookieKey)) {
replace = true;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/org/asynchttpclient/Response.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.asynchttpclient;

import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.cookie.Cookie;

import java.io.InputStream;
import java.net.SocketAddress;
Expand All @@ -25,7 +26,6 @@
import java.util.ArrayList;
import java.util.List;

import org.asynchttpclient.cookie.Cookie;
import org.asynchttpclient.netty.NettyResponse;
import org.asynchttpclient.uri.Uri;

Expand Down
105 changes: 0 additions & 105 deletions client/src/main/java/org/asynchttpclient/cookie/Cookie.java

This file was deleted.

Loading

0 comments on commit a6d659e

Please sign in to comment.