Merge pull request #255 from marklogic/feature/db-fix

Ensuring separate database option is not overridden by connection string

Author: rjrudin

src/main/java/com/marklogic/spark/ContextSupport.java

@@ -114,7 +114,11 @@ private void parseConnectionString(String value, Map<String, String> connectionP
         connectionProps.put(Options.CLIENT_PASSWORD, connectionString.getPassword());
         connectionProps.put(Options.CLIENT_HOST, connectionString.getHost());
         connectionProps.put(Options.CLIENT_PORT, connectionString.getPort() + "");
-        connectionProps.put(Options.CLIENT_DATABASE, connectionString.getDatabase());
+
+        String db = connectionString.getDatabase();
+        if (db != null && db.trim().length() > 0) {
+            connectionProps.put(Options.CLIENT_DATABASE, db);
+        }
     }
 
     protected final long getNumericOption(String optionName, long defaultValue, long minimumValue) {

src/test/java/com/marklogic/spark/BuildConnectionPropertiesTest.java

@@ -40,6 +40,22 @@ void useDefaults() {
                 "they can simply set this to 'direct' instead.");
     }
 
+    @Test
+    void clientUriWithDatabase() {
+        properties.put(Options.CLIENT_DATABASE, "Documents");
+        properties.put(Options.CLIENT_URI, "user:password@host:8016");
+        Map<String, String> connectionProps = new ContextSupport(properties).buildConnectionProperties();
+
+        assertEquals("Documents", connectionProps.get(Options.CLIENT_DATABASE), "If the user does not specify a " +
+            "database in the connection string, then the database value specified separately should still be used. " +
+            "This avoids a potential issue where the user is not aware that the connection string accepts a database " +
+            "and thus specifies it via the database option.");
+        assertEquals("user", connectionProps.get(Options.CLIENT_USERNAME));
+        assertEquals("password", connectionProps.get(Options.CLIENT_PASSWORD));
+        assertEquals("host", connectionProps.get(Options.CLIENT_HOST));
+        assertEquals("8016", connectionProps.get(Options.CLIENT_PORT));
+    }
+
     @Test
     void overrideDefaults() {
         properties.put(AUTH_TYPE, "basic");