From 508cb72b7cd647e89071aa957dbf954ea111f34f Mon Sep 17 00:00:00 2001 From: Unknow0 Date: Sun, 24 Mar 2024 12:56:59 +0100 Subject: [PATCH] gh-30 fix dependencies --- unknow-server-bom/pom.xml | 2 +- unknow-server-maven/pom.xml | 2 +- .../unknow/server/maven/jsp/JspGeneratorMojo.java | 2 +- .../unknow/server/maven/servlet/ServletGenMojo.java | 12 ++++++------ .../server/maven/servlet/builder/CreateContext.java | 2 +- .../maven/servlet/builder/CreateEventManager.java | 2 +- .../server/maven/servlet/builder/CreateFilters.java | 2 +- .../maven/servlet/builder/CreateServletManager.java | 2 +- .../server/maven/servlet/builder/CreateServlets.java | 4 ++-- .../server/maven/servlet/descriptor/Descriptor.java | 4 ++-- .../unknow/server/servlet/utils/PathTreeTest.java | 10 +++++----- unknow-server-test/unknow-server-test-jar/pom.xml | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/unknow-server-bom/pom.xml b/unknow-server-bom/pom.xml index 8daf6aa2..1b47073e 100644 --- a/unknow-server-bom/pom.xml +++ b/unknow-server-bom/pom.xml @@ -27,7 +27,7 @@ ${project.groupId} - unknow-server-http + unknow-server-servlet ${project.version} diff --git a/unknow-server-maven/pom.xml b/unknow-server-maven/pom.xml index 9d78b75d..c89a23bc 100644 --- a/unknow-server-maven/pom.xml +++ b/unknow-server-maven/pom.xml @@ -41,7 +41,7 @@ ${project.groupId} - unknow-server-http + unknow-server-servlet ${project.version} diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/jsp/JspGeneratorMojo.java b/unknow-server-maven/src/main/java/unknow/server/maven/jsp/JspGeneratorMojo.java index 0c0ce763..b5ac71be 100644 --- a/unknow-server-maven/src/main/java/unknow/server/maven/jsp/JspGeneratorMojo.java +++ b/unknow-server-maven/src/main/java/unknow/server/maven/jsp/JspGeneratorMojo.java @@ -21,9 +21,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import unknow.server.http.servlet.ServletJsp; import unknow.server.maven.TypeCache; import unknow.server.maven.Utils; +import unknow.server.servlet.impl.ServletJsp; /** * @author unknow diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/ServletGenMojo.java b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/ServletGenMojo.java index f66211d6..9cd65969 100644 --- a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/ServletGenMojo.java +++ b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/ServletGenMojo.java @@ -33,11 +33,6 @@ import jakarta.servlet.DispatcherType; import jakarta.servlet.ServletContainerInitializer; import unknow.sax.SaxParser; -import unknow.server.http.AbstractHttpServer; -import unknow.server.http.AccessLogFilter; -import unknow.server.http.servlet.ServletResource; -import unknow.server.http.servlet.ServletResourceStatic; -import unknow.server.http.utils.Resource; import unknow.server.maven.AbstractGeneratorMojo; import unknow.server.maven.TypeCache; import unknow.server.maven.model.ModelLoader; @@ -52,6 +47,11 @@ import unknow.server.maven.servlet.descriptor.Descriptor; import unknow.server.maven.servlet.descriptor.SD; import unknow.server.maven.servlet.sax.Context; +import unknow.server.servlet.AbstractHttpServer; +import unknow.server.servlet.AccessLogFilter; +import unknow.server.servlet.utils.Resource; +import unknow.server.servlet.utils.ServletResource; +import unknow.server.servlet.utils.ServletResourceStatic; /** * @author unknow @@ -88,7 +88,7 @@ public class ServletGenMojo extends AbstractGeneratorMojo implements BuilderCont @Parameter(defaultValue = "4096") private int staticResourceSize; - @Parameter(defaultValue = "unknow.server.http.servlet.session.NoSessionFactory") + @Parameter(defaultValue = "unknow.server.servlet.impl.session.NoSessionFactory") private String sessionFactory; @Parameter(defaultValue = "false") diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateContext.java b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateContext.java index 42ddafaf..9bfe6d0f 100644 --- a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateContext.java +++ b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateContext.java @@ -8,11 +8,11 @@ import com.github.javaparser.ast.expr.ObjectCreationExpr; import com.github.javaparser.ast.stmt.ReturnStmt; -import unknow.server.http.servlet.ServletContextImpl; import unknow.server.maven.TypeCache; import unknow.server.maven.Utils; import unknow.server.maven.servlet.Builder; import unknow.server.maven.servlet.Names; +import unknow.server.servlet.impl.ServletContextImpl; /** * @author unknow diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateEventManager.java b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateEventManager.java index 107cd72b..e43db7dd 100644 --- a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateEventManager.java +++ b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateEventManager.java @@ -19,12 +19,12 @@ import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.ast.stmt.ReturnStmt; -import unknow.server.http.utils.EventManager; import unknow.server.maven.TypeCache; import unknow.server.maven.Utils; import unknow.server.maven.servlet.Builder; import unknow.server.maven.servlet.descriptor.Descriptor; import unknow.server.maven.servlet.descriptor.LD; +import unknow.server.servlet.utils.EventManager; /** * @author unknow diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateFilters.java b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateFilters.java index 377a00f2..a7e782fc 100644 --- a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateFilters.java +++ b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateFilters.java @@ -15,13 +15,13 @@ import com.github.javaparser.ast.type.ClassOrInterfaceType; import jakarta.servlet.DispatcherType; -import unknow.server.http.servlet.FilterConfigImpl; import unknow.server.maven.TypeCache; import unknow.server.maven.Utils; import unknow.server.maven.servlet.Builder; import unknow.server.maven.servlet.Names; import unknow.server.maven.servlet.descriptor.Descriptor; import unknow.server.maven.servlet.descriptor.SD; +import unknow.server.servlet.impl.FilterConfigImpl; import unknow.server.util.data.ArraySet; /** diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateServletManager.java b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateServletManager.java index 83e92568..ff8c21a6 100644 --- a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateServletManager.java +++ b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateServletManager.java @@ -19,13 +19,13 @@ import com.github.javaparser.ast.stmt.ReturnStmt; import com.github.javaparser.ast.type.PrimitiveType; -import unknow.server.http.utils.ServletManager; import unknow.server.maven.TypeCache; import unknow.server.maven.Utils; import unknow.server.maven.servlet.Builder; import unknow.server.maven.servlet.Names; import unknow.server.maven.servlet.descriptor.Descriptor; import unknow.server.maven.servlet.descriptor.SD; +import unknow.server.servlet.utils.ServletManager; import unknow.server.util.data.IntArrayMap; import unknow.server.util.data.ObjectArrayMap; diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateServlets.java b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateServlets.java index 2b021e63..4094d333 100644 --- a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateServlets.java +++ b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateServlets.java @@ -16,14 +16,14 @@ import com.github.javaparser.ast.stmt.ReturnStmt; import com.github.javaparser.ast.type.ClassOrInterfaceType; -import unknow.server.http.servlet.ServletConfigImpl; -import unknow.server.http.utils.Resource; import unknow.server.maven.TypeCache; import unknow.server.maven.Utils; import unknow.server.maven.servlet.Builder; import unknow.server.maven.servlet.Names; import unknow.server.maven.servlet.descriptor.Descriptor; import unknow.server.maven.servlet.descriptor.SD; +import unknow.server.servlet.impl.ServletConfigImpl; +import unknow.server.servlet.utils.Resource; /** * @author unknow diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/descriptor/Descriptor.java b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/descriptor/Descriptor.java index 2edddf50..4ad16182 100644 --- a/unknow-server-maven/src/main/java/unknow/server/maven/servlet/descriptor/Descriptor.java +++ b/unknow-server-maven/src/main/java/unknow/server/maven/servlet/descriptor/Descriptor.java @@ -23,11 +23,11 @@ import jakarta.servlet.http.HttpSessionAttributeListener; import jakarta.servlet.http.HttpSessionIdListener; import jakarta.servlet.http.HttpSessionListener; -import unknow.server.http.servlet.ServletCookieConfigImpl; -import unknow.server.http.utils.Resource; import unknow.server.maven.AbstractGeneratorMojo.TypeConsumer; import unknow.server.maven.model.AnnotationModel; import unknow.server.maven.model.TypeModel; +import unknow.server.servlet.impl.ServletCookieConfigImpl; +import unknow.server.servlet.utils.Resource; /** * @author unknow diff --git a/unknow-server-servlet/src/test/java/unknow/server/servlet/utils/PathTreeTest.java b/unknow-server-servlet/src/test/java/unknow/server/servlet/utils/PathTreeTest.java index 7cb764e4..c178ed1d 100644 --- a/unknow-server-servlet/src/test/java/unknow/server/servlet/utils/PathTreeTest.java +++ b/unknow-server-servlet/src/test/java/unknow/server/servlet/utils/PathTreeTest.java @@ -7,7 +7,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -18,10 +17,9 @@ import jakarta.servlet.DispatcherType; import jakarta.servlet.FilterChain; -import unknow.server.servlet.HttpConnection; +import unknow.server.servlet.HttpAdapter; import unknow.server.servlet.impl.ServletContextImpl; import unknow.server.servlet.impl.ServletRequestImpl; -import unknow.server.servlet.utils.PathTree; import unknow.server.servlet.utils.PathTree.Node; import unknow.server.servlet.utils.PathTree.PartNode; @@ -36,9 +34,11 @@ public class PathTreeTest { public void init() { path = new ArrayList<>(); ServletContextImpl ctx = new ServletContextImpl("", "", null, null, null, null, null, null); - HttpConnection p = mock(HttpConnection.class, Mockito.withSettings().useConstructor(null, ctx, 0)); + HttpAdapter p = mock(HttpAdapter.class); + when(p.ctx()).thenReturn(ctx); + mock = mock(ServletRequestImpl.class, Mockito.withSettings().useConstructor(p, DispatcherType.REQUEST)); - Mockito.when(mock.getPaths()).thenReturn(path); + when(mock.getPaths()).thenReturn(path); } @Test diff --git a/unknow-server-test/unknow-server-test-jar/pom.xml b/unknow-server-test/unknow-server-test-jar/pom.xml index 78acda3e..c15c4592 100644 --- a/unknow-server-test/unknow-server-test-jar/pom.xml +++ b/unknow-server-test/unknow-server-test-jar/pom.xml @@ -101,7 +101,7 @@ ${project.groupId} - unknow-server-http + unknow-server-servlet ${project.version}