Replaced RequestMethod enums with HttpRequestMethod static strings. (#121)

* move requestmethod

single class packages don't make any sense.

* Replace RequestMethod with static strings

This change is necessary as there is no fixed list of request methods.

* cleanup

* Update module-info.java

Author: Katsute

src/main/java/com/kttdevelopment/simplehttpserver/HttpRequestMethod.java

@@ -0,0 +1,24 @@
+package com.kttdevelopment.simplehttpserver;
+
+/**
+ * A list of expected HTTP method requests.
+ * See <a href="https://tools.ietf.org/html/rfc7231#section-4.3" target="_blank">IANA RFC7324 Section 4.3</a>
+ * @since 01.00.00
+ * @version 4.3.0
+ * @author Ktt Development
+ */
+@SuppressWarnings("unused")
+public abstract class HttpRequestMethod {
+
+    public static final String GET          = "GET";
+    public static final String HEAD         = "HEAD";
+    public static final String POST         = "POST";
+    public static final String PUT          = "PUT";
+    public static final String DELETE       = "DELETE";
+    public static final String CONNECT      = "CONNECT";
+    public static final String OPTIONS      = "OPTIONS";
+    public static final String TRACE        = "TRACE";
+    public static final String PATCH        = "PATCH";
+    public static final String UNSUPPORTED  = "UNSUPPORTED";
+
+}

src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpExchange.java

@@ -1,6 +1,5 @@
 package com.kttdevelopment.simplehttpserver;
 
-import com.kttdevelopment.simplehttpserver.var.RequestMethod;
 import com.sun.net.httpserver.*;
 
 import java.io.*;
@@ -161,11 +160,11 @@ static SimpleHttpExchange create(final HttpExchange exchange){
      *
      * @return request method
      *
-     * @see RequestMethod
+     * @see HttpRequestMethod
      * @since 02.00.00
      * @author Ktt Development
      */
-    public abstract RequestMethod getRequestMethod();
+    public abstract String getRequestMethod();
 
 //
 

src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpExchangeImpl.java

@@ -1,7 +1,6 @@
 package com.kttdevelopment.simplehttpserver;
 
 import com.sun.net.httpserver.*;
-import com.kttdevelopment.simplehttpserver.var.*;
 
 import java.io.*;
 import java.net.*;
@@ -35,7 +34,7 @@ final class SimpleHttpExchangeImpl extends SimpleHttpExchange {
     private final String protocol;
 
     private final Headers requestHeaders;
-    private final RequestMethod requestMethod;
+    private final String requestMethod;
 
     private final String rawGet;
     private final Map<String,String> getMap;
@@ -96,28 +95,7 @@ static SimpleHttpExchange create(final HttpExchange exchange){
         protocol    = httpExchange.getProtocol();
     //
         requestHeaders = httpExchange.getRequestHeaders();
-        switch(exchange.getRequestMethod()){
-            case "GET":
-                requestMethod = RequestMethod.GET; break;
-            case "HEAD":
-                requestMethod = RequestMethod.HEAD; break;
-            case "POST":
-                requestMethod = RequestMethod.POST; break;
-            case "PUT":
-                requestMethod = RequestMethod.PUT; break;
-            case "DELETE":
-                requestMethod = RequestMethod.DELETE; break;
-            case "CONNECT":
-                requestMethod = RequestMethod.CONNECT; break;
-            case "OPTIONS":
-                requestMethod = RequestMethod.OPTIONS; break;
-            case "TRACE":
-                requestMethod = RequestMethod.TRACE; break;
-            case "PATCH":
-                requestMethod = RequestMethod.PATCH; break;
-            default:
-                requestMethod = RequestMethod.UNSUPPORTED; break;
-        }
+        requestMethod  = exchange.getRequestMethod().toUpperCase();
     //
         hasGet = (rawGet = URI.getRawQuery()) != null;
         getMap = hasGet ? Collections.unmodifiableMap(parseWwwFormEnc.apply(rawGet)) : new HashMap<>();
@@ -267,7 +245,7 @@ public final Headers getRequestHeaders(){
     }
 
     @Override
-    public final RequestMethod getRequestMethod(){
+    public final String getRequestMethod(){
         return requestMethod;
     }
 

src/main/java/com/kttdevelopment/simplehttpserver/handler/SSEHandler.java

@@ -2,7 +2,7 @@
 
 import com.kttdevelopment.simplehttpserver.SimpleHttpExchange;
 import com.kttdevelopment.simplehttpserver.SimpleHttpHandler;
-import com.kttdevelopment.simplehttpserver.var.RequestMethod;
+import com.kttdevelopment.simplehttpserver.HttpRequestMethod;
 import com.sun.net.httpserver.HttpExchange;
 
 import java.io.IOException;
@@ -41,7 +41,7 @@ public final void handle(final SimpleHttpExchange exchange) throws IOException{
         exchange.getResponseHeaders().add("Access-Control-Max-Age", String.valueOf(TimeUnit.HOURS.toSeconds(1)));
         exchange.getResponseHeaders().add("Cache-Control","no-cache");
 
-        if(exchange.getRequestMethod() == RequestMethod.OPTIONS){
+        if(exchange.getRequestMethod().equals(HttpRequestMethod.OPTIONS)){
             exchange.sendResponseHeaders(HttpURLConnection.HTTP_OK, 0);
             return;
         }

src/main/java/com/kttdevelopment/simplehttpserver/var/RequestMethod.java

@@ -3,7 +3,6 @@
     requires jdk.httpserver;
     requires java.net.http; // test requirement
     exports com.kttdevelopment.simplehttpserver.handler;
-    exports com.kttdevelopment.simplehttpserver.var;
     exports com.kttdevelopment.simplehttpserver;
 
 }

src/main/java/module-info.java

@@ -1,7 +1,7 @@
 package com.kttdevelopment.simplehttpserver.simplehttpexchange.io;
 
 import com.kttdevelopment.simplehttpserver.*;
-import com.kttdevelopment.simplehttpserver.var.RequestMethod;
+import com.kttdevelopment.simplehttpserver.HttpRequestMethod;
 import com.sun.net.httpserver.HttpContext;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -49,7 +49,7 @@ public final void get() throws IOException, ExecutionException, InterruptedExcep
         // exchange
         final SimpleHttpExchange exchange = exchangeRef.get();
 
-        Assertions.assertEquals(RequestMethod.GET, exchange.getRequestMethod(), "Client request method did not match exchange request method (GET)");
+        Assertions.assertEquals(HttpRequestMethod.GET, exchange.getRequestMethod(), "Client request method did not match exchange request method (GET)");
         Assertions.assertTrue(exchange.hasGet(), "Exchange was missing client GET map");
         Assertions.assertEquals(queryValue, exchange.getGetMap().get(queryKey), "Exchange GET did not match client GET");
         Assertions.assertEquals(altValueRaw, exchange.getGetMap().get(altKey), "Exchange GET did not match client GET");

src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/io/SimpleHttpExchangeGetTest.java

@@ -1,7 +1,7 @@
 package com.kttdevelopment.simplehttpserver.simplehttpexchange.io;
 
 import com.kttdevelopment.simplehttpserver.*;
-import com.kttdevelopment.simplehttpserver.var.RequestMethod;
+import com.kttdevelopment.simplehttpserver.HttpRequestMethod;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -62,7 +62,7 @@ public final void postMultipartFormData() throws IOException, ExecutionException
         // exchange
         final SimpleHttpExchange exchange = exchangeRef.get();
 
-        Assertions.assertEquals(RequestMethod.POST, exchange.getRequestMethod(), "Client request method did not match exchange request method (POST)");
+        Assertions.assertEquals(HttpRequestMethod.POST, exchange.getRequestMethod(), "Client request method did not match exchange request method (POST)");
         Assertions.assertTrue(exchange.hasPost(), "Exchange was missing client POST map");
 
         Assertions.assertEquals(value, ((Map) exchange.getPostMap().get(key)).get("value"), "Client form value did not match server value");

src/test/java/com/kttdevelopment/simplehttpserver/simplehttpexchange/io/SimpleHttpExchangeMultipartFormTest.java

@@ -1,7 +1,7 @@
 package com.kttdevelopment.simplehttpserver.simplehttpexchange.io;
 
 import com.kttdevelopment.simplehttpserver.*;
-import com.kttdevelopment.simplehttpserver.var.RequestMethod;
+import com.kttdevelopment.simplehttpserver.HttpRequestMethod;
 import com.sun.net.httpserver.HttpContext;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -46,7 +46,7 @@ public final void postSimple() throws IOException, ExecutionException, Interrupt
         // exchange
         final SimpleHttpExchange exchange = exchangeRef.get();
 
-        Assertions.assertEquals(RequestMethod.POST, exchange.getRequestMethod(), "Client request method did not match exchange request method (POST)");
+        Assertions.assertEquals(HttpRequestMethod.POST, exchange.getRequestMethod(), "Client request method did not match exchange request method (POST)");
         Assertions.assertTrue(exchange.hasPost(), "Exchange was missing client POST map");
         Assertions.assertEquals(queryValue, exchange.getPostMap().get(queryKey), "Exchange POST did not match client POST");