Merge pull request #101 from akshaysonvane/update-java-client

Upgrade Java Client API to 4.1.1

Author: rjrudin

build.gradle

@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-  compile 'com.marklogic:marklogic-client-api:4.0.3.1'
+  compile 'com.marklogic:marklogic-client-api:4.1.1'
   compile 'com.marklogic:marklogic-xcc:9.0.3'
   compile 'org.jdom:jdom2:2.0.6'
   compile 'org.springframework:spring-context:4.3.7.RELEASE'

src/main/java/com/marklogic/client/ext/DatabaseClientConfig.java

@@ -1,5 +1,6 @@
 package com.marklogic.client.ext;
 
+import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory.SSLHostnameVerifier;
 
 import javax.net.ssl.SSLContext;
@@ -12,92 +13,93 @@ public class DatabaseClientConfig {
 
 	private SecurityContextType securityContextType = SecurityContextType.DIGEST;
 	private String host;
-    private int port;
-    private String username;
-    private String password;
-    private String database;
-    private SSLContext sslContext;
-    private SSLHostnameVerifier sslHostnameVerifier;
-    private String certFile;
-    private String certPassword;
-    private String externalName;
-    private X509TrustManager trustManager;
+	private int port;
+	private String username;
+	private String password;
+	private String database;
+	private SSLContext sslContext;
+	private SSLHostnameVerifier sslHostnameVerifier;
+	private String certFile;
+	private String certPassword;
+	private String externalName;
+	private X509TrustManager trustManager;
+	private DatabaseClient.ConnectionType connectionType;
 
 	public DatabaseClientConfig() {
-    }
+	}
 
-    public DatabaseClientConfig(String host, int port) {
-    	this.host = host;
-    	this.port = port;
-    }
+	public DatabaseClientConfig(String host, int port) {
+		this.host = host;
+		this.port = port;
+	}
 
-    public DatabaseClientConfig(String host, int port, String username, String password) {
-        this.host = host;
-        this.port = port;
-        this.username = username;
-        this.password = password;
-    }
+	public DatabaseClientConfig(String host, int port, String username, String password) {
+		this.host = host;
+		this.port = port;
+		this.username = username;
+		this.password = password;
+	}
 
-    @Override
-    public String toString() {
-        return String.format("[%s@%s:%d]", username, host, port, username);
-    }
+	@Override
+	public String toString() {
+		return String.format("[%s@%s:%d]", username, host, port, username);
+	}
 
-    public String getHost() {
-        return host;
-    }
+	public String getHost() {
+		return host;
+	}
 
-    public int getPort() {
-        return port;
-    }
+	public int getPort() {
+		return port;
+	}
 
-    public String getUsername() {
-        return username;
-    }
+	public String getUsername() {
+		return username;
+	}
 
-    public String getPassword() {
-        return password;
-    }
+	public String getPassword() {
+		return password;
+	}
 
-    public void setHost(String host) {
-        this.host = host;
-    }
+	public void setHost(String host) {
+		this.host = host;
+	}
 
-    public void setPort(int port) {
-        this.port = port;
-    }
+	public void setPort(int port) {
+		this.port = port;
+	}
 
-    public void setUsername(String username) {
-        this.username = username;
-    }
+	public void setUsername(String username) {
+		this.username = username;
+	}
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
+	public void setPassword(String password) {
+		this.password = password;
+	}
 
-    public SSLContext getSslContext() {
-        return sslContext;
-    }
+	public SSLContext getSslContext() {
+		return sslContext;
+	}
 
-    public void setSslContext(SSLContext sslContext) {
-        this.sslContext = sslContext;
-    }
+	public void setSslContext(SSLContext sslContext) {
+		this.sslContext = sslContext;
+	}
 
-    public SSLHostnameVerifier getSslHostnameVerifier() {
-        return sslHostnameVerifier;
-    }
+	public SSLHostnameVerifier getSslHostnameVerifier() {
+		return sslHostnameVerifier;
+	}
 
-    public void setSslHostnameVerifier(SSLHostnameVerifier sslHostnameVerifier) {
-        this.sslHostnameVerifier = sslHostnameVerifier;
-    }
+	public void setSslHostnameVerifier(SSLHostnameVerifier sslHostnameVerifier) {
+		this.sslHostnameVerifier = sslHostnameVerifier;
+	}
 
-    public String getDatabase() {
-        return database;
-    }
+	public String getDatabase() {
+		return database;
+	}
 
-    public void setDatabase(String database) {
-        this.database = database;
-    }
+	public void setDatabase(String database) {
+		this.database = database;
+	}
 
 	public SecurityContextType getSecurityContextType() {
 		return securityContextType;
@@ -138,4 +140,12 @@ public X509TrustManager getTrustManager() {
 	public void setTrustManager(X509TrustManager trustManager) {
 		this.trustManager = trustManager;
 	}
+
+	public DatabaseClient.ConnectionType getConnectionType() {
+		return connectionType;
+	}
+
+	public void setConnectionType(DatabaseClient.ConnectionType connectionType) {
+		this.connectionType = connectionType;
+	}
 }

src/main/java/com/marklogic/client/ext/DefaultConfiguredDatabaseClientFactory.java

@@ -19,6 +19,7 @@ public DatabaseClient newDatabaseClient(DatabaseClientConfig config) {
 		DatabaseClientFactory.SecurityContext securityContext;
 
 		SecurityContextType securityContextType = config.getSecurityContextType();
+		DatabaseClient.ConnectionType connectionType = config.getConnectionType();
 
 		if (SecurityContextType.BASIC.equals(securityContextType)) {
 			securityContext = new DatabaseClientFactory.BasicAuthContext(config.getUsername(), config.getPassword());
@@ -50,16 +51,30 @@ public DatabaseClient newDatabaseClient(DatabaseClientConfig config) {
 		int port = config.getPort();
 		String database = config.getDatabase();
 
-		if (securityContext == null) {
+		if (connectionType == null) {
+			if (securityContext == null) {
+				if (database == null) {
+					return DatabaseClientFactory.newClient(host, port);
+				}
+				return DatabaseClientFactory.newClient(host, port, database);
+			}
 			if (database == null) {
-				return DatabaseClientFactory.newClient(host, port);
+				return DatabaseClientFactory.newClient(host, port, securityContext);
 			}
-			return DatabaseClientFactory.newClient(host, port, database);
+			return DatabaseClientFactory.newClient(host, port, database, securityContext);
 		}
-		if (database == null) {
-			return DatabaseClientFactory.newClient(host, port, securityContext);
+		else {
+			if (securityContext == null) {
+				if (database == null) {
+					return DatabaseClientFactory.newClient(host, port, null, connectionType);
+				}
+				return DatabaseClientFactory.newClient(host, port, database, null, connectionType);
+			}
+			if (database == null) {
+				return DatabaseClientFactory.newClient(host, port, securityContext, connectionType);
+			}
+			return DatabaseClientFactory.newClient(host, port, database, securityContext, connectionType);
 		}
-		return DatabaseClientFactory.newClient(host, port, database, securityContext);
 	}