From 98350db948cd90841e7c2cc589be184f89fe9f1e Mon Sep 17 00:00:00 2001
From: Martijn van Exel <m@rtijn.org>
Date: Fri, 4 Jan 2019 17:29:29 -0700
Subject: [PATCH] Adding port parameter

Signed-off-by: Matt Robinson <mattrob@hey.com>
---
 .../apidb/common/DataSourceFactory.java       |  6 ++--
 .../osmosis/apidb/common/DatabaseContext.java |  9 ++++--
 .../apidb/v0_6/impl/DatabaseUtilities.java    |  3 +-
 .../AuthenticationPropertiesLoader.java       |  5 ++++
 .../core/database/DatabaseConstants.java      | 10 +++++++
 .../database/DatabaseLoginCredentials.java    | 28 +++++++++++++++++--
 .../database/DatabaseTaskManagerFactory.java  |  3 ++
 .../extract/apidb/common/Configuration.java   | 12 +++++++-
 .../apidb/v0_6/OsmosisExtractApiDb.java       |  1 +
 .../apidb/v0_6/osmosis-extract-apidb.conf     |  2 ++
 .../extract/apidb/v0_6/DatabaseUtilities.java |  3 +-
 .../pgsimple/common/DatabaseContext.java      |  2 +-
 .../pgsnapshot/common/DataSourceManager.java  |  5 ++--
 13 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
