#92 Can now merge and reindex a database easily

Author: rjrudin

src/main/java/com/marklogic/mgmt/databases/DatabaseManager.java

@@ -15,17 +15,43 @@ public DatabaseManager(ManageClient manageClient) {
         super(manageClient);
     }
 
+    /**
+     * This will catch and log any exception by default, as the most frequent reason why this fails is because the
+     * database doesn't exist yet.
+     * 
+     * @param databaseIdOrName
+     */
     public void clearDatabase(String databaseIdOrName) {
-        String path = format("/manage/v2/databases/%s", databaseIdOrName);
-        logger.info(format("Clearing database %s", databaseIdOrName));
+        clearDatabase(databaseIdOrName, true);
+    }
+
+    public void clearDatabase(String databaseIdOrName, boolean catchException) {
         try {
-            getManageClient().postJson(path, "{\"operation\":\"clear-database\"}");
-            logger.info(format("Cleared database %s", databaseIdOrName));
+            invokeOperation(databaseIdOrName, "clear-database");
         } catch (Exception e) {
-            logger.error("Unable to clear database; cause: " + e.getMessage());
+            if (catchException) {
+                logger.error("Unable to clear database; cause: " + e.getMessage());
+            } else {
+                throw e;
+            }
         }
     }
 
+    public void mergeDatabase(String databaseIdOrName) {
+        invokeOperation(databaseIdOrName, "merge-database");
+    }
+
+    public void reindexDatabase(String databaseIdOrName) {
+        invokeOperation(databaseIdOrName, "reindex-database");
+    }
+    
+    private void invokeOperation(String databaseIdOrName, String operation) {
+        String path = format("/manage/v2/databases/%s", databaseIdOrName);
+        logger.info(format("Invoking operation %s on database %s", operation, databaseIdOrName));
+        getManageClient().postJson(path, format("{\"operation\":\"%s\"}", operation));
+        logger.info(format("Finished invoking operation %s on database %s", operation, databaseIdOrName));
+    }
+
     public void deleteByName(String databaseName) {
         String json = format("{\"database-name\":\"%s\"}", databaseName);
         delete(json);
@@ -46,13 +72,14 @@ public List<String> getForestIds(String databaseNameOrId) {
      */
     public List<String> getForestNames(String databaseNameOrId) {
         Fragment f = getAsXml(databaseNameOrId);
-        return f.getElementValues("/node()/db:relations/db:relation-group[db:typeref='forests']/db:relation/db:nameref");
+        return f.getElementValues(
+                "/node()/db:relations/db:relation-group[db:typeref='forests']/db:relation/db:nameref");
     }
 
     /**
      * @param databaseNameOrId
      * @return the IDs of all primary forests related to the database. The properties endpoint for a database lists
-     * primary forest IDs, but not replica forest IDs.
+     *         primary forest IDs, but not replica forest IDs.
      */
     public List<String> getPrimaryForestIds(String databaseNameOrId) {
         return getPropertiesAsXml(databaseNameOrId).getElementValues("/node()/m:forests/m:forest");

src/test/java/com/marklogic/appdeployer/AbstractAppDeployerTest.java

@@ -74,6 +74,10 @@ public void closeAppContext() {
         }
     }
 
+    protected void deploySampleApp() {
+        appDeployer.deploy(appConfig);
+    }
+    
     protected void undeploySampleApp() {
         try {
             appDeployer.undeploy(appConfig);
@@ -98,4 +102,8 @@ protected LoadModulesCommand buildLoadModulesCommand() {
         command.setModulesLoader(loader);
         return command;
     }
+    
+    protected void setConfigBaseDir(String path) {
+        appConfig.getConfigDir().setBaseDir(new File("src/test/resources/" + path));
+    }
 }

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

@@ -0,0 +1,29 @@
+package com.marklogic.appdeployer.command.databases;
+
+import org.junit.After;
+import org.junit.Test;
+
+import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.mgmt.databases.DatabaseManager;
+
+public class InvokeDatabaseOperationsTest extends AbstractAppDeployerTest {
+
+    @After
+    public void teardown() {
+        undeploySampleApp();
+    }
+
+    @Test
+    public void test() {
+        setConfigBaseDir("sample-app/db-only-config");
+
+        initializeAppDeployer(new DeployContentDatabasesCommand(1));
+        deploySampleApp();
+
+        DatabaseManager mgr = new DatabaseManager(manageClient);
+
+        // Just smoke-testing these to make sure they don't blow up
+        mgr.mergeDatabase(appConfig.getContentDatabaseName());
+        mgr.reindexDatabase(appConfig.getContentDatabaseName());
+    }
+}