#304 Only supporting a list of default servers to not undeploy

Author: rjrudin

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -222,8 +222,6 @@ public class AppConfig {
 
 	private boolean updateMimetypeWhenPropertiesAreEqual = false;
 
-	private String[] serversToNotUndeploy;
-
 	private Map<String, Object> additionalProperties = new HashMap<>();
 
 	public AppConfig() {
@@ -1258,12 +1256,4 @@ public X509TrustManager getAppServicesTrustManager() {
 	public void setAppServicesTrustManager(X509TrustManager appServicesTrustManager) {
 		this.appServicesTrustManager = appServicesTrustManager;
 	}
-
-	public String[] getServersToNotUndeploy() {
-		return serversToNotUndeploy;
-	}
-
-	public void setServersToNotUndeploy(String... serversToNotUndeploy) {
-		this.serversToNotUndeploy = serversToNotUndeploy;
-	}
 }

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -635,12 +635,6 @@ public void initialize() {
 			logger.info("Update mimetype when properties are equal (defaults to false to avoid unnecessary ML restarts): " + prop);
 			config.setUpdateMimetypeWhenPropertiesAreEqual(Boolean.parseBoolean(prop));
 		});
-
-		propertyConsumerMap.put("mlServersToNotUndeploy", (config, prop) -> {
-			String[] values = prop.split(",");
-			logger.info("Servers that will not be undeployed: " + Arrays.asList(values));
-			config.setServersToNotUndeploy(values);
-		});
 	}
 
 	@Override

src/main/java/com/marklogic/appdeployer/command/appservers/DeployOtherServersCommand.java

