Move request related code into request package

onlyskin · onlyskin · commit 0a4f7427e648 · 2017-12-20T16:41:56.000+02:00
diff --git a/src/main/java/httpserver/Authorizer.java b/src/main/java/httpserver/Authorizer.java
@@ -1,5 +1,7 @@
 package httpserver;
 
+import httpserver.request.Request;
+
 import java.util.Base64;
 
 public class Authorizer {
diff --git a/src/main/java/httpserver/SocketHandler.java b/src/main/java/httpserver/SocketHandler.java
@@ -1,5 +1,7 @@
 package httpserver;
 
+import httpserver.request.Request;
+import httpserver.request.RequestParser;
 import httpserver.responder.GeneralResponder;
 import httpserver.response.BadRequestResponse;
 import httpserver.response.Response;
diff --git a/src/main/java/httpserver/SocketHandlerFactory.java b/src/main/java/httpserver/SocketHandlerFactory.java
@@ -1,5 +1,6 @@
 package httpserver;
 
+import httpserver.request.RequestParser;
 import httpserver.responder.GeneralResponder;
 
 import java.io.IOException;
diff --git a/src/main/java/httpserver/request/Request.java b/src/main/java/httpserver/request/Request.java
@@ -1,5 +1,6 @@
-package httpserver;
+package httpserver.request;
 
+import httpserver.Parameter;
 import httpserver.header.Header;
 
 import java.util.ArrayList;
diff --git a/src/main/java/httpserver/request/RequestParser.java b/src/main/java/httpserver/request/RequestParser.java
@@ -1,5 +1,7 @@
-package httpserver;
+package httpserver.request;
 
+import httpserver.AppConfig;
+import httpserver.Logger;
 import httpserver.header.Header;
 
 import java.io.*;
diff --git a/src/main/java/httpserver/request/UrlDecoder.java b/src/main/java/httpserver/request/UrlDecoder.java
@@ -1,4 +1,4 @@
-package httpserver;
+package httpserver.request;
 
 import java.io.UnsupportedEncodingException;
 
diff --git a/src/main/java/httpserver/responder/DeleteResponder.java b/src/main/java/httpserver/responder/DeleteResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 import httpserver.response.MethodNotAllowedResponse;
diff --git a/src/main/java/httpserver/responder/FormGetResponder.java b/src/main/java/httpserver/responder/FormGetResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 import httpserver.response.OkResponse;
diff --git a/src/main/java/httpserver/responder/GeneralResponder.java b/src/main/java/httpserver/responder/GeneralResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.ResponderSupplier;
 import httpserver.response.Response;
 import httpserver.response.ServerErrorResponse;
diff --git a/src/main/java/httpserver/responder/GetResponder.java b/src/main/java/httpserver/responder/GetResponder.java
@@ -6,7 +6,7 @@
 import httpserver.header.ContentTypeHeader;
 import httpserver.header.RangeHeaderValueParser;
 import httpserver.response.NotFoundResponse;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.OkResponse;
 import httpserver.response.PartialContentResponse;
 import httpserver.response.Response;
diff --git a/src/main/java/httpserver/responder/HeadResponder.java b/src/main/java/httpserver/responder/HeadResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.file.Html;
 import httpserver.file.PathExaminer;
 import httpserver.header.RangeHeaderValueParser;
diff --git a/src/main/java/httpserver/responder/InvalidMethodResponder.java b/src/main/java/httpserver/responder/InvalidMethodResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.MethodNotAllowedResponse;
 import httpserver.response.Response;
 
diff --git a/src/main/java/httpserver/responder/OptionsResponder.java b/src/main/java/httpserver/responder/OptionsResponder.java
@@ -2,7 +2,7 @@
 
 import httpserver.AppConfig;
 import httpserver.Method;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.ResponderSupplier;
 import httpserver.header.Header;
 import httpserver.response.OkResponse;
diff --git a/src/main/java/httpserver/responder/PatchResponder.java b/src/main/java/httpserver/responder/PatchResponder.java
@@ -2,7 +2,7 @@
 
 import httpserver.AppConfig;
 import httpserver.Hasher;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 import httpserver.response.*;
diff --git a/src/main/java/httpserver/responder/PostResponder.java b/src/main/java/httpserver/responder/PostResponder.java
@@ -3,6 +3,7 @@
 import httpserver.*;
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
+import httpserver.request.Request;
 import httpserver.response.MethodNotAllowedResponse;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
diff --git a/src/main/java/httpserver/responder/PutResponder.java b/src/main/java/httpserver/responder/PutResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 import httpserver.response.MethodNotAllowedResponse;
diff --git a/src/main/java/httpserver/responder/Responder.java b/src/main/java/httpserver/responder/Responder.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.Response;
 
 import java.io.IOException;
diff --git a/src/main/java/httpserver/responder/special/CoffeeResponder.java b/src/main/java/httpserver/responder/special/CoffeeResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder.special;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.responder.Responder;
 import httpserver.response.TeapotResponse;
 import httpserver.response.Response;
diff --git a/src/main/java/httpserver/responder/special/CookieResponder.java b/src/main/java/httpserver/responder/special/CookieResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder.special;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.header.Header;
 import httpserver.responder.Responder;
 import httpserver.response.OkResponse;
diff --git a/src/main/java/httpserver/responder/special/EatCookieResponder.java b/src/main/java/httpserver/responder/special/EatCookieResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder.special;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.responder.Responder;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
diff --git a/src/main/java/httpserver/responder/special/LogsResponder.java b/src/main/java/httpserver/responder/special/LogsResponder.java
@@ -2,7 +2,7 @@
 
 import httpserver.AppConfig;
 import httpserver.Authorizer;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.responder.Responder;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
diff --git a/src/main/java/httpserver/responder/special/ParametersResponder.java b/src/main/java/httpserver/responder/special/ParametersResponder.java
@@ -2,7 +2,7 @@
 
 import httpserver.AppConfig;
 import httpserver.Parameter;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.responder.Responder;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
diff --git a/src/main/java/httpserver/responder/special/RedirectResponder.java b/src/main/java/httpserver/responder/special/RedirectResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder.special;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.responder.Responder;
 import httpserver.response.FoundResponse;
 import httpserver.response.Response;
diff --git a/src/main/java/httpserver/responder/special/TeaResponder.java b/src/main/java/httpserver/responder/special/TeaResponder.java
@@ -1,7 +1,7 @@
 package httpserver.responder.special;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.responder.Responder;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
diff --git a/src/test/java/httpserver/AuthorizerTest.java b/src/test/java/httpserver/AuthorizerTest.java
@@ -1,6 +1,7 @@
 package httpserver;
 
 import httpserver.header.Header;
+import httpserver.request.Request;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/httpserver/SocketHandlerTest.java b/src/test/java/httpserver/SocketHandlerTest.java
@@ -1,6 +1,8 @@
 package httpserver;
 
 import httpserver.file.FileOperator;
+import httpserver.request.Request;
+import httpserver.request.RequestParser;
 import httpserver.responder.GeneralResponder;
 import httpserver.response.Response;
 import org.junit.Test;
diff --git a/src/test/java/httpserver/request/RequestParserTest.java b/src/test/java/httpserver/request/RequestParserTest.java
@@ -1,6 +1,10 @@
-package httpserver;
+package httpserver.request;
 
+import httpserver.AppConfig;
+import httpserver.Logger;
 import httpserver.header.Header;
+import httpserver.request.Request;
+import httpserver.request.RequestParser;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
diff --git a/src/test/java/httpserver/request/RequestTest.java b/src/test/java/httpserver/request/RequestTest.java
@@ -1,10 +1,11 @@
-package httpserver;
+package httpserver.request;
 
+import httpserver.Parameter;
 import httpserver.header.Header;
+import httpserver.request.Request;
 import org.junit.Test;
 
 import java.util.Arrays;
-import java.util.concurrent.ExecutorService;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/httpserver/request/UrlDecoderTest.java b/src/test/java/httpserver/request/UrlDecoderTest.java
@@ -1,5 +1,6 @@
-package httpserver;
+package httpserver.request;
 
+import httpserver.request.UrlDecoder;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/httpserver/responder/DeleteResponderTest.java b/src/test/java/httpserver/responder/DeleteResponderTest.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 import httpserver.header.Header;
diff --git a/src/test/java/httpserver/responder/FormGetResponderTest.java b/src/test/java/httpserver/responder/FormGetResponderTest.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 import httpserver.header.Header;
diff --git a/src/test/java/httpserver/responder/GeneralResponderTest.java b/src/test/java/httpserver/responder/GeneralResponderTest.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.ResponderSupplier;
 import httpserver.response.Response;
 import org.junit.Test;
diff --git a/src/test/java/httpserver/responder/GetResponderTest.java b/src/test/java/httpserver/responder/GetResponderTest.java
@@ -5,7 +5,7 @@
 import httpserver.file.Html;
 import httpserver.file.PathExaminer;
 import httpserver.header.Header;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.header.RangeHeaderValueParser;
 import httpserver.response.Response;
 import org.junit.Test;
diff --git a/src/test/java/httpserver/responder/HeadResponderTest.java b/src/test/java/httpserver/responder/HeadResponderTest.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.file.Html;
 import httpserver.file.PathExaminer;
 import httpserver.header.Header;
diff --git a/src/test/java/httpserver/responder/InvalidMethodResponderTest.java b/src/test/java/httpserver/responder/InvalidMethodResponderTest.java
@@ -1,7 +1,7 @@
 package httpserver.responder;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.Response;
 import org.junit.Test;
 
diff --git a/src/test/java/httpserver/responder/OptionsResponderTest.java b/src/test/java/httpserver/responder/OptionsResponderTest.java
@@ -2,7 +2,7 @@
 
 import httpserver.AppConfig;
 import httpserver.Method;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.ResponderSupplier;
 import httpserver.header.Header;
 import httpserver.response.Response;
diff --git a/src/test/java/httpserver/responder/PatchResponderTest.java b/src/test/java/httpserver/responder/PatchResponderTest.java
@@ -2,7 +2,7 @@
 
 import httpserver.AppConfig;
 import httpserver.Hasher;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 import httpserver.header.Header;
diff --git a/src/test/java/httpserver/responder/PostResponderTest.java b/src/test/java/httpserver/responder/PostResponderTest.java
@@ -4,7 +4,7 @@
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 import httpserver.header.Header;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.Response;
 import org.junit.Test;
 
diff --git a/src/test/java/httpserver/responder/PutResponderTest.java b/src/test/java/httpserver/responder/PutResponderTest.java
@@ -4,7 +4,7 @@
 import httpserver.file.FileOperator;
 import httpserver.file.PathExaminer;
 import httpserver.header.Header;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.Response;
 import org.junit.Test;
 
diff --git a/src/test/java/httpserver/responder/special/CoffeeResponderTest.java b/src/test/java/httpserver/responder/special/CoffeeResponderTest.java
@@ -1,7 +1,7 @@
 package httpserver.responder.special;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.Response;
 import org.junit.Test;
 
diff --git a/src/test/java/httpserver/responder/special/CookieResponderTest.java b/src/test/java/httpserver/responder/special/CookieResponderTest.java
@@ -1,7 +1,7 @@
 package httpserver.responder.special;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.header.Header;
 import httpserver.response.Response;
 import org.junit.Test;
diff --git a/src/test/java/httpserver/responder/special/EatCookieResponderTest.java b/src/test/java/httpserver/responder/special/EatCookieResponderTest.java
@@ -1,7 +1,7 @@
 package httpserver.responder.special;
 
 import httpserver.AppConfig;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.Response;
 import org.junit.Test;
 
diff --git a/src/test/java/httpserver/responder/special/LogsResponderTest.java b/src/test/java/httpserver/responder/special/LogsResponderTest.java
@@ -3,7 +3,7 @@
 import httpserver.AppConfig;
 import httpserver.header.Header;
 import httpserver.Logger;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.Response;
 import org.junit.Test;
 
diff --git a/src/test/java/httpserver/responder/special/ParametersResponderTest.java b/src/test/java/httpserver/responder/special/ParametersResponderTest.java
@@ -2,7 +2,7 @@
 
 import httpserver.AppConfig;
 import httpserver.Parameter;
-import httpserver.Request;
+import httpserver.request.Request;
 import httpserver.response.Response;
 import org.junit.Test;
 
diff --git a/src/test/java/httpserver/responder/special/RedirectResponderTest.java b/src/test/java/httpserver/responder/special/RedirectResponderTest.java
diff --git a/src/test/java/httpserver/responder/special/TeaResponderTest.java b/src/test/java/httpserver/responder/special/TeaResponderTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package httpserver;`
	`1`	`+package httpserver.request;`
`2`	`2`
`3`	`3`	`import java.io.UnsupportedEncodingException;`
`4`	`4`