Merge pull request #472 from marklogic-community/feature/builder-fix

Renamed withSecurityContextType to withAuthType

Author: rjrudin

src/main/java/com/marklogic/mgmt/DefaultManageConfigFactory.java

@@ -46,13 +46,13 @@ public void initialize() {
 
 		propertyConsumerMap.put("mlManageAuthentication", (config, prop) -> {
 			logger.info("Manage authentication: " + prop);
-			config.setSecurityContextType(prop);
+			config.setAuthType(prop);
 		});
 
 		propertyConsumerMap.put("mlAuthentication", (config, prop) -> {
 			if (!propertyExists("mlManageAuthentication")) {
 				logger.info("Manage authentication: " + prop);
-				config.setSecurityContextType(prop);
+				config.setAuthType(prop);
 			}
 		});
 

src/main/java/com/marklogic/mgmt/admin/DefaultAdminConfigFactory.java

@@ -46,13 +46,13 @@ public void initialize() {
 
 		propertyConsumerMap.put("mlAdminAuthentication", (config, prop) -> {
 			logger.info("Admin authentication: " + prop);
-			config.setSecurityContextType(prop);
+			config.setAuthType(prop);
 		});
 
 		propertyConsumerMap.put("mlAuthentication", (config, prop) -> {
 			if (!propertyExists("mlAdminAuthentication")) {
 				logger.info("Admin authentication: " + prop);
-				config.setSecurityContextType(prop);
+				config.setAuthType(prop);
 			}
 		});
 

src/main/java/com/marklogic/rest/util/RestConfig.java

@@ -17,7 +17,7 @@ public class RestConfig {
 	private String host;
 	private int port;
 	// Defaulting this for backwards-compatibility reasons in 4.5.0
-	private String securityContextType = "digest";
+	private String authType = "digest";
 	private String username;
 	private String password;
 	private String cloudApiKey;
@@ -71,7 +71,7 @@ public DatabaseClientBuilder newDatabaseClientBuilder() {
 			.withHost(getHost())
 			.withPort(getPort())
 			.withBasePath(getBasePath())
-			.withSecurityContextType(getSecurityContextType())
+			.withAuthType(getAuthType())
 			.withUsername(getUsername())
 			.withPassword(getPassword())
 			.withCloudApiKey(getCloudApiKey())
@@ -258,12 +258,12 @@ public void setBasePath(String basePath) {
 		this.basePath = basePath;
 	}
 
-	public String getSecurityContextType() {
-		return securityContextType;
+	public String getAuthType() {
+		return authType;
 	}
 
-	public void setSecurityContextType(String securityContextType) {
-		this.securityContextType = securityContextType;
+	public void setAuthType(String authType) {
+		this.authType = authType;
 	}
 
 	public String getCertFile() {

src/test/java/com/marklogic/mgmt/DefaultManageConfigFactoryTest.java

@@ -1,7 +1,6 @@
 package com.marklogic.mgmt;
 
 import com.marklogic.client.DatabaseClientFactory;
-import com.marklogic.mgmt.admin.AdminConfig;
 import com.marklogic.mgmt.util.SimplePropertySource;
 import org.junit.jupiter.api.Test;
 
@@ -120,7 +119,7 @@ void cloudApiKeyAndBasePath() {
 
 		DatabaseClientFactory.Bean bean = config.newDatabaseClientBuilder().buildBean();
 		assertTrue(bean.getSecurityContext() instanceof DatabaseClientFactory.MarkLogicCloudAuthContext);
-		assertEquals("my-key", ((DatabaseClientFactory.MarkLogicCloudAuthContext)bean.getSecurityContext()).getKey());
+		assertEquals("my-key", ((DatabaseClientFactory.MarkLogicCloudAuthContext)bean.getSecurityContext()).getApiKey());
 	}
 
 	@Test
@@ -131,7 +130,7 @@ void certificateAuth() {
 			"mlManageCertPassword", "passwd"
 		);
 
-		assertEquals("certificate", config.getSecurityContextType());
+		assertEquals("certificate", config.getAuthType());
 		assertEquals("my-file.crt", config.getCertFile());
 		assertEquals("passwd", config.getCertPassword());
 	}
@@ -143,7 +142,7 @@ void kerberosAuth() {
 			"mlManageExternalName", "my-name"
 		);
 
-		assertEquals("kerberos", config.getSecurityContextType());
+		assertEquals("kerberos", config.getAuthType());
 		assertEquals("my-name", config.getExternalName());
 
 		DatabaseClientFactory.Bean bean = config.newDatabaseClientBuilder().buildBean();
@@ -158,7 +157,7 @@ void samlAuth() {
 			"mlManageSamlToken", "my-token"
 		);
 
-		assertEquals("saml", config.getSecurityContextType());
+		assertEquals("saml", config.getAuthType());
 		assertEquals("my-token", config.getSamlToken());
 
 		DatabaseClientFactory.Bean bean = config.newDatabaseClientBuilder().buildBean();
@@ -195,13 +194,13 @@ void mlSslHostnameVerifier() {
 	@Test
 	void mlAuthentication() {
 		ManageConfig config = configure("mlAuthentication", "cloud");
-		assertEquals("cloud", config.getSecurityContextType());
+		assertEquals("cloud", config.getAuthType());
 
 		config = configure(
 			"mlAuthentication", "cloud",
 			"mlManageAuthentication", "basic"
 		);
-		assertEquals("basic", config.getSecurityContextType());
+		assertEquals("basic", config.getAuthType());
 	}
 
 	@Test

src/test/java/com/marklogic/mgmt/admin/DefaultAdminConfigFactoryTest.java

@@ -1,9 +1,7 @@
 package com.marklogic.mgmt.admin;
 
 import com.marklogic.client.DatabaseClientFactory;
-import com.marklogic.mgmt.ManageConfig;
 import com.marklogic.mgmt.util.SimplePropertySource;
-import com.marklogic.rest.util.RestTemplateUtil;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -79,7 +77,7 @@ void cloudApiKeyAndBasePath() {
 
 		DatabaseClientFactory.Bean bean = config.newDatabaseClientBuilder().buildBean();
 		assertTrue(bean.getSecurityContext() instanceof DatabaseClientFactory.MarkLogicCloudAuthContext);
-		assertEquals("my-key", ((DatabaseClientFactory.MarkLogicCloudAuthContext)bean.getSecurityContext()).getKey());
+		assertEquals("my-key", ((DatabaseClientFactory.MarkLogicCloudAuthContext)bean.getSecurityContext()).getApiKey());
 	}
 
 	@Test
@@ -90,7 +88,7 @@ void certificateAuth() {
 			"mlAdminCertPassword", "passwd"
 		);
 
-		assertEquals("certificate", config.getSecurityContextType());
+		assertEquals("certificate", config.getAuthType());
 		assertEquals("my-file.crt", config.getCertFile());
 		assertEquals("passwd", config.getCertPassword());
 	}
@@ -102,7 +100,7 @@ void kerberosAuth() {
 			"mlAdminExternalName", "my-name"
 		);
 
-		assertEquals("kerberos", config.getSecurityContextType());
+		assertEquals("kerberos", config.getAuthType());
 		assertEquals("my-name", config.getExternalName());
 
 		DatabaseClientFactory.Bean bean = config.newDatabaseClientBuilder().buildBean();
@@ -117,7 +115,7 @@ void samlAuth() {
 			"mlAdminSamlToken", "my-token"
 		);
 
-		assertEquals("saml", config.getSecurityContextType());
+		assertEquals("saml", config.getAuthType());
 		assertEquals("my-token", config.getSamlToken());
 
 		DatabaseClientFactory.Bean bean = config.newDatabaseClientBuilder().buildBean();
@@ -154,13 +152,13 @@ void mlSslHostnameVerifier() {
 	@Test
 	void mlAuthentication() {
 		AdminConfig config = configure("mlAuthentication", "cloud");
-		assertEquals("cloud", config.getSecurityContextType());
+		assertEquals("cloud", config.getAuthType());
 
 		config = configure(
 			"mlAuthentication", "cloud",
 			"mlAdminAuthentication", "basic"
 		);
-		assertEquals("basic", config.getSecurityContextType());
+		assertEquals("basic", config.getAuthType());
 	}
 
 	@Test