import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import spark.ModelAndView;
import spark.template.freemarker.FreeMarkerEngine;

import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;

import static spark.Spark.*;

public class Main {

  private static HikariDataSource dataSource;

  public static void main(String[] args) {

    port(Integer.valueOf(System.getenv("PORT")));
    staticFileLocation("/public");

    get("/hello", (req, res) -> "Hello World");

    get("/", (request, response) -> {
        Map<String, Object> attributes = new HashMap<>();
        attributes.put("message", "Hello World!");

        return new ModelAndView(attributes, "index.ftl");
    }, new FreeMarkerEngine());

    String jdbcUrl = System.getenv("JDBC_DATABASE_URL");
    if (jdbcUrl != null) {
      HikariConfig config = new  HikariConfig();
      config.setJdbcUrl(jdbcUrl);
      dataSource = new HikariDataSource(config);
    }

    get("/db", (req, res) -> {
      Map<String, Object> attributes = new HashMap<>();
      try(Connection connection = dataSource.getConnection()) {
        Statement stmt = connection.createStatement();
        stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ticks (tick timestamp)");
        stmt.executeUpdate("INSERT INTO ticks VALUES (now())");
        ResultSet rs = stmt.executeQuery("SELECT tick FROM ticks");

        ArrayList<String> output = new ArrayList<String>();
        while (rs.next()) {
          output.add( "Read from DB: " + rs.getTimestamp("tick"));
        }

        attributes.put("results", output);
        return new ModelAndView(attributes, "db.ftl");
      } catch (Exception e) {
        attributes.put("message", "There was an error: " + e);
        return new ModelAndView(attributes, "error.ftl");
      }
    }, new FreeMarkerEngine());

  }

}

@@ -368,55 +368,8 @@
  %7B%0A%0A
-  private static HikariDataSource dataSource;%0A%0A
   pu
@@ -843,37 +843,8 @@
 %22);%0A
-    if (jdbcUrl != null) %7B%0A  
     
@@ -890,18 +890,16 @@
 ();%0A    
-  
 config.s
@@ -926,22 +926,69 @@
     
-  dataSource =
+final HikariDataSource dataSource = (jdbcUrl != null) ?%0A     
  new
@@ -1012,23 +1012,48 @@
 (config)
-;
+ :
 %0A    
-%7D
+  new HikariDataSource();
 %0A%0A    ge

Improve Hikari configuration