Merge pull request #445 from hansenmc/cleanupLinting

Apply various code quality fixes, remove unused imports, use diamond operator, try-with-resources, etc

Author: ryanjdew

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

@@ -457,9 +457,7 @@ public void initialize() {
 			logger.info("Databases that will have their forest(s) created on a single host: " + prop);
 			String[] names = prop.split(",");
 			Set<String> set = new HashSet<>();
-			for (String name : names) {
-				set.add(name);
-			}
+			set.addAll(Arrays.asList(names));
 			config.setDatabasesWithForestsOnOneHost(set);
 		});
 
@@ -904,9 +902,7 @@ protected Map<String, List<String>> buildMapOfListsFromDelimitedString(String st
 			String dbName = tokens[i];
 			String[] hostNames = tokens[i + 1].split("\\|");
 			List<String> names = new ArrayList<>();
-			for (String name : hostNames) {
-				names.add(name);
-			}
+			names.addAll(Arrays.asList(hostNames));
 			map.put(dbName, names);
 		}
 		return map;

src/main/java/com/marklogic/appdeployer/cli/Main.java

@@ -102,11 +102,8 @@ private static PropertySource buildPropertySource(Options options) throws IOExce
 			if (logger.isInfoEnabled()) {
 				logger.info("Reading properties from file path: " + propertiesFilePath);
 			}
