applied order filter annotations to existing filters (#107)

* applied order filter annotations to existing filters

* put secfilter first

* fixed orders

Author: kristinaxm

src/main/java/org/juv25d/App.java

@@ -3,9 +3,9 @@
 import org.juv25d.filter.*;
 import org.juv25d.logging.ServerLogging;
 import org.juv25d.http.HttpParser;
-import org.juv25d.plugin.NotFoundPlugin; // New import
+import org.juv25d.plugin.NotFoundPlugin;
 import org.juv25d.plugin.StaticFilesPlugin;
-import org.juv25d.router.SimpleRouter; // New import
+import org.juv25d.router.SimpleRouter;
 import org.juv25d.util.ConfigLoader;
 
 import java.util.List;
@@ -18,42 +18,32 @@ public static void main(String[] args) {
         ConfigLoader config = ConfigLoader.getInstance();
         Logger logger = ServerLogging.getLogger();
         HttpParser httpParser = new HttpParser();
-
         Pipeline pipeline = new Pipeline();
 
         pipeline.addGlobalFilter(new SecurityHeadersFilter(), 0);
 
-        // Configure redirect rules
+        pipeline.addGlobalFilter(new LoggingFilter(), 1);
+
+        pipeline.addGlobalFilter(new IpFilter(Set.of(), Set.of()), 2);
+
+        if (config.isRateLimitingEnabled()) {pipeline.addGlobalFilter(new RateLimitingFilter(
+            config.getRequestsPerMinute(), config.getBurstCapacity()), 3);}
+
         List<RedirectRule> redirectRules = List.of(
             new RedirectRule("/old-page", "/new-page", 301),
             new RedirectRule("/temp", "https://example.com/temporary", 302),
             new RedirectRule("/docs/*", "/documentation/", 301)
         );
-        pipeline.addGlobalFilter(new RedirectFilter(redirectRules), 0);
-
-        // IP filter is enabled but configured with open access during development
-        // White/blacklist can be tightened when specific IP restrictions are decided
-        pipeline.addGlobalFilter(new IpFilter(
-            Set.of(),
-            Set.of()
-        ), 0);
 
-        pipeline.addGlobalFilter(new LoggingFilter(), 0);
+        pipeline.addGlobalFilter(new RedirectFilter(redirectRules), 4);
 
-        if (config.isRateLimitingEnabled()) {
-            pipeline.addGlobalFilter(new RateLimitingFilter(
-                config.getRequestsPerMinute(),
-                config.getBurstCapacity()
-            ), 0);
-        }
 
-        // Initialize and configure SimpleRouter
         SimpleRouter router = new SimpleRouter();
-        router.registerPlugin("/", new StaticFilesPlugin()); // Register StaticFilesPlugin for the root path
-        router.registerPlugin("/*", new StaticFilesPlugin()); // Register StaticFilesPlugin for all paths
-        router.registerPlugin("/notfound", new NotFoundPlugin()); // Example: Register NotFoundPlugin for a specific path
+        router.registerPlugin("/", new StaticFilesPlugin());
+        router.registerPlugin("/*", new StaticFilesPlugin());
+        router.registerPlugin("/notfound", new NotFoundPlugin());
 
-        pipeline.setRouter(router); // Set the router in the pipeline
+        pipeline.setRouter(router);
 
         DefaultConnectionHandlerFactory handlerFactory =
             new DefaultConnectionHandlerFactory(httpParser, logger, pipeline);
@@ -64,7 +54,6 @@ public static void main(String[] args) {
             handlerFactory,
             pipeline
         );
-
         server.start();
     }
 }

src/main/java/org/juv25d/filter/IpFilter.java

@@ -1,12 +1,14 @@
 package org.juv25d.filter;
 
+import org.juv25d.filter.annotation.Global;
 import org.juv25d.http.HttpRequest;
 import org.juv25d.http.HttpResponse;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Set;
 
+@Global(order = 2)
 public class IpFilter implements Filter {
 
     private final Set<String> whitelist;

src/main/java/org/juv25d/filter/LoggingFilter.java

@@ -1,10 +1,12 @@
 package org.juv25d.filter;
 
+import org.juv25d.filter.annotation.Global;
 import org.juv25d.http.HttpRequest;
 import org.juv25d.http.HttpResponse;
 
 import java.io.IOException;
 
+@Global(order = 1)
 public class LoggingFilter implements Filter {
 
     @Override

src/main/java/org/juv25d/filter/RateLimitingFilter.java

@@ -3,6 +3,7 @@
 import io.github.bucket4j.Bandwidth;
 import io.github.bucket4j.Bucket;
 import io.github.bucket4j.Refill;
+import org.juv25d.filter.annotation.Global;
 import org.juv25d.http.HttpRequest;
 import org.juv25d.http.HttpResponse;
 import org.juv25d.logging.ServerLogging;
@@ -18,6 +19,7 @@
  * A filter that implements rate limiting for incoming HTTP requests.
  * It uses a token bucket algorithm via Bucket4J to limit the number of requests per client IP.
  */
+@Global(order = 3)
 public class RateLimitingFilter implements Filter {
 
     private static final Logger logger = ServerLogging.getLogger();

src/main/java/org/juv25d/filter/RedirectFilter.java

@@ -1,5 +1,6 @@
 package org.juv25d.filter;
 
+import org.juv25d.filter.annotation.Global;
 import org.juv25d.http.HttpRequest;
 import org.juv25d.http.HttpResponse;
 
@@ -27,6 +28,8 @@
  * pipeline.addFilter(new RedirectFilter(rules));
  * </pre>
  */
+
+@Global(order = 4)
 public class RedirectFilter implements Filter {
     private final List<RedirectRule> rules;
     private final Logger logger;