bug fixes

Author: Katsute

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

@@ -55,6 +55,6 @@ abstract class ConnectionThrottler {
      * @since 03.05.00
      * @author Ktt Development
      */
-    abstract int getMaxConnections(final HttpExchange exchange);
+    public abstract int getMaxConnections(final HttpExchange exchange);
 
 }

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

@@ -13,8 +13,9 @@
  *
  * @see HttpExchange
  * @see ThrottledHandler
- * @see ServerThrottler
+ * @see ServerExchangeThrottler
  * @see SessionThrottler
+ * @see ServerSessionThrottler
  * @since 03.05.00
  * @version 03.05.00
  * @author Ktt Development
@@ -23,6 +24,14 @@ public class ExchangeThrottler extends ConnectionThrottler {
 
     private final Map<InetAddress,AtomicInteger> connections = new ConcurrentHashMap<>();
 
+    /**
+     * Creates a throttler with limits on each exchange.
+     *
+     * @since 03.05.00
+     * @author Ktt Development
+     */
+    public ExchangeThrottler(){ }
+
     @Override
     final boolean addConnection(final HttpExchange exchange){
         final InetAddress address = exchange.getRemoteAddress().getAddress();
@@ -54,7 +63,7 @@ final void deleteConnection(final HttpExchange exchange){
     }
 
     @Override
-    int getMaxConnections(final HttpExchange exchange){
+    public int getMaxConnections(final HttpExchange exchange){
         return -1;
     }
 

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

@@ -14,6 +14,8 @@
  * @see HttpExchange
  * @see ThrottledHandler
  * @see ExchangeThrottler
+ * @see SessionThrottler
+ * @see ServerSessionThrottler
  * @since 03.05.00
  * @version 03.05.00
  * @author Ktt Development
@@ -23,7 +25,27 @@ public class ServerExchangeThrottler extends ConnectionThrottler {
     private final Map<InetAddress, AtomicInteger> connections = new ConcurrentHashMap<>();
 
     private final AtomicInteger uConn = new AtomicInteger(0);
-    private final AtomicInteger uConnMax = new AtomicInteger(0);
+    private final AtomicInteger uConnMax = new AtomicInteger(-1);
+
+    /**
+     * Creates a throttler with connection limits on user and total connections.
+     *
+     * @since 03.05.00
+     * @author Ktt Development
+     */
+    public ServerExchangeThrottler(){ }
+
+    /**
+     * Creates a throttler with connection limits on user and total connections.
+     *
+     * @param maxConnections maximum allowed server connections
+     *
+     * @since 03.05.00
+     * @author Ktt Development
+     */
+    public ServerExchangeThrottler(final int maxConnections){
+        uConnMax.set(maxConnections);
+    }
 
     @Override
     final boolean addConnection(final HttpExchange exchange){
@@ -84,7 +106,7 @@ final void deleteConnection(final HttpExchange exchange){
     }
 
     @Override
-    int getMaxConnections(final HttpExchange exchange){
+    public int getMaxConnections(final HttpExchange exchange){
         return -1;
     }
 
@@ -98,7 +120,7 @@ int getMaxConnections(final HttpExchange exchange){
      * @since 03.05.00
      * @author Ktt Development
      */
-    boolean canIgnoreConnectionLimit(final HttpExchange exchange){
+    public boolean canIgnoreConnectionLimit(final HttpExchange exchange){
         return false;
     }
 

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

@@ -13,7 +13,10 @@
  * Limits connections per session to the server and total server sessions.
  *
  * @see HttpSession
+ * @see HttpSessionHandler
  * @see ThrottledHandler
+ * @see ExchangeThrottler
+ * @see ServerExchangeThrottler
  * @see SessionThrottler
  * @since 03.05.00
  * @version 03.05.00
@@ -25,12 +28,36 @@ public class ServerSessionThrottler extends ConnectionThrottler{
     private final Map<HttpSession,AtomicInteger> connections = new ConcurrentHashMap<>();
 
     private final AtomicInteger uConn = new AtomicInteger(0);
-    private final AtomicInteger uConnMax = new AtomicInteger(0);
+    private final AtomicInteger uConnMax = new AtomicInteger(-1);
 
+    /**
+     * Creates a throttler with limits on session and total connections.
+     *
+     * @param sessionHandler http session handler
+     *
+     * @see HttpSessionHandler
+     * @since 03.05.00
+     * @author Ktt Development
+     */
     public ServerSessionThrottler(final HttpSessionHandler sessionHandler){
         this.sessionHandler = sessionHandler;
     }
 
+    /**
+     * Creates a throttler with limits on session and total connections.
+     *
+     * @param sessionHandler http session handler
+     * @param maxConnections maximum allowed server connections
+     *
+     * @see HttpSessionHandler
+     * @since 03.05.00
+     * @author Ktt Development
+     */
+    public ServerSessionThrottler(final HttpSessionHandler sessionHandler, final int maxConnections){
+        this.sessionHandler = sessionHandler;
+        uConnMax.set(maxConnections);
+    }
+
     @Override
     final boolean addConnection(final HttpExchange exchange){
         final HttpSession session = sessionHandler.getSession(exchange);
@@ -90,7 +117,7 @@ final void deleteConnection(final HttpExchange exchange){
     }
 
     @Override
-    final int getMaxConnections(final HttpExchange exchange){
+    public final int getMaxConnections(final HttpExchange exchange){
         return getMaxConnections(sessionHandler.getSession(exchange),exchange);
     }
 
@@ -104,7 +131,7 @@ final int getMaxConnections(final HttpExchange exchange){
      * @since 03.05.00
      * @author Ktt Development
      */
-    int getMaxConnections(final HttpSession session, final HttpExchange exchange){
+    public int getMaxConnections(final HttpSession session, final HttpExchange exchange){
         return -1;
     }
 
@@ -119,7 +146,7 @@ int getMaxConnections(final HttpSession session, final HttpExchange exchange){
      * @since 03.05.00
      * @author Ktt Development
      */
-    boolean canIgnoreConnectionLimit(final HttpSession session, final HttpExchange exchange){
+    public boolean canIgnoreConnectionLimit(final HttpSession session, final HttpExchange exchange){
         return false;
     }
 

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

@@ -124,7 +124,7 @@ final void deleteConnection(final HttpExchange exchange){
     }
 
     @Override
-    int getMaxConnections(final HttpExchange exchange){
+    public int getMaxConnections(final HttpExchange exchange){
         return getMaxConnections();
     }
 

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

@@ -15,7 +15,8 @@
  * @see HttpSession
  * @see ThrottledHandler
  * @see ExchangeThrottler
- * @see ServerThrottler
+ * @see ServerExchangeThrottler
+ * @see ServerSessionThrottler
  * @since 03.03.00
  * @version 03.05.00
  * @author Ktt Development
@@ -43,7 +44,7 @@ public class SessionThrottler extends ConnectionThrottler {
      */
     public SessionThrottler(final HttpSessionHandler sessionHandler){
         this.sessionHandler = sessionHandler;
-        countsTowardsLimit = (exchange) -> true;
+        countsTowardsLimit = (exchange) -> true; // @depreciated
     }
 
     /**
@@ -158,7 +159,7 @@ final void deleteConnection(final HttpExchange exchange){
     }
 
     @Override
-    final int getMaxConnections(final HttpExchange exchange){
+    public final int getMaxConnections(final HttpExchange exchange){
         return getMaxConnections(sessionHandler.getSession(exchange),exchange);
     }
 
@@ -172,7 +173,7 @@ final int getMaxConnections(final HttpExchange exchange){
      * @since 03.05.00
      * @author Ktt Development
      */
-    int getMaxConnections(final HttpSession session, final HttpExchange exchange){
+    public int getMaxConnections(final HttpSession session, final HttpExchange exchange){
         return countsTowardsLimit.test(session) ? getMaxConnections() : -1;
     }
 
@@ -186,7 +187,7 @@ public String toString(){
             "sessions@depreciated"          + '=' +     connections.toString()  + ", " +
             "maxConnections@depreciated"    + '=' +     maxConnections.get()    + ", " +
             "sessionHandler"                + '=' +     sessionHandler          + ", " +
-            "connections"                   + '=' +     connections.toString()  + ", " +
+            "connections"                   + '=' +     connections.toString()  +
             '}';
     }