Merge pull request heroku#11 from heroku/jkutner/heroku-jdbc

Jon Mountjoy · Jon Mountjoy · commit 61256d0d5fbc · 2015-07-09T16:01:39.000+01:00
Added heroku-jdbc for each database url parsing
diff --git a/pom.xml b/pom.xml
@@ -22,6 +22,11 @@
       <artifactId>postgresql</artifactId>
       <version>9.4-1201-jdbc4</version>
     </dependency>
+    <dependency>
+      <groupId>com.heroku.sdk</groupId>
+      <artifactId>heroku-jdbc</artifactId>
+      <version>0.1.0</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -11,6 +11,8 @@
 import spark.ModelAndView;
 import static spark.Spark.get;
 
+import com.heroku.sdk.jdbc.DatabaseUrl;
+
 public class Main {
 
   public static void main(String[] args) {
@@ -31,7 +33,7 @@ public static void main(String[] args) {
       Connection connection = null;
       Map<String, Object> attributes = new HashMap<>();
       try {
-        connection = getConnection();
+        connection = DatabaseUrl.extract().getConnection();
 
         Statement stmt = connection.createStatement();
         stmt.executeUpdate("CREATE TABLE IF NOT EXISTS ticks (tick timestamp)");
@@ -51,22 +53,8 @@ public static void main(String[] args) {
       } finally {
         if (connection != null) try{connection.close();} catch(SQLException e){}
       }
-  }, new FreeMarkerEngine());
-
-  }
-
-  private static Connection getConnection() throws URISyntaxException, SQLException {
-    URI dbUri = new URI(System.getenv("DATABASE_URL"));
-    int port = dbUri.getPort();
-    String dbUrl = "jdbc:postgresql://" + dbUri.getHost() + ":" + port + dbUri.getPath();
+    }, new FreeMarkerEngine());
 
-    if (dbUri.getUserInfo() != null) {
-      String username = dbUri.getUserInfo().split(":")[0];
-      String password = dbUri.getUserInfo().split(":")[1];
-      return DriverManager.getConnection(dbUrl, username, password);
-    } else {
-      return DriverManager.getConnection(dbUrl);
-    }
   }
 
 }
