convert simplehttpserver to modular

Katsute · Katsute · commit f871d6bdac2b · 2020-10-12T13:23:18.000-04:00
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module simplehttpserver {
+
+    requires jdk.httpserver;
+    requires java.net.http; // test requirement
+    exports com.kttdevelopment.simplehttpserver.handler;
+    exports com.kttdevelopment.simplehttpserver.var;
+    exports com.kttdevelopment.simplehttpserver;
+
+}
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/ContextUtilTests.java b/src/test/java/com/kttdevelopment/simplehttpserver/ContextUtilTests.java
@@ -1,3 +1,5 @@
+package com.kttdevelopment.simplehttpserver;
+
 import com.kttdevelopment.simplehttpserver.ContextUtil;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/PredicateHandlerTests.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/PredicateHandlerTests.java
@@ -1,4 +1,4 @@
-package handlers;
+package com.kttdevelopment.simplehttpserver.handlers;
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpHandler;
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/RedirectHandlerTests.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/RedirectHandlerTests.java
@@ -1,4 +1,4 @@
-package handlers;
+package com.kttdevelopment.simplehttpserver.handlers;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.handler.RedirectHandler;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/SSEHandlerTests.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/SSEHandlerTests.java
@@ -1,4 +1,4 @@
-package handlers;
+package com.kttdevelopment.simplehttpserver.handlers;
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
 import com.kttdevelopment.simplehttpserver.handler.SSEHandler;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddDirTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddDirTest.java
@@ -1,4 +1,4 @@
-package handlers.file;
+package com.kttdevelopment.simplehttpserver.handlers.file;
 
 import com.kttdevelopment.core.tests.TestUtil;
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddFilesTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddFilesTest.java
@@ -1,4 +1,4 @@
-package handlers.file;
+package com.kttdevelopment.simplehttpserver.handlers.file;
 
 import com.kttdevelopment.core.tests.TestUtil;
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddTest.java
@@ -1,4 +1,4 @@
-package handlers.file;
+package com.kttdevelopment.simplehttpserver.handlers.file;
 
 import com.kttdevelopment.core.tests.TestUtil;
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerNoWalkTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerNoWalkTest.java
@@ -1,4 +1,4 @@
-package handlers.file;
+package com.kttdevelopment.simplehttpserver.handlers.file;
 
 import com.kttdevelopment.core.tests.TestUtil;
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerWalkTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerWalkTest.java
@@ -1,4 +1,4 @@
-package handlers.file;
+package com.kttdevelopment.simplehttpserver.handlers.file;
 
 import com.kttdevelopment.core.tests.TestUtil;
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/predicate/RootHandlerTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/predicate/RootHandlerTest.java
@@ -1,4 +1,4 @@
-package handlers.predicate;
+package com.kttdevelopment.simplehttpserver.handlers.predicate;
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpHandler;
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/temporary/TemporaryFirstTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/temporary/TemporaryFirstTest.java
@@ -1,4 +1,4 @@
-package handlers.temporary;
+package com.kttdevelopment.simplehttpserver.handlers.temporary;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.handler.TemporaryHandler;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/temporary/TemporaryTimeTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/temporary/TemporaryTimeTest.java
@@ -1,4 +1,4 @@
-package handlers.temporary;
+package com.kttdevelopment.simplehttpserver.handlers.temporary;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.handler.TemporaryHandler;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/throttler/ExchangeThrottlerTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/throttler/ExchangeThrottlerTest.java
@@ -1,4 +1,4 @@
-package handlers.throttler;
+package com.kttdevelopment.simplehttpserver.handlers.throttler;
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpHandler;
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/throttler/ServerExchangeThrottlerTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/throttler/ServerExchangeThrottlerTest.java
@@ -1,4 +1,4 @@
-package handlers.throttler;
+package com.kttdevelopment.simplehttpserver.handlers.throttler;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.handler.*;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/throttler/ServerSessionThrottlerTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/throttler/ServerSessionThrottlerTest.java
@@ -1,4 +1,4 @@
-package handlers.throttler;
+package com.kttdevelopment.simplehttpserver.handlers.throttler;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.handler.ServerSessionThrottler;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/handlers/throttler/SessionThrottlerTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/handlers/throttler/SessionThrottlerTest.java
@@ -1,4 +1,4 @@
-package handlers.throttler;
+package com.kttdevelopment.simplehttpserver.handlers.throttler;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.handler.SessionThrottler;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/SimpleHttpExchangeCookieSessionTests.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/SimpleHttpExchangeCookieSessionTests.java
@@ -1,4 +1,4 @@
-package simplehttpexchange;
+package com.kttdevelopment.simplehttpserver.simplehttpexchange;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.sun.net.httpserver.HttpContext;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/SimpleHttpExchangeReadTests.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/SimpleHttpExchangeReadTests.java
@@ -1,4 +1,4 @@
-package simplehttpexchange;
+package com.kttdevelopment.simplehttpserver.simplehttpexchange;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.var.HttpCode;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/io/SimpleHttpExchangeGetTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/io/SimpleHttpExchangeGetTest.java
@@ -1,4 +1,4 @@
-package simplehttpexchange.io;
+package com.kttdevelopment.simplehttpserver.simplehttpexchange.io;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.var.RequestMethod;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/io/SimpleHttpExchangeMultipartFormTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/io/SimpleHttpExchangeMultipartFormTest.java
@@ -1,4 +1,4 @@
-package simplehttpexchange.io;
+package com.kttdevelopment.simplehttpserver.simplehttpexchange.io;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.var.RequestMethod;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/io/SimpleHttpExchangePostTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/io/SimpleHttpExchangePostTest.java
@@ -1,4 +1,4 @@
-package simplehttpexchange.io;
+package com.kttdevelopment.simplehttpserver.simplehttpexchange.io;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.var.RequestMethod;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/SimpleHttpServerContextTests.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/SimpleHttpServerContextTests.java
@@ -1,4 +1,4 @@
-package simplehttpserver;
+package com.kttdevelopment.simplehttpserver.simplehttpserver;
 
 import com.kttdevelopment.simplehttpserver.*;
 import com.kttdevelopment.simplehttpserver.handler.RootHandler;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/SimpleHttpServerGetTests.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/SimpleHttpServerGetTests.java
