updaterat i StaticFileHandler och skapat CacheFilter

Author: Boppler12

src/main/java/org/example/CacheFilter.java

@@ -0,0 +1,23 @@
+package org.example;
+
+import java.io.IOException;
+
+public class CacheFilter {
+    private final FileCache cache = new FileCache();
+    
+    public byte[] getOrFetch(String uri, FileProvider provider) throws IOException {
+        if (cache.contains(uri)) {
+            System.out.println("✓ Cache hit for: " + uri);
+            return cache.get(uri);
+        }
+        System.out.println("✗ Cache miss for: " + uri);
+        byte[] fileBytes = provider.fetch(uri);
+        cache.put(uri, fileBytes);
+        return fileBytes;
+    }
+    
+    @FunctionalInterface
+    public interface FileProvider {
+        byte[] fetch(String uri) throws IOException;
+    }
+}

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

@@ -11,32 +11,17 @@
 
 public class StaticFileHandler {
     private static final String WEB_ROOT = "www";
-    private byte[] fileBytes;
-    private final FileCache cache = new FileCache();
+    private final CacheFilter cacheFilter = new CacheFilter();
 
-    public StaticFileHandler(){}
-
-    private void handleGetRequest(String uri) throws IOException {
-        if (cache.contains(uri)) {
-            System.out.println("✓ Cache hit for: " + uri);
-            fileBytes = cache.get(uri);
-            return;
-        }
-        System.out.println("✗ Cache miss for: " + uri);
-        File file = new File(WEB_ROOT, uri);
-        fileBytes = Files.readAllBytes(file.toPath());
-
-        cache.put(uri, fileBytes);
-    }
-
-    public void sendGetRequest(OutputStream outputStream, String uri) throws IOException{
-        handleGetRequest(uri);
+    public void sendGetRequest(OutputStream outputStream, String uri) throws IOException {
+        byte[] fileBytes = cacheFilter.getOrFetch(uri, 
+            path -> Files.readAllBytes(new File(WEB_ROOT, path).toPath())
+        );
+        
         HttpResponseBuilder response = new HttpResponseBuilder();
         response.setHeaders(Map.of("Content-Type", "text/html; charset=utf-8"));
         response.setBody(fileBytes);
         PrintWriter writer = new PrintWriter(outputStream, true);
         writer.println(response.build());
-
     }
-
 }