#236 Can now customize the database that ES models are loaded into

Author: rjrudin

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

@@ -199,6 +199,7 @@ public class AppConfig {
 	private boolean generateDatabaseProperties = true;
 	private boolean generateExtractionTemplate = true;
 	private boolean generateSearchOptions = true;
+	private String modelsDatabase;
 
 	private String[] resourceFilenamesToIgnore;
 	private Pattern resourceFilenamesExcludePattern;
@@ -1195,4 +1196,12 @@ public Integer getModulesLoaderBatchSize() {
 	public void setModulesLoaderBatchSize(Integer modulesLoaderBatchSize) {
 		this.modulesLoaderBatchSize = modulesLoaderBatchSize;
 	}
+
+	public String getModelsDatabase() {
+		return modelsDatabase;
+	}
+
+	public void setModelsDatabase(String modelsDatabase) {
+		this.modelsDatabase = modelsDatabase;
+	}
 }

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

@@ -597,6 +597,12 @@ public AppConfig newAppConfig() {
 		/**
 		 * The following properties are all for generating Entity Services artifacts.
 		 */
+		prop = getProperty("mlModelsDatabase");
+		if (prop != null) {
+			logger.info("Entity Services models database: " + prop);
+			c.setModelsDatabase(prop);
+		}
+
 		prop = getProperty("mlModelsPath");
 		if (prop != null) {
 			logger.info("Entity Services models path: " + prop);

src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java

@@ -10,6 +10,7 @@
 import com.marklogic.client.ext.es.EntityServicesManager;
 import com.marklogic.client.ext.es.GeneratedCode;
 import org.springframework.util.FileCopyUtils;
+import org.springframework.util.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -39,23 +40,38 @@ public void execute(CommandContext context) {
 		String modelsPath = appConfig.getModelsPath();
 		File modelsDir = new File(modelsPath);
 		if (modelsDir.exists()) {
-			DatabaseClient client = appConfig.newDatabaseClient();
-			EntityServicesManager mgr = new EntityServicesManager(client);
-			for (File f : modelsDir.listFiles()) {
-				GeneratedCode code = loadModelDefinition(appConfig, f, mgr);
+			DatabaseClient client = buildDatabaseClient(appConfig);
+			try {
+				EntityServicesManager mgr = new EntityServicesManager(client);
+				for (File f : modelsDir.listFiles()) {
+					GeneratedCode code = loadModelDefinition(appConfig, f, mgr);
 
-				File modulesDir = selectModulesDir(appConfig);
-				modulesDir.mkdirs();
+					File modulesDir = selectModulesDir(appConfig);
+					modulesDir.mkdirs();
 
-				generateInstanceConverter(appConfig, code, modulesDir);
-				generateSearchOptions(code, modulesDir);
-				generateDatabaseProperties(appConfig, code);
-				generateSchema(appConfig, code);
-				generateExtractionTemplate(appConfig, code);
+					generateInstanceConverter(appConfig, code, modulesDir);
+					generateSearchOptions(code, modulesDir);
+					generateDatabaseProperties(appConfig, code);
+					generateSchema(appConfig, code);
+					generateExtractionTemplate(appConfig, code);
+				}
+			} finally {
+				client.release();
 			}
 		}
 	}
 
+	protected DatabaseClient buildDatabaseClient(AppConfig appConfig) {
+		String db = appConfig.getModelsDatabase();
+		if (StringUtils.isEmpty(db)) {
+			db = appConfig.getContentDatabaseName();
+		}
+		if (logger.isInfoEnabled()) {
+			logger.info("Will load Entity Services models into database: " + db);
+		}
+		return appConfig.newAppServicesDatabaseClient(db);
+	}
+
 	protected GeneratedCode loadModelDefinition(AppConfig appConfig, File f, EntityServicesManager mgr) {
 		return loadModelDefinition(buildCodeGenerationRequest(appConfig),f,mgr);
 	}

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

@@ -141,6 +141,7 @@ public void allProperties() {
         p.setProperty("mlModulesLoaderBatchSize", "79");
 
         p.setProperty("mlModelsPath", "ml/models");
+        p.setProperty("mlModelsDatabase", "my-models-database");
         p.setProperty("mlInstanceConverterPath", "ext/my/path");
         p.setProperty("mlGenerateInstanceConverter", "false");
 	    p.setProperty("mlGenerateDatabaseProperties", "false");
@@ -243,6 +244,7 @@ public void allProperties() {
         assertEquals(new Integer(79), config.getModulesLoaderBatchSize());
 
         assertEquals("ml/models", config.getModelsPath());
+        assertEquals("my-models-database", config.getModelsDatabase());
         assertEquals("ext/my/path", config.getInstanceConverterPath());
         assertFalse(config.isGenerateDatabaseProperties());
 	    assertFalse(config.isGenerateExtractionTemplate());

src/test/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsTest.java

@@ -3,12 +3,12 @@
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
 import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.appdeployer.command.databases.DeployContentDatabasesCommand;
+import com.marklogic.appdeployer.command.databases.DeployOtherDatabasesCommand;
 import com.marklogic.appdeployer.command.databases.DeploySchemasDatabaseCommand;
-import com.marklogic.appdeployer.command.modules.LoadModulesCommand;
 import com.marklogic.appdeployer.command.restapis.DeployRestApiServersCommand;
-import com.marklogic.appdeployer.command.schemas.LoadSchemasCommand;
+import com.marklogic.client.DatabaseClient;
+import com.marklogic.client.io.StringHandle;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -17,8 +17,6 @@ public class GenerateModelArtifactsTest extends AbstractAppDeployerTest {
 
 	@After
 	public void tearDown() {
-		initializeAppDeployer(new DeployContentDatabasesCommand(), new DeploySchemasDatabaseCommand(),
-			new DeployRestApiServersCommand());
 		undeploySampleApp();
 	}
 
@@ -34,8 +32,10 @@ public void test() {
 		appConfig.getModulePaths().clear();
 		appConfig.getModulePaths().add(projectPath + "/src/main/ml-modules");
 		appConfig.setSchemasPath(projectPath + "/src/main/ml-schemas");
+		appConfig.setModelsDatabase(appConfig.getContentDatabaseName() + "-other");
 
 		initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeploySchemasDatabaseCommand(),
+			new DeployOtherDatabasesCommand(1),
 			new DeployRestApiServersCommand(), new GenerateModelArtifactsCommand());
 		deploySampleApp();
 
@@ -47,6 +47,15 @@ public void test() {
 		assertTrue("A schemas db file needs to be created since the ES content-database.json file refers to one",
 			new File(projectPath, "src/main/ml-config/databases/schemas-database.json").exists());
 
+		// Verify the model was loaded into the "other" database
+		DatabaseClient modelsClient = appConfig.newAppServicesDatabaseClient(appConfig.getModelsDatabase());
+		try {
+			String raceModel = modelsClient.newDocumentManager().read("/marklogic.com/entity-services/models/race.json").nextContent(new StringHandle()).get();
+			assertTrue("Simple smoke test to make sure the race model came back", raceModel.contains("This schema represents a Runner"));
+		} finally {
+			modelsClient.release();
+		}
+
 		deploySampleApp();
 
 		// These shouldn't exist because the content is the same
@@ -55,10 +64,5 @@ public void test() {
 		assertFalse(new File(projectPath, "src/main/ml-config/databases/content-database-GENERATED.json").exists());
 		assertFalse(new File(projectPath, "src/main/ml-schemas/Race-0.0.1-GENERATED.xsd").exists());
 		assertFalse(new File(projectPath, "src/main/ml-schemas/Race-0.0.1-GENERATED.tdex").exists());
-
-		// Make sure none of these files break when they're deployed
-		initializeAppDeployer(new DeployContentDatabasesCommand(), new DeploySchemasDatabaseCommand(),
-			new LoadSchemasCommand(), new LoadModulesCommand());
-		//deploySampleApp();
 	}
 }