#403 Removing deprecated features

Will document this in the Wiki

Author: rjrudin

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

@@ -149,9 +149,6 @@ public class AppConfig {
     // Passed into the PayloadTokenReplacer that subclasses of AbstractCommand use
     private Map<String, String> customTokens = new HashMap<>();
 
-	@Deprecated
-    private boolean createTriggersDatabase = false;
-
     // Controls whether forests are created when a database is created
     private boolean createForests = true;
 
@@ -611,18 +608,6 @@ public void setGroupName(String groupName) {
         this.groupName = groupName;
     }
 
-    /**
-     * As of 3.3.0, this now returns the first ConfigDir in the List of ConfigsDir that this class now maintains.
-     *
-     * @return a {@code ConfigDir} instance that defines the location of the configuration directory (where files are
-     * stored that are then loaded via MarkLogic Management API endpoints) as well as paths to specific
-     * resources within that directory
-     */
-    @Deprecated
-    public ConfigDir getConfigDir() {
-    	return getFirstConfigDir();
-    }
-
 	/**
 	 * Starting in 3.3.0, use this when you only care about the first ConfigDir in the List of ConfigDirs maintained by
 	 * this class.
@@ -1315,16 +1300,6 @@ public void setAppServicesTrustManager(X509TrustManager appServicesTrustManager)
 		this.appServicesTrustManager = appServicesTrustManager;
 	}
 
-	@Deprecated
-	public boolean isCreateTriggersDatabase() {
-		return createTriggersDatabase;
-	}
-
-	@Deprecated
-	public void setCreateTriggersDatabase(boolean createTriggerDatabase) {
-		this.createTriggersDatabase = createTriggerDatabase;
-	}
-
 	public ReplicaBuilderStrategy getReplicaBuilderStrategy() {
 		return replicaBuilderStrategy;
 	}
@@ -1373,30 +1348,6 @@ public void setSchemaPaths(List<String> schemaPaths) {
 		this.schemaPaths = schemaPaths;
 	}
 
-	/**
-	 * With the 3.13.0 release, this should no longer be used, as it necessarily has to clear out the current list
-	 * of schema paths in order to set the list to the single path passed in.
-	 *
-	 * @param path
-	 */
-	@Deprecated
-	public void setSchemasPath(String path) {
-    	List<String> paths = new ArrayList<>();
-    	paths.add(path);
-    	setSchemaPaths(paths);
-	}
-
-	/**
-	 * @return the last path in schemaPaths, if any exist
-	 */
-	@Deprecated
-	public String getSchemasPath() {
-		if (schemaPaths == null || schemaPaths.isEmpty()) {
-			return null;
-		}
-		return schemaPaths.get(schemaPaths.size() - 1);
-	}
-
 	public boolean isMergeResources() {
 		return mergeResources;
 	}
@@ -1437,22 +1388,6 @@ public void setCmaConfig(CmaConfig cmaConfig) {
 		this.cmaConfig = cmaConfig;
 	}
 
-	// Still used by DHF 4.3.x
-	@Deprecated
-	public void setDeployForestsWithCma(boolean b) {
-		getCmaConfig().setDeployForests(b);
-	}
-	@Deprecated
-	public void setDeployPrivilegesWithCma(boolean b) {
-		getCmaConfig().setDeployPrivileges(b);
-	}
-	@Deprecated
-	public void setDeployAmpsWithCma(boolean b) {
-		getCmaConfig().setDeployAmps(b);
-	}
-	// End of methods still used by DHF 4.3.x
-
-
 	public boolean isRestUseDefaultKeystore() {
 		return restUseDefaultKeystore;
 	}

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

@@ -21,9 +21,6 @@ public class ConfigDir {
 
 	private String restApiPath = "rest-api.json";
 
-	@Deprecated
-	private List<File> contentDatabaseFiles;
-
 	private File projectDir;
 
 	public static ConfigDir withProjectDir(File projectDir) {
@@ -43,7 +40,6 @@ public ConfigDir(File baseDir) {
 
 	public void setBaseDir(File baseDir) {
 		this.baseDir = baseDir;
-		initializeContentDatabaseFiles();
 	}
 
 	public File getDatabasesDir() {
@@ -65,12 +61,6 @@ public List<File> getDatabaseResourceDirectories() {
 		return new ArrayList<>();
 	}
 
-	@Deprecated
-	protected void initializeContentDatabaseFiles() {
-		contentDatabaseFiles = new ArrayList<>();
-		contentDatabaseFiles.add(new File(getDatabasesDir(), defaultContentDatabaseFilename));
-	}
-
 	public File getRestApiFile() {
 		return new File(baseDir, restApiPath);
 	}
@@ -242,16 +232,6 @@ public File getBaseDir() {
 		return baseDir;
 	}
 
-	@Deprecated
-	public List<File> getContentDatabaseFiles() {
-		return contentDatabaseFiles;
-	}
-
-	@Deprecated
-	public void setContentDatabaseFiles(List<File> contentDatabaseFiles) {
-		this.contentDatabaseFiles = contentDatabaseFiles;
-	}
-
 	public String getDefaultContentDatabaseFilename() {
 		return defaultContentDatabaseFilename;
 	}

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

@@ -42,8 +42,6 @@ public AppConfig newAppConfig() {
 			}
 		}
 
-		setDefaultsForDatabasesWithForestsOnOneHost(appConfig);
-
 		return appConfig;
 	}
 
@@ -875,32 +873,6 @@ protected ConfigDir buildConfigDir(String path) {
 		return new ConfigDir(baseDir);
 	}
 
-	/**
-	 * This was added in 3.11.0 to mirror the functionality of the now-deprecated DeployTriggersDatabaseCommand and
-	 * DeploySchemasDatabaseCommand classes. But the mlDatabasesWithForestsOnOneHost property is the better way of
-	 * handling this so that it's explicitly configured, rather than happening magically via setting mlAppName.
-	 *
-	 * @param appConfig
-	 */
-	@Deprecated
-	protected void setDefaultsForDatabasesWithForestsOnOneHost(AppConfig appConfig) {
-		Set<String> set = appConfig.getDatabasesWithForestsOnOneHost();
-		if (set == null || set.isEmpty()) {
-			set = new HashSet<>();
-			final String triggersName = appConfig.getTriggersDatabaseName();
-			if (triggersName != null) {
-				set.add(triggersName);
-			}
-			final String schemasName = appConfig.getSchemasDatabaseName();
-			if (schemasName != null) {
-				set.add(schemasName);
-			}
-			if (!set.isEmpty()) {
-				appConfig.setDatabasesWithForestsOnOneHost(set);
-			}
-		}
-	}
-
 	protected List<String> buildPathListFromCommaDelimitedString(String prop) {
 		String[] paths = prop.split(",");
 		List<String> list = new ArrayList<>();

src/main/java/com/marklogic/appdeployer/command/SortOrderConstants.java

@@ -27,11 +27,6 @@ public abstract class SortOrderConstants {
 	// then the forests will be created on the correct hosts.
 	public static Integer ASSIGN_HOSTS_TO_GROUPS = 95;
 
-	@Deprecated
-	public static Integer DEPLOY_TRIGGERS_DATABASE = 100;
-	@Deprecated
-	public static Integer DEPLOY_SCHEMAS_DATABASE = 100;
-
 	public static Integer DEPLOY_OTHER_DATABASES = 120;
 	public static Integer DEPLOY_FORESTS = 150;
 	public static Integer DEPLOY_PARTITIONS = 170;
@@ -108,14 +103,8 @@ public abstract class SortOrderConstants {
 	 */
 	public static Integer DELETE_FOREST_REPLICAS = 8000;
 
-	public static Integer DELETE_CONTENT_DATABASES = 8100;
 	public static Integer DELETE_OTHER_DATABASES = 8120;
 
-	@Deprecated
-	public static Integer DELETE_TRIGGERS_DATABASE = 8140;
-	@Deprecated
-	public static Integer DELETE_SCHEMAS_DATABASE = 8160;
-
 	public static Integer DELETE_REST_API_SERVERS = 7000;
 
 	// Amps can reference roles and databases, so must delete amps before both (and before deleting REST API servers

src/main/java/com/marklogic/appdeployer/command/databases/DeployContentDatabasesCommand.java

@@ -153,7 +153,6 @@ public List<DatabasePlan> buildDatabasePlans(CommandContext context) {
 		DatabasePlans databasePlan = new DatabasePlans();
 
 		for (ConfigDir configDir : context.getAppConfig().getConfigDirs()) {
-			addLegacyContentDatabaseFiles(context, configDir, databasePlan);
 			addDatabaseFiles(context, configDir, databasePlan);
 		}
 
@@ -168,42 +167,6 @@ public List<DatabasePlan> buildDatabasePlans(CommandContext context) {
 		return databasePlans;
 	}
 
-	/**
-	 * This processes the content database files as defined in the ConfigDir object. This approach dates back to the
-	 * 2.0 release of ml-app-deployer, where multiple files could be defined for the content database. Starting in
-	 * 3.14.0, multiple files will be detected and merged automatically for several resources, including database,
-	 * thus rendering this approach unnecessary. But it's being kept for backwards-compatibility purposes.
-	 *
-	 * @param context
-	 * @param configDir
-	 * @param databasePlans
-	 */
-	@Deprecated
-	protected void addLegacyContentDatabaseFiles(CommandContext context, ConfigDir configDir, DatabasePlans databasePlans) {
-		List<File> files = configDir.getContentDatabaseFiles();
-		if (files != null && !files.isEmpty()) {
-			for (File f : files) {
-				// We're not using listFilesInDirectory, but should still apply the filename filter
-				if (f != null && f.exists() && getResourceFilenameFilter().accept(f.getParentFile(), f.getName())) {
-					String payload = copyFileToString(f, context);
-					String databaseName = payloadParser.getPayloadFieldValue(payload, "database-name", false);
-					if (databaseName != null) {
-						if (databasePlans.getMainContentDatabaseName() == null) {
-							databasePlans.setMainContentDatabaseName(databaseName);
-						}
-						if (databasePlans.getDatabasePlanMap().containsKey(databaseName)) {
-							DatabasePlan ref = databasePlans.getDatabasePlanMap().get(databaseName);
-							ref.addFile(f);
-							ref.setMainContentDatabase(true);
-						} else {
-							databasePlans.getDatabasePlanMap().put(databaseName, new DatabasePlan(databaseName, f, true));
-						}
-					}
-				}
-			}
-		}
-	}
-
 	/**
 	 * @param context
 	 * @param configDir