Merge pull request #494 from marklogic/feature/qbv-tde-fix

Fixing how TDE validation is disabled

Author: rjrudin

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

@@ -80,9 +80,10 @@ protected void loadSchemasFromDatabaseSpecificPaths(CommandContext 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);
+		DatabaseClient schemasClient = context.getAppConfig().newAppServicesDatabaseClient(schemasDatabaseName);
+		DatabaseClient contentClient = buildContentClient(context, schemasDatabaseName);
 		try {
-			SchemasLoader schemasLoader = buildSchemasLoader(context, client, schemasDatabaseName);
+			SchemasLoader schemasLoader = buildSchemasLoader(context, schemasClient, contentClient);
 			schemasLoader.loadSchemas(schemasPath);
 			logger.info("Finished loading schemas from: " + schemasPath);
 		} catch (FailedRequestException fre) {
@@ -92,12 +93,29 @@ protected void loadSchemas(String schemasPath, String schemasDatabaseName, Comma
 				throw fre;
 			}
 		} finally {
-			client.release();
+			schemasClient.release();
+			if (contentClient != null) {
+				contentClient.release();
+			}
 		}
 	}
 
-	protected DatabaseClient buildDatabaseClient(String schemasDatabaseName, CommandContext context) {
-		return context.getAppConfig().newAppServicesDatabaseClient(schemasDatabaseName);
+	/**
+	 * Construct a content client, for use when validating TDEs and generating QBVs.
+	 *
+	 * @param context
+	 * @param schemasDatabase
+	 * @return
+	 */
+	private DatabaseClient buildContentClient(CommandContext context, String schemasDatabase) {
+		String contentDatabase = findContentDatabaseAssociatedWithSchemasDatabase(context, schemasDatabase);
+		if (contentDatabase != null) {
+			logger.info(format("Will use %s as a content database when loading into schemas database: %s", contentDatabase, schemasDatabase));
+			return context.getAppConfig().newAppServicesDatabaseClient(contentDatabase);
+		}
+		logger.warn(format("Unable to find a content database associated with schemas database: %s; this may " +
+			"result in errors when loading TDE templates and Query-Based-View scripts."));
+		return null;
 	}
 
 	/**
@@ -106,24 +124,12 @@ protected DatabaseClient buildDatabaseClient(String schemasDatabaseName, Command
 	 * So given a schemasDatabaseName,
 	 *
 	 * @param context
-	 * @param client
+	 * @param schemasClient
 	 * @return
 	 */
-	protected SchemasLoader buildSchemasLoader(CommandContext context, DatabaseClient client, String schemasDatabaseName) {
+	protected SchemasLoader buildSchemasLoader(CommandContext context, DatabaseClient schemasClient, DatabaseClient contentClient) {
 		AppConfig appConfig = context.getAppConfig();
-
-		String tdeValidationDatabase = null;
-		if (appConfig.isTdeValidationEnabled()) {
-			tdeValidationDatabase = findContentDatabaseAssociatedWithSchemasDatabase(context, schemasDatabaseName);
-			if (tdeValidationDatabase != null) {
-				logger.info(format("TDE templates loaded into %s will be validated against content database %s",
-					schemasDatabaseName, tdeValidationDatabase));
-			}
-		} else {
-			logger.info("TDE validation is disabled");
-		}
-
-		DefaultSchemasLoader schemasLoader = new DefaultSchemasLoader(client, tdeValidationDatabase);
+		DefaultSchemasLoader schemasLoader = new DefaultSchemasLoader(schemasClient, contentClient, context.getAppConfig().isTdeValidationEnabled());
 		schemasLoader.setCascadeCollections(appConfig.isCascadeCollections());
 		schemasLoader.setCascadePermissions(appConfig.isCascadePermissions());
 		FileFilter filter = appConfig.getSchemasFileFilter();

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

@@ -39,7 +39,7 @@ public class LoadSchemasTest extends AbstractAppDeployerTest {
 
 	@AfterEach
 	public void cleanup() {
-		undeploySampleApp();
+//		undeploySampleApp();
 	}
 
 	@Test
@@ -153,6 +153,9 @@ public void multipleSchemaPaths() {
 		File projectDir = new File("src/test/resources/schemas-project");
 
 		initializeAppConfig(projectDir);
+
+		// Turn off TDE validation, just to verify that the QBV still gets processed
+		appConfig.setTdeValidationEnabled(false);
 		appConfig.getSchemaPaths().add(new File(projectDir, "src/main/more-schemas").getAbsolutePath());
 
 		initializeAppDeployer(new DeployOtherDatabasesCommand(1), new LoadSchemasCommand());
@@ -162,9 +165,15 @@ public void multipleSchemaPaths() {
 		GenericDocumentManager docMgr = client.newDocumentManager();
 		assertNotNull(docMgr.exists("/tde/template1.json"));
 		assertNotNull(docMgr.exists("/tde/template2.json"));
-
-		assertTrue(docMgr.readMetadata("/tde/template1.json", new DocumentMetadataHandle()).getCollections().contains("http://marklogic.com/xdmp/tde"));
-		assertTrue(docMgr.readMetadata("/tde/template2.json", new DocumentMetadataHandle()).getCollections().contains("http://marklogic.com/xdmp/tde"));
+		assertNotNull(docMgr.exists("/qbv/example.sjs.xml"),
+			"The QBV XML should have been generated, even though TDE validation is disabled.");
+
+		assertTrue(docMgr.readMetadata("/tde/template1.json",
+			new DocumentMetadataHandle()).getCollections().contains("http://marklogic.com/xdmp/tde"));
+		assertTrue(docMgr.readMetadata("/tde/template2.json",
+			new DocumentMetadataHandle()).getCollections().contains("http://marklogic.com/xdmp/tde"));
+		assertTrue(docMgr.readMetadata("/qbv/example.sjs.xml",
+			new DocumentMetadataHandle()).getCollections().contains("http://marklogic.com/xdmp/qbv"));
 	}
 
 	/**

src/test/resources/schemas-project/src/main/more-schemas/qbv/example.sjs

@@ -0,0 +1,3 @@
+'use strict';
+const op = require('/MarkLogic/optic');
+op.fromView('Example2', 'default').generateView('qbv', 'example')