Fixes on Smart Routes' unit test

Skullabs · May 25, 2016 · 3cb33cb · 3cb33cb
1 parent bf40ba4
commit 3cb33cb
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/kikaha-core/resources/META-INF/defaults.yml b/kikaha-core/resources/META-INF/defaults.yml
@@ -28,6 +28,7 @@ server:
 
     redirect-to-http: true
 
+  # Undertow internals
   undertow:
     io-threads: -1
     worker-threads: -1
@@ -40,13 +41,20 @@ server:
     socket-options:
       BACKLOG: 20000
 
+  # Static asset routing
   static:
     enabled: false
     location: "webapp"
 
+  # Smart routes
   routes:
     rewrite:
     reverse:
+    cors:
+      enabled: false
+      always-allow-origin: false
+      allowed-methods:
+      allowed-hosts:
 
   auth:
     fixed-auth:

diff --git a/kikaha-core/source/kikaha/core/modules/smart/CORSFilterModule.java b/kikaha-core/source/kikaha/core/modules/smart/CORSFilterModule.java
@@ -31,7 +31,7 @@ public class CORSFilterModule implements Module {
 
 	@Override
 	public void load(Undertow.Builder server, DeploymentContext context) throws IOException {
-		if ( !config.getBoolean("server.cors.enabled") )
+		if ( !config.getBoolean("server.smart-routes.cors.enabled") )
 			return;
 
 		final CORSConfig corsConfig = loadCorsConfig();
@@ -44,9 +44,9 @@ public void load(Undertow.Builder server, DeploymentContext context) throws IOEx
 
 	CORSConfig loadCorsConfig(){
 		return new CORSConfig(
-			config.getBoolean("server.cors.always-allow-origin"),
-			asSet(config.getStringList("server.cors.allowed-methods")),
-			asMatcherSet(config.getStringList("server.cors.allowed-origins")));
+			config.getBoolean("server.smart-routes.cors.always-allow-origin"),
+			asSet(config.getStringList("server.smart-routes.cors.allowed-methods")),
+			asMatcherSet(config.getStringList("server.smart-routes.cors.allowed-origins")));
 	}
 
 	private static <T> Set<T> asSet( List<T> list ) {

diff --git a/kikaha-core/source/kikaha/core/modules/smart/RewriteRoutesModule.java b/kikaha-core/source/kikaha/core/modules/smart/RewriteRoutesModule.java
@@ -1,21 +1,18 @@
 package kikaha.core.modules.smart;
 
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
+import javax.inject.*;
 import io.undertow.Undertow;
 import io.undertow.server.HttpHandler;
-import io.undertow.server.handlers.proxy.ProxyClient;
-import io.undertow.server.handlers.proxy.ProxyHandler;
+import io.undertow.server.handlers.proxy.*;
 import kikaha.config.Config;
 import kikaha.core.DeploymentContext;
 import kikaha.core.modules.Module;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Slf4j
 @Getter
 @Singleton
@@ -32,9 +29,9 @@ public class RewriteRoutesModule implements Module {
 
 	@PostConstruct
 	public void loadConfig(){
-		List<Config> configs = config.getConfigList("server.routes.rewrite");
+		List<Config> configs = config.getConfigList("server.smart-routes.rewrite");
 		rewriteRoutes = configs.stream().map( c->RewritableRule.from(c) ).collect(Collectors.toList());
-		configs = config.getConfigList("server.routes.reverse");
+		configs = config.getConfigList("server.smart-routes.reverse");
 		reverseRoutes = configs.stream().map( c->RewritableRule.from(c) ).collect(Collectors.toList());
 	}
 

diff --git a/kikaha-core/tests-resources/conf/application-test.yml b/kikaha-core/tests-resources/conf/application-test.yml
@@ -19,7 +19,17 @@ server:
   static:
     enabled: true
 
-  routes:
+  smart-routes:
+
+    cors:
+      enabled: true
+      always-allow-origin: false
+      allowed-origins:
+        - "http://localhost"
+        - "http://localhost:9000"
+      allowed-methods:
+        - "GET"
+
     rewrite:
       -
         virtual-host: "test.localdomain"

diff --git a/kikaha-core/tests/kikaha/core/modules/smart/CORSFilterHttpHandlerTest.java b/kikaha-core/tests/kikaha/core/modules/smart/CORSFilterHttpHandlerTest.java
@@ -3,7 +3,7 @@
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
-import static sizebay.plugin.plugin.CORSFilterHttpHandler.*;
+import static kikaha.core.modules.smart.CORSFilterHttpHandler.*;
 import java.net.URL;
 import javax.inject.Inject;
 import io.undertow.server.*;