har lagt till i line 20-25 samt line 29

# Conflicts:
#	src/main/java/org/example/StaticFileHandler.java

Author: Boppler12

src/main/java/org/example/StaticFileHandler.java

@@ -5,64 +5,31 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.nio.file.Files;
+import java.util.Map;
 
 public class StaticFileHandler {
-    private final String WEB_ROOT;
+    private static final String WEB_ROOT = "www";
     private byte[] fileBytes;
-    private int statusCode;
 
-    // Constructor for production
-    public StaticFileHandler() {
-        WEB_ROOT = "www";
-    }
-
-    // Constructor for tests, otherwise the www folder won't be seen
-    public StaticFileHandler(String webRoot) {
-        WEB_ROOT = webRoot;
-    }
+    public StaticFileHandler(){}
 
     private void handleGetRequest(String uri) throws IOException {
-        // Sanitize URI
-        int q = uri.indexOf('?');
-        if (q >= 0) uri = uri.substring(0, q);
-        int h = uri.indexOf('#');
-        if (h >= 0) uri = uri.substring(0, h);
-        uri = uri.replace("\0", "");
-        if (uri.startsWith("/")) uri = uri.substring(1);
 
-        // Path traversal check
-        File root = new File(WEB_ROOT).getCanonicalFile();
-        File file = new File(root, uri).getCanonicalFile();
-        if (!file.toPath().startsWith(root.toPath())) {
-            fileBytes = "403 Forbidden".getBytes(java.nio.charset.StandardCharsets.UTF_8);
-            statusCode = 403;
-            return;
-        }
+        File file = new File(WEB_ROOT, uri);
+        fileBytes = Files.readAllBytes(file.toPath());
 
-        // Read file
-        if (file.isFile()) {
-            fileBytes = Files.readAllBytes(file.toPath());
-            statusCode = 200;
-        } else {
-            File errorFile = new File(WEB_ROOT, "pageNotFound.html");
-            if (errorFile.isFile()) {
-                fileBytes = Files.readAllBytes(errorFile.toPath());
-            } else {
-                fileBytes = "404 Not Found".getBytes(java.nio.charset.StandardCharsets.UTF_8);
-            }
-            statusCode = 404;
-        }
     }
 
-    public void sendGetRequest(OutputStream outputStream, String uri) throws IOException {
+    public void sendGetRequest(OutputStream outputStream, String uri) throws IOException{
         handleGetRequest(uri);
         HttpResponseBuilder response = new HttpResponseBuilder();
-        response.setStatusCode(statusCode);
-        // Use MimeTypeDetector instead of hardcoded text/html
-        response.setContentTypeFromFilename(uri);
+        response.setHeaders(Map.of("Content-Type", "text/html; charset=utf-8"));
         response.setBody(fileBytes);
-        outputStream.write(response.build());
-        outputStream.flush();
+        PrintWriter writer = new PrintWriter(outputStream, true);
+        writer.println(response.build());
+
     }
-}
+
+}