#784 - Removed the new newClient methods

vivekmuniyandi · vivekmuniyandi · commit 6921f8c575fb · 2017-07-27T12:29:54.000-07:00
diff --git a/src/main/java/com/marklogic/client/DatabaseClientFactory.java b/src/main/java/com/marklogic/client/DatabaseClientFactory.java
@@ -21,7 +21,6 @@
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
-import javax.net.ssl.TrustManager;
 
 import okhttp3.OkHttpClient;
 import org.slf4j.Logger;
@@ -213,7 +212,7 @@ private DatabaseClientFactory() {
    * @return	a new client for making database requests
    */
   static public DatabaseClient newClient(String host, int port) {
-    return newClient(host, port, null, null, null, null, null, null, null);
+    return newClient(host, port, null, null, null, null, null, null);
   }
 
   /**
@@ -227,7 +226,7 @@ static public DatabaseClient newClient(String host, int port) {
    * @return	a new client for making database requests
    */
   static public DatabaseClient newClient(String host, int port, String database) {
-    return newClient(host, port, database, null, null, null, null, null, null);
+    return newClient(host, port, database, null, null, null, null, null);
   }
 
   /**
@@ -241,7 +240,7 @@ static public DatabaseClient newClient(String host, int port, String database) {
    * @return	a new client for making database requests
    */
   static public DatabaseClient newClient(String host, int port, String user, String password, Authentication type) {
-    return newClient(host, port, null, user, password, type, null, null, null);
+    return newClient(host, port, null, user, password, type, null, null);
   }
   /**
    * Creates a client to access the database by means of a REST server.
@@ -255,7 +254,7 @@ static public DatabaseClient newClient(String host, int port, String user, Strin
    * @return	a new client for making database requests
    */
   static public DatabaseClient newClient(String host, int port, String database, String user, String password, Authentication type) {
-    return newClient(host, port, database, user, password, type, null, null, null);
+    return newClient(host, port, database, user, password, type, null, null);
   }
   /**
    * Creates a client to access the database by means of a REST server.
@@ -267,26 +266,9 @@ static public DatabaseClient newClient(String host, int port, String database, S
    * @param type	the type of authentication applied to the request
    * @param context	the SSL context for authenticating with the server
    * @return	a new client for making database requests
-   * @deprecated use {@link DatabaseClientFactory#newClient(String, int, String, String, Authentication, SSLContext, TrustManager)}}
    */
   static public DatabaseClient newClient(String host, int port, String user, String password, Authentication type, SSLContext context) {
-    return newClient(host, port, null, user, password, type, context, null, SSLHostnameVerifier.COMMON);
-  }
-  /**
-   * Creates a client to access the database by means of a REST server.
-   *
-   * @param host  the host with the REST server
-   * @param port  the port for the REST server
-   * @param user  the user with read, write, or administrative privileges
-   * @param password  the password for the user
-   * @param type  the type of authentication applied to the request
-   * @param context the SSL context for authenticating with the server
-   * @param trustManager the TrustManager object which is responsible for
-   *                     deciding if a credential should be trusted or not.
-   * @return  a new client for making database requests
-   */
-  static public DatabaseClient newClient(String host, int port, String user, String password, Authentication type, SSLContext context, TrustManager trustManager) {
-    return newClient(host, port, null, user, password, type, context, trustManager, SSLHostnameVerifier.COMMON);
+    return newClient(host, port, null, user, password, type, context, SSLHostnameVerifier.COMMON);
   }
   /**
    * Creates a client to access the database by means of a REST server.
@@ -299,27 +281,9 @@ static public DatabaseClient newClient(String host, int port, String user, Strin
    * @param type	the type of authentication applied to the request
    * @param context	the SSL context for authenticating with the server
    * @return	a new client for making database requests
-   * @deprecated use {@link DatabaseClientFactory#newClient(String, int, String, String, String, Authentication, SSLContext, TrustManager)}}
    */
   static public DatabaseClient newClient(String host, int port, String database, String user, String password, Authentication type, SSLContext context) {
-    return newClient(host, port, database, user, password, type, context, null, SSLHostnameVerifier.COMMON);
-  }
-  /**
-   * Creates a client to access the database by means of a REST server.
-   *
-   * @param host  the host with the REST server
-   * @param port  the port for the REST server
-   * @param database  the database to access (default: configured database for the REST server)
-   * @param user  the user with read, write, or administrative privileges
-   * @param password  the password for the user
-   * @param type  the type of authentication applied to the request
-   * @param context the SSL context for authenticating with the server
-   * @param trustManager the TrustManager object which is responsible for
-   *                     deciding if a credential should be trusted or not.
-   * @return  a new client for making database requests
-   */
-  static public DatabaseClient newClient(String host, int port, String database, String user, String password, Authentication type, SSLContext context, TrustManager trustManager) {
-    return newClient(host, port, database, user, password, type, context, trustManager, SSLHostnameVerifier.COMMON);
+    return newClient(host, port, database, user, password, type, context, SSLHostnameVerifier.COMMON);
   }
   /**
    * Creates a client to access the database by means of a REST server.
@@ -332,29 +296,9 @@ static public DatabaseClient newClient(String host, int port, String database, S
    * @param context	the SSL context for authenticating with the server
    * @param verifier	a callback for checking hostnames
    * @return	a new client for making database requests
-   * @deprecated use {@link DatabaseClientFactory#newClient(String, int, String, String, Authentication, SSLContext, TrustManager, SSLHostnameVerifier)}
    */
   static public DatabaseClient newClient(String host, int port, String user, String password, Authentication type, SSLContext context, SSLHostnameVerifier verifier) {
-    DatabaseClientImpl client = newClientImpl(host, port, null, user, password, type, context, null, verifier);
-    client.setHandleRegistry(getHandleRegistry().copy());
-    return client;
-  }
-  /**
-   * Creates a client to access the database by means of a REST server.
-   *
-   * @param host  the host with the REST server
-   * @param port  the port for the REST server
-   * @param user  the user with read, write, or administrative privileges
-   * @param password  the password for the user
-   * @param type  the type of authentication applied to the request
-   * @param context the SSL context for authenticating with the server
-   * @param trustManager the TrustManager object which is responsible for
-   *                     deciding if a credential should be trusted or not.
-   * @param verifier  a callback for checking hostnames
-   * @return  a new client for making database requests
-   */
-  static public DatabaseClient newClient(String host, int port, String user, String password, Authentication type, SSLContext context, TrustManager trustManager, SSLHostnameVerifier verifier) {
-    DatabaseClientImpl client = newClientImpl(host, port, null, user, password, type, context, trustManager, verifier);
+    DatabaseClientImpl client = newClientImpl(host, port, null, user, password, type, context, verifier);
     client.setHandleRegistry(getHandleRegistry().copy());
     return client;
   }
@@ -370,34 +314,13 @@ static public DatabaseClient newClient(String host, int port, String user, Strin
    * @param context the SSL context for authenticating with the server
    * @param verifier  a callback for checking hostnames
    * @return  a new client for making database requests
-   * @deprecated use {@link DatabaseClientFactory#newClient(String, int, String, String, String, Authentication, SSLContext, TrustManager, SSLHostnameVerifier)}}
    */
   static public DatabaseClient newClient(String host, int port, String database, String user, String password, Authentication type, SSLContext context, SSLHostnameVerifier verifier) {
-    DatabaseClientImpl client = newClientImpl(host, port, database, user, password, type, context, null, verifier);
-    client.setHandleRegistry(getHandleRegistry().copy());
-    return client;
-  }
-  /**
-   * Creates a client to access the database by means of a REST server.
-   *
-   * @param host	the host with the REST server
-   * @param port	the port for the REST server
-   * @param database	the database to access (default: configured database for the REST server)
-   * @param user	the user with read, write, or administrative privileges
-   * @param password	the password for the user
-   * @param type	the type of authentication applied to the request
-   * @param context	the SSL context for authenticating with the server
-   * @param trustManager the TrustManager object which is responsible for
-   *                     deciding if a credential should be trusted or not.
-   * @param verifier	a callback for checking hostnames
-   * @return	a new client for making database requests
-   */
-  static public DatabaseClient newClient(String host, int port, String database, String user, String password, Authentication type, SSLContext context, TrustManager trustManager, SSLHostnameVerifier verifier) {
-    DatabaseClientImpl client = newClientImpl(host, port, database, user, password, type, context, trustManager, verifier);
+    DatabaseClientImpl client = newClientImpl(host, port, database, user, password, type, context, verifier);
     client.setHandleRegistry(getHandleRegistry().copy());
     return client;
   }
-  static private DatabaseClientImpl newClientImpl(String host, int port, String database, String user, String password, Authentication type, SSLContext context, TrustManager trustManager, SSLHostnameVerifier verifier) {
+  static private DatabaseClientImpl newClientImpl(String host, int port, String database, String user, String password, Authentication type, SSLContext context, SSLHostnameVerifier verifier) {
     logger.debug("Creating new database client for server at "+host+":"+port);
     OkHttpServices services = new OkHttpServices();
     services.connect(host, port, database, user, password, type, context, verifier);
@@ -498,7 +421,6 @@ static public class Bean implements Serializable {
 
     transient private SSLContext            context;
     transient private SSLHostnameVerifier   verifier;
-    transient private TrustManager          trustManager;
 
     /**
      * Zero-argument constructor for bean applications. Other
@@ -613,22 +535,6 @@ public SSLContext getContext() {
     public void setContext(SSLContext context) {
       this.context = context;
     }
-    /**
-     * Returns the TrustManager for SSL clients created with a
-     * DatabaseClientFactory.Bean object.
-     * @return  the TrustManager
-     */
-    public TrustManager getTrustManager() {
-      return trustManager;
-    }
-    /**
-     * Specifies the TrustManager for clients created with a
-     * DatabaseClientFactory.Bean object that authenticate with SSL.
-     * @param trustManager the TrustManager
-     */
-    public void setTrustManager(TrustManager trustManager) {
-      this.trustManager = trustManager;
-    }
     /**
      * Returns the host verifier for clients created with a
      * DatabaseClientFactory.Bean object.
@@ -680,7 +586,7 @@ public void registerDefaultHandles() {
      * @return	a new client for making database requests
      */
     public DatabaseClient newClient() {
-      DatabaseClientImpl client = newClientImpl(host, port, database, user, password, authentication, context, trustManager, verifier);
+      DatabaseClientImpl client = newClientImpl(host, port, database, user, password, authentication, context, verifier);
       client.setHandleRegistry(getHandleRegistry().copy());
 
       return client;
diff --git a/src/main/java/com/marklogic/client/impl/OkHttpServices.java b/src/main/java/com/marklogic/client/impl/OkHttpServices.java
@@ -124,8 +124,6 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
 import javax.ws.rs.core.NewCookie;
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
@@ -284,17 +282,10 @@ private FailedRequest extractErrorFields(Response response) {
     }
   }
 
-  @Deprecated
-  public void connect(String host, int port, String database, String user, String password,
-                      Authentication authenType, SSLContext sslContext,
-                      SSLHostnameVerifier verifier) {
-    connect(host, port, database, user, password, authenType, sslContext, null, verifier);
-  }
   @Override
-
   public void connect(String host, int port, String database, String user, String password,
-                      Authentication authenType, SSLContext sslContext, TrustManager trustManager,
-                      SSLHostnameVerifier verifier) {
+      Authentication authenType, SSLContext sslContext,
+      SSLHostnameVerifier verifier) {
     HostnameVerifier hostnameVerifier = null;
     if (verifier == SSLHostnameVerifier.ANY) {
       hostnameVerifier = new HostnameVerifier() {
@@ -313,11 +304,11 @@ public boolean verify(String hostname, SSLSession session) {
     //  throw new IllegalArgumentException(
     //    "Null SSLContext but non-null SSLHostnameVerifier for client");
     //}
-    connect(host, port, database, user, password, authenType, sslContext, trustManager, hostnameVerifier);
+    connect(host, port, database, user, password, authenType, sslContext, hostnameVerifier);
   }
 
   private void connect(String host, int port, String database, String user, String password,
-                       Authentication authenType, SSLContext sslContext, TrustManager trustManager,
+                       Authentication authenType, SSLContext sslContext,
                        HostnameVerifier verifier) {
     logger.debug("Connecting to {} at {} as {}", new Object[]{host, port, user});
 
@@ -368,13 +359,7 @@ private void connect(String host, int port, String database, String user, String
       .readTimeout(0, TimeUnit.SECONDS)
       .writeTimeout(0, TimeUnit.SECONDS);
 
-    if(sslContext != null) {
-      if(trustManager == null) {
-        clientBldr.sslSocketFactory(sslContext.getSocketFactory());
-      } else {
-        clientBldr.sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustManager);
-      }
-    }
+    if(sslContext != null)  clientBldr.sslSocketFactory(sslContext.getSocketFactory());
 
     if ( authenticator != null ) {
       clientBldr = clientBldr.authenticator(new CachingAuthenticatorDecorator(authenticator, authCache));
diff --git a/src/main/java/com/marklogic/client/impl/RESTServices.java b/src/main/java/com/marklogic/client/impl/RESTServices.java
@@ -21,7 +21,6 @@
 import java.util.Set;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory.Authentication;
@@ -103,11 +102,8 @@ public interface RESTServices {
 	String MAX_DELAY_PROP = "com.marklogic.client.maximumRetrySeconds";
 	String MIN_RETRY_PROP = "com.marklogic.client.minimumRetries";
 
-	@Deprecated
 	public void connect(String host, int port, String database, String user, String password, Authentication type,
 			SSLContext context, SSLHostnameVerifier verifier);
-	public void connect(String host, int port, String database, String user, String password, Authentication type,
-			SSLContext context, TrustManager trustManager, SSLHostnameVerifier verifier);
 	public DatabaseClient getDatabaseClient();
 	public void setDatabaseClient(DatabaseClient client);
 	public void release();
