Improve Hikari configuration

jkutner · jkutner · commit 295eda005eb9 · 2017-02-03T10:25:46.000-06:00
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -14,8 +14,6 @@
 
 public class Main {
 
-  private static HikariDataSource dataSource;
-
   public static void main(String[] args) {
 
     port(Integer.valueOf(System.getenv("PORT")));
@@ -31,11 +29,11 @@ public static void main(String[] args) {
     }, new FreeMarkerEngine());
 
     String jdbcUrl = System.getenv("JDBC_DATABASE_URL");
-    if (jdbcUrl != null) {
-      HikariConfig config = new  HikariConfig();
-      config.setJdbcUrl(jdbcUrl);
-      dataSource = new HikariDataSource(config);
-    }
+    HikariConfig config = new  HikariConfig();
+    config.setJdbcUrl(jdbcUrl);
+    final HikariDataSource dataSource = (jdbcUrl != null) ?
+      new HikariDataSource(config) :
+      new HikariDataSource();
 
     get("/db", (req, res) -> {
       Map<String, Object> attributes = new HashMap<>();
