Add remove methods to FileHandler (#111)

* version

* Add #110; required tests

* Add additional remove methods

- context, file
- file
- context, directory
- directory

Author: Katsute

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>com.kttdevelopment</groupId>
     <artifactId>simplehttpserver</artifactId>
-    <version>4.0.0</version>
+    <version>4.1.0</version>
 
     <name>simplehttpserver</name>
     <description>📕 SimpleHttpServer :: Simplified implementation of the sun http server :: Simplified handlers to execute complex operations</description>

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

@@ -26,7 +26,7 @@
  * @see SimpleHttpHandler
  * @see com.sun.net.httpserver.HttpHandler
  * @since 02.00.00
- * @version 4.0.0
+ * @version 4.1.0
  * @author Ktt Development
  */
 public class FileHandler implements SimpleHttpHandler {
@@ -791,6 +791,92 @@ public final void addDirectory(final String context, final File directory, final
         }catch(final UncheckedIOException ignored){}
     }
 
+//
+
+    /**
+     * Removes a file from the handler at a specified context.
+     *
+     * @param full_context context and file name
+     *
+     * @see #removeFile(String, File)
+     * @see #removeFile(File)
+     * @since 4.1.0
+     * @author Ktt Development
+     */
+    public final void removeFile(final String full_context){
+        files.remove(ContextUtil.getContext(full_context, true, false));
+    }
+
+    /**
+     * Removes a file from the handler.
+     *
+     * @param file file to remove
+     *
+     * @see #removeFile(String)
+     * @see #removeFile(String, File)
+     */
+    public final void removeFile(final File file){
+        removeFile(adapter.getName(file));
+    }
+
+    /**
+     * Removes a file from the handler at a specified context.
+     *
+     * @param context context
+     * @param file file
+     *
+     * @see #removeFile(String)
+     * @see #removeFile(File)
+     * @since 4.1.0
+     * @author Ktt Development
+     */
+    public final void removeFile(final String context, final File file){
+        removeFile(ContextUtil.joinContexts(true, false, context, adapter.getName(file)));
+    }
+
+    /**
+     * Removes a directory from the handler at a specified context.
+     *
+     * @param full_context context and directory name
+     *
+     * @see #removeDirectory(File)
+     * @see #removeDirectory(String, File)
+     * @since 4.1.0
+     * @author Ktt Development
+     */
+    public final void removeDirectory(final String full_context){
+        directories.remove(ContextUtil.getContext(full_context, true, false));
+    }
+
+    /**
+     * Removes a directory from the handler.
+     *
+     * @param directory directory to remove
+     *
+     * @see #removeDirectory(String)
+     * @see #removeDirectory(String, File)
+     * @since 4.1.0
+     * @author Ktt Development
+     */
+    public final void removeDirectory(final File directory){
+        removeDirectory(getName(directory));
+    }
+
+    /**
+     * Removes a directory from the handler at a specified context.
+     *
+     * @param context context
+     * @param directory directory
+     *
+     * @see #removeDirectory(String)
+     * @see #removeDirectory(File)
+     * @since 4.1.0
+     * @author Ktt Development
+     */
+    public final void removeDirectory(final String context, final File directory){
+       removeDirectory(ContextUtil.joinContexts(true, false, context, getName(directory)));
+    }
+
 //
 
     private String getName(final File file){

…handlers/file/FileHandlerAddDirTest.java …er/handlers/file/FileHandlerDirTest.javasrc/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddDirTest.java renamed to src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerDirTest.java src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddDirTest.java renamed to src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerDirTest.java

@@ -14,14 +14,14 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
-public final class FileHandlerAddDirTest {
+public final class FileHandlerDirTest {
 
     @TempDir
     public final File dir = new File(UUID.randomUUID().toString());
 
     @SuppressWarnings("SpellCheckingInspection")
     @Test
-    public final void addDirectoryTestsNoWalk() throws IOException, InterruptedException{
+    public final void addAndRemoveTest() throws IOException, InterruptedException{
         final int port = 8080;
         final SimpleHttpServer server   = SimpleHttpServer.create(port);
         final FileHandler handler       = new FileHandler();
@@ -41,6 +41,7 @@ public final void addDirectoryTestsNoWalk() throws IOException, InterruptedExcep
         Files.write(walk.toPath(), testContent.getBytes());
 
         final String context = "";
+        final String empty = handler.toString();
 
         handler.addDirectory(dir); // test file & directory read
         handler.addDirectory(contextNoName, dir);
@@ -102,6 +103,12 @@ public final void addDirectoryTestsNoWalk() throws IOException, InterruptedExcep
         }
 
         server.stop();
+
+        handler.removeDirectory(dir); // test file & directory read
+        handler.removeDirectory(contextNoName, dir);
+        handler.removeDirectory(dirNewName);
+        handler.removeDirectory(contextWName + '/' + dirNewName);
+        Assertions.assertEquals(empty, handler.toString());
     }
 
 }

…er/handlers/file/FileHandlerAddTest.java …r/handlers/file/FileHandlerFileTest.javasrc/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddTest.java renamed to src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerFileTest.java src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddTest.java renamed to src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerFileTest.java

@@ -15,14 +15,14 @@
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 
-public final class FileHandlerAddTest {
+public final class FileHandlerFileTest {
 
     @TempDir
     public final File dir = new File(UUID.randomUUID().toString());
 
     @SuppressWarnings("SpellCheckingInspection")
     @Test
-    public final void addFileTests() throws IOException{
+    public final void addAndRemoveTest() throws IOException{
         final int port = 8080;
         final SimpleHttpServer server = SimpleHttpServer.create(port);
         final FileHandler handler     = new FileHandler();
@@ -32,16 +32,12 @@ public final void addFileTests() throws IOException{
         Arrays.stream(ByteLoadingOption.values())
             .filter(o -> o != ByteLoadingOption.CACHELOAD)
             .forEach(blop -> files.put(new File(dir, blop.name()), blop));
-
+        final String empty = handler.toString();
         // initial write
         final String testContent = String.valueOf(System.currentTimeMillis());
         files.forEach((file, loadingOption) -> {
-            try{
-                Files.write(file.toPath(), testContent.getBytes());
-                handler.addFile(file, loadingOption);
-            }catch(final IOException e){
-                e.printStackTrace();
-            }
+            Assertions.assertDoesNotThrow(() ->  Files.write(file.toPath(), testContent.getBytes()));
+            handler.addFile(file, loadingOption);
         });
 
         server.createContext(context, handler);
@@ -79,6 +75,9 @@ public final void addFileTests() throws IOException{
         });
 
         server.stop();
+
+        files.forEach((file, loadingOption) -> handler.removeFile(file));
+        Assertions.assertEquals(empty, handler.toString());
     }
 
 }

…ndlers/file/FileHandlerAddFilesTest.java …/handlers/file/FileHandlerFilesTest.javasrc/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddFilesTest.java renamed to src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerFilesTest.java src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerAddFilesTest.java renamed to src/test/java/com/kttdevelopment/simplehttpserver/handlers/file/FileHandlerFilesTest.java

@@ -14,13 +14,13 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
-public final class FileHandlerAddFilesTest {
+public final class FileHandlerFilesTest {
 
     @TempDir
     public final File dir = new File(UUID.randomUUID().toString());
 
     @Test
-    public final void addFilesTests() throws IOException, ExecutionException, InterruptedException{
+    public final void addAndRemoveTest() throws IOException, ExecutionException, InterruptedException{
         final int port = 8080;
         final SimpleHttpServer server       = SimpleHttpServer.create(port);
         final String override               = "override";
@@ -44,6 +44,8 @@ public final String getName(final File file){
             new File(dir, UUID.randomUUID().toString() + ".txt")
         };
 
+        final String empty = handler.toString();
+
         for(final File file : files)
             Assertions.assertTrue(file.createNewFile());
 
@@ -79,6 +81,13 @@ public final String getName(final File file){
         }
 
         server.stop();
+
+        for(final File file : files){
+            handler.removeFile(file);
+            handler.removeFile(altContext, file);
+        }
+
+        Assertions.assertEquals(empty, handler.toString());
     }
 
 }