gh-30 cleanup & reorder

Unknow0 · Jun 21, 2024 · 0712f54 · 0712f54
1 parent 9ee8d12
commit 0712f54
Show file tree

Hide file tree

Showing 26 changed files with 571 additions and 456 deletions.
diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/jaxb/JaxbGeneratorMojo.java b/unknow-server-maven/src/main/java/unknow/server/maven/jaxb/JaxbGeneratorMojo.java
@@ -79,7 +79,6 @@
  */
 @Mojo(defaultPhase = LifecyclePhase.GENERATE_SOURCES, name = "jaxb-generator", requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
 public class JaxbGeneratorMojo extends AbstractGeneratorMojo {
-//	private static final Logger logger = LoggerFactory.getLogger(JaxbGeneratorMojo.class);
 
 	private static final HandlerBuilder HANDLER = new HandlerBuilder();
 

diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/jaxws/JaxwsServletBuilder.java b/unknow-server-maven/src/main/java/unknow/server/maven/jaxws/JaxwsServletBuilder.java
@@ -67,8 +67,6 @@
  * @author unknow
  */
 public class JaxwsServletBuilder {
-//	private static final Logger logger = LoggerFactory.getLogger(JaxwsServletBuilder.class);
-
 	private final ClassModel serviceClass;
 
 	private final Service service;

diff --git a/unknow-server-servlet/src/main/java/unknow/server/servlet/HttpAdapter.java b/unknow-server-servlet/src/main/java/unknow/server/servlet/HttpAdapter.java
@@ -4,8 +4,8 @@
 import java.net.InetSocketAddress;
 
 import jakarta.servlet.ServletInputStream;
+import unknow.server.servlet.impl.AbstractServletOutput;
 import unknow.server.servlet.impl.ServletContextImpl;
-import unknow.server.servlet.impl.out.AbstractServletOutput;
 import unknow.server.servlet.utils.EventManager;
 
 public interface HttpAdapter {

diff --git a/.../servlet/impl/in/ChunckedInputStream.java → ...r/servlet/http11/ChunckedInputStream.java b/.../servlet/impl/in/ChunckedInputStream.java → ...r/servlet/http11/ChunckedInputStream.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package unknow.server.servlet.impl.in;
+package unknow.server.servlet.http11;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,8 +23,6 @@ public class ChunckedInputStream extends ServletInputStream {
 
 	private final InputStream in;
 
-	private ReadListener listener;
-
 	private int step = 0;
 	private int chunkLen;
 	private final byte[] b = new byte[4096];
@@ -68,8 +66,7 @@ public long skip(long n) throws IOException {
 	}
 
 	@Override
-	public void setReadListener(ReadListener listener) {
-		this.listener = listener;
+	public void setReadListener(ReadListener listener) { // ok
 	}
 
 	private void readData() throws IOException {

diff --git a/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/ChunckedOutputStream.java b/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/ChunckedOutputStream.java
@@ -6,8 +6,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import unknow.server.servlet.impl.AbstractServletOutput;
 import unknow.server.servlet.impl.ServletResponseImpl;
-import unknow.server.servlet.impl.out.AbstractServletOutput;
 
 /**
  * Http chuncked entity

diff --git a/...ver/servlet/impl/in/EmptyInputStream.java → ...rver/servlet/http11/EmptyInputStream.java b/...ver/servlet/impl/in/EmptyInputStream.java → ...rver/servlet/http11/EmptyInputStream.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package unknow.server.servlet.impl.in;
+package unknow.server.servlet.http11;
 
 import java.io.IOException;
 

diff --git a/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/EmptyStream.java b/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/EmptyStream.java
@@ -5,7 +5,7 @@
 
 import java.io.IOException;
 
-import unknow.server.servlet.impl.out.AbstractServletOutput;
+import unknow.server.servlet.impl.AbstractServletOutput;
 
 /**
  * @author unknow

diff --git a/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/Http11Processor.java b/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/Http11Processor.java
@@ -11,8 +11,6 @@
  * http/1.1 implementation
  */
 public class Http11Processor implements HttpProcessor {
-//	private static final Logger logger = LoggerFactory.getLogger(Http11Processor.class);
-
 	private static final byte[] END = new byte[] { '\r', '\n', '\r', '\n' };
 
 	private static final int MAX_START_SIZE = 8192;

diff --git a/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/Http11Worker.java b/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/Http11Worker.java
@@ -18,21 +18,16 @@
 import unknow.server.servlet.HttpConnection;
 import unknow.server.servlet.HttpError;
 import unknow.server.servlet.HttpWorker;
+import unknow.server.servlet.impl.AbstractServletOutput;
 import unknow.server.servlet.impl.ServletRequestImpl;
 import unknow.server.servlet.impl.ServletResponseImpl;
-import unknow.server.servlet.impl.in.ChunckedInputStream;
-import unknow.server.servlet.impl.in.EmptyInputStream;
-import unknow.server.servlet.impl.in.LengthInputStream;
-import unknow.server.servlet.impl.out.AbstractServletOutput;
 import unknow.server.util.io.Buffers;
 import unknow.server.util.io.BuffersUtils;
 
 /** http/1.1 worker */
 public final class Http11Worker extends HttpWorker {
 	private static final Logger logger = LoggerFactory.getLogger(Http11Worker.class);
 
-//	private static final byte[] END = new byte[] { '\r', '\n', '\r', '\n' };
-
 	private static final byte[] CRLF = { '\r', '\n' };
 	private static final byte[] PARAM_SEP = { '&', '=' };
 	private static final byte[] SPACE_SLASH = { ' ', '/' };
@@ -42,22 +37,16 @@ public final class Http11Worker extends HttpWorker {
 	private static final byte[] CONTENT_LENGTH = new byte[] { 'c', 'o', 'n', 't', 'e', 'n', 't', '-', 'l', 'e', 'n', 'g', 't', 'h', ':', ' ' };
 	private static final byte[] CONTENT_LENGTH0 = new byte[] { 'c', 'o', 'n', 't', 'e', 'n', 't', '-', 'l', 'e', 'n', 'g', 't', 'h', ':', ' ', '0', '\r', '\n' };
 	private static final byte[] CONTENT_TYPE = new byte[] { 'c', 'o', 'n', 't', 'e', 'n', 't', '-', 't', 'y', 'p', 'e', ':', ' ' };
-//	private static final byte[] CONTENT_HTML = new byte[] { 'c', 'o', 'n', 't', 'e', 'n', 't', '-', 't', 'y', 'p', 'e', ':', ' ', 't', 'e', 'x', 't', '/', 'h', 't', 'm', 'l',
-//			';', 'c', 'h', 'a', 'r', 's', 'e', 't', '=', 'u', 't', 'f', '8', '\r', '\n' };
 	private static final byte[] COOKIE = new byte[] { 's', 'e', 't', '-', 'c', 'o', 'o', 'k', 'i', 'e', ':', ' ' };
 	private static final byte[] PATH = new byte[] { ';', 'p', 'a', 't', 'h', '=' };
 	private static final byte[] DOMAIN = new byte[] { ';', 'd', 'o', 'm', 'a', 'i', 'n', '=' };
 	private static final byte[] MAX_AGE = new byte[] { ';', 'm', 'a', 'x', '-', 'a', 'g', 'e' };
 	private static final byte[] SECURE = new byte[] { ';', 's', 'e', 'c', 'u', 'r', 'e' };
 	private static final byte[] HTTP_ONLY = new byte[] { ';', 'h', 't', 't', 'p', 'o', 'n', 'l', 'y' };
-//	private static final byte[] ERROR_START = new byte[] { '<', 'h', 't', 'm', 'l', '>', '<', 'b', 'o', 'd', 'y', '>', '<', 'h', '1', '>' };
-//	private static final byte[] ERROR_END = new byte[] { '<', '/', 'h', '1', '>', '<', '/', 'b', 'o', 'd', 'y', '>', '<', '/', 'h', 't', 'm', 'l', '>' };
 
 	private static final byte SPACE = ' ';
 	private static final byte QUESTION = '?';
 	private static final byte COLON = ':';
-//	private static final byte SEMICOLON = ';';
-//	private static final byte SLASH = '/';
 	private static final byte AMPERSAMP = '&';
 	private static final byte EQUAL = '=';
 

diff --git a/...er/servlet/impl/in/LengthInputStream.java → ...ver/servlet/http11/LengthInputStream.java b/...er/servlet/impl/in/LengthInputStream.java → ...ver/servlet/http11/LengthInputStream.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package unknow.server.servlet.impl.in;
+package unknow.server.servlet.http11;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,7 +15,6 @@
 public class LengthInputStream extends ServletInputStream {
 	private final InputStream in;
 	private long length;
-	private ReadListener listener;
 
 	/**
 	 * create new ServletInputLength
@@ -41,14 +40,13 @@ public long skip(long n) throws IOException {
 	public boolean isReady() {
 		try {
 			return in.available() > 0;
-		} catch (IOException e) {
+		} catch (@SuppressWarnings("unused") IOException e) {
 			return true;
 		}
 	}
 
 	@Override
-	public void setReadListener(ReadListener readListener) {
-		this.listener = readListener;
+	public void setReadListener(ReadListener readListener) { // ok
 	}
 
 	@Override

diff --git a/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/LengthOutputStream.java b/unknow-server-servlet/src/main/java/unknow/server/servlet/http11/LengthOutputStream.java
@@ -6,8 +6,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import unknow.server.servlet.impl.AbstractServletOutput;
 import unknow.server.servlet.impl.ServletResponseImpl;
-import unknow.server.servlet.impl.out.AbstractServletOutput;
 
 /**
  * http with a Content-Length (can be -1)