From 834a7822bd38c6445d8d05cc2dd4d6d39f212b49 Mon Sep 17 00:00:00 2001 From: ReaJason Date: Sun, 26 Apr 2026 13:50:26 +0800 Subject: [PATCH] chore: use tomcat-embed-core dep --- generator/build.gradle.kts | 1 + .../main/java/org/apache/catalina/Valve.java | 25 -- .../apache/catalina/connector/Request.java | 349 ------------------ .../apache/catalina/connector/Response.java | 196 ---------- .../main/java/org/apache/coyote/Adapter.java | 8 - .../java/org/apache/coyote/Processor.java | 8 - .../main/java/org/apache/coyote/Request.java | 11 - .../org/apache/coyote/UpgradeProtocol.java | 22 -- .../upgrade/InternalHttpUpgradeHandler.java | 8 - .../tomcat/util/net/SocketWrapperBase.java | 8 - gradle/libs.versions.toml | 2 + 11 files changed, 3 insertions(+), 635 deletions(-) delete mode 100644 generator/src/main/java/org/apache/catalina/Valve.java delete mode 100644 generator/src/main/java/org/apache/catalina/connector/Request.java delete mode 100644 generator/src/main/java/org/apache/catalina/connector/Response.java delete mode 100644 generator/src/main/java/org/apache/coyote/Adapter.java delete mode 100644 generator/src/main/java/org/apache/coyote/Processor.java delete mode 100644 generator/src/main/java/org/apache/coyote/Request.java delete mode 100644 generator/src/main/java/org/apache/coyote/UpgradeProtocol.java delete mode 100644 generator/src/main/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java delete mode 100644 generator/src/main/java/org/apache/tomcat/util/net/SocketWrapperBase.java diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts index cef92a1c..6425e4a7 100644 --- a/generator/build.gradle.kts +++ b/generator/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { implementation(libs.jakarta.servlet.api) implementation(libs.spring.webmvc) implementation(libs.spring.webflux) + implementation(libs.tomcat.embed.core) implementation(libs.reactor.netty.core) implementation(libs.jackson.annotations) implementation(libs.bundles.jna) diff --git a/generator/src/main/java/org/apache/catalina/Valve.java b/generator/src/main/java/org/apache/catalina/Valve.java deleted file mode 100644 index 0b9fb834..00000000 --- a/generator/src/main/java/org/apache/catalina/Valve.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apache.catalina; - -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.Response; - -import javax.servlet.ServletException; -import java.io.IOException; - -/** - * @author ReaJason - * @since 2024/12/27 - */ -public interface Valve { - - public Valve getNext(); - - public void setNext(Valve valve); - - public void backgroundProcess(); - - public void invoke(Request request, Response response) - throws IOException, ServletException; - - public boolean isAsyncSupported(); -} diff --git a/generator/src/main/java/org/apache/catalina/connector/Request.java b/generator/src/main/java/org/apache/catalina/connector/Request.java deleted file mode 100644 index 9e0bef4f..00000000 --- a/generator/src/main/java/org/apache/catalina/connector/Request.java +++ /dev/null @@ -1,349 +0,0 @@ -package org.apache.catalina.connector; - -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.Principal; -import java.util.*; - -/** - * @author ReaJason - * @since 2024/12/27 - */ -public class Request implements HttpServletRequest { - @Override - public String getAuthType() { - return ""; - } - - @Override - public Cookie[] getCookies() { - return new Cookie[0]; - } - - @Override - public long getDateHeader(String name) { - return 0; - } - - @Override - public String getHeader(String name) { - return ""; - } - - @Override - public Enumeration getHeaders(String name) { - return null; - } - - @Override - public Enumeration getHeaderNames() { - return null; - } - - @Override - public int getIntHeader(String name) { - return 0; - } - - @Override - public String getMethod() { - return ""; - } - - @Override - public String getPathInfo() { - return ""; - } - - @Override - public String getPathTranslated() { - return ""; - } - - @Override - public String getContextPath() { - return ""; - } - - @Override - public String getQueryString() { - return ""; - } - - @Override - public String getRemoteUser() { - return ""; - } - - @Override - public boolean isUserInRole(String role) { - return false; - } - - @Override - public Principal getUserPrincipal() { - return null; - } - - @Override - public String getRequestedSessionId() { - return ""; - } - - @Override - public String getRequestURI() { - return ""; - } - - @Override - public StringBuffer getRequestURL() { - return null; - } - - @Override - public String getServletPath() { - return ""; - } - - @Override - public HttpSession getSession(boolean create) { - return null; - } - - @Override - public HttpSession getSession() { - return null; - } - - @Override - public boolean isRequestedSessionIdValid() { - return false; - } - - @Override - public boolean isRequestedSessionIdFromCookie() { - return false; - } - - @Override - public boolean isRequestedSessionIdFromURL() { - return false; - } - - @Override - public boolean isRequestedSessionIdFromUrl() { - return false; - } - - @Override - public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { - return false; - } - - @Override - public void login(String username, String password) throws ServletException { - - } - - @Override - public void logout() throws ServletException { - - } - - @Override - public Collection getParts() throws IOException, ServletException { - return Collections.emptyList(); - } - - @Override - public Part getPart(String name) throws IOException, ServletException { - return null; - } - - @Override - public Object getAttribute(String name) { - return null; - } - - @Override - public Enumeration getAttributeNames() { - return null; - } - - @Override - public String getCharacterEncoding() { - return ""; - } - - @Override - public void setCharacterEncoding(String env) throws UnsupportedEncodingException { - - } - - @Override - public int getContentLength() { - return 0; - } - - @Override - public String getContentType() { - return ""; - } - - @Override - public ServletInputStream getInputStream() throws IOException { - return null; - } - - @Override - public String getParameter(String name) { - return ""; - } - - @Override - public Enumeration getParameterNames() { - return null; - } - - @Override - public String[] getParameterValues(String name) { - return new String[0]; - } - - @Override - public Map getParameterMap() { - return Collections.emptyMap(); - } - - @Override - public String getProtocol() { - return ""; - } - - @Override - public String getScheme() { - return ""; - } - - @Override - public String getServerName() { - return ""; - } - - @Override - public int getServerPort() { - return 0; - } - - @Override - public BufferedReader getReader() throws IOException { - return null; - } - - @Override - public String getRemoteAddr() { - return ""; - } - - @Override - public String getRemoteHost() { - return ""; - } - - @Override - public void setAttribute(String name, Object o) { - - } - - @Override - public void removeAttribute(String name) { - - } - - @Override - public Locale getLocale() { - return null; - } - - @Override - public Enumeration getLocales() { - return null; - } - - @Override - public boolean isSecure() { - return false; - } - - @Override - public RequestDispatcher getRequestDispatcher(String path) { - return null; - } - - @Override - public String getRealPath(String path) { - return ""; - } - - @Override - public int getRemotePort() { - return 0; - } - - @Override - public String getLocalName() { - return ""; - } - - @Override - public String getLocalAddr() { - return ""; - } - - @Override - public int getLocalPort() { - return 0; - } - - @Override - public ServletContext getServletContext() { - return null; - } - - @Override - public AsyncContext startAsync() throws IllegalStateException { - return null; - } - - @Override - public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException { - return null; - } - - @Override - public boolean isAsyncStarted() { - return false; - } - - @Override - public boolean isAsyncSupported() { - return false; - } - - @Override - public AsyncContext getAsyncContext() { - return null; - } - - @Override - public DispatcherType getDispatcherType() { - return null; - } - - public Response getResponse() { - return null; - } -} diff --git a/generator/src/main/java/org/apache/catalina/connector/Response.java b/generator/src/main/java/org/apache/catalina/connector/Response.java deleted file mode 100644 index dac89a86..00000000 --- a/generator/src/main/java/org/apache/catalina/connector/Response.java +++ /dev/null @@ -1,196 +0,0 @@ -package org.apache.catalina.connector; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Collection; -import java.util.Collections; -import java.util.Locale; - -/** - * @author ReaJason - * @since 2024/12/27 - */ -public class Response implements HttpServletResponse { - @Override - public void addCookie(Cookie cookie) { - - } - - @Override - public boolean containsHeader(String name) { - return false; - } - - @Override - public String encodeURL(String url) { - return ""; - } - - @Override - public String encodeRedirectURL(String url) { - return ""; - } - - @Override - public String encodeUrl(String url) { - return ""; - } - - @Override - public String encodeRedirectUrl(String url) { - return ""; - } - - @Override - public void sendError(int sc, String msg) throws IOException { - - } - - @Override - public void sendError(int sc) throws IOException { - - } - - @Override - public void sendRedirect(String location) throws IOException { - - } - - @Override - public void setDateHeader(String name, long date) { - - } - - @Override - public void addDateHeader(String name, long date) { - - } - - @Override - public void setHeader(String name, String value) { - - } - - @Override - public void addHeader(String name, String value) { - - } - - @Override - public void setIntHeader(String name, int value) { - - } - - @Override - public void addIntHeader(String name, int value) { - - } - - @Override - public void setStatus(int sc) { - - } - - @Override - public void setStatus(int sc, String sm) { - - } - - @Override - public int getStatus() { - return 0; - } - - @Override - public String getHeader(String name) { - return ""; - } - - @Override - public Collection getHeaders(String name) { - return Collections.emptyList(); - } - - @Override - public Collection getHeaderNames() { - return Collections.emptyList(); - } - - @Override - public String getCharacterEncoding() { - return ""; - } - - @Override - public String getContentType() { - return ""; - } - - @Override - public ServletOutputStream getOutputStream() throws IOException { - return null; - } - - @Override - public PrintWriter getWriter() throws IOException { - return null; - } - - @Override - public void setCharacterEncoding(String charset) { - - } - - @Override - public void setContentLength(int len) { - - } - - @Override - public void setContentType(String type) { - - } - - @Override - public void setBufferSize(int size) { - - } - - @Override - public int getBufferSize() { - return 0; - } - - @Override - public void flushBuffer() throws IOException { - - } - - @Override - public void resetBuffer() { - - } - - @Override - public boolean isCommitted() { - return false; - } - - @Override - public void reset() { - - } - - @Override - public void setLocale(Locale loc) { - - } - - @Override - public Locale getLocale() { - return null; - } -} diff --git a/generator/src/main/java/org/apache/coyote/Adapter.java b/generator/src/main/java/org/apache/coyote/Adapter.java deleted file mode 100644 index 9954623a..00000000 --- a/generator/src/main/java/org/apache/coyote/Adapter.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.coyote; - -/** - * @author ReaJason - * @since 2025/12/6 - */ -public interface Adapter { -} diff --git a/generator/src/main/java/org/apache/coyote/Processor.java b/generator/src/main/java/org/apache/coyote/Processor.java deleted file mode 100644 index ad8f45ab..00000000 --- a/generator/src/main/java/org/apache/coyote/Processor.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.coyote; - -/** - * @author ReaJason - * @since 2025/12/6 - */ -public interface Processor { -} diff --git a/generator/src/main/java/org/apache/coyote/Request.java b/generator/src/main/java/org/apache/coyote/Request.java deleted file mode 100644 index 27387fd0..00000000 --- a/generator/src/main/java/org/apache/coyote/Request.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.apache.coyote; - -/** - * @author ReaJason - * @since 2025/12/6 - */ -public class Request { - public Object getNote(int id) { - return null; - } -} diff --git a/generator/src/main/java/org/apache/coyote/UpgradeProtocol.java b/generator/src/main/java/org/apache/coyote/UpgradeProtocol.java deleted file mode 100644 index bb1bfba1..00000000 --- a/generator/src/main/java/org/apache/coyote/UpgradeProtocol.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apache.coyote; - -import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler; -import org.apache.tomcat.util.net.SocketWrapperBase; - -/** - * @author ReaJason - * @since 2025/12/6 - */ -public interface UpgradeProtocol { - public String getHttpUpgradeName(boolean isSSLEnabled); - - public byte[] getAlpnIdentifier(); - - public String getAlpnName(); - - public Processor getProcessor(SocketWrapperBase socketWrapper, Adapter adapter); - - public InternalHttpUpgradeHandler getInternalUpgradeHandler(Adapter adapter, Request request); - - public boolean accept(Request request); -} diff --git a/generator/src/main/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java b/generator/src/main/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java deleted file mode 100644 index c37068b5..00000000 --- a/generator/src/main/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.coyote.http11.upgrade; - -/** - * @author ReaJason - * @since 2025/12/6 - */ -public interface InternalHttpUpgradeHandler { -} diff --git a/generator/src/main/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/generator/src/main/java/org/apache/tomcat/util/net/SocketWrapperBase.java deleted file mode 100644 index b3868a99..00000000 --- a/generator/src/main/java/org/apache/tomcat/util/net/SocketWrapperBase.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.tomcat.util.net; - -/** - * @author ReaJason - * @since 2025/12/6 - */ -public class SocketWrapperBase { -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index edb76804..6f3d422d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,6 +11,7 @@ spring-webflux = "5.3.24" reactor-netty = "1.1.25" jackson = "2.19.0" jetbrains-annotations = "26.0.2" +tomcat = "8.5.85" byte-buddy = "1.18.5" # https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy commons-io = "2.21.0" # https://mvnrepository.com/artifact/commons-io/commons-io @@ -30,6 +31,7 @@ testcontainers = "2.0.4" # https://mvnrepository.com/artifact/org.testcontainers [libraries] byte-buddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byte-buddy" } +tomcat-embed-core = { module = "org.apache.tomcat.embed:tomcat-embed-core", version.ref = "tomcat" } asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" } jna = { module = "net.java.dev.jna:jna", version.ref = "jna" } jna-platform = { module = "net.java.dev.jna:jna-platform", version.ref = "jna" }