use HttpHandler functional interface instead of BiConsumer

This commit is contained in:
Daniel
2024-10-23 19:26:36 +03:00
parent 4e71cb59a4
commit 6256bc32d0
9 changed files with 152 additions and 33 deletions

View File

@@ -1,25 +1,13 @@
package org.lumijiez;
import org.lumijiez.core.HttpServer;
import java.net.Socket;
import org.lumijiez.core.http.HttpServer;
import org.lumijiez.logging.Logger;
public class Main {
public static void main(String[] args) {
TcpServerCallback callback = new TcpServerCallback() {
@Override
public String onClientMessage(String message, Socket clientSocket) {
return "";
}
Logger logger = new Logger(Logger.LogLevel.DEBUG);
@Override
public String onClientConnected(Socket clientSocket) {
System.out.println("Client connected: " + clientSocket.getInetAddress());
return "";
}
};
HttpServer httpServer = new HttpServer(8080, callback);
HttpServer httpServer = new HttpServer(8080);
httpServer.GET("/hello", (req, res) -> {
res.sendResponse(200, "Hello, World!");

View File

@@ -1,4 +1,4 @@
package org.lumijiez.core;
package org.lumijiez.core.http;
@FunctionalInterface
public interface HttpHandler {

View File

@@ -1,4 +1,4 @@
package org.lumijiez.core;
package org.lumijiez.core.http;
import java.io.BufferedReader;
import java.io.IOException;

View File

@@ -1,4 +1,4 @@
package org.lumijiez.core;
package org.lumijiez.core.http;
import java.io.PrintWriter;

View File

@@ -1,25 +1,27 @@
package org.lumijiez.core;
package org.lumijiez.core.http;
import org.lumijiez.core.routing.Router;
import org.lumijiez.core.tcp.TcpServer;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.net.Socket;
import java.util.function.BiConsumer;
public class HttpServer extends TcpServer {
private final Router router;
public HttpServer(int port, TcpServerCallback callback) {
public HttpServer(int port) {
super(port);
this.router = new Router();
}
public void GET(String path, BiConsumer<HttpRequest, HttpResponse> handler) {
public void GET(String path, HttpHandler handler) {
router.addRoute("GET", path, handler);
}
public void POST(String path, BiConsumer<HttpRequest, HttpResponse> handler) {
public void POST(String path, HttpHandler handler) {
router.addRoute("POST", path, handler);
}

View File

@@ -1,13 +1,15 @@
package org.lumijiez.core;
package org.lumijiez.core.routing;
import java.util.function.BiConsumer;
import org.lumijiez.core.http.HttpHandler;
import org.lumijiez.core.http.HttpRequest;
import org.lumijiez.core.http.HttpResponse;
public class Route {
private final String path;
private final String method;
private final BiConsumer<HttpRequest, HttpResponse> handler;
private final HttpHandler handler;
public Route(String method, String path, BiConsumer<HttpRequest, HttpResponse> handler) {
public Route(String method, String path, HttpHandler handler) {
this.method = method;
this.path = path;
this.handler = handler;
@@ -22,6 +24,6 @@ public class Route {
}
public void handle(HttpRequest request, HttpResponse response) {
handler.accept(request, response);
handler.handle(request, response);
}
}

View File

@@ -1,13 +1,16 @@
package org.lumijiez.core;
package org.lumijiez.core.routing;
import org.lumijiez.core.http.HttpHandler;
import org.lumijiez.core.http.HttpRequest;
import org.lumijiez.core.http.HttpResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.function.BiConsumer;
public class Router {
private final List<Route> routes = new ArrayList<>();
public void addRoute(String method, String path, BiConsumer<HttpRequest, HttpResponse> handler) {
public void addRoute(String method, String path, HttpHandler handler) {
routes.add(new Route(method, path, handler));
}

View File

@@ -1,4 +1,4 @@
package org.lumijiez.core;
package org.lumijiez.core.tcp;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;