From da5e8d8c9a2975a84db0610d4ea6bb6368d6f1de Mon Sep 17 00:00:00 2001 From: Daniel <59575049+lumijiez@users.noreply.github.com> Date: Wed, 23 Oct 2024 20:50:38 +0300 Subject: [PATCH] slight cleanup, remove thread sleep, low risk of spinning --- src/main/java/org/lumijiez/Main.java | 16 +++++----------- .../org/lumijiez/core/http/HttpResponse.java | 3 ++- .../java/org/lumijiez/core/http/HttpServer.java | 5 +---- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/lumijiez/Main.java b/src/main/java/org/lumijiez/Main.java index ef94840..857bcb9 100644 --- a/src/main/java/org/lumijiez/Main.java +++ b/src/main/java/org/lumijiez/Main.java @@ -4,20 +4,14 @@ import org.lumijiez.core.http.HttpServer; public class Main { public static void main(String[] args) { - HttpServer httpServer = new HttpServer(8080); + HttpServer server = new HttpServer(8080); - httpServer.GET("/hello", (req, res) -> { - res.sendResponse(200, "Hello, World!"); - }); + server.GET("/hello", (req, res) -> res.sendResponse(200, "Hello, World!")); - httpServer.GET("/goodbye", (req, res) -> { - res.sendResponse(200, "Goodbye, World!"); - }); + server.GET("/goodbye", (req, res) -> res.sendResponse(200, "Goodbye, World!")); - httpServer.POST("/data", (req, res) -> { - res.sendResponse(200, "Data received"); - }); + server.POST("/data", (req, res) -> res.sendResponse(200, "Data received")); - httpServer.start(); + server.start(); } } \ No newline at end of file diff --git a/src/main/java/org/lumijiez/core/http/HttpResponse.java b/src/main/java/org/lumijiez/core/http/HttpResponse.java index ec67d45..7ccf5a0 100644 --- a/src/main/java/org/lumijiez/core/http/HttpResponse.java +++ b/src/main/java/org/lumijiez/core/http/HttpResponse.java @@ -4,6 +4,7 @@ import org.lumijiez.logging.Logger; import java.io.BufferedWriter; import java.io.IOException; +import java.nio.charset.StandardCharsets; public class HttpResponse { private final BufferedWriter out; @@ -20,7 +21,7 @@ public class HttpResponse { out.write("Content-Type: text/plain"); out.write("\r\n"); - out.write("Content-Length: " + message.getBytes("UTF-8").length); + out.write("Content-Length: " + message.getBytes(StandardCharsets.UTF_8).length); out.write("\r\n"); out.write("Connection: keep-alive"); out.write("\r\n"); diff --git a/src/main/java/org/lumijiez/core/http/HttpServer.java b/src/main/java/org/lumijiez/core/http/HttpServer.java index 8878121..f21605c 100644 --- a/src/main/java/org/lumijiez/core/http/HttpServer.java +++ b/src/main/java/org/lumijiez/core/http/HttpServer.java @@ -82,7 +82,7 @@ public class HttpServer { while (keepAlive && requestCount < MAX_REQUESTS_PER_CONNECTION && running) { try { if (!in.ready()) { - Thread.sleep(10); + // Thread.sleep(10); continue; } @@ -111,9 +111,6 @@ public class HttpServer { } catch (SocketTimeoutException e) { Logger.info("HTTP", "Keep-alive timeout reached"); break; - } catch (InterruptedException e) { - Logger.info("HTTP", "Connection handling interrupted"); - break; } catch (IOException e) { if (running) { Logger.error("HTTP", "Error processing request: " + e.getMessage());