Skip to content

Commit 2925dba

Browse files
alalag1alalag1
authored
introduce commons-net (#16)
* remove commons-http and commons-netty-http * add commons-net-core and commons-net-netty dependencies * rearrange imports
1 parent 361867f commit 2925dba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+292
-99
lines changed

‎httpserver/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
</dependency>
3232
<dependency>
3333
<groupId>io.esastack</groupId>
34-
<artifactId>commons-http</artifactId>
34+
<artifactId>commons-net-core</artifactId>
3535
</dependency>
3636
<dependency>
3737
<groupId>io.esastack</groupId>
38-
<artifactId>commons-netty-http</artifactId>
38+
<artifactId>commons-net-netty</artifactId>
3939
</dependency>
4040
<dependency>
4141
<groupId>io.netty</groupId>

‎httpserver/src/main/java/io/esastack/httpserver/core/Aggregation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package io.esastack.httpserver.core;
1717

18-
import esa.commons.http.HttpHeaders;
18+
import io.esastack.commons.net.http.HttpHeaders;
1919
import io.netty.buffer.ByteBuf;
2020

2121
/**

‎httpserver/src/main/java/io/esastack/httpserver/core/BaseRequest.java‎

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

18-
import esa.commons.http.Cookie;
19-
import esa.commons.http.HttpHeaders;
20-
import esa.commons.http.HttpMethod;
21-
import esa.commons.http.HttpVersion;
18+
import io.esastack.commons.net.http.Cookie;
19+
import io.esastack.commons.net.http.HttpHeaders;
20+
import io.esastack.commons.net.http.HttpMethod;
21+
import io.esastack.commons.net.http.HttpVersion;
2222

2323
import java.net.SocketAddress;
2424
import java.util.List;

‎httpserver/src/main/java/io/esastack/httpserver/core/RequestHandle.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package io.esastack.httpserver.core;
1717

18-
import esa.commons.http.HttpHeaders;
18+
import io.esastack.commons.net.http.HttpHeaders;
1919
import io.netty.buffer.ByteBuf;
2020
import io.netty.util.concurrent.Future;
2121
import io.netty.util.concurrent.Promise;

‎httpserver/src/main/java/io/esastack/httpserver/core/Response.java‎

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

1818
import esa.commons.Checks;
1919
import esa.commons.annotation.Beta;
20-
import esa.commons.http.Cookie;
21-
import esa.commons.http.HttpHeaders;
20+
import io.esastack.commons.net.http.Cookie;
21+
import io.esastack.commons.net.http.HttpHeaders;
2222
import io.netty.buffer.ByteBuf;
2323
import io.netty.buffer.ByteBufAllocator;
2424
import io.netty.buffer.Unpooled;

‎httpserver/src/main/java/io/esastack/httpserver/impl/AggregationHandle.java‎

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

18-
import esa.commons.http.HttpHeaders;
19-
import esa.commons.netty.http.EmptyHttpHeaders;
18+
import io.esastack.commons.net.http.EmptyHttpHeaders;
19+
import io.esastack.commons.net.http.HttpHeaders;
2020
import io.esastack.httpserver.core.Aggregation;
2121
import io.netty.buffer.ByteBuf;
2222
import io.netty.buffer.CompositeByteBuf;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
package io.esastack.httpserver.impl;
1717

1818
import esa.commons.StringUtils;
19-
import esa.commons.http.Cookie;
20-
import esa.commons.http.HttpHeaders;
21-
import esa.commons.http.HttpMethod;
22-
import esa.commons.netty.http.CookieImpl;
19+
import io.esastack.commons.net.http.Cookie;
20+
import io.esastack.commons.net.http.HttpHeaders;
21+
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;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import esa.commons.Checks;
1919
import esa.commons.ExceptionUtils;
2020
import esa.commons.StringUtils;
21-
import esa.commons.http.Cookie;
2221
import esa.commons.http.MimeMappings;
23-
import esa.commons.netty.http.CookieImpl;
22+
import io.esastack.commons.net.http.Cookie;
23+
import io.esastack.commons.net.http.CookieUtil;
2424
import io.esastack.httpserver.core.Response;
2525
import io.netty.buffer.ByteBuf;
2626
import io.netty.buffer.ByteBufAllocator;
@@ -97,7 +97,7 @@ public Response addCookie(Cookie cookie) {
9797

9898
@Override
9999
public Response addCookie(String name, String value) {
100-
return addCookie(new CookieImpl(name, value));
100+
return addCookie(CookieUtil.cookie(name, value));
101101
}
102102

103103
@Override

‎httpserver/src/main/java/io/esastack/httpserver/impl/Http1Handler.java‎

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

18-
import esa.commons.http.HttpHeaders;
19-
import esa.commons.netty.http.EmptyHttpHeaders;
20-
import esa.commons.netty.http.Http1HeadersAdaptor;
18+
import io.esastack.commons.net.http.EmptyHttpHeaders;
19+
import io.esastack.commons.net.http.HttpHeaders;
20+
import io.esastack.commons.net.netty.http.Http1HeadersAdaptor;
2121
import io.esastack.httpserver.core.RequestHandle;
2222
import io.esastack.httpserver.utils.Loggers;
2323
import io.netty.buffer.ByteBuf;
@@ -28,7 +28,17 @@
2828
import io.netty.channel.SimpleChannelInboundHandler;
2929
import io.netty.handler.codec.DecoderResult;
3030
import io.netty.handler.codec.TooLongFrameException;
31-
import io.netty.handler.codec.http.*;
31+
import io.netty.handler.codec.http.DefaultFullHttpResponse;
32+
import io.netty.handler.codec.http.FullHttpResponse;
33+
import io.netty.handler.codec.http.HttpContent;
34+
import io.netty.handler.codec.http.HttpHeaderValues;
35+
import io.netty.handler.codec.http.HttpMessage;
36+
import io.netty.handler.codec.http.HttpObject;
37+
import io.netty.handler.codec.http.HttpRequest;
38+
import io.netty.handler.codec.http.HttpResponseStatus;
39+
import io.netty.handler.codec.http.HttpUtil;
40+
import io.netty.handler.codec.http.HttpVersion;
41+
import io.netty.handler.codec.http.LastHttpContent;
3242

3343
import java.nio.charset.StandardCharsets;
3444
import java.util.function.Consumer;

‎httpserver/src/main/java/io/esastack/httpserver/impl/Http1RequestHandleImpl.java‎

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

18-
import esa.commons.http.HttpHeaders;
19-
import esa.commons.http.HttpMethod;
20-
import esa.commons.http.HttpVersion;
18+
import io.esastack.commons.net.http.HttpHeaders;
19+
import io.esastack.commons.net.http.HttpMethod;
20+
import io.esastack.commons.net.http.HttpVersion;
2121
import io.esastack.httpserver.core.RequestHandle;
2222
import io.netty.channel.ChannelHandlerContext;
2323
import io.netty.handler.codec.http.HttpRequest;

0 commit comments

Comments
 (0)