Important change to the Route and Router!

Route and Router does no longer require a "path" argument in their constructor! This will be set by using WebserverBuilder#addRoute(String, Route), WebserverBuilder#addRouter(String, Router) or Router#addRoute(String, Route)

Removed Debug messages in Webserver#handle
Made Webserver#handle compatible with the new Route and Router
updated the version to 1.2
updated the README.md to explain the new Route and Router

Author: Joshua

README.md

@@ -14,7 +14,7 @@ You can also download the newest version from the [releases](https://github.com/
 <dependency>
     <groupId>de.joshicodes</groupId>
     <artifactId>webapi</artifactId>
-    <version>1.1.2</version>
+    <version>1.2</version>
 </dependency>
 ```
 
@@ -34,17 +34,15 @@ To add a new route, create a new class that extends the `Route` class and add it
 The `Route` class has a constructor that takes a path as a parameter. The path is the path that the route will be available on.
 
 ```java
+        // This will create a new route that is available on /testRoute
         builder.addRoute(
-                // You can also create a new Route object and add it here
-        
-                // This will create a new route that is available on /testRoute
-                new Route("/testRoute") {
+                "/testRoute",
+                new Route() {
                     @Override
                     public ResponseData handle(RequestData request) {
                         // Do something and return a ResponseData object
                     }
                 }
-                
         );
 ```
 You can also add multiple routes at once using `builder.addRoutes(Route...)`.
@@ -54,27 +52,35 @@ To register a new Router, you can use `WebserverBuilder#addRouter(Router)`.
 The `Router` class has a constructor that takes a path as a parameter. The path is the base path that the router will be available on.
 
 ```java
-        // This will create a new router that is available on /testRouter
-        Router router = new Router("/testRouter");
+        // This will create a new router without any path, that will be set by registering it to the builder
+        // This router will be available on /testRouter
+        Router router = new Router();
 
         // This will create a new route that is available on /testRouter
         // If there is no Route for "/" in the Router, "/testRouter" will return a 404 
-        router.addRoute(new Route("/") {
-            @Override
-            public ResponseData handle(RequestData request) {
-                // Do something and return a ResponseData object
-            }
-        });
+        router.addRoute(
+                "/",
+                new Route() {
+                    @Override
+                    public ResponseData handle(RequestData request) {
+                        // Do something and return a ResponseData object
+                    }
+                }
+        );
 
         // This will create a new route that is available on /testRouter/testRoute
-        router.addRoute(new Route("/testRoute") {
-            @Override
-            public ResponseData handle(RequestData request) {
-                // Do something and return a ResponseData object
-            }
-        });
+        router.addRoute(
+                "/testRoute",
+                new Route() {
+                    @Override
+                    public ResponseData handle(RequestData request) {
+                        // Do something and return a ResponseData object
+                    }
+                }
+        );
 
-        builder.addRouter(router);
+        // This will register the router to the builder
+        builder.addRouter("/testRouter", router);
 ```
 
 The `Route` class has a method called `handle(RequestData request)`. This method is called when a request is made to the route. The `RequestData` object contains information about the request. The `handle` Method should return a ResponseData object.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.joshicodes</groupId>
     <artifactId>webapi</artifactId>
-    <version>1.1.2</version>
+    <version>1.2</version>
 
     <build>
         <plugins>
@@ -33,6 +33,15 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>javadoc</goal>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <source>17</source>
                     <doclint>none</doclint>

src/main/java/de/joshicodes/webapi/Webserver.java

@@ -24,8 +24,7 @@ public class Webserver {
 
     private HttpServer server;
 
-    private final List<Router> routers;
-    private final List<Route> routes;
+    private final HashMap<String, Router> routers;
     private final HashMap<Integer, ErrorRoute> errorHandlers;
 
     private final String path;
@@ -34,7 +33,6 @@ public class Webserver {
         this.host = builder.getHost();
         this.port = builder.getPort();
         this.routers = builder.getRouters();
-        this.routes = builder.getRoutes();
         this.errorHandlers = builder.getErrorHandlers();
         this.path = builder.getPath();
         create();
@@ -64,12 +62,14 @@ public void stop() {
 
     private void handle(URI uri, HttpExchange exchange) throws IOException {
         // Check if there is a router for the path
-        for (Router router : routers) {
-            System.out.println(uri.getPath() + " " + router.getPath());
-            if(uri.getPath().startsWith(router.getPath())) {
-                String path = uri.getPath().replace(router.getPath(), "");
-                if(!path.endsWith("/"))
-                    path = path.concat("/");
+        for (String routePath : routers.keySet()) {
+            Router router = routers.get(routePath);
+            if(uri.getPath().startsWith(routePath)) {
+                String path = uri.getPath().replace(routePath, "");
+                if(!path.startsWith("/"))
+                    path = "/" + path;  // Add slash if not present
+                if(path.endsWith("/") && !path.equals("/"))
+                    path = path.substring(0, path.length() - 1);  // Remove last slash
                 Route request = router.getRoute(path);
                 if(request == null) {
                     continue;
@@ -81,13 +81,17 @@ private void handle(URI uri, HttpExchange exchange) throws IOException {
             }
         }
         // Check if there is a route for the path
-        for (Route request : routes) {
-            if (request.getPath().equals(uri.getPath())) {
+        Router defaultRouter = routers.get("/");
+        if(defaultRouter != null) {
+            String path = uri.getPath();
+            if(!path.startsWith("/"))
+                path = "/" + path;
+            if(defaultRouter.hasRoute(path)) {
+                Route request = defaultRouter.getRoute(path);
                 if(handleRoute(request, exchange)) {
                     return;
                 }
             }
-            continue;
         }
         if(errorHandlers.containsKey(HttpErrorCode.NOT_FOUND)) {
             ResponseData response = errorHandlers.get(HttpErrorCode.NOT_FOUND).handle(new RequestData(exchange));

src/main/java/de/joshicodes/webapi/WebserverBuilder.java

@@ -11,34 +11,36 @@
 
 public class WebserverBuilder {
 
-    private final List<Router> routers;
-    private final List<Route> routes;
+    private final HashMap<String, Router> routers;
     private final HashMap<Integer, ErrorRoute> errorHandlers;
     private String host;
     private int port = -1;
 
     private String path;
 
+    private Router defaultRouter;
+
     public WebserverBuilder() {
-        this.routers = new ArrayList<>();
-        this.routes = new ArrayList<>();
+        this.routers = new HashMap<>();
         this.errorHandlers = new HashMap<>();
         this.host = "0.0.0.0";
-        path = null;
-    }
-
-    public WebserverBuilder addRouter(Router router) {
-        this.routers.add(router);
-        return this;
+        path = "/";
     }
 
-    public WebserverBuilder addRoute(Route route) {
-        this.routes.add(route);
+    public WebserverBuilder addRouter(String path, Router router) {
+        if(!path.startsWith("/"))
+            path = "/" + path;
+        this.routers.put(path, router);
         return this;
     }
 
-    public WebserverBuilder addRoutes(Route... routes) {
-        this.routes.addAll(Arrays.asList(routes));
+    public WebserverBuilder addRoute(String path, Route route) {
+        if(!path.startsWith("/"))
+            path = "/" + path;
+        if(defaultRouter == null)
+            defaultRouter = new Router();
+        defaultRouter.addRoute(path, route);
+        routers.put(this.path, defaultRouter);
         return this;
     }
 
@@ -76,14 +78,10 @@ public int getPort() {
         return port;
     }
 
-    public List<Router> getRouters() {
+    public HashMap<String, Router> getRouters() {
         return routers;
     }
 
-    public List<Route> getRoutes() {
-        return routes;
-    }
-
     public HashMap<Integer, ErrorRoute> getErrorHandlers() {
         return errorHandlers;
     }

src/main/java/de/joshicodes/webapi/router/Router.java

@@ -4,50 +4,40 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 public class Router {
 
-    private final String path;
-    private final List<Route> routes;
+    private final HashMap<String, Route> routes;
 
-    public Router(String path) {
-        this.path = path;
-        this.routes = new ArrayList<>();
+    public Router() {
+        this.routes = new HashMap<>();
     }
 
-    public void addRoute(Route route) {
-        this.routes.add(route);
+    public void addRoute(String path, Route route) {
+        this.routes.put(path, route);
     }
 
-    public void addRoutes(Route... routes) {
-        this.routes.addAll(Arrays.asList(routes));
+    public void addRoutes(HashMap<String, Route> routes) {
+        this.routes.putAll(routes);
     }
 
-    public String getPath() {
-        return path;
-    }
-
-    public List<Route> getRoutes() {
+    public HashMap<String, Route> getRoutes() {
         return routes;
     }
 
-    public boolean hasRoute(String path) {
-        for (Route route : routes) {
-            if (route.getPath().equals(path)) {
+    public boolean hasRoute(String requestPath) {
+        for (String path : routes.keySet()) {
+            if (path.equalsIgnoreCase(requestPath)) {
                 return true;
             }
         }
         return false;
     }
 
     public Route getRoute(String path) {
-        for (Route route : routes) {
-            if (route.getPath().equals(path)) {
-                return route;
-            }
-        }
-        return null;
+        return routes.get(path);
     }
 
 }

src/main/java/de/joshicodes/webapi/router/route/ErrorRoute.java

@@ -3,7 +3,7 @@
 public abstract class ErrorRoute extends Route {
 
     public ErrorRoute() {
-        super(null);
+        super();
     }
 
 }

src/main/java/de/joshicodes/webapi/router/route/Route.java

@@ -5,16 +5,8 @@
 
 public abstract class Route {
 
-    private String path;
-
-    public Route(String path) {
-        this.path = path;
-    }
+    public Route() {}
 
     abstract public ResponseData handle(RequestData request);
 
-    public String getPath() {
-        return path;
-    }
-
 }