provide missing configuration in DatabaseClientFactory.Bean #1020 -

Fixed the code.

Author: anu3990

marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClientFactory.java

@@ -1216,9 +1216,6 @@ static public class Bean implements Serializable {
     private           DatabaseClient.ConnectionType connectionType;
     private           HandleFactoryRegistry handleRegistry =
       HandleFactoryRegistryImpl.newDefault();
-    private String certFile;
-	private String certPassword;
-	private X509TrustManager trustManager;
 
     transient private SSLContext            context;
     transient private SSLHostnameVerifier   verifier;
@@ -1233,18 +1230,6 @@ public Bean() {
       super();
     }
 
-    public Bean(String host, int port) {
-		this.host = host;
-		this.port = port;
-	}
-
-	public Bean(String host, int port, String username, String password) {
-		this.host = host;
-		this.port = port;
-		this.user = username;
-		this.password = password;
-		this.authentication = Authentication.DIGEST;
-	}
 
     /**
      * Returns the host for clients created with a
@@ -1457,29 +1442,6 @@ public DatabaseClient.ConnectionType getConnectionType() {
     public void setConnectionType(DatabaseClient.ConnectionType connectionType) {
       this.connectionType = connectionType;
     }
-    public String getCertFile() {
-		return certFile;
-	}
-
-	public void setCertFile(String certFile) {
-		this.certFile = certFile;
-	}
-
-	public String getCertPassword() {
-		return certPassword;
-	}
-
-	public void setCertPassword(String certPassword) {
-		this.certPassword = certPassword;
-	}
-
-	public X509TrustManager getTrustManager() {
-		return trustManager;
-	}
-
-	public void setTrustManager(X509TrustManager trustManager) {
-		this.trustManager = trustManager;
-	}
 
     /**
      * Returns the registry for associating
@@ -1513,10 +1475,9 @@ public void registerDefaultHandles() {
      * The client accesses the database by means of a REST server.
      * @return	a new client for making database requests
      */
-    public DatabaseClient newClient() {
+	public DatabaseClient newClient() {
       DatabaseClientImpl client = (DatabaseClientImpl) DatabaseClientFactory.newClient(
-            host, port, database,
-            makeSecurityContext(user, password, authentication, context, verifier),
+            host, port, database, (securityContext!=null? securityContext:makeSecurityContext(user, password, authentication, context, verifier)),
             connectionType);
       client.setHandleRegistry(getHandleRegistry().copy());
       return client;