Better config management.

README.md

@@ -3,6 +3,8 @@
 
 An extremely lightweight, flexible, and high performance [Undertow](http://undertow.io) based Java framework for developing and running microservices.
 
+JAX-RS compliant.
+
 Verifiably [FAST](https://www.techempower.com/benchmarks/): [The latest benchmarks](https://www.techempower.com/benchmarks/) show Proteus ranks faster than 99% of other Java frameworks. 
 
 Inspired by [Play](http://playframework.com), [Jooby](http://jooby.org), and [light-4j](https://github.com/networknt/light-4j).

src/main/java/io/sinistral/proteus/modules/ConfigModule.java

@@ -63,19 +63,24 @@ public ConfigModule(URL configURL)
 
 	@Override
 	protected void configure()
-	{ 
-		if(configFile == null && configURL == null)
-		{
-			this.bindConfig(ConfigFactory.defaultApplication());
-		}
-		else if(configURL != null)
-		{
-			this.bindConfig( ConfigFactory.load(ConfigFactory.parseURL(configURL)));
+	{  
+		Config config = ConfigFactory.defaultApplication();
+
+		Config referenceConfig = ConfigFactory.load(ConfigFactory.defaultReference());
+
+		config = ConfigFactory.load(config).withFallback(referenceConfig);
+
+		if(configURL != null)
+		{  
+			config = ConfigFactory.load(ConfigFactory.parseURL(configURL)).withFallback(config); 
 		}
 		else if(configFile != null)
-		{
-			this.bindConfig(fileConfig(configFile));
+		{ 
+
+			config = fileConfig(configFile).withFallback(config); 
 		}
+
+		this.bindConfig(config);
 
         install(new ApplicationModule(this.config)); 
 	}
@@ -84,6 +89,7 @@ else if(configFile != null)
 	@SuppressWarnings("unchecked")
 	private void bindConfig(final Config config)
 	{ 
+
 		traverse(this.binder(), "", config.root());
 
 		for (Entry<String, ConfigValue> entry : config.entrySet())
@@ -102,6 +108,7 @@ private void bindConfig(final Config config)
 
 				Key<Object> key = (Key<Object>) Key.get(listType, Names.named(name));
 
+
 				this.binder().bind(key).toInstance(values);
 			}
 			else
@@ -126,14 +133,15 @@ private static void traverse(final Binder binder, final String nextPath, final C
 	{
 		rootConfig.forEach((key, value) -> 
 		{
+
 			if (value instanceof ConfigObject)
 			{
 				ConfigObject child = (ConfigObject) value;
 
 				String path = nextPath + key;
 
 				Named named = Names.named(path);
-				
+
 				binder.bind(Config.class).annotatedWith(named).toInstance(child.toConfig());
 
 				traverse(binder, path + ".", child);

src/main/java/io/sinistral/proteus/services/SwaggerService.java

@@ -35,6 +35,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigObject;
@@ -74,7 +75,7 @@
 import io.undertow.util.Methods;
 
 
- 
+@Singleton
 public class SwaggerService   extends BaseService implements Supplier<RoutingHandler>
 {