#89 Now always creating forests when a database is created/updated

Author: rjrudin

.gitignore

@@ -4,6 +4,7 @@
 /build/
 .project
 .classpath
+.idea
 src/test/resources/user.properties
 setenv.bat
 src/test/resources/scaffold-test/

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

@@ -51,7 +51,7 @@ public void execute(CommandContext context) {
                 DatabaseManager dbMgr = new DatabaseManager(context.getManageClient());
                 String json = tokenReplacer.replaceTokens(payload, appConfig, true);
                 SaveReceipt receipt = dbMgr.save(json);
-                createForestsIfDatabaseWasJustCreated(receipt, context);
+                buildDeployForestsCommand(receipt, context).execute(context);
             }
         }
     }

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

@@ -81,7 +81,7 @@ public void execute(CommandContext context) {
             String json = tokenReplacer.replaceTokens(payload, appConfig, false);
             DatabaseManager dbMgr = new DatabaseManager(context.getManageClient());
             SaveReceipt receipt = dbMgr.save(json);
-            createForestsIfDatabaseWasJustCreated(receipt, context);
+            buildDeployForestsCommand(receipt, context).execute(context);
         }
     }
 
@@ -114,16 +114,6 @@ protected String getPayload(CommandContext context) {
         }
     }
 
-    protected void createForestsIfDatabaseWasJustCreated(SaveReceipt receipt, CommandContext context) {
-        // Location header is only set when the database has just been created
-        if (receipt.hasLocationHeader()) {
-            if (logger.isInfoEnabled()) {
-                logger.info("Creating forests for newly created database: " + receipt.getResourceId());
-            }
-            buildDeployForestsCommand(receipt, context).execute(context);
-        }
-    }
-
     /**
      * Allows for how an instance of DeployForestsCommand is built to be overridden by a subclass.
      * 

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

@@ -29,6 +29,11 @@ public DeployRestApiServersCommand() {
         setExecuteSortOrder(SortOrderConstants.DEPLOY_REST_API_SERVERS);
     }
 
+    public DeployRestApiServersCommand(boolean deleteContentDatabase) {
+        this();
+        this.deleteContentDatabase = deleteContentDatabase;
+    }
+
     @Override
     public Integer getUndoSortOrder() {
         return SortOrderConstants.DELETE_REST_API_SERVERS;

src/test/java/com/marklogic/appdeployer/command/databases/UpdateForestCountTest.java

@@ -0,0 +1,45 @@
+package com.marklogic.appdeployer.command.databases;
+
+import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.mgmt.databases.DatabaseManager;
+import com.marklogic.rest.util.Fragment;
+import org.junit.After;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * Verifies support for bumping up the number of content forests and then re-deploying. Does not yet support lowering
+ * the number of content forests and expecting the existing ones to be detached/deleted.
+ */
+public class UpdateForestCountTest extends AbstractAppDeployerTest {
+
+    @Test
+    public void test() {
+        appConfig.getConfigDir().setBaseDir(new File("src/test/resources/sample-app/db-only-config"));
+        DatabaseManager mgr = new DatabaseManager(manageClient);
+
+        initializeAppDeployer(new DeployContentDatabasesCommand());
+
+        appConfig.setContentForestsPerHost(1);
+        appDeployer.deploy(appConfig);
+        assertEquals("Should only have 1 forest", 1, mgr.getForestIds(appConfig.getContentDatabaseName()).size());
+
+        appConfig.setContentForestsPerHost(2);
+        appDeployer.deploy(appConfig);
+        assertEquals("Should now have 2 forests", 2, mgr.getForestIds(appConfig.getContentDatabaseName()).size());
+
+        appDeployer.deploy(appConfig);
+        assertEquals("Should still have 2 forests", 2, mgr.getForestIds(appConfig.getContentDatabaseName()).size());
+
+        appConfig.setContentForestsPerHost(1);
+        appDeployer.deploy(appConfig);
+        assertEquals("Should still have 2 forests, we don't yet support deleting forests when the number drops", 2, mgr.getForestIds(appConfig.getContentDatabaseName()).size());
+    }
+
+    @After
+    public void teardown() {
+        undeploySampleApp();
+    }
+}

