#354 Including custom forests in CMA configurations

Author: rjrudin

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

@@ -218,6 +218,13 @@ protected String getContextKeyForResourcesToSave() {
 		return getClass().getName() + "-resources-to-save";
 	}
 
+	/**
+	 * If the payload is XML, this will first convert it to JSON.
+	 *
+	 * @param context
+	 * @param payload
+	 * @return
+	 */
 	protected ObjectNode convertPayloadToObjectNode(CommandContext context, String payload) {
 		payload = convertXmlPayloadToJsonIfNecessary(context, payload);
 		try {

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

@@ -4,16 +4,11 @@
 import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.mgmt.SaveReceipt;
-import com.marklogic.mgmt.api.API;
 import com.marklogic.mgmt.api.configuration.Configuration;
 import com.marklogic.mgmt.api.configuration.Configurations;
-import com.marklogic.mgmt.mapper.DefaultResourceMapper;
-import com.marklogic.mgmt.mapper.ResourceMapper;
 import com.marklogic.mgmt.resource.ResourceManager;
-import com.marklogic.mgmt.util.ObjectMapperFactory;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -161,28 +156,21 @@ protected void deployResourcesViaCma(CommandContext context, File resourceDir) {
 			}
 			String payload = readResourceFromFile(context, f);
 			if (payload != null && payload.trim().length() > 0) {
-				payload = convertXmlPayloadToJsonIfNecessary(context, payload);
-				ObjectNode objectNode;
-				try {
-					objectNode = (ObjectNode)ObjectMapperFactory.getObjectMapper().readTree(payload);
-				} catch (IOException e) {
-					throw new RuntimeException("Unable to read JSON, cause: " + e.getMessage(), e);
-				}
+				ObjectNode objectNode = convertPayloadToObjectNode(context, payload);
 				((SupportsCmaCommand) this).addResourceToConfiguration(objectNode, config);
 			}
 		}
 		deployConfiguration(context, config);
 	}
 
 	/**
-	 *
 	 * @param context
 	 * @param mergedReferences
 	 */
 	protected void saveMergedResourcesViaCma(CommandContext context, List<ResourceReference> mergedReferences) {
 		Configuration config = new Configuration();
 		for (ResourceReference reference : mergedReferences) {
-			((SupportsCmaCommand)this).addResourceToConfiguration(reference.getObjectNode(), config);
+			((SupportsCmaCommand) this).addResourceToConfiguration(reference.getObjectNode(), config);
 		}
 		deployConfiguration(context, config);
 	}

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

@@ -363,8 +363,7 @@ protected void deployDatabasesAndForestsViaCma(CommandContext context, List<Data
 		databasePlans.forEach(plan -> {
 			final DeployDatabaseCommand deployDatabaseCommand = plan.getDeployDatabaseCommand();
 			String payload = deployDatabaseCommand.buildPayloadForSaving(context);
-			payload = convertXmlPayloadToJsonIfNecessary(context, payload);
-			dbConfig.addDatabase(payload);
+			dbConfig.addDatabase(convertPayloadToObjectNode(context, payload));
 
 			DeployForestsCommand deployForestsCommand = deployDatabaseCommand.buildDeployForestsCommand(plan.getDatabaseName(), context);
 			if (deployForestsCommand != null) {

src/main/java/com/marklogic/appdeployer/command/forests/DeployCustomForestsCommand.java

@@ -1,20 +1,24 @@
 package com.marklogic.appdeployer.command.forests;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 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.PayloadParser;
+import com.marklogic.mgmt.api.configuration.Configuration;
 import com.marklogic.mgmt.resource.forests.ForestManager;
 
 import java.io.File;
+import java.util.Iterator;
 
 /**
  * Use this command when you want precise control over the forests that are created for a database. It processes
  * each directory under ml-config/forests (the name of the directory does not matter, but it makes sense to name
  * it after the database that the forests belong to), and each file in a directory can have a single forest object
  * or an array of forest objects.
- *
+ * <p>
  * You can also set customForestsPath to specify a directory other than "forest" as the path that contains
  * directories of custom forests. This allows you to easily support different custom forests in different
  * environments.
@@ -30,19 +34,28 @@ public DeployCustomForestsCommand() {
 
 	@Override
 	public void execute(CommandContext context) {
+		Configuration configuration = null;
+		if (context.getAppConfig().getCmaConfig().isDeployForests()) {
+			configuration = new Configuration();
+		}
+
 		for (ConfigDir configDir : context.getAppConfig().getConfigDirs()) {
 			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);
+						processDirectory(f, context, configuration);
 					}
 				}
 			} else {
 				logResourceDirectoryNotFound(dir);
 			}
 		}
+
+		if (configuration != null) {
+			context.addCmaConfigurationToCombinedRequest(configuration);
+		}
 	}
 
 	/**
@@ -51,21 +64,43 @@ public void execute(CommandContext context) {
 	 * @param dir
 	 * @param context
 	 */
-	protected void processDirectory(File dir, CommandContext context) {
+	protected void processDirectory(File dir, CommandContext context, Configuration configuration) {
 		if (logger.isInfoEnabled()) {
 			logger.info("Processing custom forest files in directory: " + dir.getAbsolutePath());
 		}
 		ForestManager mgr = new ForestManager(context.getManageClient());
+
 		for (File f : listFilesInDirectory(dir)) {
 			if (logger.isInfoEnabled()) {
 				logger.info("Processing forests in file: " + f.getAbsolutePath());
 			}
 			String payload = readResourceFromFile(context, f);
+
 			if (payloadParser.isJsonPayload(payload)) {
-				mgr.saveJsonForests(payload);
+				if (configuration != null) {
+					addForestsToCmaConfiguration(context, payload, configuration);
+				} else {
+					mgr.saveJsonForests(payload);
+				}
 			} else {
-				mgr.save(payload);
+				if (configuration != null) {
+					configuration.addForest(convertPayloadToObjectNode(context, payload));
+				} else {
+					mgr.save(payload);
+				}
+			}
+		}
+	}
+
+	protected void addForestsToCmaConfiguration(CommandContext context, String payload, Configuration configuration) {
+		JsonNode node = payloadParser.parseJson(payload);
+		if (node.isArray()) {
+			Iterator<JsonNode> iter = node.iterator();
+			while (iter.hasNext()) {
+				configuration.addForest((ObjectNode) iter.next());
 			}
+		} else {
+			configuration.addForest((ObjectNode) node);
 		}
 	}
 

src/main/java/com/marklogic/mgmt/api/configuration/Configuration.java

@@ -66,12 +66,6 @@ protected ObjectNode readJson(String json) {
 		}
 	}
 
-	public ObjectNode addDatabase(String json) {
-		ObjectNode node = readJson(json);
-		addDatabase(node);
-		return node;
-	}
-
 	public void addDatabase(ObjectNode d) {
 		if (databases == null) databases = new ArrayList<>();
 		databases.add(d);

src/test/java/com/marklogic/appdeployer/command/forests/DeployCustomForestsTest.java

@@ -32,4 +32,10 @@ public void test() {
 		assertTrue(mgr.exists("sample-app-content-custom-2"));
 		assertTrue(mgr.exists("sample-app-content-custom-3"));
 	}
+
+	@Test
+	public void deployWithCma() {
+		appConfig.getCmaConfig().enableAll();
+		test();
+	}
 }