#243 Removed depreceated authentication properties

Author: rjrudin

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -77,8 +77,6 @@ public class AppConfig {
     private String restCertFile;
     private String restCertPassword;
     private String restExternalName;
-    @Deprecated
-    private Authentication restAuthentication;
     private Integer restPort = DEFAULT_PORT;
     private Integer testRestPort;
 
@@ -92,8 +90,6 @@ public class AppConfig {
 	private String appServicesCertFile;
 	private String appServicesCertPassword;
 	private String appServicesExternalName;
-	@Deprecated
-	private Authentication appServicesAuthentication;
 
     // These can all be set to override the default names that are generated off of the "name" attribute.
     private String groupName = DEFAULT_GROUP;
@@ -293,7 +289,6 @@ public DatabaseClient newTestDatabaseClient() {
 
     public DatabaseClientConfig newRestDatabaseClientConfig(int port) {
 	    DatabaseClientConfig config = new DatabaseClientConfig(getHost(), port, getRestAdminUsername(), getRestAdminPassword());
-	    config.setAuthentication(getRestAuthentication());
 	    config.setSecurityContextType(restSecurityContextType);
 	    config.setSslHostnameVerifier(getRestSslHostnameVerifier());
 	    config.setSslContext(getRestSslContext());
@@ -323,7 +318,6 @@ public DatabaseClient newSchemasDatabaseClient() {
     public DatabaseClient newAppServicesDatabaseClient(String databaseName) {
 	    DatabaseClientConfig config = new DatabaseClientConfig(getHost(), getAppServicesPort(), getAppServicesUsername(), getAppServicesPassword());
 	    config.setDatabase(databaseName);
-	    config.setAuthentication(getAppServicesAuthentication());
 	    config.setSecurityContextType(appServicesSecurityContextType);
 	    config.setSslHostnameVerifier(getAppServicesSslHostnameVerifier());
 	    config.setSslContext(getAppServicesSslContext());
@@ -521,20 +515,6 @@ public void setGroupName(String groupName) {
         this.groupName = groupName;
     }
 
-    /**
-     * @return the MarkLogic Java Client {@code Authentication} object that is used for authenticating with a REST API
-     * server for loading modules
-     */
-    @Deprecated
-    public Authentication getRestAuthentication() {
-        return restAuthentication;
-    }
-
-    @Deprecated
-    public void setRestAuthentication(Authentication authentication) {
-        this.restAuthentication = authentication;
-    }
-
     /**
      * As of 3.3.0, this now returns the first ConfigDir in the List of ConfigsDir that this class now maintains.
      *
@@ -862,16 +842,6 @@ public void setAppServicesSslHostnameVerifier(SSLHostnameVerifier appServicesSsl
 		this.appServicesSslHostnameVerifier = appServicesSslHostnameVerifier;
 	}
 
-	@Deprecated
-	public Authentication getAppServicesAuthentication() {
-		return appServicesAuthentication;
-	}
-
-	@Deprecated
-	public void setAppServicesAuthentication(Authentication appServicesAuthentication) {
-		this.appServicesAuthentication = appServicesAuthentication;
-	}
-
 	public String getReplicaForestDataDirectory() {
 		return replicaForestDataDirectory;
 	}

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -141,7 +141,6 @@ public AppConfig newAppConfig() {
 		prop = getProperty("mlRestAuthentication");
 		if (prop != null) {
 			logger.info("App REST authentication: " + prop);
-			c.setRestAuthentication(DatabaseClientFactory.Authentication.valueOfUncased(prop));
 			c.setRestSecurityContextType(SecurityContextType.valueOf(prop.toUpperCase()));
 		}
 
@@ -232,7 +231,6 @@ public AppConfig newAppConfig() {
 		if (prop != null) {
 			logger.info("App Services authentication: " + prop);
 			c.setAppServicesSecurityContextType(SecurityContextType.valueOf(prop.toUpperCase()));
-			c.setAppServicesAuthentication(DatabaseClientFactory.Authentication.valueOfUncased(prop));
 		}
 
 		prop = getProperty("mlAppServicesCertFile");

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

@@ -203,7 +203,6 @@ public void allProperties() {
 	    assertEquals((Integer) 8765, config.getTestRestPort());
         assertEquals("propuser2", config.getRestAdminUsername());
         assertEquals("proppassword2", config.getRestAdminPassword());
-	    assertEquals(DatabaseClientFactory.Authentication.CERTIFICATE, config.getRestAuthentication());
         assertEquals(SecurityContextType.CERTIFICATE, config.getRestSecurityContextType());
         assertEquals("restCertFile", config.getRestCertFile());
         assertEquals("restCertPassword", config.getRestCertPassword());
@@ -213,7 +212,6 @@ public void allProperties() {
 	    assertEquals("appServicesUsername", config.getAppServicesUsername());
 	    assertEquals("appServicesPassword", config.getAppServicesPassword());
 	    assertEquals((Integer) 8123, config.getAppServicesPort());
-	    assertEquals(DatabaseClientFactory.Authentication.KERBEROS, config.getAppServicesAuthentication());
 	    assertEquals(SecurityContextType.KERBEROS, config.getAppServicesSecurityContextType());
 	    assertEquals("appServicesCertFile", config.getAppServicesCertFile());
 	    assertEquals("appServicesCertPassword", config.getAppServicesCertPassword());