Align rate-limiting configuration with Server and Logging in ConfigLoader. (#110)

* Align rate-limiting configuration with Server and Logging in ConfigLoader.

Author: mattknatt

src/main/java/org/juv25d/util/ConfigLoader.java

@@ -3,6 +3,7 @@
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.InputStream;
+import java.util.Collections;
 import java.util.Map;
 
 public class ConfigLoader {
@@ -64,14 +65,19 @@ private void loadConfiguration(InputStream input) {
             }
 
             // rate-limiting
-            Map<String, Object> rateLimitingConfig = (Map<String, Object>) config.get("rate-limiting");
+            // defaults (consistent pattern)
+            this.rateLimitingEnabled = false;
+
+            Map<String, Object> rateLimitingConfig = asStringObjectMap(config.get("rate-limiting"));
             if (rateLimitingConfig != null) {
-                this.rateLimitingEnabled = (Boolean) rateLimitingConfig.getOrDefault("enabled", true);
-                this.requestsPerMinute = ((Number) rateLimitingConfig.getOrDefault("requests-per-minute", 60L)).longValue();
-                this.burstCapacity = ((Number) rateLimitingConfig.getOrDefault("burst-capacity", 100L)).longValue();
-            } else {
-                // rate-limiting is disabled if not present in the config file.
-                this.rateLimitingEnabled = false;
+                this.rateLimitingEnabled =
+                    Boolean.parseBoolean(String.valueOf(rateLimitingConfig.getOrDefault("enabled", false)));
+
+                this.requestsPerMinute =
+                    Long.parseLong(String.valueOf(rateLimitingConfig.getOrDefault("requests-per-minute", 60L)));
+
+                this.burstCapacity =
+                    Long.parseLong(String.valueOf(rateLimitingConfig.getOrDefault("burst-capacity", 100L)));
             }
 
         } catch (Exception e) {
@@ -96,7 +102,7 @@ private static Map<String, Object> asStringObjectMap(Object value) {
         if (value instanceof Map<?, ?> map) {
             return (Map<String, Object>) map;
         }
-        return null;
+        return Collections.emptyMap();
     }
     public long getRequestsPerMinute() {
         return requestsPerMinute;

src/test/java/org/juv25d/util/ConfigLoaderTest.java

@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -24,6 +25,10 @@ void loadsValuesFromYaml() {
                   root-dir: "public"
                 logging:
                   level: "DEBUG"
+                rate-limiting:
+                  enabled: true
+                  requests-per-minute: 20
+                  burst-capacity: 10
                 """;
 
         ConfigLoader loader = new ConfigLoader(
@@ -33,6 +38,9 @@ void loadsValuesFromYaml() {
         assertEquals(9090, loader.getPort());
         assertEquals("public", loader.getRootDirectory());
         assertEquals("DEBUG", loader.getLogLevel());
+        assertTrue(loader.isRateLimitingEnabled());
+        assertEquals(20, loader.getRequestsPerMinute());
+        assertEquals(10, loader.getBurstCapacity());
     }
 
     /**
@@ -46,6 +54,7 @@ void usesDefaultsWhenServerKeysMissing() {
         String yaml = """
         server: {}
         logging: {}
+        rate-limiting: {}
         """;
 
         ConfigLoader loader = new ConfigLoader(
@@ -55,6 +64,7 @@ void usesDefaultsWhenServerKeysMissing() {
         assertEquals(8080, loader.getPort());
         assertEquals("static", loader.getRootDirectory());
         assertEquals("INFO", loader.getLogLevel());
+        assertFalse(loader.isRateLimitingEnabled());
     }
 
 
@@ -67,5 +77,18 @@ void usesDefaultsWhenServerKeysMissing() {
     @Test void throwsWhenYamlMissing() {
         assertThrows(RuntimeException.class, () ->
             new ConfigLoader(null) ); }
+
+    @Test
+    void shouldThrowWhenYamlIsMalformed() {
+        String yaml = "server:\nBadYaml";
+        InputStream input = new ByteArrayInputStream(yaml.getBytes(StandardCharsets.UTF_8));
+
+        RuntimeException ex = assertThrows(RuntimeException.class,
+            () -> new ConfigLoader(input));
+
+        assertTrue(ex.getMessage().contains("Failed to load application config"));
+    }
 }
 
+
+