#308 Can now load schemas into specific databases

Author: rjrudin

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

@@ -48,15 +48,10 @@ public File getDatabasesDir() {
 	public List<File> getDatabaseResourceDirectories() {
 		File dbDir = getDatabasesDir();
 		if (dbDir != null && dbDir.exists()) {
-			File[] dirs = dbDir.listFiles(new FileFilter() {
-				@Override
-				public boolean accept(File pathname) {
-					return pathname.isDirectory();
-				}
-			});
+			File[] dirs = dbDir.listFiles(pathname -> pathname.isDirectory());
 			return Arrays.asList(dirs);
 		}
-		return new ArrayList<File>();
+		return new ArrayList<>();
 	}
 
 	protected void initializeContentDatabaseFiles() {

src/main/java/com/marklogic/appdeployer/command/schemas/LoadSchemasCommand.java

@@ -9,6 +9,7 @@
 import com.marklogic.client.ext.schemasloader.SchemasLoader;
 import com.marklogic.client.ext.schemasloader.impl.DefaultSchemasLoader;
 
+import java.io.File;
 import java.io.FileFilter;
 
 public class LoadSchemasCommand extends AbstractCommand {
@@ -19,35 +20,65 @@ public LoadSchemasCommand() {
 
 	@Override
 	public void execute(CommandContext context) {
-		loadSchemasIntoSchemasDatabase(context);
+		loadSchemasFromSchemasPath(context);
+		loadSchemasFromDatabaseSpecificPaths(context);
 	}
 
-	protected void loadSchemasIntoSchemasDatabase(CommandContext context) {
+	/**
+	 * This expects a single path to be defined in the AppConfig object. If set, then any files at that path are loaded
+	 * into the schemas database defined by the AppConfig object.
+	 *
+	 * @param context
+	 */
+	protected void loadSchemasFromSchemasPath(CommandContext context) {
 		AppConfig config = context.getAppConfig();
-		DatabaseClient client = config.newSchemasDatabaseClient();
-		SchemasLoader schemasLoader = buildSchemasLoader(context, client);
+		final String schemasPath = config.getSchemasPath();
+		if (schemasPath != null && schemasPath.trim().length() > 0) {
+			loadSchemas(config.getSchemasPath(), config.getSchemasDatabaseName(), context);
+		} else {
+			logger.info("Schemas path is empty, so not attempting to load any schemas");
+		}
+	}
+
+	/**
+	 * This loads schemas from every "databases/(name of schemas database)/schemas" path found in each configuration
+	 * directory in the AppConfig object.
+	 *
+	 * @param context
+	 */
+	protected void loadSchemasFromDatabaseSpecificPaths(CommandContext context) {
+		context.getAppConfig().getConfigDirs().forEach(configDir -> {
+			configDir.getDatabaseResourceDirectories().forEach(dir -> {
+				File schemasDir = new File(dir, "schemas");
+				if (schemasDir.exists()) {
+					loadSchemas(schemasDir.getAbsolutePath(), dir.getName(), context);
+				}
+			});
+		});
+	}
+
+	protected void loadSchemas(String schemasPath, String schemasDatabaseName, CommandContext context) {
+		logger.info(format("Loading schemas into database %s from: %s", schemasDatabaseName, schemasPath));
+		DatabaseClient client = buildDatabaseClient(schemasDatabaseName, context);
 		try {
-			String schemasPath = config.getSchemasPath();
-			if (schemasPath != null && schemasPath.trim().length() > 0) {
-				logger.info("Loading schemas from path: " + schemasPath);
-				schemasLoader.loadSchemas(schemasPath);
-				logger.info("Finished loading schemas from: " + schemasPath);
-			}
-			else {
-				logger.info("Schemas path is empty, so not attempting to load any schemas");
-			}
+			SchemasLoader schemasLoader = buildSchemasLoader(context, client);
+			schemasLoader.loadSchemas(schemasPath);
+			logger.info("Finished loading schemas from: " + schemasPath);
 		} catch (FailedRequestException fre) {
 			if (fre.getMessage().contains("NOSUCHDB")) {
 				logger.warn("Unable to load schemas because no schemas database exists; cause: " + fre.getMessage());
-			}
-			else {
+			} else {
 				throw fre;
 			}
 		} finally {
 			client.release();
 		}
 	}
 
+	protected DatabaseClient buildDatabaseClient(String schemasDatabaseName, CommandContext context) {
+		return context.getAppConfig().newAppServicesDatabaseClient(schemasDatabaseName);
+	}
+
 	/**
 	 * Will utilize schemasFileFilter in AppConfig if it's been set.
 	 *

src/test/java/com/marklogic/appdeployer/command/schemas/LoadSchemasTest.java

@@ -15,6 +15,31 @@
 
 public class LoadSchemasTest extends AbstractAppDeployerTest {
 
+	@Test
+	public void databaseSpecificPaths() {
+		initializeAppDeployer(new DeployOtherDatabasesCommand(), newCommand());
+
+		appConfig.getFirstConfigDir().setBaseDir(new File("src/test/resources/sample-app/multiple-schema-databases/ml-config"));
+		appConfig.setSchemasDatabaseName("sample-app-schemas1");
+		appConfig.setSchemasPath("src/test/resources/sample-app/multiple-schema-databases/ml-schemas");
+
+		deploySampleApp();
+
+		DatabaseClient client = appConfig.newSchemasDatabaseClient();
+		GenericDocumentManager mgr = client.newDocumentManager();
+		assertNotNull(mgr.exists("/default-schema.xsd"));
+		assertNotNull(mgr.exists("/schema1.xsd"));
+		assertNull(mgr.exists("/schema2.xsd"));
+		client.release();
+
+		client = appConfig.newAppServicesDatabaseClient("sample-app-schemas2");
+		mgr = client.newDocumentManager();
+		assertNull(mgr.exists("/default-schema.xsd"));
+		assertNull(mgr.exists("/schema1.xsd"));
+		assertNotNull(mgr.exists("/schema2.xsd"));
+		client.release();
+	}
+
 	@Test
 	public void testSchemaLoading() {
 		initializeAppDeployer(new DeployOtherDatabasesCommand(),

src/test/resources/sample-app/multiple-schema-databases/ml-config/databases/sample-app-schemas1.json

@@ -0,0 +1,3 @@
+{
+	"database-name": "sample-app-schemas1"
+}

src/test/resources/sample-app/multiple-schema-databases/ml-config/databases/sample-app-schemas1/schemas/schema1.xsd

@@ -0,0 +1 @@
+<schema1/>

src/test/resources/sample-app/multiple-schema-databases/ml-config/databases/sample-app-schemas2.json

@@ -0,0 +1,3 @@
+{
+	"database-name": "sample-app-schemas2"
+}

src/test/resources/sample-app/multiple-schema-databases/ml-config/databases/sample-app-schemas2/schemas/schema2.xsd

@@ -0,0 +1 @@
+<schema2/>

src/test/resources/sample-app/multiple-schema-databases/ml-schemas/default-schema.xsd

@@ -0,0 +1 @@
+<default-schema/>