Move special case responders into own package

onlyskin · onlyskin · commit 53cd79ccea77 · 2017-12-19T19:26:51.000+02:00
diff --git a/src/main/java/httpserver/ResponderSupplierFactory.java b/src/main/java/httpserver/ResponderSupplierFactory.java
@@ -3,7 +3,9 @@
 import httpserver.file.FileOperator;
 import httpserver.file.Html;
 import httpserver.file.PathExaminer;
+import httpserver.header.RangeHeaderValueParser;
 import httpserver.responder.*;
+import httpserver.responder.special.*;
 
 public class ResponderSupplierFactory {
     public ResponderSupplier makeResponderSupplier() {
diff --git a/src/main/java/httpserver/header/RangeHeaderValueParser.java b/src/main/java/httpserver/header/RangeHeaderValueParser.java
@@ -1,4 +1,4 @@
-package httpserver.responder;
+package httpserver.header;
 
 import httpserver.Range;
 
diff --git a/src/main/java/httpserver/responder/GetResponder.java b/src/main/java/httpserver/responder/GetResponder.java
@@ -4,6 +4,7 @@
 import httpserver.Range;
 import httpserver.file.Html;
 import httpserver.header.ContentTypeHeader;
+import httpserver.header.RangeHeaderValueParser;
 import httpserver.response.NotFoundResponse;
 import httpserver.Request;
 import httpserver.response.OkResponse;
diff --git a/src/main/java/httpserver/responder/HeadResponder.java b/src/main/java/httpserver/responder/HeadResponder.java
@@ -4,6 +4,7 @@
 import httpserver.Request;
 import httpserver.file.Html;
 import httpserver.file.PathExaminer;
+import httpserver.header.RangeHeaderValueParser;
 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,8 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Request;
+import httpserver.responder.Responder;
 import httpserver.response.FourEighteenResponse;
 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,8 +1,9 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Request;
 import httpserver.header.Header;
+import httpserver.responder.Responder;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
 
diff --git a/src/main/java/httpserver/responder/special/EatCookieResponder.java b/src/main/java/httpserver/responder/special/EatCookieResponder.java
@@ -1,7 +1,8 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.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
@@ -1,8 +1,9 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Authorizer;
 import httpserver.Request;
+import httpserver.responder.Responder;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
 import httpserver.response.UnauthorizedResponse;
diff --git a/src/main/java/httpserver/responder/special/ParametersResponder.java b/src/main/java/httpserver/responder/special/ParametersResponder.java
@@ -1,8 +1,9 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Parameter;
 import httpserver.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,8 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.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,8 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Request;
+import httpserver.responder.Responder;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
 
diff --git a/src/test/java/httpserver/header/RangeHeaderValueParserTest.java b/src/test/java/httpserver/header/RangeHeaderValueParserTest.java
@@ -1,7 +1,7 @@
-package httpserver.responder;
+package httpserver.header;
 
 import httpserver.Range;
-import org.junit.Ignore;
+import httpserver.header.RangeHeaderValueParser;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/httpserver/responder/GetResponderTest.java b/src/test/java/httpserver/responder/GetResponderTest.java
@@ -6,8 +6,8 @@
 import httpserver.file.PathExaminer;
 import httpserver.header.Header;
 import httpserver.Request;
+import httpserver.header.RangeHeaderValueParser;
 import httpserver.response.Response;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/src/test/java/httpserver/responder/HeadResponderTest.java b/src/test/java/httpserver/responder/HeadResponderTest.java
@@ -5,6 +5,7 @@
 import httpserver.file.Html;
 import httpserver.file.PathExaminer;
 import httpserver.header.Header;
+import httpserver.header.RangeHeaderValueParser;
 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,8 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Request;
+import httpserver.responder.special.CoffeeResponder;
 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,8 +1,9 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Request;
 import httpserver.header.Header;
+import httpserver.responder.special.CookieResponder;
 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,8 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Request;
+import httpserver.responder.special.EatCookieResponder;
 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
@@ -1,9 +1,10 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.header.Header;
 import httpserver.Logger;
 import httpserver.Request;
+import httpserver.responder.special.LogsResponder;
 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
@@ -1,8 +1,9 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Parameter;
 import httpserver.Request;
+import httpserver.responder.special.ParametersResponder;
 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
@@ -1,7 +1,8 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Request;
+import httpserver.responder.special.RedirectResponder;
 import httpserver.response.Response;
 import org.junit.Test;
 
diff --git a/src/test/java/httpserver/responder/special/TeaResponderTest.java b/src/test/java/httpserver/responder/special/TeaResponderTest.java
@@ -1,7 +1,8 @@
-package httpserver.responder;
+package httpserver.responder.special;
 
 import httpserver.AppConfig;
 import httpserver.Request;
+import httpserver.responder.special.TeaResponder;
 import httpserver.response.Response;
 import org.junit.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package httpserver.responder;`
	`1`	`+package httpserver.header;`
`2`	`2`
`3`	`3`	`import httpserver.Range;`
`4`	`4`