Small spellfixes and refactoring

Author: simonwep

.gitignore

@@ -25,6 +25,4 @@ hs_err_pid*
 
 *.idea
 *.iml
-
-test/
-_psd
+/_psd

src/examples/Examples.java

@@ -82,7 +82,7 @@ public static void main(String[] args) throws IOException {
 
     app.get("/session", (req, res) -> {
 
-      /**
+      /*
        * CookieSession named his data "Session Cookie" which is
        * an SessionCookie so we can Cast it.
        */

src/examples/PortMiddleware.java

@@ -23,7 +23,7 @@ public void handle(Request req, Response res) {
     // Add the port to the request middleware map
     req.addMiddlewareContent(this, port);
 
-    /**
+    /*
      * After that you can use this middleware by call:
      *	app.use(new PortMiddleware());
      *

src/express/Express.java

@@ -1,6 +1,5 @@
 package express;
 
-import com.sun.istack.internal.NotNull;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
@@ -52,7 +51,7 @@ public class Express implements Router {
    *
    * @param hostname The host name
    */
-  public Express(@NotNull String hostname) {
+  public Express(String hostname) {
     this.hostname = hostname;
   }
 
@@ -61,7 +60,7 @@ public Express(@NotNull String hostname) {
    *
    * @param httpsConfigurator The HttpsConfigurator for https
    */
-  public Express(@NotNull HttpsConfigurator httpsConfigurator) {
+  public Express(HttpsConfigurator httpsConfigurator) {
     this.httpsConfigurator = httpsConfigurator;
   }
 
@@ -72,7 +71,7 @@ public Express(@NotNull HttpsConfigurator httpsConfigurator) {
    * @param hostname          The host name
    * @param httpsConfigurator The HttpsConfigurator for https
    */
-  public Express(@NotNull String hostname, HttpsConfigurator httpsConfigurator) {
+  public Express(String hostname, HttpsConfigurator httpsConfigurator) {
     this.hostname = hostname;
     this.httpsConfigurator = httpsConfigurator;
   }
@@ -96,7 +95,7 @@ public boolean isSecure() {
    * @param param   The parameter name.
    * @param request An request handler.
    */
-  public void onParam(@NotNull String param, @NotNull HttpRequest request) {
+  public void onParam(String param, HttpRequest request) {
     PARAMETER_LISTENER.put(param, request);
   }
 
@@ -133,7 +132,7 @@ public Object get(String key) {
    * @param executor The new executor.
    * @throws IOException If the server is currently running
    */
-  public void setExecutor(@NotNull Executor executor) throws IOException {
+  public void setExecutor(Executor executor) throws IOException {
     if (httpServer != null) {
       throw new IOException("Cannot set the executor after the server has starderd!");
     } else {
@@ -146,7 +145,7 @@ public void setExecutor(@NotNull Executor executor) throws IOException {
    *
    * @param router The router.
    */
-  public void use(@NotNull ExpressRouter router) {
+  public void use(ExpressRouter router) {
     this.HANDLER.combine(router.getHandler());
     this.WORKER.addAll(router.getWorker());
   }
@@ -158,7 +157,7 @@ public void use(@NotNull ExpressRouter router) {
    * @param router The router.
    */
   @SuppressWarnings("unchecked")
-  public void use(@NotNull String root, @NotNull ExpressRouter router) {
+  public void use(String root, ExpressRouter router) {
 
     router.getHandler().forEach(fl -> fl.getFilter().forEach(layer -> {
       ((FilterImpl) layer).setRoot(root);
@@ -168,100 +167,95 @@ public void use(@NotNull String root, @NotNull ExpressRouter router) {
     this.WORKER.addAll(router.getWorker());
   }
 
-  public void use(@NotNull HttpRequest middleware) {
+  public void use(HttpRequest middleware) {
     addMiddleware("*", "*", middleware);
   }
 
-  public void use(@NotNull String context, @NotNull HttpRequest middleware) {
+  public void use(String context, HttpRequest middleware) {
     addMiddleware("*", context, middleware);
   }
 
-  public void use(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest middleware) {
+  public void use(String context, String requestMethod, HttpRequest middleware) {
     addMiddleware(requestMethod.toUpperCase(), context, middleware);
   }
 
   // Internal service to handle middleware
-  private void addMiddleware(@NotNull String requestMethod, @NotNull String context, HttpRequest middleware) {
+  private void addMiddleware(String requestMethod, String context, HttpRequest middleware) {
     if (middleware instanceof FilterTask) {
       WORKER.add(new FilterWorker((FilterTask) middleware));
     }
 
     HANDLER.add(0, new FilterImpl(requestMethod, context, middleware));
   }
 
-  public void all(@NotNull HttpRequest request) {
+  public void all(HttpRequest request) {
     HANDLER.add(1, new FilterImpl("*", "*", request));
   }
 
-  public void all(@NotNull String context, @NotNull HttpRequest request) {
+  public void all(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("*", context, request));
   }
 
-  public void all(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest request) {
+  public void all(String context, String requestMethod, HttpRequest request) {
     HANDLER.add(1, new FilterImpl(requestMethod, context, request));
   }
 
-  public void get(@NotNull String context, @NotNull HttpRequest request) {
+  public void get(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("GET", context, request));
   }
 
-  public void post(@NotNull String context, @NotNull HttpRequest request) {
+  public void post(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("POST", context, request));
   }
 
-  public void put(@NotNull String context, @NotNull HttpRequest request) {
+  public void put(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("PUT", context, request));
   }
 
-  public void delete(@NotNull String context, @NotNull HttpRequest request) {
+  public void delete(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("DELETE", context, request));
   }
 
-  public void patch(@NotNull String context, @NotNull HttpRequest request) {
+  public void patch(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("PATCH", context, request));
   }
 
   /**
    * Start the HTTP-Server on port 80.
-   * This method is asyncronous so be sure to add an listener or keep it in mind!
-   *
-   * @throws IOException - If an IO-Error occurs, eg. the port is already in use.
+   * This method is asynchronous so be sure to add an listener or keep it in mind!
    */
-  public void listen() throws IOException {
+  public void listen() {
     listen(null, 80);
   }
 
   /**
    * Start the HTTP-Server on a specific port
-   * This method is asyncronous so be sure to add an listener or keep it in mind!
+   * This method is asynchronous so be sure to add an listener or keep it in mind!
    *
    * @param port The port.
-   * @throws IOException - If an IO-Error occurs, eg. the port is already in use.
    */
-  public void listen(int port) throws IOException {
+  public void listen(int port) {
     listen(null, port);
   }
 
   /**
    * Start the HTTP-Server on port 80.
-   * This method is asyncronous so be sure to add an listener or keep it in mind!
+   * This method is asynchronous so be sure to add an listener or keep it in mind!
    *
    * @param onStart An listener which will be fired after the server is stardet.
-   * @throws IOException - If an IO-Error occurs, eg. the port is already in use.
    */
-  public void listen(ExpressListener onStart) throws IOException {
+  public void listen(ExpressListener onStart) {
     listen(onStart, 80);
   }
 
   /**
    * Start the HTTP-Server on a specific port.
-   * This method is asyncronous so be sure to add an listener or keep it in mind!
+   * This method is asynchronous so be sure to add an listener or keep it in mind!
    *
    * @param onStart An listener which will be fired after the server is stardet.
    * @param port    The port.
-   * @throws IOException - If an IO-Error occurs, eg. the port is already in use.
    */
-  public void listen(ExpressListener onStart, int port) throws IOException {
+  public void listen(ExpressListener onStart, int port) {
     new Thread(() -> {
       try {
         // Fire worker threads

src/express/ExpressRouter.java

@@ -1,6 +1,5 @@
 package express;
 
-import com.sun.istack.internal.NotNull;
 import express.filter.FilterImpl;
 import express.filter.FilterLayerHandler;
 import express.filter.FilterTask;
@@ -24,55 +23,55 @@ public class ExpressRouter implements Router {
     HANDLER = new FilterLayerHandler(2);
   }
 
-  public void use(@NotNull HttpRequest middleware) {
+  public void use(HttpRequest middleware) {
     addMiddleware("*", "*", middleware);
   }
 
-  public void use(@NotNull String context, @NotNull HttpRequest middleware) {
+  public void use(String context, HttpRequest middleware) {
     addMiddleware("*", context, middleware);
   }
 
-  public void use(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest middleware) {
+  public void use(String context, String requestMethod, HttpRequest middleware) {
     addMiddleware(requestMethod.toUpperCase(), context, middleware);
   }
 
-  private void addMiddleware(@NotNull String requestMethod, @NotNull String context, HttpRequest middleware) {
+  private void addMiddleware(String requestMethod, String context, HttpRequest middleware) {
     if (middleware instanceof FilterTask) {
       WORKER.add(new FilterWorker((FilterTask) middleware));
     }
 
     HANDLER.add(0, new FilterImpl(requestMethod, context, middleware));
   }
 
-  public void all(@NotNull HttpRequest request) {
+  public void all(HttpRequest request) {
     HANDLER.add(1, new FilterImpl("*", "*", request));
   }
 
-  public void all(@NotNull String context, @NotNull HttpRequest request) {
+  public void all(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("*", context, request));
   }
 
-  public void all(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest request) {
+  public void all(String context, String requestMethod, HttpRequest request) {
     HANDLER.add(1, new FilterImpl(requestMethod, context, request));
   }
 
-  public void get(@NotNull String context, @NotNull HttpRequest request) {
+  public void get(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("GET", context, request));
   }
 
-  public void post(@NotNull String context, @NotNull HttpRequest request) {
+  public void post(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("POST", context, request));
   }
 
-  public void put(@NotNull String context, @NotNull HttpRequest request) {
+  public void put(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("PUT", context, request));
   }
 
-  public void delete(@NotNull String context, @NotNull HttpRequest request) {
+  public void delete(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("DELETE", context, request));
   }
 
-  public void patch(@NotNull String context, @NotNull HttpRequest request) {
+  public void patch(String context, HttpRequest request) {
     HANDLER.add(1, new FilterImpl("PATCH", context, request));
   }