MLE-25959 Deprecating AUTH_TYPE_MARKLOGIC_CLOUD

Should have renamed this in a prior release.

Author: rjrudin

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

@@ -29,7 +29,15 @@ public class DatabaseClientBuilder {
 	public final static String PREFIX = "marklogic.client.";
 	public final static String AUTH_TYPE_BASIC = "basic";
 	public final static String AUTH_TYPE_DIGEST = "digest";
-	public final static String AUTH_TYPE_MARKLOGIC_CLOUD = "cloud";
+
+	public final static String AUTH_TYPE_CLOUD = "cloud";
+
+	/**
+	 * @deprecated as of 8.1.0, use AUTH_TYPE_CLOUD instead
+	 */
+	@Deprecated
+	public final static String AUTH_TYPE_MARKLOGIC_CLOUD = AUTH_TYPE_CLOUD;
+
 	public final static String AUTH_TYPE_KERBEROS = "kerberos";
 	public final static String AUTH_TYPE_CERTIFICATE = "certificate";
 	public final static String AUTH_TYPE_SAML = "saml";
@@ -150,7 +158,7 @@ public DatabaseClientBuilder withDigestAuth(String username, String password) {
 	}
 
 	public DatabaseClientBuilder withCloudAuth(String apiKey, String basePath) {
-		return withAuthType(AUTH_TYPE_MARKLOGIC_CLOUD)
+		return withAuthType(AUTH_TYPE_CLOUD)
 			.withCloudApiKey(apiKey)
 			.withBasePath(basePath);
 	}
@@ -163,7 +171,7 @@ public DatabaseClientBuilder withCloudAuth(String apiKey, String basePath) {
 	 * @since 6.3.0
 	 */
 	public DatabaseClientBuilder withCloudAuth(String apiKey, String basePath, Integer tokenDuration) {
-		return withAuthType(AUTH_TYPE_MARKLOGIC_CLOUD)
+		return withAuthType(AUTH_TYPE_CLOUD)
 			.withCloudApiKey(apiKey)
 			.withBasePath(basePath)
 			.withCloudTokenDuration(tokenDuration != null ? tokenDuration.toString() : null);

marklogic-client-api/src/main/java/com/marklogic/client/impl/DatabaseClientPropertySource.java

@@ -185,7 +185,7 @@ private DatabaseClientFactory.SecurityContext newSecurityContext(String type, Co
 				return newBasicAuthContext(connectionString);
 			case DatabaseClientBuilder.AUTH_TYPE_DIGEST:
 				return newDigestAuthContext(connectionString);
-			case DatabaseClientBuilder.AUTH_TYPE_MARKLOGIC_CLOUD:
+			case DatabaseClientBuilder.AUTH_TYPE_CLOUD:
 				return newCloudAuthContext();
 			case DatabaseClientBuilder.AUTH_TYPE_KERBEROS:
 				return newKerberosAuthContext();
@@ -400,7 +400,7 @@ private String getSSLProtocol(String authType) {
 		}
 		// For convenience for Progress Data Cloud users, assume the JVM's default SSLContext should trust the certificate
 		// used by Progress Data Cloud. A user can always override this default behavior by providing their own SSLContext.
-		if ((sslProtocol == null || sslProtocol.length() == 0) && DatabaseClientBuilder.AUTH_TYPE_MARKLOGIC_CLOUD.equalsIgnoreCase(authType)) {
+		if ((sslProtocol == null || sslProtocol.length() == 0) && DatabaseClientBuilder.AUTH_TYPE_CLOUD.equalsIgnoreCase(authType)) {
 			sslProtocol = "default";
 		}
 		return sslProtocol;