Fix #69 optional, fix remove context issue (#70)

Co-authored-by: Katsute <[email protected]>

Author: Katsute

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

@@ -13,7 +13,7 @@
  *
  * @see SimpleHttpServer
  * @since 02.00.00
- * @version 03.05.00
+ * @version 03.05.02
  * @author Ktt Development
  */
 @SuppressWarnings("SpellCheckingInspection")
@@ -168,11 +168,16 @@ public synchronized final HttpContext createContext(final String path, final Htt
 
     @Override
     public synchronized final void removeContext(final String path){
-        server.removeContext(getContext(path));
-        for(final HttpContext context : contexts.keySet()){
-            if(context.getPath().equalsIgnoreCase(getContext(path))){
-                contexts.remove(context);
-                break;
+        try{
+            server.removeContext(getContext(path));
+        }catch(final IllegalArgumentException e){
+            throw e;
+        }finally{
+            for(final HttpContext context : contexts.keySet()){
+                if(context.getPath().equalsIgnoreCase(getContext(path))){
+                    contexts.remove(context);
+                    break;
+                }
             }
         }
     }

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

@@ -8,16 +8,18 @@
 
 /**
  * A temporary handler handles a single request and then removes itself from the server. This can be used for single use downloads, or media file hosting.
+ * For time based expiry the handler will only remove itself if a user connects to the handler after the time expires.
  *
  * @see HttpHandler
  * @see SimpleHttpServer#getRandomContext()
  * @see SimpleHttpServer#getRandomContext(String)
  * @since 03.03.00
- * @version 03.05.00
+ * @version 03.05.02
  * @author Ktt Development
  */
 public class TemporaryHandler implements HttpHandler {
 
+    private SimpleHttpServer server = null;
     private final HttpHandler handler;
 
     private boolean hasExpiry;
@@ -30,23 +32,57 @@ public class TemporaryHandler implements HttpHandler {
      *
      * @param handler handler to use
      *
+     * @see HttpHandler
      * @since 03.03.00
      * @author Ktt Development
      */
     public TemporaryHandler(final HttpHandler handler){
         this.handler = handler;
     }
 
+    /**
+     * Creates a temporary handler that removes itself after the first connection.
+     *
+     * @param server simple http server; required if you want {@link SimpleHttpServer#getContexts()} to work properly
+     * @param handler handler to use
+     *
+     * @see SimpleHttpServer
+     * @see HttpHandler
+     * @since 03.05.02
+     */
+    public TemporaryHandler(final SimpleHttpServer server, final HttpHandler handler){
+        this.server = server;
+        this.handler = handler;
+    }
+
     /**
      * Creates a temporary handler that removes itself after the first connection, or after the time expires.
      *
      * @param handler handler to use
      * @param maxTime how long the handler may exists for in milliseconds
      *
+     * @see HttpHandler
      * @since 03.03.00
      * @author Ktt Development
      */
     public TemporaryHandler(final HttpHandler handler, final long maxTime){
+        this(null,handler,maxTime);
+    }
+
+    /**
+     * Creates a temporary handler that removes itself after the first connection, or after the time expires.
+     *
+     * @param server simple http server; required if you want {@link SimpleHttpServer#getContexts()} to work properly
+     * @param handler handler to use
+     * @param maxTime how long the handler may exists for in milliseconds
+     *
+     * @see SimpleHttpServer
+     * @see HttpHandler
+     * @since 03.05.02
+     * @author Ktt Development
+     */
+    public TemporaryHandler(final SimpleHttpServer server, final HttpHandler handler, final long maxTime){
+        this.server = server;
         this.handler = handler;
 
         hasExpiry = true;
@@ -59,7 +95,10 @@ public TemporaryHandler(final HttpHandler handler, final long maxTime){
     public final void handle(final HttpExchange exchange) throws IOException{
         if(!hasExpiry || System.currentTimeMillis() < expiry)
             handler.handle(exchange);
-        exchange.getHttpContext().getServer().removeContext(exchange.getHttpContext());
+        if(server == null)
+            exchange.getHttpContext().getServer().removeContext(exchange.getHttpContext());
+        else
+            server.removeContext(exchange.getHttpContext());
         exchange.close();
     }