gh-30 fix dependencies

Unknow0 · Mar 24, 2024 · 508cb72 · 508cb72
1 parent c229cbc
commit 508cb72
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 23 deletions.
diff --git a/unknow-server-bom/pom.xml b/unknow-server-bom/pom.xml
@@ -27,7 +27,7 @@
 			</dependency>
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>unknow-server-http</artifactId>
+				<artifactId>unknow-server-servlet</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>

diff --git a/unknow-server-maven/pom.xml b/unknow-server-maven/pom.xml
@@ -41,7 +41,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>unknow-server-http</artifactId>
+			<artifactId>unknow-server-servlet</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

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
@@ -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
@@ -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
@@ -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/...ow-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateEventManager.java b/...ow-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
@@ -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/...-server-maven/src/main/java/unknow/server/maven/servlet/builder/CreateServletManager.java b/...-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
@@ -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
@@ -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
@@ -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
@@ -101,7 +101,7 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>unknow-server-http</artifactId>
+			<artifactId>unknow-server-servlet</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>