Merge pull request #737 from marklogic/feature/21542-polaris-nulls

MLE-21542 First batch of null checks

Author: rjrudin

ml-app-deployer/src/main/java/com/marklogic/appdeployer/ConfigDir.java

@@ -71,7 +71,9 @@ public List<File> getDatabaseResourceDirectories() {
 		File dbDir = getDatabasesDir();
 		if (dbDir != null && dbDir.exists()) {
 			File[] dirs = dbDir.listFiles(pathname -> pathname.isDirectory());
-			return Arrays.asList(dirs);
+			if (dirs != null) {
+				return Arrays.asList(dirs);
+			}
 		}
 		return new ArrayList<>();
 	}

ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/AbstractResourceCommand.java

@@ -55,8 +55,11 @@ public void execute(CommandContext context) {
 			setIncrementalMode(isIncrementalDeploy);
 		}
 
-		for (File resourceDir : getResourceDirs(context)) {
-			processExecuteOnResourceDir(context, resourceDir);
+		File[] dirs = getResourceDirs(context);
+		if (dirs != null) {
+			for (File resourceDir : dirs) {
+				processExecuteOnResourceDir(context, resourceDir);
+			}
 		}
 
 		if (mergeResourcesBeforeSaving) {

ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/admin/RequireAtLeastMl8Command.java

@@ -33,7 +33,9 @@ public void execute(CommandContext context) {
             if (logger.isInfoEnabled()) {
                 logger.info("Verifying MarkLogic version is at least 8 or higher; version: " + version);
             }
-            major = Integer.parseInt(version.split("\\.")[0]);
+			if (version != null) {
+				major = Integer.parseInt(version.split("\\.")[0]);
+			}
         } catch (Exception e) {
             logger.warn("Unable to verify MarkLogic version is 8 or higher, will continue with deployment; error: "
                     + e.getMessage());

ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertActionsCommand.java

@@ -60,9 +60,12 @@ public void execute(CommandContext context) {
 	protected void deployActions(CommandContext context, ConfigDir configDir, String databaseIdOrName) {
 		File configsDir = configDir.getAlertConfigsDir();
 		if (configsDir != null && configsDir.exists()) {
-			for (File f : configsDir.listFiles()) {
-				if (f.isDirectory() && f.getName().endsWith(actionsDirectorySuffix)) {
-					deployActionsInDirectory(f, context, databaseIdOrName);
+			File[] files = configsDir.listFiles();
+			if (files != null) {
+				for (File f : files) {
+					if (f.isDirectory() && f.getName().endsWith(actionsDirectorySuffix)) {
+						deployActionsInDirectory(f, context, databaseIdOrName);
+					}
 				}
 			}
 		} else {

ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/alert/DeployAlertRulesCommand.java

@@ -51,9 +51,12 @@ public void execute(CommandContext context) {
 	protected void deployRules(CommandContext context, ConfigDir configDir, String databaseIdOrName) {
 		File configsDir = configDir.getAlertConfigsDir();
 		if (configsDir != null && configsDir.exists()) {
-			for (File f : configsDir.listFiles()) {
-				if (f.isDirectory() && f.getName().endsWith(rulesDirectorySuffix)) {
-					deployRulesInDirectory(f, context, databaseIdOrName);
+			File[] files = configsDir.listFiles();
+			if (files != null) {
+				for (File f : files) {
+					if (f.isDirectory() && f.getName().endsWith(rulesDirectorySuffix)) {
+						deployRulesInDirectory(f, context, databaseIdOrName);
+					}
 				}
 			}
 		} else {

ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/clusters/ModifyLocalClusterCommand.java

@@ -39,10 +39,13 @@ public void execute(CommandContext context) {
 		for (ConfigDir configDir : context.getAppConfig().getConfigDirs()) {
 			File clustersDir = configDir.getClustersDir();
 			if (clustersDir != null && clustersDir.exists()) {
-				for (File f : clustersDir.listFiles()) {
-					if (f.isFile() && f.getName().startsWith("local-cluster")) {
-						String payload = copyFileToString(f, context);
-						new ClusterManager(context.getManageClient()).modifyLocalCluster(payload, context.getAdminManager());
+				File[] files = clustersDir.listFiles();
+				if (files != null) {
+					for (File f : files) {
+						if (f.isFile() && f.getName().startsWith("local-cluster")) {
+							String payload = copyFileToString(f, context);
+							new ClusterManager(context.getManageClient()).modifyLocalCluster(payload, context.getAdminManager());
+						}
 					}
 				}
 			} else {

ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/databases/DeployDatabaseCommand.java

@@ -188,17 +188,16 @@ public String buildPayloadForSaving(CommandContext context) {
 	@Override
     public void undo(CommandContext context) {
         String payload = buildPayload(context);
-
-        if (databasesToNotUndeploy != null) {
-        	final String dbName = new PayloadParser().getPayloadFieldValue(payload, "database-name", false);
-        	if (dbName != null && databasesToNotUndeploy.contains(dbName)) {
-        		logger.info(format("Not undeploying database %s because it is in the list of database names to not undeploy.", dbName));
-        		return;
-	        }
-        }
-
         if (payload != null) {
-        	DatabaseManager dbMgr = newDatabaseManageForDeleting(context);
+			if (databasesToNotUndeploy != null) {
+				final String dbName = new PayloadParser().getPayloadFieldValue(payload, "database-name", false);
+				if (dbName != null && databasesToNotUndeploy.contains(dbName)) {
+					logger.info(format("Not undeploying database %s because it is in the list of database names to not undeploy.", dbName));
+					return;
+				}
+			}
+
+			DatabaseManager dbMgr = newDatabaseManageForDeleting(context);
 
 	        // if this has sub-databases, detach/delete them first
 	        if (!isSubDatabase()) {

ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/databases/DeployOtherDatabasesCommand.java

@@ -295,6 +295,7 @@ protected List<DatabasePlan> mergeDatabasePlanFiles(CommandContext context, Data
 					nodes.add(convertPayloadToObjectNode(context, payload));
 				});
 				ObjectNode mergedNode = JsonNodeUtil.mergeObjectNodes(nodes.toArray(new ObjectNode[]{}));
+				Objects.requireNonNull(mergedNode);
 				reference.setMergedObjectNode(mergedNode);
 				try {
 					reference.setDatabaseForSorting(objectReader.readValue(mergedNode));
@@ -398,11 +399,12 @@ protected void deployDatabasesAndForestsViaCma(CommandContext context, List<Data
 		databasePlans.forEach(plan -> {
 			final DeployDatabaseCommand deployDatabaseCommand = plan.getDeployDatabaseCommand();
 			String payload = deployDatabaseCommand.buildPayloadForSaving(context);
-			dbConfig.addDatabase(convertPayloadToObjectNode(context, payload));
-
-			DeployForestsCommand deployForestsCommand = deployDatabaseCommand.buildDeployForestsCommand(plan.getDatabaseName(), context);
-			if (deployForestsCommand != null) {
-				deployForestsCommand.buildForests(context, false).forEach(forest -> forestConfig.addForest(forest.toObjectNode()));
+			if (payload != null) {
+				dbConfig.addDatabase(convertPayloadToObjectNode(context, payload));
+				DeployForestsCommand deployForestsCommand = deployDatabaseCommand.buildDeployForestsCommand(plan.getDatabaseName(), context);
+				if (deployForestsCommand != null) {
+					deployForestsCommand.buildForests(context, false).forEach(forest -> forestConfig.addForest(forest.toObjectNode()));
+				}
 			}
 		});
 

ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/flexrep/DeployTargetsCommand.java

@@ -58,9 +58,12 @@ public void execute(CommandContext context) {
 	protected void deployTargets(CommandContext context, ConfigDir configDir, String databaseIdOrName) {
 		File configsDir = configDir.getFlexrepConfigsDir();
 		if (configsDir != null && configsDir.exists()) {
-			for (File f : configsDir.listFiles()) {
-				if (f.isDirectory() && f.getName().endsWith(targetDirectorySuffix)) {
-					deployTargetsInDirectory(f, context, databaseIdOrName);
+			File[] files = configsDir.listFiles();
+			if (files != null) {
+				for (File f : files) {
+					if (f.isDirectory() && f.getName().endsWith(targetDirectorySuffix)) {
+						deployTargetsInDirectory(f, context, databaseIdOrName);
+					}
 				}
 			}
 		} else {

ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/forests/DeployCustomForestsCommand.java

@@ -53,9 +53,12 @@ public void execute(CommandContext context) {
 			File dir = new File(configDir.getBaseDir(), customForestsPath);
 			if (dir != null && dir.exists()) {
 				payloadParser = new PayloadParser();
-				for (File f : dir.listFiles()) {
-					if (f.isDirectory()) {
-						processDirectory(f, context);
+				File[] dirs = dir.listFiles();
+				if (dirs != null) {
+					for (File f : dirs) {
+						if (f.isDirectory()) {
+							processDirectory(f, context);
+						}
 					}
 				}
 			} else {