index fe0f28db2..94f91f7a8 100644
--- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
+++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java
@@ -34,12 +34,14 @@ public static BasicDataSource createDataSource(DatabaseLoginCredentials credenti
         switch (credentials.getDbType()) {
         case POSTGRESQL:
         	dataSource.setDriverClassName("org.postgresql.Driver");
-        	dataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + "/" + credentials.getDatabase()
+        	dataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + ":" 
+        	+ credentials.getPort() + "/" + credentials.getDatabase()
         			/*+ "?loglevel=2"*/);
         	break;
         case MYSQL:
         	dataSource.setDriverClassName("com.mysql.jdbc.Driver");
-        	dataSource.setUrl("jdbc:mysql://" + credentials.getHost() + "/" + credentials.getDatabase());
+        	dataSource.setUrl("jdbc:mysql://" + credentials.getHost() + ":"
+        	+ credentials.getPort() + "/" + credentials.getDatabase());
             break;
         default:
             throw new OsmosisRuntimeException("Unknown database type " + credentials.getDbType() + ".");
diff --git a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DatabaseContext.java b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DatabaseContext.java
index e54b25ebf..068af9e1b 100644
--- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DatabaseContext.java
+++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DatabaseContext.java
@@ -104,7 +104,8 @@ private Connection getPostgresConnection() {
             LOG.finer("Creating a new database connection.");
 
             newConnection = DriverManager.getConnection(
-            		"jdbc:postgresql://" + loginCredentials.getHost() + "/"
+            		"jdbc:postgresql://" + loginCredentials.getHost() + ":"
+            		+ loginCredentials.getPort() + "/"
                     + loginCredentials.getDatabase(), // + "?logLevel=2"
                     loginCredentials.getUser(),
                     loginCredentials.getPassword()
@@ -126,8 +127,10 @@ private Connection getMysqlConnection() {
         try {
             String url;
 
-            url = "jdbc:mysql://" + loginCredentials.getHost() + "/" + loginCredentials.getDatabase() + "?user="
-                    + loginCredentials.getUser() + "&password=" + loginCredentials.getPassword();
+            url = "jdbc:mysql://" + loginCredentials.getHost() + ":" + loginCredentials.getPort()
+            		+ "/" + loginCredentials.getDatabase()
+            		+ "?user=" + loginCredentials.getUser()
+                    + "&password=" + loginCredentials.getPassword();
 
             if (loginCredentials.getForceUtf8()) {
                 url += "&useUnicode=true&characterEncoding=UTF-8";
diff --git a/osmosis-apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/impl/DatabaseUtilities.java b/osmosis-apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/impl/DatabaseUtilities.java
index f14e48de6..7d6a48e56 100644
--- a/osmosis-apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/impl/DatabaseUtilities.java
+++ b/osmosis-apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/impl/DatabaseUtilities.java
@@ -43,7 +43,8 @@ public DatabaseContext createDatabaseContext() {
         AuthenticationPropertiesLoader credentialsLoader;
         DatabaseLoginCredentials credentials;
 
-        credentials = new DatabaseLoginCredentials(DatabaseConstants.TASK_DEFAULT_HOST,
+        credentials = new DatabaseLoginCredentials(
+                DatabaseConstants.TASK_DEFAULT_HOST, DatabaseConstants.TASK_DEFAULT_PORT,
                 DatabaseConstants.TASK_DEFAULT_DATABASE, DatabaseConstants.TASK_DEFAULT_USER,
                 DatabaseConstants.TASK_DEFAULT_PASSWORD, DatabaseConstants.TASK_DEFAULT_FORCE_UTF8,
                 DatabaseConstants.TASK_DEFAULT_PROFILE_SQL, DatabaseConstants.TASK_DEFAULT_DB_TYPE);
diff --git a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/AuthenticationPropertiesLoader.java b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/AuthenticationPropertiesLoader.java
index 00d1ebc1a..7a90eaa09 100644
--- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/AuthenticationPropertiesLoader.java
+++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/AuthenticationPropertiesLoader.java
@@ -14,6 +14,7 @@
  * The recognised properties are:
  * <ul>
  * <li>host</li>
+ * <li>port</li>
  * <li>database</li>
  * <li>user</li>
  * <li>password</li>
@@ -25,6 +26,7 @@
 public class AuthenticationPropertiesLoader {
 
     private static final String KEY_HOST = "host";
+    private static final String KEY_PORT = "port";
     private static final String KEY_DATABASE = "database";
     private static final String KEY_USER = "user";
     private static final String KEY_PASSWORD = "password";
@@ -69,6 +71,9 @@ public void updateLoginCredentials(DatabaseLoginCredentials loginCredentials) {
         if (properties.containsKey(KEY_HOST)) {
             loginCredentials.setHost(properties.getProperty(KEY_HOST));
         }
+        if (properties.containsKey(KEY_PORT)) {
+            loginCredentials.setPort(properties.getProperty(KEY_PORT));
+        }
         if (properties.containsKey(KEY_DATABASE)) {
             loginCredentials.setDatabase(properties.getProperty(KEY_DATABASE));
         }
diff --git a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseConstants.java b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseConstants.java
index 1ba3cab0e..f8ecb0919 100644
--- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseConstants.java
+++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseConstants.java
@@ -19,6 +19,11 @@ public final class DatabaseConstants {
      */
     public static final String TASK_ARG_HOST = "host";
 
+    /**
+     * The task argument for specifying the port for a database connection.
+     */
+    public static final String TASK_ARG_PORT = "port";
+    
     /**
      * The task argument for specifying the database instance for a database connection.
      */
@@ -70,6 +75,11 @@ public final class DatabaseConstants {
      */
     public static final String TASK_DEFAULT_HOST = "localhost";
 
+    /**
+     * The default port for a database connection.
+     */
+    public static final String TASK_DEFAULT_PORT = "5432";
+    
     /**
      * The default database for a database connection.
      */
diff --git a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseLoginCredentials.java b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseLoginCredentials.java
index 03ce00c05..277b372b3 100644
--- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseLoginCredentials.java
+++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseLoginCredentials.java
@@ -10,6 +10,7 @@ public class DatabaseLoginCredentials {
 
 	private String datasourceJndiLocation;
     private String host;
+    private String port;
     private String database;
     private String user;
     private String password;
@@ -35,6 +36,8 @@ public DatabaseLoginCredentials(String datasourceJndiLocation) {
 	 * 
 	 * @param host
 	 *            The server hosting the database.
+	 * @param port
+	 *            The port the database is running on. Defaults to 5432.
 	 * @param database
 	 *            The database instance.
 	 * @param user
@@ -50,9 +53,10 @@ public DatabaseLoginCredentials(String datasourceJndiLocation) {
 	 * @param dbType
 	 *            The database type.
 	 */
-    public DatabaseLoginCredentials(String host, String database, String user, String password, boolean forceUtf8,
-            boolean profileSql, DatabaseType dbType) {
+    public DatabaseLoginCredentials(String host, String port, String database, String user, String password,
+            boolean forceUtf8, boolean profileSql, DatabaseType dbType) {
         this.host = host;
+        this.port = port;
         this.database = database;
         this.user = user;
         this.password = password;
@@ -61,7 +65,7 @@ public DatabaseLoginCredentials(String host, String database, String user, Strin
         this.dbType = dbType;
         this.postgresSchema = "";
     }
-    
+
     
 	/**
 	 * Gets the location of the datasource in JNDI. If null, new connections
@@ -92,6 +96,24 @@ public void setHost(String host) {
         this.host = host;
     }
 
+    /**
+     * Returns the port.
+     * 
+     * @return The port.
+     */
+    public String getPort() {
+        return port;
+    }
+
+    /**
+     * Updates the port.
+     * 
+     * @param port The new port.
+     */
+    public void setPort(String port) {
+        this.port = port;
+    }
+
     /**
      * Returns the database.
      * 
diff --git a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseTaskManagerFactory.java b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseTaskManagerFactory.java
index 5797cf215..14242be48 100644
--- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseTaskManagerFactory.java
+++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/database/DatabaseTaskManagerFactory.java
@@ -24,6 +24,7 @@ protected DatabaseLoginCredentials getDatabaseLoginCredentials(TaskConfiguration
 
         // Create a new credential object with default values.
         loginCredentials = new DatabaseLoginCredentials(DatabaseConstants.TASK_DEFAULT_HOST,
+        		DatabaseConstants.TASK_DEFAULT_PORT,
                 DatabaseConstants.TASK_DEFAULT_DATABASE, DatabaseConstants.TASK_DEFAULT_USER,
                 DatabaseConstants.TASK_DEFAULT_PASSWORD, DatabaseConstants.TASK_DEFAULT_FORCE_UTF8,
                 DatabaseConstants.TASK_DEFAULT_PROFILE_SQL, DatabaseConstants.TASK_DEFAULT_DB_TYPE);
@@ -43,6 +44,8 @@ protected DatabaseLoginCredentials getDatabaseLoginCredentials(TaskConfiguration
         // command line.
         loginCredentials.setHost(getStringArgument(taskConfig, DatabaseConstants.TASK_ARG_HOST, loginCredentials
                 .getHost()));
+        loginCredentials.setPort(getStringArgument(taskConfig, DatabaseConstants.TASK_ARG_PORT, loginCredentials
+                .getPort()));
         loginCredentials.setDatabase(getStringArgument(taskConfig, DatabaseConstants.TASK_ARG_DATABASE,
                 loginCredentials.getDatabase()));
         loginCredentials.setUser(getStringArgument(taskConfig, DatabaseConstants.TASK_ARG_USER, loginCredentials
diff --git a/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/common/Configuration.java b/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/common/Configuration.java
index 4531f1d2e..6e435a1fc 100644
--- a/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/common/Configuration.java
+++ b/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/common/Configuration.java
@@ -20,6 +20,7 @@
 public class Configuration {
 
 	private static final String KEY_HOST = "host";
+	private static final String KEY_PORT = "port";
 	private static final String KEY_DATABASE = "database";
 	private static final String KEY_USER = "user";
 	private static final String KEY_PASSWORD = "password";
@@ -82,6 +83,15 @@ public String getHost() {
 		return getProperty(KEY_HOST);
 	}
 
+	/**
+	 * Returns the database port.
+	 * 
+	 * @return The database port.
+	 */
+	public String getPort() {
+		return getProperty(KEY_PORT);
+	}
+
 
 	/**
 	 * Returns the database instance.
@@ -201,7 +211,7 @@ public boolean getAllowIncorrectSchemaVersion() {
 	 * @return The database login credentials.
 	 */
 	public DatabaseLoginCredentials getDatabaseLoginCredentials() {
-		return new DatabaseLoginCredentials(getHost(), getDatabase(), getUser(), getPassword(), false, false,
+		return new DatabaseLoginCredentials(getHost(), getPort(), getDatabase(), getUser(), getPassword(), false, false,
 				getDbType());
 	}
 	
diff --git a/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/v0_6/OsmosisExtractApiDb.java b/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/v0_6/OsmosisExtractApiDb.java
index aafedcc63..54928d604 100644
--- a/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/v0_6/OsmosisExtractApiDb.java
+++ b/osmosis-extract/src/main/java/org/openstreetmap/osmosis/extract/apidb/v0_6/OsmosisExtractApiDb.java
@@ -234,6 +234,7 @@ private void infoCommand() {
 
 		System.out.println("Configuration");
 		System.out.println("\thost: " + configuration.getHost());
+		System.out.println("\tport: " + configuration.getPort());
 		System.out.println("\tdatabase: " + configuration.getDatabase());
 		System.out.println("\tuser: " + configuration.getUser());
 		System.out.println("\tpassword: " + configuration.getPassword());
diff --git a/osmosis-extract/src/main/resources/org/openstreetmap/osmosis/extract/apidb/v0_6/osmosis-extract-apidb.conf b/osmosis-extract/src/main/resources/org/openstreetmap/osmosis/extract/apidb/v0_6/osmosis-extract-apidb.conf
index f0f71288c..6df7d4ab5 100644
--- a/osmosis-extract/src/main/resources/org/openstreetmap/osmosis/extract/apidb/v0_6/osmosis-extract-apidb.conf
+++ b/osmosis-extract/src/main/resources/org/openstreetmap/osmosis/extract/apidb/v0_6/osmosis-extract-apidb.conf
@@ -1,5 +1,7 @@
 # The database host system.
 host=localhost
+# The database port.
+port=5432
 # The database instance.
 database=osm
 # The database user.
diff --git a/osmosis-extract/src/test/java/org/openstreetmap/osmosis/extract/apidb/v0_6/DatabaseUtilities.java b/osmosis-extract/src/test/java/org/openstreetmap/osmosis/extract/apidb/v0_6/DatabaseUtilities.java
index 79aa1c366..742549a73 100644
--- a/osmosis-extract/src/test/java/org/openstreetmap/osmosis/extract/apidb/v0_6/DatabaseUtilities.java
+++ b/osmosis-extract/src/test/java/org/openstreetmap/osmosis/extract/apidb/v0_6/DatabaseUtilities.java
@@ -43,7 +43,8 @@ public DatabaseContext createDatabaseContext() {
         AuthenticationPropertiesLoader credentialsLoader;
         DatabaseLoginCredentials credentials;
 
-        credentials = new DatabaseLoginCredentials(DatabaseConstants.TASK_DEFAULT_HOST,
+        credentials = new DatabaseLoginCredentials(
+                DatabaseConstants.TASK_DEFAULT_HOST, DatabaseConstants.TASK_DEFAULT_PORT, 
                 DatabaseConstants.TASK_DEFAULT_DATABASE, DatabaseConstants.TASK_DEFAULT_USER,
                 DatabaseConstants.TASK_DEFAULT_PASSWORD, DatabaseConstants.TASK_DEFAULT_FORCE_UTF8,
                 DatabaseConstants.TASK_DEFAULT_PROFILE_SQL, DatabaseConstants.TASK_DEFAULT_DB_TYPE);
diff --git a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/DatabaseContext.java b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/DatabaseContext.java
index b3e5cf14c..943850850 100644
--- a/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/DatabaseContext.java
+++ b/osmosis-pgsimple/src/main/java/org/openstreetmap/osmosis/pgsimple/common/DatabaseContext.java
@@ -62,7 +62,7 @@ public DatabaseContext(DatabaseLoginCredentials loginCredentials) {
 	private Connection getConnectionFromDriverManager() {
 		try {
 			return DriverManager.getConnection(
-				"jdbc:postgresql://" + loginCredentials.getHost() + "/"
+				"jdbc:postgresql://" + loginCredentials.getHost() + ":" + loginCredentials.getPort() + "/"
 				+ loginCredentials.getDatabase(),
 		    	// + "?logLevel=2"
 		    	loginCredentials.getUser(),
diff --git a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/DataSourceManager.java b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/DataSourceManager.java
index 28ec29928..559a57704 100644
--- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/DataSourceManager.java
+++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/DataSourceManager.java
@@ -47,7 +47,8 @@ private void createDataSource() {
 		localDataSource = new BasicDataSource();
 		
 		localDataSource.setDriverClassName("org.postgresql.Driver");
-		localDataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + "/" + credentials.getDatabase()
+		localDataSource.setUrl("jdbc:postgresql://" + credentials.getHost() + ":" + credentials.getPort() + "/"
+          + credentials.getDatabase()
     			/*+ "?loglevel=2"*/);
         
 		localDataSource.setUsername(credentials.getUser());
@@ -87,7 +88,7 @@ private Connection createConnectionFromDriverManager() {
 			}
 			
 			return DriverManager.getConnection(
-				"jdbc:postgresql://" + credentials.getHost() + "/"
+				"jdbc:postgresql://" + credentials.getHost() + ":" + credentials.getPort() + "/"
 				+ credentials.getDatabase(),
 		    	// + "?logLevel=2"
 				credentials.getUser(),