#107 Loading files now supports a wildcard for collections and permissions

Author: rjrudin

src/main/java/com/marklogic/client/ext/file/CollectionsFileDocumentFileProcessor.java

@@ -9,6 +9,8 @@
  */
 public class CollectionsFileDocumentFileProcessor extends PropertiesDrivenDocumentFileProcessor {
 
+	private String delimiter = ",";
+
 	public CollectionsFileDocumentFileProcessor() {
 		this("collections.properties");
 	}
@@ -22,7 +24,20 @@ protected void processProperties(DocumentFile documentFile, Properties propertie
 		String name = documentFile.getFile().getName();
 		if (properties.containsKey(name)) {
 			String value = properties.getProperty(name);
-			documentFile.getDocumentMetadata().withCollections(value.split(","));
+			documentFile.getDocumentMetadata().withCollections(value.split(delimiter));
+		}
+
+		if (properties.containsKey(WILDCARD_KEY)) {
+			String value = properties.getProperty(WILDCARD_KEY);
+			documentFile.getDocumentMetadata().withCollections(value.split(delimiter));
 		}
 	}
+
+	public String getDelimiter() {
+		return delimiter;
+	}
+
+	public void setDelimiter(String delimiter) {
+		this.delimiter = delimiter;
+	}
 }

src/main/java/com/marklogic/client/ext/file/PermissionsFileDocumentFileProcessor.java

@@ -33,6 +33,11 @@ protected void processProperties(DocumentFile documentFile, Properties propertie
 			String value = properties.getProperty(name);
 			documentPermissionsParser.parsePermissions(value, documentFile.getDocumentMetadata().getPermissions());
 		}
+
+		if (properties.containsKey(WILDCARD_KEY)) {
+			String value = properties.getProperty(WILDCARD_KEY);
+			documentPermissionsParser.parsePermissions(value, documentFile.getDocumentMetadata().getPermissions());
+		}
 	}
 
 	public void setDocumentPermissionsParser(DocumentPermissionsParser documentPermissionsParser) {

src/main/java/com/marklogic/client/ext/file/PropertiesDrivenDocumentFileProcessor.java

@@ -16,6 +16,8 @@
  */
 public abstract class PropertiesDrivenDocumentFileProcessor extends LoggingObject implements DocumentFileProcessor, FileFilter {
 
+	protected final static String WILDCARD_KEY = "*";
+
 	private String propertiesFilename;
 
 	// Used to avoid checking for and loading the properties for every file in a directory

src/test/java/com/marklogic/client/ext/file/CollectionsFileDocumentFileProcessorTest.java

@@ -0,0 +1,28 @@
+package com.marklogic.client.ext.file;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+
+public class CollectionsFileDocumentFileProcessorTest extends Assert {
+
+	private CollectionsFileDocumentFileProcessor processor = new CollectionsFileDocumentFileProcessor();
+
+	@Test
+	public void wildcard() {
+		File testDir = new File("src/test/resources/process-files/wildcard-test");
+
+		DocumentFile file = new DocumentFile("/test.json", new File(testDir, "test.json"));
+		processor.processDocumentFile(file);
+		assertTrue(file.getDocumentMetadata().getCollections().contains("json-data"));
+		assertFalse(file.getDocumentMetadata().getCollections().contains("xml-data"));
+		assertTrue(file.getDocumentMetadata().getCollections().contains("global"));
+
+		file = new DocumentFile("/test.xml", new File(testDir, "test.xml"));
+		processor.processDocumentFile(file);
+		assertFalse(file.getDocumentMetadata().getCollections().contains("json-data"));
+		assertTrue(file.getDocumentMetadata().getCollections().contains("xml-data"));
+		assertTrue(file.getDocumentMetadata().getCollections().contains("global"));
+	}
+}

src/test/java/com/marklogic/client/ext/file/PermissionsFileDocumentFileProcessorTest.java

@@ -0,0 +1,38 @@
+package com.marklogic.client.ext.file;
+
+import com.marklogic.client.io.DocumentMetadataHandle;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+
+public class PermissionsFileDocumentFileProcessorTest extends Assert {
+
+	private PermissionsFileDocumentFileProcessor processor = new PermissionsFileDocumentFileProcessor();
+
+	/**
+	 * *=manage-user,read
+	 * test.json=manage-user,update,manage-admin,update
+	 * test.xml=qconsole-user,update
+	 */
+	@Test
+	public void wildcard() {
+		File testDir = new File("src/test/resources/process-files/wildcard-test");
+
+		DocumentFile file = new DocumentFile("/test.json", new File(testDir, "test.json"));
+		processor.processDocumentFile(file);
+		DocumentMetadataHandle.DocumentPermissions permissions = file.getDocumentMetadata().getPermissions();
+		assertTrue(permissions.get("manage-user").contains(DocumentMetadataHandle.Capability.READ));
+		assertTrue(permissions.get("manage-user").contains(DocumentMetadataHandle.Capability.UPDATE));
+		assertTrue(permissions.get("manage-admin").contains(DocumentMetadataHandle.Capability.UPDATE));
+		assertNull(permissions.get("qconsole-user"));
+
+		file = new DocumentFile("/test.xml", new File(testDir, "test.xml"));
+		processor.processDocumentFile(file);
+		permissions = file.getDocumentMetadata().getPermissions();
+		assertTrue(permissions.get("manage-user").contains(DocumentMetadataHandle.Capability.READ));
+		assertFalse(permissions.get("manage-user").contains(DocumentMetadataHandle.Capability.UPDATE));
+		assertNull(permissions.get("manage-admin"));
+		assertTrue(permissions.get("qconsole-user").contains(DocumentMetadataHandle.Capability.UPDATE));
+	}
+}

src/test/resources/process-files/wildcard-test/collections.properties

@@ -0,0 +1,3 @@
+*=global
+test.json=json-data
+test.xml=xml-data

src/test/resources/process-files/wildcard-test/permissions.properties

@@ -0,0 +1,3 @@
+*=manage-user,read
+test.json=manage-user,update,manage-admin,update
+test.xml=qconsole-user,update

src/test/resources/process-files/wildcard-test/test.json

@@ -0,0 +1,3 @@
+{
+	"test": "test"
+}

src/test/resources/process-files/wildcard-test/test.xml

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