@@ -78,26 +78,17 @@ protected ResourceManager adjustResourceManagerForPayload(ResourceManager mgr, C
 	@Override
 	protected String adjustPayloadBeforeDeletingResource(ResourceManager mgr, CommandContext context, File f, String payload) {
 		String serverName = new PayloadParser().getPayloadFieldValue(payload, "server-name", false);
-		if (serverName != null) {
-			if (!shouldUndeployServer(serverName, context)) {
-				logger.info(format("Not undeploying server %s because it's in the list of server names to not undeploy", serverName));
-				return null;
-			}
+
+		if (serverName != null && !shouldUndeployServer(serverName, context)) {
+			logger.info(format("Not undeploying server %s because it's in the list of server names to not undeploy", serverName));
+			return null;
 		}
 
 		return super.adjustPayloadBeforeDeletingResource(mgr, context, f, payload);
 	}
 
 	public boolean shouldUndeployServer(String serverName, CommandContext context) {
-		if (defaultServersToNotUndeploy != null && defaultServersToNotUndeploy.contains(serverName)) {
-			return false;
-		}
-
-		String[] names = null;
-		if (context != null && context.getAppConfig() != null) {
-			names = context.getAppConfig().getServersToNotUndeploy();
-		}
-		return names != null ? !Arrays.asList(names).contains(serverName) : true;
+		return defaultServersToNotUndeploy == null || !defaultServersToNotUndeploy.contains(serverName);
 	}
 
 	public Set<String> getDefaultServersToNotUndeploy() {

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

@@ -199,8 +199,6 @@ public void allProperties() {
 
 	    p.setProperty("mlUpdateMimetypeWhenPropertiesAreEqual", "true");
 
-	    p.setProperty("mlServersToNotUndeploy", "server1,server2");
-
 	    sut = new DefaultAppConfigFactory(new SimplePropertySource(p));
         AppConfig config = sut.newAppConfig();
 
@@ -350,10 +348,6 @@ public void allProperties() {
 	    assertEquals("other-group", map.get("host2"));
 
 	    assertTrue(config.isUpdateMimetypeWhenPropertiesAreEqual());
-
-	    assertEquals(2, config.getServersToNotUndeploy().length);
-	    assertEquals("server1", config.getServersToNotUndeploy()[0]);
-	    assertEquals("server2", config.getServersToNotUndeploy()[1]);
     }
 
 	/**

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

@@ -6,6 +6,7 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.util.Set;
 
 public class DontUndeployDefaultDatabasesTest extends AbstractAppDeployerTest {
 
@@ -26,4 +27,21 @@ public void test() {
 		assertFalse(mgr.exists(appConfig.getContentDatabaseName()));
 		assertTrue(mgr.exists("Fab"));
 	}
+
+	@Test
+	public void verifyDatabasesToNotUndeploy() {
+		DeployOtherDatabasesCommand c = new DeployOtherDatabasesCommand();
+		Set<String> set = c.getDefaultDatabasesToNotUndeploy();
+		assertTrue(set.contains("App-Services"));
+		assertTrue(set.contains("Documents"));
+		assertTrue(set.contains("Extensions"));
+		assertTrue(set.contains("Fab"));
+		assertTrue(set.contains("Last-Login"));
+		assertTrue(set.contains("Meters"));
+		assertTrue(set.contains("Modules"));
+		assertTrue(set.contains("Schemas"));
+		assertTrue(set.contains("Security"));
+		assertTrue(set.contains("Triggers"));
+		assertEquals(10, set.size());
+	}
 }

src/test/java/com/marklogic/appdeployer/command/servers/DontUndeploySpecificServersTest.java renamed to src/test/java/com/marklogic/appdeployer/command/servers/DontUndeployDefaultServersTest.java

@@ -1,9 +1,7 @@
 package com.marklogic.appdeployer.command.servers;
 
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
-import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.ConfigDir;
-import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.appservers.DeployOtherServersCommand;
 import com.marklogic.mgmt.resource.appservers.ServerManager;
 import org.junit.Test;
@@ -12,55 +10,39 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class DontUndeploySpecificServersTest extends AbstractAppDeployerTest {
+public class DontUndeployDefaultServersTest extends AbstractAppDeployerTest {
 
 	@Test
 	public void test() {
-		appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/other-servers")));
+		appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/default-servers")));
 
 		ServerManager mgr = new ServerManager(manageClient);
 
 		DeployOtherServersCommand c = new DeployOtherServersCommand();
 		initializeAppDeployer(c);
 
-		appConfig.getCustomTokens().put("%%ODBC_PORT%%", "8048");
 		appConfig.getCustomTokens().put("%%XDBC_PORT%%", "8049");
+
 		deploySampleApp();
 
-		try {
-			assertTrue(mgr.exists("sample-app-xdbc"));
-			assertTrue(mgr.exists("sample-app-odbc"));
+		assertTrue(mgr.exists("sample-app-xdbc"));
+		assertTrue(mgr.exists("Manage"));
 
-			appConfig.setServersToNotUndeploy("sample-app-xdbc", "sample-app-odbc");
-			undeploySampleApp();
-			assertTrue(mgr.exists("sample-app-xdbc"));
-			assertTrue(mgr.exists("sample-app-odbc"));
-		} finally {
-			appConfig.setServersToNotUndeploy(null);
-			undeploySampleApp();
-			assertFalse(mgr.exists("sample-app-xdbc"));
-			assertFalse(mgr.exists("sample-app-odbc"));
-		}
+		undeploySampleApp();
+		assertFalse(mgr.exists("sample-app-xdbc"));
+		assertTrue(mgr.exists("Manage"));
 	}
 
 	@Test
 	public void unitTestShouldUndeployServer() {
 		DeployOtherServersCommand c = new DeployOtherServersCommand();
 
-		AppConfig appConfig = new AppConfig();
-		CommandContext context = new CommandContext(appConfig, null, null);
-
 		// These should all be not-undeployed by default
 		assertFalse(c.shouldUndeployServer("Admin", null));
 		assertFalse(c.shouldUndeployServer("App-Services", null));
 		assertFalse(c.shouldUndeployServer("HealthCheck", null));
 		assertFalse(c.shouldUndeployServer("Manage", null));
 
-		appConfig.setServersToNotUndeploy("server1", "server2");
-		assertFalse(c.shouldUndeployServer("server1", context));
-		assertFalse(c.shouldUndeployServer("server2", context));
-		assertTrue(c.shouldUndeployServer("server3", context));
-
 		Set<String> customDefaultServersNotToUndeploy = new HashSet<>();
 		customDefaultServersNotToUndeploy.add("Admin");
 		customDefaultServersNotToUndeploy.add("TestServer");

src/test/resources/sample-app/default-servers/servers/manage-server.json

@@ -0,0 +1,4 @@
+{
+	"server-name": "Manage",
+	"server-type": "http"
+}

src/test/resources/sample-app/default-servers/servers/xdbc-server.json

@@ -0,0 +1,9 @@
+{
+  "server-name": "%%NAME%%-xdbc",
+  "server-type": "xdbc",
+  "root": "/",
+  "group-name": "%%GROUP%%",
+  "port": %%XDBC_PORT%%,
+  "modules-database": "Modules",
+  "content-database": "Documents"
+}