#135 Using new approach for loading schemas

Author: Rob Rudin

build.gradle

@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-  compile 'com.marklogic:ml-javaclient-util:2.12.DEV'
+  compile 'com.marklogic:ml-javaclient-util:2.13.DEV'
   compile 'jaxen:jaxen:1.1.6'
   compile 'org.apache.httpcomponents:httpclient:4.3.5'
   compile 'org.springframework:spring-web:4.3.5.RELEASE'

src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java

@@ -41,6 +41,9 @@ public Integer getExecuteSortOrder() {
      * @param filenames
      */
     public void setFilenamesToIgnore(String... filenames) {
+        if (filenames == null || filenames.length == 0) {
+            return;
+        }
         if (resourceFilenameFilter != null && resourceFilenameFilter instanceof ResourceFilenameFilter) {
             ResourceFilenameFilter rff = (ResourceFilenameFilter) resourceFilenameFilter;
             Set<String> set = null;

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

@@ -1,21 +1,16 @@
 package com.marklogic.appdeployer.command.schemas;
 
-import java.io.File;
-
 import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.command.AbstractCommand;
 import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.FailedRequestException;
 import com.marklogic.client.schemasloader.SchemasLoader;
-import com.marklogic.client.schemasloader.impl.DefaultSchemasFinder;
 import com.marklogic.client.schemasloader.impl.DefaultSchemasLoader;
 
 public class LoadSchemasCommand extends AbstractCommand {
 
-	private SchemasLoader schemasLoader;
-
 	public LoadSchemasCommand() {
 		setExecuteSortOrder(SortOrderConstants.LOAD_SCHEMAS);
 	}
@@ -26,16 +21,13 @@ public void execute(CommandContext context) {
 	}
 
 	protected void loadSchemasIntoSchemasDatabase(CommandContext context) {
-		if (schemasLoader == null) {
-			initializeDefaultSchemasLoader(context);
-		}
-
 		AppConfig config = context.getAppConfig();
 		DatabaseClient client = config.newSchemasDatabaseClient();
+		SchemasLoader schemasLoader = new DefaultSchemasLoader(client);
 		try {
 			String schemasPath = config.getSchemasPath();
 			logger.info("Loading schemas database data from path: " + schemasPath);
-			schemasLoader.loadSchemas(new File(schemasPath), new DefaultSchemasFinder(), client);
+			schemasLoader.loadSchemas(schemasPath);
 		} catch (FailedRequestException fre) {
 			if (fre.getMessage().contains("NOSUCHDB")) {
 				logger.warn("Unable to load schemas because no schemas database exists; cause: " + fre.getMessage());
@@ -47,10 +39,4 @@ protected void loadSchemasIntoSchemasDatabase(CommandContext context) {
 			client.release();
 		}
 	}
-
-	private void initializeDefaultSchemasLoader(CommandContext context) {
-		logger.info("Initializing instance of DefaultSchemasLoader");
-		this.schemasLoader = new DefaultSchemasLoader();
-	}
-
 }

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

@@ -26,8 +26,8 @@ public void testSchemaLoading() {
         GenericDocumentManager docMgr = client.newDocumentManager();
 
         assertNull("Rules document loaded", docMgr.exists("notExists"));
-        assertNotNull("Rules document loaded", docMgr.exists("my.rules").getUri());
-        assertNotNull("XSD document loaded", docMgr.exists("x.xsd").getUri());
+        assertNotNull("Rules document loaded", docMgr.exists("/my.rules").getUri());
+        assertNotNull("XSD document loaded", docMgr.exists("/x.xsd").getUri());
     }
 
     @Test
@@ -41,10 +41,10 @@ public void testSchemaCustomSchemasPath() {
 
         GenericDocumentManager docMgr = client.newDocumentManager();
 
-        assertNotNull("TDEXML document loaded", docMgr.exists("x.tdex").getUri());
-        assertNotNull("TDEJSON document loaded", docMgr.exists("x.tdej").getUri());
+        assertNotNull("TDEXML document loaded", docMgr.exists("/x.tdex").getUri());
+        assertNotNull("TDEJSON document loaded", docMgr.exists("/x.tdej").getUri());
 
-        for (String uri : new String[] { "x.tdex", "x.tdej" }) {
+        for (String uri : new String[] { "/x.tdex", "/x.tdej" }) {
             DocumentMetadataHandle h = docMgr.readMetadata(uri, new DocumentMetadataHandle());
             assertEquals("Files ending in tdex and tdej go into a special collection", "http://marklogic.com/xdmp/tde",
                     h.getCollections().iterator().next());