@@ -1,4 +1,4 @@
-package simplehttpserver;
+package com.kttdevelopment.simplehttpserver.simplehttpserver;
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
 import org.junit.Assert;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/bind/SimpleHttpServerBindOccupiedTests.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/bind/SimpleHttpServerBindOccupiedTests.java
@@ -1,4 +1,4 @@
-package simplehttpserver.bind;
+package com.kttdevelopment.simplehttpserver.simplehttpserver.bind;
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
 import org.junit.*;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/bind/SimpleHttpServerBindRangeTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/bind/SimpleHttpServerBindRangeTest.java
@@ -1,4 +1,4 @@
-package simplehttpserver.bind;
+package com.kttdevelopment.simplehttpserver.simplehttpserver.bind;
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
 import org.junit.Assert;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/create/SimpleHttpServerCreateTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/create/SimpleHttpServerCreateTest.java
@@ -1,4 +1,4 @@
-package simplehttpserver.create;
+package com.kttdevelopment.simplehttpserver.simplehttpserver.create;
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
 import org.junit.Assert;
diff --git a/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/create/SimpleHttpsServerCreateTest.java b/src/test/java/com/kttdevelopment/simplehttpserver/simplehttpserver/create/SimpleHttpsServerCreateTest.java
@@ -1,4 +1,4 @@
-package simplehttpserver.create;
+package com.kttdevelopment.simplehttpserver.simplehttpserver.create;
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpsServer;
 import org.junit.Assert;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package com.kttdevelopment.simplehttpserver;`
	`2`	`+`
`1`	`3`	`import com.kttdevelopment.simplehttpserver.ContextUtil;`
`2`	`4`	`import org.junit.Assert;`
`3`	`5`	`import org.junit.Test;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package handlers;`
	`1`	`+package com.kttdevelopment.simplehttpserver.handlers;`
`2`	`2`
`3`	`3`	`import com.kttdevelopment.simplehttpserver.SimpleHttpHandler;`
`4`	`4`	`import com.kttdevelopment.simplehttpserver.SimpleHttpServer;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package handlers.file;`
	`1`	`+package com.kttdevelopment.simplehttpserver.handlers.file;`
`2`	`2`
`3`	`3`	`import com.kttdevelopment.core.tests.TestUtil;`
`4`	`4`	`import com.kttdevelopment.simplehttpserver.SimpleHttpServer;`