Revamped folders.

noboomu · Apr 7, 2017 · dac0df4 · dac0df4
1 parent 4a47da2
commit dac0df4
Show file tree

Hide file tree

Showing 48 changed files with 1,244 additions and 473 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/conf/logback.xml b/conf/logback.xml
@@ -20,7 +20,7 @@
 	<logger name="io.netty" level="ERROR" />
 	<logger name="io.netty.handler" level="ERROR" />
 
-	<logger name="com.wurrly.server.swagger" level="ERROR" />
+	<logger name="com.wurrly.server.swagger" level="INFO" />
 
 	<logger name="com.relayrides" level="ERROR" />
 	<logger name="org.apache.activemq" level="ERROR" />

diff --git a/src/com/wurrly/server/Extractors.java b/src/com/wurrly/server/Extractors.java
diff --git a/src/com/wurrly/Application.java → src/main/java/com/wurrly/Application.java b/src/com/wurrly/Application.java → src/main/java/com/wurrly/Application.java
@@ -19,7 +19,6 @@
 import com.google.common.util.concurrent.ServiceManager.Listener;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.google.inject.name.Named;
 import com.typesafe.config.Config;
 import com.wurrly.controllers.Users;
 import com.wurrly.modules.ConfigModule;
@@ -34,10 +33,8 @@
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.server.RoutingHandler;
-import io.undertow.server.protocol.http2.Http2UpgradeHandler;
 import io.undertow.util.Headers;
-import static org.fusesource.jansi.Ansi.*;
-import static org.fusesource.jansi.Ansi.Color.*;
+import io.undertow.util.HttpString;
 /**
  * @author jbauer
  */
@@ -81,11 +78,7 @@ public void start()
 
 
 
-		Set<Service> services = registeredServices.stream().map( sc -> {
-
-			return injector.getInstance(sc);
-
-		}).collect(Collectors.toSet());
+		Set<Service> services = registeredServices.stream().map( sc -> injector.getInstance(sc)).collect(Collectors.toSet());
 
 		this.serviceManager = new ServiceManager(services);
 
@@ -138,7 +131,7 @@ public Undertow buildServer()
 
 		Set<RouteInfo> routingInfo = routingModule.getRegisteredRoutes(); //injector.getInstance(Key.get(new TypeLiteral<Set<RouteInfo>>() {},Names.named("routeInfo")));
 
-		routingInfo.stream().forEachOrdered( r -> sb.append(r.toString() + "\n"));
+		routingInfo.stream().forEachOrdered( r -> sb.append(r.toString()).append("\n"));
 
 		log.info("\n\nRegistered the following endpoints: \n\n" + sb.toString());
 
@@ -151,7 +144,7 @@ public Undertow buildServer()
 
  		        .setSocketOption(org.xnio.Options.BACKLOG, 10000)
 		        .setServerOption(UndertowOptions.RECORD_REQUEST_START_TIME, false)
-		        .setServerOption(UndertowOptions.MAX_ENTITY_SIZE, 1000000l * 200 )
+		        .setServerOption(UndertowOptions.MAX_ENTITY_SIZE, 1000000L * 200 )
 				.setWorkerThreads(Runtime.getRuntime().availableProcessors() * 8)
 				.setHandler( new HttpHandler()
 		{
@@ -166,9 +159,9 @@ public void handleRequest(final HttpServerExchange exchange) throws Exception
 //						return;
 //					}
 
-//					exchange.getResponseHeaders().put(HttpString.tryFromString("Access-Control-Allow-Origin"), "*");
-//					exchange.getResponseHeaders().put(HttpString.tryFromString("Access-Control-Allow-Methods"), "GET, POST, DELETE, PUT, PATCH, OPTIONS");
-//					exchange.getResponseHeaders().put(HttpString.tryFromString("Access-Control-Allow-Headers"), "Content-Type, api_key, Authorization");
+					exchange.getResponseHeaders().put(HttpString.tryFromString("Access-Control-Allow-Origin"), "*");
+					exchange.getResponseHeaders().put(HttpString.tryFromString("Access-Control-Allow-Methods"), "*");
+					exchange.getResponseHeaders().put(HttpString.tryFromString("Access-Control-Allow-Headers"), "*");
 					exchange.getResponseHeaders().put(Headers.SERVER, "Bowser"); 
 
 					router.handleRequest(exchange);