src/test/java/com/marklogic/appdeployer/command/modules/LoadModulesTest.java

@@ -1,24 +1,26 @@
 package com.marklogic.appdeployer.command.modules;
 
-import java.io.File;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.appdeployer.command.databases.DeployContentDatabasesCommand;
+import com.marklogic.appdeployer.command.databases.DeployTriggersDatabaseCommand;
 import com.marklogic.appdeployer.command.restapis.DeployRestApiServersCommand;
 import com.marklogic.client.modulesloader.impl.AssetFileFilter;
 import com.marklogic.junit.PermissionsFragment;
 import com.marklogic.xcc.template.XccTemplate;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
 
 public class LoadModulesTest extends AbstractAppDeployerTest {
 
     private XccTemplate xccTemplate;
 
     @Before
     public void setup() {
-        xccTemplate = newModulesXccTemplate();
+        xccTemplate = new XccTemplate(format("xcc://%s:%s@%s:8000/%s", "admin",
+                "admin", appConfig.getHost(), appConfig.getModulesDatabaseName()));
         deleteModuleTimestampsFile();
     }
 
@@ -31,7 +33,7 @@ public void teardown() {
     public void loadModulesFromMultiplePaths() {
         appConfig.getModulePaths().add("src/test/resources/sample-app/build/mlRestApi/some-library/ml-modules");
 
-        initializeAppDeployer(new DeployRestApiServersCommand(), new LoadModulesCommand());
+        initializeAppDeployer(new DeployRestApiServersCommand(true), new LoadModulesCommand());
 
         appDeployer.deploy(appConfig);
 
@@ -46,7 +48,7 @@ public void loadModulesWithCustomPermissions() {
         LoadModulesCommand c = new LoadModulesCommand();
         appConfig.setModulePermissions(appConfig.getModulePermissions() + ",app-user,execute");
 
-        initializeAppDeployer(new DeployRestApiServersCommand(), c);
+        initializeAppDeployer(new DeployRestApiServersCommand(true), c);
 
         appDeployer.deploy(appConfig);
 
@@ -63,23 +65,25 @@ public void loadModulesWithAssetFileFilter() {
         LoadModulesCommand c = new LoadModulesCommand();
         appConfig.setAssetFileFilter(new TestFileFilter());
 
-        initializeAppDeployer(new DeployRestApiServersCommand(), c);
+        initializeAppDeployer(new DeployRestApiServersCommand(true), c);
         appDeployer.deploy(appConfig);
-        
+
         assertEquals("true", xccTemplate.executeAdhocQuery("doc-available('/ext/lib/test.xqy')"));
         assertEquals("false", xccTemplate.executeAdhocQuery("doc-available('/ext/lib/test2.xqy')"));
     }
 
     @Test
     public void testServerExists() {
+        appConfig.getConfigDir().setBaseDir(new File(("src/test/resources/sample-app/db-only-config")));
         appConfig.setTestRestPort(8541);
-        initializeAppDeployer(new DeployRestApiServersCommand(), new LoadModulesCommand());
+        initializeAppDeployer(new DeployRestApiServersCommand(true), new LoadModulesCommand());
+
         appDeployer.deploy(appConfig);
 
-        assertEquals("true", xccTemplate
-                .executeAdhocQuery("fn:doc-available('/Default/sample-app/rest-api/options/sample-app-options.xml')"));
-        assertEquals("true", xccTemplate.executeAdhocQuery(
-                "fn:doc-available('/Default/sample-app-test/rest-api/options/sample-app-options.xml')"));
+        String[] uris = new String[]{"/Default/sample-app/rest-api/options/sample-app-options.xml", "/Default/sample-app/rest-api/options/sample-app-options.xml"};
+        for (String uri : uris) {
+            assertEquals("true", xccTemplate.executeAdhocQuery(format("doc-available('%s')", uri)));
+        }
     }
 
     private void assertModuleExistsWithDefaultPermissions(String message, String uri) {