Merge pull request #98 from Ktt-Development/modular@a5c6648

Convert simplehttpserver to modular project

Author: Katsute

pom.xml

@@ -6,48 +6,40 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-        <github.organization>Ktt-Development</github.organization>
-
-        <github.repository>simplehttpserver</github.repository>
-        <github.repository.license>GPL-2</github.repository.license>
-        <github.repository.head>main</github.repository.head>
-
-        <github.username>Katsute</github.username>
     </properties>
 
     <groupId>com.kttdevelopment</groupId>
     <artifactId>simplehttpserver</artifactId>
-    <version>03.06.05</version>
+    <version>4.0.0</version>
 
     <name>simplehttpserver</name>
     <description>📕 SimpleHttpServer :: Simplified implementation of the sun http server :: Simplified handlers to execute complex operations</description>
-    <url>https://github.com/${github.organization}/${github.repository}</url>
+    <url>https://github.com/Ktt-Development/simplehttpserver</url>
 
     <licenses>
         <license>
-            <name>${github.repository.license}</name>
+            <name>GPL-2</name>
             <distribution>repo</distribution>
-            <url>https://github.com/${github.organization}/${github.repository}/blob/${github.repository.head}/LICENSE</url>
+            <url>https://github.com/Ktt-Development/simplehttpserver/blob/main/LICENSE</url>
         </license>
     </licenses>
 
     <developers>
         <developer>
-            <name>${github.username}</name>
+            <name>Katsute</name>
             <roles>
                 <role>developer</role>
             </roles>
-            <url>https://github.com/${github.username}</url>
-            <organization>${github.organization}</organization>
-            <organizationUrl>https://github.com/${github.organization}</organizationUrl>
+            <url>https://github.com/Katsute</url>
+            <organization>Ktt-Development</organization>
+            <organizationUrl>https://github.com/Ktt-Development</organizationUrl>
         </developer>
     </developers>
 
     <scm>
-        <url>https://github.com/${github.organization}/${github.repository}.git</url>
-        <connection>scm:git:[email protected]:${github.organization}/${github.repository}.git</connection>
-        <developerConnection>scm:git:[email protected]:${github.organization}/${github.repository}.git</developerConnection>
+        <url>https://github.com/Ktt-Development/simplehttpserver.git</url>
+        <connection>scm:git:[email protected]:Ktt-Development/simplehttpserver.git</connection>
+        <developerConnection>scm:git:[email protected]:Ktt-Development/simplehttpserver.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
 

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;
+
+}

src/test/java/ContextUtilTests.java renamed to 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;

src/test/java/handlers/PredicateHandlerTests.java renamed to 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;

src/test/java/handlers/RedirectHandlerTests.java renamed to 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;

src/test/java/handlers/SSEHandlerTests.java renamed to 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;

src/test/java/handlers/file/FileHandlerAddDirTest.java renamed to 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;

src/test/java/handlers/file/FileHandlerAddFilesTest.java renamed to 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;

src/test/java/handlers/file/FileHandlerAddTest.java renamed to 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;

src/test/java/handlers/file/FileHandlerNoWalkTest.java renamed to 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;

src/test/java/handlers/file/FileHandlerWalkTest.java renamed to 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;

src/test/java/handlers/predicate/RootHandlerTest.java renamed to 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;

src/test/java/handlers/temporary/TemporaryFirstTest.java renamed to 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;

src/test/java/handlers/temporary/TemporaryTimeTest.java renamed to 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;

src/test/java/handlers/throttler/ExchangeThrottlerTest.java renamed to 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;

src/test/java/handlers/throttler/ServerExchangeThrottlerTest.java renamed to 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.*;

src/test/java/handlers/throttler/ServerSessionThrottlerTest.java renamed to 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;

src/test/java/handlers/throttler/SessionThrottlerTest.java renamed to 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;

src/test/java/simplehttpexchange/SimpleHttpExchangeCookieSessionTests.java renamed to 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;

src/test/java/simplehttpexchange/SimpleHttpExchangeReadTests.java renamed to 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;

src/test/java/simplehttpexchange/io/SimpleHttpExchangeGetTest.java renamed to 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;

src/test/java/simplehttpexchange/io/SimpleHttpExchangeMultipartFormTest.java renamed to 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;

src/test/java/simplehttpexchange/io/SimpleHttpExchangePostTest.java renamed to 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;

src/test/java/simplehttpserver/SimpleHttpServerContextTests.java renamed to 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;

src/test/java/simplehttpserver/SimpleHttpServerGetTests.java renamed to 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;

src/test/java/simplehttpserver/bind/SimpleHttpServerBindOccupiedTests.java renamed to 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.*;

src/test/java/simplehttpserver/bind/SimpleHttpServerBindRangeTest.java renamed to 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;

src/test/java/simplehttpserver/create/SimpleHttpServerCreateTest.java renamed to 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;

src/test/java/simplehttpserver/create/SimpleHttpsServerCreateTest.java renamed to 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;