From 8170a24eecd2cab9d7da7cc8c9acffd971d4ab9b Mon Sep 17 00:00:00 2001 From: Benedikt Galbavy Date: Thu, 28 Dec 2023 01:04:18 +0100 Subject: [PATCH] Changed http codes (404 vs 501) + generic fixes --- src/Main.java | 4 ++-- src/at/nanopenguin/mtcg/application/InternalErrorService.java | 1 + src/at/nanopenguin/mtcg/application/TestService.java | 2 +- src/at/nanopenguin/mtcg/http/HttpRequest.java | 2 +- src/at/nanopenguin/mtcg/http/RequestHandler.java | 2 +- src/at/nanopenguin/mtcg/http/Response.java | 2 -- src/at/nanopenguin/mtcg/http/Router.java | 3 +-- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Main.java b/src/Main.java index 52f1bac..a79fddc 100644 --- a/src/Main.java +++ b/src/Main.java @@ -33,8 +33,8 @@ public class Main { /* trading */ router.addRoute(HttpMethod.GET, "/tradings", new TestService(), new int[]{}); router.addRoute(HttpMethod.POST, "/tradings", new TestService(), new int[]{}); - router.addRoute(HttpMethod.DELETE, "/tradings/{tradingdealid}", new TestService(), new int[]{2}); - router.addRoute(HttpMethod.POST, "/tradings/{tradingdealid}", new TestService(), new int[]{2}); + router.addRoute(HttpMethod.DELETE, "/tradings/{tradingDealId}", new TestService(), new int[]{2}); + router.addRoute(HttpMethod.POST, "/tradings/{tradingDealId}", new TestService(), new int[]{2}); Server server = new Server(10001, 10, router); server.start(); diff --git a/src/at/nanopenguin/mtcg/application/InternalErrorService.java b/src/at/nanopenguin/mtcg/application/InternalErrorService.java index 9d55ee9..e8407f6 100644 --- a/src/at/nanopenguin/mtcg/application/InternalErrorService.java +++ b/src/at/nanopenguin/mtcg/application/InternalErrorService.java @@ -5,6 +5,7 @@ import at.nanopenguin.mtcg.http.HttpRequest; import at.nanopenguin.mtcg.http.Response; public class InternalErrorService implements Service { + /* For error in http server */ @Override public Response handleRequest(HttpRequest request) { diff --git a/src/at/nanopenguin/mtcg/application/TestService.java b/src/at/nanopenguin/mtcg/application/TestService.java index 46ccb79..8adb001 100644 --- a/src/at/nanopenguin/mtcg/application/TestService.java +++ b/src/at/nanopenguin/mtcg/application/TestService.java @@ -8,6 +8,6 @@ public class TestService implements Service { @Override public Response handleRequest(HttpRequest request) { - return new Response(HttpStatus.OK, "application/json", ""); + return new Response(HttpStatus.NOT_IMPLEMENTED, "application/json", ""); } } diff --git a/src/at/nanopenguin/mtcg/http/HttpRequest.java b/src/at/nanopenguin/mtcg/http/HttpRequest.java index 6353b22..09f31df 100644 --- a/src/at/nanopenguin/mtcg/http/HttpRequest.java +++ b/src/at/nanopenguin/mtcg/http/HttpRequest.java @@ -9,7 +9,7 @@ public class HttpRequest { private final HttpMethod method; private final String path; private final String version; - private Map httpHeaders = new HashMap(); + private final Map httpHeaders = new HashMap<>(); private final String body; public HttpRequest(BufferedReader br) throws IOException { diff --git a/src/at/nanopenguin/mtcg/http/RequestHandler.java b/src/at/nanopenguin/mtcg/http/RequestHandler.java index 8483775..fd7a669 100644 --- a/src/at/nanopenguin/mtcg/http/RequestHandler.java +++ b/src/at/nanopenguin/mtcg/http/RequestHandler.java @@ -36,7 +36,7 @@ public class RequestHandler implements Runnable { if (service == null) { System.out.println("service does not exist"); - response = new Response(HttpStatus.NOT_IMPLEMENTED, "text/plain", ""); + response = new Response(HttpStatus.NOT_FOUND, "text/plain", ""); break responseBuilder; } System.out.println("creating response"); diff --git a/src/at/nanopenguin/mtcg/http/Response.java b/src/at/nanopenguin/mtcg/http/Response.java index c35abdb..b72b3cb 100644 --- a/src/at/nanopenguin/mtcg/http/Response.java +++ b/src/at/nanopenguin/mtcg/http/Response.java @@ -19,10 +19,8 @@ public class Response { String localDatetime = DateTimeFormatter.RFC_1123_DATE_TIME.format(ZonedDateTime.now(ZoneId.of("UTC"))); return "HTTP/1.1 " + this.httpStatus.statusCode + " " + this.httpStatus.statusMessage + "\r\n" + - "Cache-Control: max-age=0\r\n" + "Connection: close\r\n" + "Date: " + localDatetime + "\r\n" + - "Expires: " + localDatetime + "\r\n" + "Content-Type: " + this.contentType + "\r\n" + "Content-Length: " + this.content.length() + "\r\n" + "\r\n" + diff --git a/src/at/nanopenguin/mtcg/http/Router.java b/src/at/nanopenguin/mtcg/http/Router.java index 3496843..37be60e 100644 --- a/src/at/nanopenguin/mtcg/http/Router.java +++ b/src/at/nanopenguin/mtcg/http/Router.java @@ -1,6 +1,5 @@ package at.nanopenguin.mtcg.http; -import at.nanopenguin.mtcg.application.InternalErrorService; import at.nanopenguin.mtcg.application.Service; import java.util.*; @@ -34,7 +33,7 @@ public class Router { System.out.println("resolving route " + route); String[] routeComponents = route.split("/"); - String pathVariable = null; + String pathVariable = null; // might be useful later, idk how services int i = 1;