-			FileInputStream fis = new FileInputStream(propertiesFilePath);
-			try {
+			try (FileInputStream fis = new FileInputStream(propertiesFilePath)) {
 				props.load(fis);
-			} finally {
-				fis.close();
 			}
 
 			// Dynamic params override what's in the properties file

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

@@ -75,9 +75,7 @@ public void setFilenamesToIgnore(String... filenames) {
 				} else {
 					set = new HashSet<>();
 				}
-				for (String f : filenames) {
-					set.add(f);
-				}
+				set.addAll(Arrays.asList(filenames));
 				rff.setFilenamesToIgnore(set);
 			} else {
 				logger.warn("resourceFilenameFilter is not an instanceof ResourceFilenameFilter, so unable to set resource filenames to ignore");

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

@@ -92,35 +92,35 @@ public List<Command> getCommandsForReplicaCluster() {
 	}
 
 	private void addCommandsThatDoNotWriteToDatabases(Map<String, List<Command>> map) {
-		List<Command> clusterCommands = new ArrayList<Command>();
+		List<Command> clusterCommands = new ArrayList<>();
 		clusterCommands.add(new ModifyLocalClusterCommand());
 		map.put("mlClusterCommands", clusterCommands);
 
 		List<Command> configurationCommands = new ArrayList<>();
 		configurationCommands.add(new DeployConfigurationsCommand());
 		map.put("mlConfigurationCommands", configurationCommands);
 
-		List<Command> dbCommands = new ArrayList<Command>();
+		List<Command> dbCommands = new ArrayList<>();
 		dbCommands.add(new DeployOtherDatabasesCommand());
 		map.put("mlDatabaseCommands", dbCommands);
 
-		List<Command> forestCommands = new ArrayList<Command>();
+		List<Command> forestCommands = new ArrayList<>();
 		forestCommands.add(new DeployCustomForestsCommand());
 		map.put("mlForestCommands", forestCommands);
 
-		List<Command> replicaCommands = new ArrayList<Command>();
+		List<Command> replicaCommands = new ArrayList<>();
 		replicaCommands.add(new ConfigureForestReplicasCommand());
 		map.put("mlForestReplicaCommands", replicaCommands);
 
-		List<Command> groupCommands = new ArrayList<Command>();
+		List<Command> groupCommands = new ArrayList<>();
 		groupCommands.add(new DeployGroupsCommand());
 		map.put("mlGroupCommands", groupCommands);
 
-		List<Command> hostCommands = new ArrayList<Command>();
+		List<Command> hostCommands = new ArrayList<>();
 		hostCommands.add(new AssignHostsToGroupsCommand());
 		map.put("mlHostCommands", hostCommands);
 
-		List<Command> mimetypeCommands = new ArrayList<Command>();
+		List<Command> mimetypeCommands = new ArrayList<>();
 		mimetypeCommands.add(new DeployMimetypesCommand());
 		map.put("mlMimetypeCommands", mimetypeCommands);
 
@@ -137,7 +137,7 @@ private void addCommandsThatDoNotWriteToDatabases(Map<String, List<Command>> map
 		restApiCommands.add(new DeployRestApiServersCommand());
 		map.put("mlRestApiCommands", restApiCommands);
 
-		List<Command> securityCommands = new ArrayList<Command>();
+		List<Command> securityCommands = new ArrayList<>();
 		securityCommands.add(new DeployRolesCommand());
 		securityCommands.add(new DeployUsersCommand());
 		securityCommands.add(new DeployAmpsCommand());
@@ -157,20 +157,20 @@ private void addCommandsThatDoNotWriteToDatabases(Map<String, List<Command>> map
 		serverCommands.add(new UpdateRestApiServersCommand());
 		map.put("mlServerCommands", serverCommands);
 
-		List<Command> taskCommands = new ArrayList<Command>();
+		List<Command> taskCommands = new ArrayList<>();
 		taskCommands.add(new DeployScheduledTasksCommand());
 		taskCommands.add(new UpdateTaskServerCommand());
 		map.put("mlTaskCommands", taskCommands);
 	}
 
 	private void addCommandsThatWriteToDatabases(Map<String, List<Command>> map) {
-		List<Command> alertCommands = new ArrayList<Command>();
+		List<Command> alertCommands = new ArrayList<>();
 		alertCommands.add(new DeployAlertConfigsCommand());
 		alertCommands.add(new DeployAlertActionsCommand());
 		alertCommands.add(new DeployAlertRulesCommand());
 		map.put("mlAlertCommands", alertCommands);
 
-		List<Command> cpfCommands = new ArrayList<Command>();
+		List<Command> cpfCommands = new ArrayList<>();
 		cpfCommands.add(new DeployCpfConfigsCommand());
 		cpfCommands.add(new DeployDomainsCommand());
 		cpfCommands.add(new DeployPipelinesCommand());
@@ -180,7 +180,7 @@ private void addCommandsThatWriteToDatabases(Map<String, List<Command>> map) {
 		dataCommands.add(new LoadDataCommand());
 		map.put("mlDataCommands", dataCommands);
 
-		List<Command> flexrepCommands = new ArrayList<Command>();
+		List<Command> flexrepCommands = new ArrayList<>();
 		flexrepCommands.add(new DeployConfigsCommand());
 		flexrepCommands.add(new DeployTargetsCommand());
 		flexrepCommands.add(new DeployFlexrepCommand());
@@ -201,11 +201,11 @@ private void addCommandsThatWriteToDatabases(Map<String, List<Command>> map) {
 		temporalCommands.add(new DeployTemporalCollectionsLSQTCommand());
 		map.put("mlTemporalCommands", temporalCommands);
 
-		List<Command> triggerCommands = new ArrayList<Command>();
+		List<Command> triggerCommands = new ArrayList<>();
 		triggerCommands.add(new DeployTriggersCommand());
 		map.put("mlTriggerCommands", triggerCommands);
 
-		List<Command> viewCommands = new ArrayList<Command>();
+		List<Command> viewCommands = new ArrayList<>();
 		viewCommands.add(new DeployViewSchemasCommand());
 		map.put("mlViewCommands", viewCommands);
 	}

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

@@ -3,6 +3,7 @@
 import com.marklogic.client.ext.helper.LoggingObject;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -38,9 +39,7 @@ public ResourceFilenameFilter(ResourceFileManager resourceFileManager) {
 	public ResourceFilenameFilter(String... filenamesToIgnore) {
 		this();
 		this.filenamesToIgnore = new HashSet<>();
-		for (String f : filenamesToIgnore) {
-			this.filenamesToIgnore.add(f);
-		}
+		this.filenamesToIgnore.addAll(Arrays.asList(filenamesToIgnore));
 	}
 
 	public ResourceFilenameFilter(Set<String> filenamesToIgnore) {

src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertRulesCommand.java

@@ -1,7 +1,5 @@
 package com.marklogic.appdeployer.command.alert;
 
-import java.io.File;
-
 import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.appdeployer.command.AbstractCommand;

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

@@ -8,7 +8,6 @@
 import com.marklogic.appdeployer.command.UndoableCommand;
 import com.marklogic.appdeployer.command.forests.DeployForestsCommand;
 import com.marklogic.mgmt.PayloadParser;
-import com.marklogic.mgmt.SaveReceipt;
 import com.marklogic.mgmt.api.database.Database;
 import com.marklogic.mgmt.resource.databases.DatabaseManager;
 

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

@@ -249,7 +249,7 @@ protected List<DatabasePlan> mergeDatabasePlanFiles(CommandContext context, Data
 		ObjectReader objectReader = ObjectMapperFactory.getObjectMapper().readerFor(Database.class);
 
 		List<DatabasePlan> databasePlanList = new ArrayList<>();
-		databasePlans.getDatabasePlanMap().values().forEach(ref -> databasePlanList.add(ref));
+		databasePlanList.addAll(databasePlans.getDatabasePlanMap().values());
 
 		DatabasePlan testDatabasePlan = null;
 

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

@@ -37,7 +37,7 @@ public void execute(CommandContext context) {
 			}
 
 			if (subdbDir.exists()) {
-				List<String> subDbNames = new ArrayList<String>();
+				List<String> subDbNames = new ArrayList<>();
 				for (File subDatabaseFile : listFilesInDirectory(subdbDir)) {
 					logger.info(format("Processing sub-database for %s found in file: %s", superDatabaseName, subDatabaseFile.getAbsolutePath()));
 

src/main/java/com/marklogic/appdeployer/command/flexrep/DeployTargetsCommand.java

@@ -1,18 +1,14 @@
 package com.marklogic.appdeployer.command.flexrep;
 
-import java.io.File;
-
 import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.appdeployer.command.AbstractCommand;
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
-import com.marklogic.mgmt.ManageClient;
 import com.marklogic.mgmt.SaveReceipt;
 import com.marklogic.mgmt.resource.flexrep.TargetManager;
 
 import java.io.File;
-import java.net.URI;
 
 /**
  * The directory structure for this is a bit different from most command. Since targets belong to a certain flexrep