All handlers except file

Author: Katsute

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.kttdevelopment</groupId>
     <artifactId>simplehttpserver</artifactId>
-    <version>03.05.07</version>
+    <version>03.05.08</version>
     <packaging>jar</packaging>
 
     <url>https://github.com/Ktt-Development/simplehttpserver</url>

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

@@ -9,7 +9,7 @@
  * @see SimpleHttpExchange
  * @see Builder
  * @since 02.00.00
- * @version 03.05.00
+ * @version 03.05.08
  * @author Ktt Development
  */
 public class SimpleHttpCookie {
@@ -61,7 +61,6 @@ private SimpleHttpCookie(final String name, final String value, final String dom
         this.httpOnly = httpOnly;
     }
 
-    @SuppressWarnings("SpellCheckingInspection")
     private final SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss");
 
     /**

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

@@ -17,7 +17,7 @@
  * @see SimpleHttpsServer
  * @see SimpleHttpHandler
  * @since 02.00.00
- * @version 03.05.02
+ * @version 03.05.08
  * @author Ktt Development
  */
 @SuppressWarnings("SpellCheckingInspection")
@@ -270,12 +270,15 @@ public static SimpleHttpServer create(final int port, final int backlog) throws
 
     /**
      * Creates an empty context.
+     * <br>
+     * * {@link HttpServer} often does not throw an exception for duplicate contexts. <a href="https://github.com/Ktt-Development/simplehttpserver/issues/86">#86</a>
      *
      * @param context the context
      * @return the http context associated with the context
-     * @throws IllegalArgumentException if the context is invalid or taken
+     * @throws IllegalArgumentException if the context is invalid or taken*
      * @throws NullPointerException if the context is null
      *
+     *
      * @see HttpContext
      * @see #createContext(String, HttpHandler)
      * @see #removeContext(String)
@@ -287,11 +290,13 @@ public static SimpleHttpServer create(final int port, final int backlog) throws
 
     /**
      * Creates a context mapped to a specified {@link HttpHandler}.
+     * <br>
+     * * {@link HttpServer} often does not throw an exception for duplicate contexts. <a href="https://github.com/Ktt-Development/simplehttpserver/issues/86">#86</a>
      *
      * @param context the context
      * @param handler the handler
      * @return the http context associated with the context
-     * @throws IllegalArgumentException if the context is invalid or taken
+     * @throws IllegalArgumentException if the context is invalid or taken*
      * @throws NullPointerException if the context is null
      *
      * @see HttpContext
@@ -308,11 +313,13 @@ public static SimpleHttpServer create(final int port, final int backlog) throws
 
     /**
      * Creates a context mapped to a specific {@link HttpContext} with an {@link Authenticator}.
+     * <br>
+     * * {@link HttpServer} often does not throw an exception for duplicate contexts. <a href="https://github.com/Ktt-Development/simplehttpserver/issues/86">#86</a>
      *
      * @param context the context
      * @param authenticator authenticator
      * @return the http context associated with the context
-     * @throws IllegalArgumentException if the context is invalid or taken
+     * @throws IllegalArgumentException if the context is invalid or taken*
      * @throws NullPointerException if the context is null
      *
      * @see HttpContext
@@ -327,12 +334,14 @@ public static SimpleHttpServer create(final int port, final int backlog) throws
 
     /**
      * Creates a context mapped to a specific {@link HttpContext} with an {@link Authenticator}.
+     * <br>
+     * * {@link HttpServer} often does not throw an exception for duplicate contexts. <a href="https://github.com/Ktt-Development/simplehttpserver/issues/86">#86</a>
      *
      * @param context the context
      * @param handler the handler
      * @param authenticator authenticator
      * @return the http context associated with the context
-     * @throws IllegalArgumentException if the context is invalid or taken
+     * @throws IllegalArgumentException if the context is invalid or taken*
      * @throws NullPointerException if the context is null
      *
      * @see HttpContext

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

@@ -7,14 +7,13 @@
 import java.net.InetSocketAddress;
 import java.util.*;
 import java.util.concurrent.Executor;
-import java.util.function.BiConsumer;
 
 /**
  * Implementation for {@link SimpleHttpServer}. Applications do not use this class.
  *
  * @see SimpleHttpServer
  * @since 02.00.00
- * @version 03.05.03
+ * @version 03.05.08
  * @author Ktt Development
  */
 @SuppressWarnings("SpellCheckingInspection")

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

@@ -13,7 +13,7 @@
  *
  * @see SimpleHttpsServer
  * @since 03.04.00
- * @version 03.05.03
+ * @version 03.05.08
  * @author Ktt Development
  */
 @SuppressWarnings("SpellCheckingInspection")
@@ -73,7 +73,7 @@ public final HttpsConfigurator getHttpsConfigurator(){
         return server.getHttpsConfigurator();
     }
 
-    // region copySimpleHttpServerImpl
+// region copy
 
     @Override
     public synchronized final InetSocketAddress bind(final int port) throws IOException{
@@ -159,15 +159,18 @@ public synchronized final HttpContext createContext(final String context, final
 
     @Override
     public synchronized final HttpContext createContext(final String context, final HttpHandler handler, final Authenticator authenticator){
-        if(!ContextUtil.getContext(context,true,false).equals("/") && handler instanceof RootHandler)
+        final String ct = ContextUtil.getContext(context,true,false);
+        if(!ct.equals("/") && handler instanceof RootHandler)
             throw new IllegalArgumentException("RootHandler can only be used at the root '/' context");
 
         final HttpHandler wrapper = exchange -> {
             handle(exchange);
             handler.handle(exchange);
         };
 
-        final HttpContext hc = server.createContext(ContextUtil.getContext(context,true,false),wrapper);
+        final HttpContext hc = server.createContext(ct);
+
+        hc.setHandler(wrapper);
         contexts.put(hc,handler);
 
         if(authenticator != null)
@@ -264,7 +267,7 @@ public synchronized final void stop(final int delay){
         }
     }
 
-    // endregion
+// endregion copy
 
     @Override
     public String toString(){

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

@@ -21,6 +21,7 @@
  * @version 03.05.06
  * @author Ktt Development
  */
+@SuppressWarnings("SpellCheckingInspection")
 class DirectoryEntry {
 
     private final File directory;

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

@@ -7,7 +7,7 @@
  * @version 01.00.00
  * @author Ktt Development
  */
-@SuppressWarnings({"unused", "SpellCheckingInspection"})
+@SuppressWarnings({"unused", "SpellCheckingInspection", "RedundantSuppression"})
 public abstract class HttpCode {
 
     public static final int HTTP_Continue = 100;

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

@@ -7,7 +7,6 @@
  * @version 01.00.00
  * @author Ktt Development
  */
-@SuppressWarnings("SpellCheckingInspection")
 public enum RequestMethod {
     GET,
     HEAD,

src/test/java/handlers/FileHandlerTests.java

@@ -14,6 +14,7 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
+@SuppressWarnings("SpellCheckingInspection")
 public class FileHandlerTests {
 
     @SuppressWarnings("ResultOfMethodCallIgnored")

src/test/java/handlers/PredicateHandlerTests.java

@@ -3,7 +3,6 @@
 import com.kttdevelopment.simplehttpserver.SimpleHttpHandler;
 import com.kttdevelopment.simplehttpserver.SimpleHttpServer;
 import com.kttdevelopment.simplehttpserver.handler.PredicateHandler;
-import com.kttdevelopment.simplehttpserver.handler.RootHandler;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -12,11 +11,11 @@
 import java.net.http.*;
 import java.util.concurrent.ExecutionException;
 
-public class PredicateHandlerTests {
+public final class PredicateHandlerTests {
 
     @Test
     public void predicate() throws IOException, ExecutionException, InterruptedException{
-        final int port = 30004;
+        final int port = 8080;
 
         final SimpleHttpServer server = SimpleHttpServer.create(port);
 
@@ -28,52 +27,18 @@ public void predicate() throws IOException, ExecutionException, InterruptedExcep
 
         Assert.assertFalse("Server did not contain a temporary context", server.getContexts().isEmpty());
 
-        String url = "http://localhost:" + port + context;
+        final String url = "http://localhost:" + port + context;
 
-        HttpRequest request = HttpRequest.newBuilder()
-             .uri(URI.create(url))
-             .build();
+        final HttpRequest request = HttpRequest.newBuilder()
+            .uri(URI.create(url))
+            .build();
 
-        String response = HttpClient.newHttpClient().sendAsync(request, HttpResponse.BodyHandlers.ofString())
-             .thenApply(HttpResponse::body).get();
+        final String response = HttpClient.newHttpClient().sendAsync(request, HttpResponse.BodyHandlers.ofString())
+            .thenApply(HttpResponse::body).get();
 
         Assert.assertEquals("Server response did not match client response", condition ? "A" : "B", response);
 
         server.stop();
     }
 
-    @Test
-    public void root() throws IOException, ExecutionException, InterruptedException{
-        final int port = 30005;
-
-        final SimpleHttpServer server = SimpleHttpServer.create(port);
-        String context = "";
-        server.createContext(context,new RootHandler((SimpleHttpHandler) exchange -> exchange.send("A"), (SimpleHttpHandler) exchange -> exchange.send("B")));
-        server.start();
-
-        Assert.assertFalse("Server did not contain a temporary context", server.getContexts().isEmpty());
-
-        String url = "http://localhost:" + port;
-
-        HttpRequest request = HttpRequest.newBuilder()
-             .uri(URI.create(url))
-             .build();
-
-        String response = HttpClient.newHttpClient().sendAsync(request, HttpResponse.BodyHandlers.ofString())
-             .thenApply(HttpResponse::body).get();
-
-        Assert.assertEquals("Server root response did not match client root response","A",response);
-
-        request = HttpRequest.newBuilder()
-             .uri(URI.create(url + server.getRandomContext()))
-             .build();
-
-        response = HttpClient.newHttpClient().sendAsync(request, HttpResponse.BodyHandlers.ofString())
-             .thenApply(HttpResponse::body).get();
-
-        Assert.assertEquals("Server else response did not match client else response","B",response);
-
-        server.stop();
-    }
-
 }

src/test/java/handlers/RedirectHandlerTests.java

@@ -11,11 +11,11 @@
 import java.net.http.*;
 import java.util.concurrent.ExecutionException;
 
-public class RedirectHandlerTests {
+public final class RedirectHandlerTests {
 
     @Test
-    public void redirectToGoogle() throws IOException, ExecutionException, InterruptedException{
-        final int port = 30003;
+    public final void redirectToGoogle() throws IOException, ExecutionException, InterruptedException{
+        final int port = 8080;
 
         final SimpleHttpServer server = SimpleHttpServer.create(port);
 
@@ -25,16 +25,16 @@ public void redirectToGoogle() throws IOException, ExecutionException, Interrupt
 
         Assert.assertFalse("Server did not contain a temporary context", server.getContexts().isEmpty());
 
-        String url = "http://localhost:" + port + context;
+        final String url = "http://localhost:" + port + context;
 
-        HttpRequest request = HttpRequest.newBuilder()
-             .uri(URI.create(url))
-             .build();
+        final HttpRequest request = HttpRequest.newBuilder()
+            .uri(URI.create(url))
+            .build();
 
         final HttpClient client = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.ALWAYS).build();
 
-        int response = client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
-             .thenApply(HttpResponse::statusCode).get();
+        final int response = client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
+            .thenApply(HttpResponse::statusCode).get();
 
         Assert.assertEquals("Client responded with redirect code (302 HTTP FOUND) not 200 HTTP OK",HttpCode.HTTP_OK, response);
 

src/test/java/handlers/SSEHandlerTests.java

@@ -10,12 +10,12 @@
 import java.time.Duration;
 import java.util.concurrent.*;
 
-public class SSEHandlerTests {
+public final class SSEHandlerTests {
 
     @SuppressWarnings({"unchecked", "Convert2Lambda", "rawtypes"})
     @Test
-    public void test() throws IOException, ExecutionException, InterruptedException{
-        final int port = 30006;
+    public final void test() throws IOException, ExecutionException, InterruptedException{
+        final int port = 8080;
 
         final SimpleHttpServer server = SimpleHttpServer.create(port);
         String context = "";
@@ -25,38 +25,39 @@ public void test() throws IOException, ExecutionException, InterruptedException{
         server.start();
 
         HttpRequest request = HttpRequest.newBuilder()
-             .uri(URI.create("http://localhost:" + port))
-             .timeout(Duration.ofSeconds(2))
-             .build();
+            .uri(URI.create("http://localhost:" + port))
+            .timeout(Duration.ofSeconds(2))
+            .build();
 
         final HttpClient client = HttpClient.newHttpClient();
         HttpResponse<InputStream> response = client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()).get();
 
         final String result = "result";
         handler.push(result);
 
-        BufferedReader IN = new BufferedReader(new InputStreamReader(response.body()));
-        StringBuilder OUT = new StringBuilder();
+        final BufferedReader IN = new BufferedReader(new InputStreamReader(response.body()));
+        final StringBuilder OUT = new StringBuilder();
 
         final Duration dur = Duration.ofSeconds(2);
         final ExecutorService executor = Executors.newSingleThreadExecutor();
         final Future<String> future = executor.submit(new Callable() {
             @Override
-            public String call(){
+            public final String call(){
                 String ln;
                 try{
                     while((ln = IN.readLine()) != null)
-                            OUT.append(ln).append('\n');
+                        OUT.append(ln).append('\n');
                 }catch(final IOException ignored){
                     Assert.fail("Unable to read input stream from client");
                 }
                 return OUT.toString();
             }
         });
 
-        try {
+        try{
             future.get(dur.toMillis(), TimeUnit.MILLISECONDS);
-        } catch (TimeoutException e) {
+        }catch(final TimeoutException ignored){
+        }finally{
             future.cancel(true);
         }