fix database initialization with empty database block (#77)

Author: BrandonArp

config/config.conf

@@ -16,30 +16,30 @@ rebalanceConfiguration {
   maxParallel=100
   threshold=500
 }
-databaseConfigurations {
-  metrics_clusteragg {
-    jdbcUrl="jdbc:h2:/opt/cluster-aggregator/data/metrics:clusteragg;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=7067;MODE=PostgreSQL;INIT=create schema if not exists clusteragg;DB_CLOSE_DELAY=-1"
-    driverName="org.h2.Driver"
-    username="sa"
-    password="secret"
-    maximumPoolSize=2
-    minimumIdle=2
-    idleTimeout=0
-    modelPackages=[ "com.arpnetworking.clusteraggregator.models.ebean" ]
-  }
-  metrics_clusteragg_ddl {
-    jdbcUrl="jdbc:h2:/opt/cluster-aggregator/data/metrics:clusteragg;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=7067;MODE=PostgreSQL;INIT=create schema if not exists clusteragg;DB_CLOSE_DELAY=-1"
-    driverName="org.h2.Driver"
-    username="sa"
-    password="secret"
-    migrationLocations=["db/migration/metrics_clusteragg/common"]
-    migrationSchemas=["clusteragg"]
-    maximumPoolSize=2
-    minimumIdle=0
-    idleTimeout=10000
-    modelPackages=[ "com.arpnetworking.clusteraggregator.models.ebean" ]
-  }
-}
+//databaseConfigurations {
+//  metrics_clusteragg {
+//    jdbcUrl="jdbc:h2:/opt/cluster-aggregator/data/metrics:clusteragg;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=7067;MODE=PostgreSQL;INIT=create schema if not exists clusteragg;DB_CLOSE_DELAY=-1"
+//    driverName="org.h2.Driver"
+//    username="sa"
+//    password="secret"
+//    maximumPoolSize=2
+//    minimumIdle=2
+//    idleTimeout=0
+//    modelPackages=[ "com.arpnetworking.clusteraggregator.models.ebean" ]
+//  }
+//  metrics_clusteragg_ddl {
+//    jdbcUrl="jdbc:h2:/opt/cluster-aggregator/data/metrics:clusteragg;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=7067;MODE=PostgreSQL;INIT=create schema if not exists clusteragg;DB_CLOSE_DELAY=-1"
+//    driverName="org.h2.Driver"
+//    username="sa"
+//    password="secret"
+//    migrationLocations=["db/migration/metrics_clusteragg/common"]
+//    migrationSchemas=["clusteragg"]
+//    maximumPoolSize=2
+//    minimumIdle=0
+//    idleTimeout=10000
+//    modelPackages=[ "com.arpnetworking.clusteraggregator.models.ebean" ]
+//  }
+//}
 akkaConfiguration {
   akka {
     extensions=["com.romix.akka.serialization.kryo.KryoSerializationExtension$"]

src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java

@@ -67,6 +67,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
+import com.google.inject.Key;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
@@ -348,7 +349,8 @@ private String provideClusterHostSuffix(final ClusterAggregatorConfiguration con
     @Provides
     @Named("circonus-partition-set")
     @SuppressFBWarnings("UPM_UNCALLED_PRIVATE_METHOD") // Invoked reflectively by Guice
-    private PartitionSet provideDatabasePartitionSet(@Named("metrics_clusteragg") final Database database) {
+    private PartitionSet provideDatabasePartitionSet(final Injector injector) {
+        final Database database = injector.getInstance(Key.get(Database.class, Names.named("metrics_clusteragg")));
         final com.arpnetworking.clusteraggregator.models.ebean.PartitionSet partitionSet =
                 com.arpnetworking.clusteraggregator.models.ebean.PartitionSet.findOrCreate(
                         "circonus-partition-set",