#332 Default REST API payload now uses contentForestsPerHost

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/restapis/DeployRestApiServersCommand.java

@@ -80,7 +80,7 @@ protected String getRestApiPayload(CommandContext context) {
 			return null;
 		} else {
 			logger.info(format("Could not find REST API file at %s, will use default payload", f.getAbsolutePath()));
-			return getDefaultRestApiPayload();
+			return getDefaultRestApiPayload(context);
 		}
 	}
 
@@ -104,8 +104,7 @@ protected File findRestApiConfigFile(CommandContext context) {
 				restApiFile = new File(context.getAppConfig().getFirstConfigDir().getBaseDir(), restApiFilename);
 			}
 			return restApiFile;
-		}
-		else {
+		} else {
 			File restApiFile = null;
 			// Check each ConfigDir for the file, with the last one winning
 			for (ConfigDir configDir : context.getAppConfig().getConfigDirs()) {
@@ -173,8 +172,12 @@ public boolean execute() {
 		}
 	}
 
-	protected String getDefaultRestApiPayload() {
-		return RestApiUtil.buildDefaultRestApiJson();
+	protected String getDefaultRestApiPayload(CommandContext context) {
+		// Use contentForestsPerHost in case the user does not have a database file for the content database that would
+		// otherwise control the number of forests created (as it would be created before the REST API instance is
+		// created)
+		Integer count = context.getAppConfig().getContentForestsPerHost();
+		return count != null ? RestApiUtil.buildDefaultRestApiJson(count) : RestApiUtil.buildDefaultRestApiJson();
 	}
 
 	/**
@@ -188,7 +191,7 @@ protected String getDefaultRestApiPayload() {
 	 * @return
 	 */
 	protected boolean deleteRestApi(String serverName, String groupName, ManageClient manageClient,
-									boolean includeModules, boolean includeContent) {
+	                                boolean includeModules, boolean includeContent) {
 		RestApiDeletionRequest request = new RestApiDeletionRequest(serverName, groupName);
 		request.setIncludeContent(includeContent);
 		request.setIncludeModules(includeModules);

src/main/java/com/marklogic/appdeployer/util/RestApiUtil.java

@@ -9,24 +9,35 @@
 public abstract class RestApiUtil {
 
 	public static String buildDefaultRestApiJson() {
-        ObjectMapper m = ObjectMapperFactory.getObjectMapper();
-        ObjectNode node = m.createObjectNode();
-        ObjectNode n = node.putObject("rest-api");
-        n.put("name", "%%NAME%%");
-        n.put("group", "%%GROUP%%");
-        n.put("database", "%%DATABASE%%");
-        n.put("modules-database", "%%MODULES_DATABASE%%");
-        n.put("port", "%%PORT%%");
-        n.put("xdbc-enabled", true);
-		// n.put("forests-per-host", 3);
-        n.put("error-format", "json");
+		return buildDefaultRestApiJson(0);
+	}
 
-        try {
-            String json = m.writer(new DefaultPrettyPrinter()).writeValueAsString(node);
-            json = json.replace("\"%%PORT%%\"", "%%PORT%%");
-            return json;
-        } catch (JsonProcessingException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
+	/**
+	 * @param forestsPerHost if greater than zero, than will be used to set the "forests-per-host" property in the
+	 *                       payload
+	 * @return
+	 */
+	public static String buildDefaultRestApiJson(int forestsPerHost) {
+		ObjectMapper m = ObjectMapperFactory.getObjectMapper();
+		ObjectNode node = m.createObjectNode();
+		ObjectNode n = node.putObject("rest-api");
+		n.put("name", "%%NAME%%");
+		n.put("group", "%%GROUP%%");
+		n.put("database", "%%DATABASE%%");
+		n.put("modules-database", "%%MODULES_DATABASE%%");
+		n.put("port", "%%PORT%%");
+		n.put("xdbc-enabled", true);
+		if (forestsPerHost > 0) {
+			n.put("forests-per-host", forestsPerHost);
+		}
+		n.put("error-format", "json");
+
+		try {
+			String json = m.writer(new DefaultPrettyPrinter()).writeValueAsString(node);
+			json = json.replace("\"%%PORT%%\"", "%%PORT%%");
+			return json;
+		} catch (JsonProcessingException ex) {
+			throw new RuntimeException(ex);
+		}
+	}
 }

src/test/java/com/marklogic/appdeployer/command/restapis/DeployRestApiTest.java

@@ -0,0 +1,31 @@
+package com.marklogic.appdeployer.command.restapis;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.DefaultPayloadTokenReplacer;
+import com.marklogic.mgmt.util.ObjectMapperFactory;
+import org.junit.Test;
+
+public class DeployRestApiTest extends AbstractAppDeployerTest {
+
+	@Test
+	public void noRestApiFileAndNoContentDatabaseFile() throws Exception {
+		final CommandContext context = new CommandContext(appConfig, null, null);
+
+		DeployRestApiServersCommand command = new DeployRestApiServersCommand();
+		String payload = command.getDefaultRestApiPayload(context);
+		payload = new DefaultPayloadTokenReplacer().replaceTokens(payload, appConfig, false);
+		ObjectNode node = (ObjectNode) ObjectMapperFactory.getObjectMapper().readTree(payload);
+		assertFalse("forests-per-host shouldn't be set unless contentForestsPerHost is greater than zero",
+			node.get("rest-api").has("forests-per-host"));
+
+		appConfig.setContentForestsPerHost(2);
+
+		payload = command.getDefaultRestApiPayload(context);
+		payload = new DefaultPayloadTokenReplacer().replaceTokens(payload, appConfig, false);
+		node = (ObjectNode) ObjectMapperFactory.getObjectMapper().readTree(payload);
+		assertEquals("When contentForestsPerHost is set, its value should be included in the REST API payload",
+			2, node.get("rest-api").get("forests-per-host").asInt());
+	}
+}