Update to use ElephantSQL and use manifest v6

Author: jkillian

app/src/com/ibm/bluemix/samples/PostgreSQLClient.java

@@ -42,6 +42,7 @@
 /*-------------------------------------------------------------------*/
 package com.ibm.bluemix.samples;
 
+import java.net.URI;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -183,23 +184,19 @@ private static Connection getConnection() throws Exception {
 			// We don't know exactly what the service is called, but it will contain "postgresql"
 			for (Object key : vcap.keySet()) {
 				String keyStr = (String) key;
-				if (keyStr.toLowerCase().contains("postgresql")) {
+				if (keyStr.toLowerCase().contains("elephantsql")) {
 					service = (JSONObject) ((JSONArray) vcap.get(keyStr)).get(0);
 					break;
 				}
 			}
 
 			if (service != null) {
 				JSONObject creds = (JSONObject) service.get("credentials");
-				String name = (String) creds.get("name");
-				String host = (String) creds.get("host");
-				Long port = (Long) creds.get("port");
-				String user = (String) creds.get("user");
-				String password = (String) creds.get("password");
-				
-				String url = "jdbc:postgresql://" + host + ":" + port + "/" + name;
-				
-				return DriverManager.getConnection(url, user, password);
+				URI uri = URI.create((String) creds.get("uri"));
+				String url = "jdbc:postgresql://" + uri.getHost() + ":" + uri.getPort() + uri.getPath();
+				String username = uri.getUserInfo().split(":")[0];
+				String password = uri.getUserInfo().split(":")[1];
+				return DriverManager.getConnection(url, username, password);
 			}
 		}
 

manifest.yml

@@ -0,0 +1,9 @@
+---
+applications:
+- name: JavaUpload
+  memory: 256M #The maximum memory to allocate to each application instance
+  instances: 1 #The number of instances of the application to start
+  host: JavaUpload-${random-word} #Hostname for app routing. Unique to domain
+  services:
+    - java-pg    #Identifier for ElephantSQL service, must be provisioned before push
+