diff --git a/pom.xml b/pom.xml index 4be2c55..27e53fb 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ pom - 0.4 + 0.5 2.8 UTF-8 diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/SmartHttpServletRequest.java b/servlet-core/src/main/java/tech/smartboot/servlet/SmartHttpServletRequest.java index 2a60e4f..0305970 100644 --- a/servlet-core/src/main/java/tech/smartboot/servlet/SmartHttpServletRequest.java +++ b/servlet-core/src/main/java/tech/smartboot/servlet/SmartHttpServletRequest.java @@ -29,20 +29,6 @@ public interface SmartHttpServletRequest extends HttpServletRequest { ServletInfo getServletInfo(); - /** - * 获取附件对象 - * - * @return 附件 - */ - Attachment getAttachment(); - - /** - * 存放附件，支持任意类型 - * - * @param attachment 附件对象 - */ - void setAttachment(Attachment attachment); - void setServletMappingInfo(ServletMappingInfo servletMappingInfo); ServletMappingInfo getServletMappingInfo(); diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/impl/HttpServletRequestImpl.java b/servlet-core/src/main/java/tech/smartboot/servlet/impl/HttpServletRequestImpl.java index 836fdd8..55d9b4f 100644 --- a/servlet-core/src/main/java/tech/smartboot/servlet/impl/HttpServletRequestImpl.java +++ b/servlet-core/src/main/java/tech/smartboot/servlet/impl/HttpServletRequestImpl.java @@ -41,6 +41,7 @@ import tech.smartboot.feat.core.common.utils.StringUtils; import tech.smartboot.feat.core.server.HttpRequest; import tech.smartboot.feat.core.server.HttpResponse; +import tech.smartboot.feat.core.server.impl.Upgrade; import tech.smartboot.servlet.ServletContextRuntime; import tech.smartboot.servlet.SmartHttpServletRequest; import tech.smartboot.servlet.conf.ServletInfo; @@ -235,16 +236,6 @@ public ServletInfo getServletInfo() { return servletInfo; } - @Override - public Attachment getAttachment() { - return request.getAttachment(); - } - - @Override - public void setAttachment(Attachment attachment) { - request.setAttachment(attachment); - } - @Override public String getPathTranslated() { return servletContext.getRealPath(getPathInfo()); @@ -592,7 +583,7 @@ public ServletOutputStream getOutputStream() throws IOException { return httpServletResponse.getOutputStream(); } }); - request.upgrade(new tech.smartboot.feat.core.server.impl.HttpUpgradeHandler() { + request.upgrade(new Upgrade() { @Override public void init(HttpRequest request, HttpResponse response) throws IOException { diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/plugins/basic/BasicPlugin.java b/servlet-core/src/main/java/tech/smartboot/servlet/plugins/basic/BasicPlugin.java index 3661597..41e660c 100644 --- a/servlet-core/src/main/java/tech/smartboot/servlet/plugins/basic/BasicPlugin.java +++ b/servlet-core/src/main/java/tech/smartboot/servlet/plugins/basic/BasicPlugin.java @@ -15,7 +15,7 @@ import org.smartboot.socket.extension.ssl.factory.PemServerSSLContextFactory; import org.smartboot.socket.extension.ssl.factory.SSLContextFactory; import org.smartboot.socket.extension.ssl.factory.ServerSSLContextFactory; -import tech.smartboot.feat.core.Feat; +import tech.smartboot.feat.Feat; import tech.smartboot.feat.core.common.enums.HeaderNameEnum; import tech.smartboot.feat.core.common.enums.HeaderValueEnum; import tech.smartboot.feat.core.common.logging.Logger; @@ -24,11 +24,10 @@ import tech.smartboot.feat.core.common.utils.StringUtils; import tech.smartboot.feat.core.server.HttpHandler; import tech.smartboot.feat.core.server.HttpRequest; -import tech.smartboot.feat.core.server.HttpResponse; import tech.smartboot.feat.core.server.HttpServer; import tech.smartboot.feat.core.server.handler.BaseHttpHandler; import tech.smartboot.feat.core.server.impl.HttpEndpoint; -import tech.smartboot.feat.core.server.upgrade.http2.Http2UpgradeHandler; +import tech.smartboot.feat.core.server.upgrade.http2.Http2Upgrade; import tech.smartboot.servlet.Container; import tech.smartboot.servlet.ContainerConfig; import tech.smartboot.servlet.ServletContextRuntime; @@ -166,9 +165,9 @@ public void handle(HttpRequest request, CompletableFuture completableFuture) throws Throwable { String upgrade = request.getHeader(HeaderNameEnum.UPGRADE.getName()); if (HeaderValueEnum.Upgrade.H2C.equalsIgnoreCase(upgrade)) { - request.upgrade(new Http2UpgradeHandler() { + request.upgrade(new Http2Upgrade() { @Override - public void handle(HttpRequest request, HttpResponse response, CompletableFuture completableFuture) throws Throwable { + public void handle(HttpRequest request, CompletableFuture completableFuture) throws Throwable { container.doHandle(request, completableFuture); } }); @@ -181,13 +180,13 @@ public void handle(HttpRequest request, HttpResponse response, CompletableFuture } System.out.println("\033[1mWeb Info:\033[0m"); if (config.isEnabled()) { - HttpServer httpServer = Feat.createHttpServer(options -> { + HttpServer httpServer = Feat.httpServer(options -> { options.group(group) .readBufferSize(config.getReadBufferSize()) .serverName("smart-servlet") .debug(config.isDebugEnable()) .bannerEnabled(false) - .setHttpIdleTimeout(config.getHttpIdleTimeout()) + .setIdleTimeout(config.getHttpIdleTimeout()) .addPlugin(config.getPlugins()); if (config.isProxyProtocolEnable()) { options.proxyProtocolSupport(); @@ -273,13 +272,13 @@ private void startSslServer(ContainerConfig config, AsynchronousChannelGroup gro default: throw new UnsupportedOperationException("无效证书类型"); } - HttpServer httpServer = Feat.createHttpServer(options -> { + HttpServer httpServer = Feat.httpServer(options -> { options.group(group) .readBufferSize(config.getSslReadBufferSize()) .serverName("smart-servlet") .debug(config.isDebugEnable()) .bannerEnabled(false) - .setHttpIdleTimeout(config.getHttpIdleTimeout()) + .setIdleTimeout(config.getHttpIdleTimeout()) .addPlugin(sslPlugin) .addPlugin(config.getPlugins()); if (config.isProxyProtocolEnable()) { diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/plugins/dispatcher/ServletRequestDispatcherWrapper.java b/servlet-core/src/main/java/tech/smartboot/servlet/plugins/dispatcher/ServletRequestDispatcherWrapper.java index ce3f253..41cb2cb 100644 --- a/servlet-core/src/main/java/tech/smartboot/servlet/plugins/dispatcher/ServletRequestDispatcherWrapper.java +++ b/servlet-core/src/main/java/tech/smartboot/servlet/plugins/dispatcher/ServletRequestDispatcherWrapper.java @@ -169,16 +169,6 @@ public ServletInfo getServletInfo() { return this.request.getServletInfo(); } - @Override - public Attachment getAttachment() { - return request.getAttachment(); - } - - @Override - public void setAttachment(Attachment attachment) { - request.setAttachment(attachment); - } - @Override public void setServletMappingInfo(ServletMappingInfo httpServletMapping) { this.servletMappingInfo = httpServletMapping; diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/plugins/websocket/impl/WebSocketUpgradeHandler.java b/servlet-core/src/main/java/tech/smartboot/servlet/plugins/websocket/impl/WebSocketUpgradeHandler.java index ab1e749..b49a955 100644 --- a/servlet-core/src/main/java/tech/smartboot/servlet/plugins/websocket/impl/WebSocketUpgradeHandler.java +++ b/servlet-core/src/main/java/tech/smartboot/servlet/plugins/websocket/impl/WebSocketUpgradeHandler.java @@ -18,6 +18,7 @@ import tech.smartboot.feat.core.server.HttpRequest; import tech.smartboot.feat.core.server.WebSocketRequest; import tech.smartboot.feat.core.server.WebSocketResponse; +import tech.smartboot.feat.core.server.upgrade.websocket.WebSocketUpgrade; import tech.smartboot.servlet.impl.WebConnectionImpl; import java.io.IOException; @@ -35,7 +36,7 @@ public void init(WebConnection wc) { public void upgrade(WebsocketSession session) throws IOException { final ClassLoader servletClassLoader = Thread.currentThread().getContextClassLoader(); - request.upgrade(new tech.smartboot.feat.core.server.upgrade.websocket.WebSocketUpgradeHandler() { + request.upgrade(new WebSocketUpgrade() { @Override public void handle(WebSocketRequest request, WebSocketResponse response) throws Throwable { final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();