Merge pull request #61 from Ktt-Development/preload2walk-param@f69264b

Remove depreciated preload methods

Author: Katsute

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

@@ -337,33 +337,6 @@ public final void addDirectory(final File directory){
         addDirectory("",directory,directory.getName(),ByteLoadingOption.LIVELOAD,false);
     }
 
-    /**
-     * Adds a directory to the handler and preloads the files' bytes.
-     *
-     * @deprecated use {@link #addDirectory(File, ByteLoadingOption)}
-     * @param directory directory to add
-     * @param preload whether to read the bytes now or at the exchange
-     *
-     * @see FileHandlerAdapter
-     * @see #addDirectory(File)
-
-     * @see #addDirectory(File, String)
-     * @see #addDirectory(File, String, boolean)
-
-     * @see #addDirectory(String, File)
-     * @see #addDirectory(String, File, boolean)
-
-     * @see #addDirectory(String, File, String)
-     * @see #addDirectory(String, File, String, boolean)
-
-     * @since 02.00.00
-     * @author Ktt Development
-     */
-    @Deprecated
-    public final void addDirectory(final File directory, final boolean preload){ // todo: after depreciation replace with walk param
-        addDirectory("",directory,directory.getName(),preload ? ByteLoadingOption.PRELOAD : ByteLoadingOption.LIVELOAD,false);
-    }
-
     /**
      * Adds a directory to the handler.
      *
@@ -439,34 +412,6 @@ public final void addDirectory(final File directory, final String directoryName)
         addDirectory("",directory,directoryName,ByteLoadingOption.LIVELOAD,false);
     }
 
-    /**
-     * Adds a directory with a specified name to the handler and preloads the bytes.
-     *
-     * @deprecated use {@link #addDirectory(File, String, ByteLoadingOption)}
-     * @param directory directory to add
-     * @param directoryName directory name
-     * @param preload whether to read the bytes now or at the exchange
-     *
-     * @see FileHandlerAdapter
-     * @see #addDirectory(File)
-     * @see #addDirectory(File, boolean)
-
-     * @see #addDirectory(File, String)
-
-     * @see #addDirectory(String, File)
-     * @see #addDirectory(String, File, boolean)
-
-     * @see #addDirectory(String, File, String)
-     * @see #addDirectory(String, File, String, boolean)
-
-     * @since 02.00.00
-     * @author Ktt Development
-     */
-    @Deprecated // todo: convert to boolean to walk after depreciation
-    public final void addDirectory(final File directory, final String directoryName, final boolean preload){ // todo: after depreciation replace with walk param
-        addDirectory("",directory,directoryName,preload ? ByteLoadingOption.PRELOAD : ByteLoadingOption.LIVELOAD,false);
-    }
-
     /**
      * Adds a directory to the handler with a specified name.
      *
@@ -544,34 +489,6 @@ public final void addDirectory(final String context, final File directory){
         addDirectory(context,directory,directory.getName(),ByteLoadingOption.LIVELOAD,false);
     }
 
-    /**
-     * Adds a directory at a specified context to the handler and preloads the bytes.
-     *
-     * @deprecated use {@link #addDirectory(String, File, ByteLoadingOption)}
-     * @param context context to use
-     * @param directory directory to add
-     * @param preload whether to read the bytes now or at the exchange
-     *
-     * @see FileHandlerAdapter
-     * @see #addDirectory(File)
-     * @see #addDirectory(File, boolean)
-
-     * @see #addDirectory(File, String)
-     * @see #addDirectory(File, String, boolean)
-
-     * @see #addDirectory(String, File)
-
-     * @see #addDirectory(String, File, String)
-     * @see #addDirectory(String, File, String, boolean)
-
-     * @since 02.00.00
-     * @author Ktt Development
-     */
-    @Deprecated // todo: after depreciation convert boolean to walk
-    public final void addDirectory(final String context, final File directory, final boolean preload){ // todo: after depreciation replace with walk param
-        addDirectory(context,directory,directory.getName(),preload ? ByteLoadingOption.PRELOAD : ByteLoadingOption.LIVELOAD,false);
-    }
-
     /**
      * Adds a directory to the handler at a specified context.
      *
@@ -650,35 +567,6 @@ public final void addDirectory(final String context, final File directory, final
         addDirectory(context,directory,directoryName,ByteLoadingOption.LIVELOAD,false);
     }
 
-    /**
-     * Adds a directory at a specified context with a specified name and preloads the bytes.
-     *
-     * @deprecated use {@link #addDirectory(String, File, String, ByteLoadingOption)}
-     * @param context context to use
-     * @param directory directory to add
-     * @param directoryName directory name
-     * @param preload whether to read the bytes now or at the exchange
-     *
-     * @see FileHandlerAdapter
-     * @see #addDirectory(File)
-     * @see #addDirectory(File, boolean)
-
-     * @see #addDirectory(File, String)
-     * @see #addDirectory(File, String, boolean)
-
-     * @see #addDirectory(String, File)
-     * @see #addDirectory(String, File, boolean)
-
-     * @see #addDirectory(String, File, String)
-
-     * @since 02.00.00
-     * @author Ktt Development
-     */
-    @Deprecated // todo: after depreciation convert boolean to walk
-    public final void addDirectory(final String context, final File directory, final String directoryName, final boolean preload){ // todo: after depreciation replace with walk param
-        addDirectory(context,directory,directoryName,preload ? ByteLoadingOption.PRELOAD : ByteLoadingOption.LIVELOAD,false);
-    }
-
     /**
      * Adds a directory to the handler at a specified context with a specified name.
      *

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

@@ -1,13 +1,13 @@
 package com.kttdevelopment.simplehttpserver.handler;
 
-import com.kttdevelopment.simplehttpserver.*;
+import com.kttdevelopment.simplehttpserver.HttpSession;
+import com.kttdevelopment.simplehttpserver.HttpSessionHandler;
 import com.sun.net.httpserver.HttpExchange;
 
-import java.util.*;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Predicate;
 
 /**
  * Limits connections per http session. This can be used to limit simultaneous downloads.
@@ -93,9 +93,9 @@ public int getMaxConnections(final HttpSession session, final HttpExchange excha
     @Override
     public String toString(){
         return
-            "SessionThrottler"              + '{' +
-            "sessionHandler"                + '=' +     sessionHandler          + ", " +
-            "connections"                   + '=' +     connections.toString()  +
+            "SessionThrottler"  + '{' +
+            "sessionHandler"    + '=' +     sessionHandler          + ", " +
+            "connections"       + '=' +     connections.toString()  +
             '}';
     }