From a9d7494e1abf4547e4a27d671b35235ef38118e1 Mon Sep 17 00:00:00 2001 From: Daniel <59575049+lumijiez@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:58:28 +0300 Subject: [PATCH] route to record class, better actions --- .../java/org/lumijiez/core/http/HttpServer.java | 4 ++-- src/main/java/org/lumijiez/core/routing/Route.java | 14 +++----------- .../java/org/lumijiez/core/routing/Router.java | 3 ++- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/lumijiez/core/http/HttpServer.java b/src/main/java/org/lumijiez/core/http/HttpServer.java index c3bf00c..f6028a1 100644 --- a/src/main/java/org/lumijiez/core/http/HttpServer.java +++ b/src/main/java/org/lumijiez/core/http/HttpServer.java @@ -29,11 +29,11 @@ public class HttpServer { } public void GET(String path, HttpHandler handler) { - router.addRoute("GET", path, handler); + router.addRoute(HttpMethod.GET, path, handler); } public void POST(String path, HttpHandler handler) { - router.addRoute("POST", path, handler); + router.addRoute(HttpMethod.POST, path, handler); } public void start() { diff --git a/src/main/java/org/lumijiez/core/routing/Route.java b/src/main/java/org/lumijiez/core/routing/Route.java index b0660d9..ada6f1c 100644 --- a/src/main/java/org/lumijiez/core/routing/Route.java +++ b/src/main/java/org/lumijiez/core/routing/Route.java @@ -1,15 +1,7 @@ package org.lumijiez.core.routing; -public class Route { - private final HttpMethod method; - private final String path; - private final HttpHandler handler; +import org.lumijiez.core.http.HttpHandler; +import org.lumijiez.core.http.HttpMethod; - public Route(HttpMethod method, String path, HttpHandler handler) { - this.method = method; - this.path = path; - this.handler = handler; - } - - // Add getters... +public record Route(HttpMethod method, String path, HttpHandler handler) { } \ No newline at end of file diff --git a/src/main/java/org/lumijiez/core/routing/Router.java b/src/main/java/org/lumijiez/core/routing/Router.java index dd7a7eb..da26e9d 100644 --- a/src/main/java/org/lumijiez/core/routing/Router.java +++ b/src/main/java/org/lumijiez/core/routing/Router.java @@ -1,6 +1,7 @@ package org.lumijiez.core.routing; import org.lumijiez.core.http.HttpHandler; +import org.lumijiez.core.http.HttpMethod; import org.lumijiez.core.http.HttpRequest; import org.lumijiez.core.http.HttpResponse; import org.lumijiez.core.middleware.Chain; @@ -49,7 +50,7 @@ public class Router { Route route = routes.get(key); if (route != null) { - route.getHandler().handle(request, response); + route.handler().handle(request, response); } else { response.sendResponse(HttpStatus.NOT_FOUND, "Not Found"); }