Skip to content

Commit 1fc3cf8

Browse files
authored
adapt the refactored commons-net (#24)
1 parent adecf93 commit 1fc3cf8

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

httpserver/src/main/java/io/esastack/httpserver/impl/BaseRequestHandle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
import esa.commons.StringUtils;
1919
import io.esastack.commons.net.http.Cookie;
20+
import io.esastack.commons.net.http.CookieUtil;
2021
import io.esastack.commons.net.http.HttpHeaders;
2122
import io.esastack.commons.net.http.HttpMethod;
22-
import io.esastack.commons.net.netty.http.CookieImpl;
2323
import io.esastack.httpserver.core.Aggregation;
2424
import io.esastack.httpserver.core.MultiPart;
2525
import io.esastack.httpserver.core.RequestHandle;
@@ -118,7 +118,7 @@ public Map<String, Cookie> cookies() {
118118
Map<String, Cookie> map = new HashMap<>(decoded.size());
119119

120120
for (io.netty.handler.codec.http.cookie.Cookie c : decoded) {
121-
map.put(c.name(), new CookieImpl(c));
121+
map.put(c.name(), CookieUtil.wrap(c));
122122
}
123123
cookies = map;
124124
}

httpserver/src/main/java/io/esastack/httpserver/impl/BaseResponse.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import esa.commons.StringUtils;
2121
import esa.commons.http.MimeMappings;
2222
import io.esastack.commons.net.http.Cookie;
23-
import io.esastack.commons.net.http.CookieUtil;
2423
import io.esastack.httpserver.core.Response;
2524
import io.netty.buffer.ByteBuf;
2625
import io.netty.buffer.ByteBufAllocator;
@@ -97,7 +96,7 @@ public Response addCookie(Cookie cookie) {
9796

9897
@Override
9998
public Response addCookie(String name, String value) {
100-
return addCookie(CookieUtil.cookie(name, value));
99+
return addCookie(Cookie.cookie(name, value));
101100
}
102101

103102
@Override

httpserver/src/test/java/io/esastack/httpserver/impl/BaseResponseTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package io.esastack.httpserver.impl;
1717

18-
import io.esastack.commons.net.http.CookieUtil;
18+
import io.esastack.commons.net.http.Cookie;
1919
import io.esastack.commons.net.http.HttpHeaders;
2020
import io.esastack.commons.net.netty.http.Http1HeadersImpl;
2121
import io.netty.buffer.ByteBuf;
@@ -57,7 +57,7 @@ void testImplementationOfResponse() {
5757
assertEquals(201, res.status());
5858
assertTrue(res.isKeepAlive());
5959
res.addCookie("a", "1");
60-
res.addCookie(CookieUtil.cookie("b", "2"));
60+
res.addCookie(Cookie.cookie("b", "2"));
6161
assertEquals(2, res.headers().getAll(SET_COOKIE).size());
6262
assertEquals("a=1", res.headers().getAll(SET_COOKIE).get(0));
6363
assertEquals("b=2", res.headers().getAll(SET_COOKIE).get(1));

0 commit comments

Comments
 (0)