Merge pull request #192 from marklogic/feature/cascade-fix-2

Fixed how cascading is disabled

Author: rjrudin

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

@@ -44,29 +44,39 @@ protected CascadingPropertiesDrivenDocumentFileProcessor(String propertiesFilena
 
 	@Override
 	public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
-		File collectionsPropertiesFile = new File(dir.toFile(), this.getPropertiesFilename());
-		if (collectionsPropertiesFile.exists()) {
-			this.loadProperties(collectionsPropertiesFile);
+		// If cascading is disabled, we still use a stack to keep track of whether a directory has properties or not.
+		// We just never grab properties from the stack in case a directory doesn't have properties.
+		if (logger.isDebugEnabled()) {
+			logger.debug(format("Visiting directory: %s", dir.toFile().getAbsolutePath()));
+		}
+		File propertiesFile = new File(dir.toFile(), this.getPropertiesFilename());
+		if (propertiesFile.exists()) {
+			if (logger.isDebugEnabled()) {
+				logger.debug(format("Loading properties from file: %s", propertiesFile.getAbsolutePath()));
+			}
+			this.loadProperties(propertiesFile);
 		} else {
 			if (cascadingEnabled && !propertiesStack.isEmpty()) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("No properties file, and cascading is enabled, so using properties from top of stack.");
+				}
 				this.setProperties(propertiesStack.peek());
 			} else {
+				if (logger.isDebugEnabled()) {
+					logger.debug("No properties file, or cascading is disabled, so using empty properties.");
+				}
 				this.setProperties(new Properties());
 			}
 		}
-		if (cascadingEnabled) {
-			propertiesStack.push(this.getProperties());
-		}
+		propertiesStack.push(this.getProperties());
 		return FileVisitResult.CONTINUE;
 	}
 
 	@Override
 	public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
-		if (cascadingEnabled) {
-			propertiesStack.pop();
-			if (!propertiesStack.isEmpty()) {
-				this.setProperties(propertiesStack.peek());
-			}
+		propertiesStack.pop();
+		if (!propertiesStack.isEmpty()) {
+			this.setProperties(propertiesStack.peek());
 		}
 		return FileVisitResult.CONTINUE;
 	}

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

@@ -42,23 +42,32 @@ void setup() {
 	void parentWithBothProperties() {
 		loader.loadFiles("src/test/resources/process-files/cascading-metadata-test/parent1-withCP");
 
-		verifyCollections("/child1_1-noCP/test.json", PARENT_COLLECTION);
-		verifyPermissions("/child1_1-noCP/test.json", "rest-writer", "update");
-
-		verifyCollections("/child1_2-withCP/test.json", CHILD_COLLECTION);
-		verifyPermissions("/child1_2-withCP/test.json", "rest-reader", "read");
-
-		verifyCollections("/child3_1-withCP/grandchild3_1_1-noCP/test.json", CHILD_COLLECTION);
-		verifyPermissions("/child3_1-withCP/grandchild3_1_1-noCP/test.json", "rest-reader", "read");
+		verifyCollections("/parent.json", PARENT_COLLECTION);
+		verifyPermissions("/parent.json", "rest-writer", "update");
 
-		verifyCollections("/child1/child1.json", "ParentCollection");
+		// Should be same as parent as it doesn't have C/P files.
+		verifyCollections("/child1/child1.json", PARENT_COLLECTION);
 		verifyPermissions("/child1/child1.json", "rest-writer", "update");
 
+		// Differs from parent because it has its own C/P files.
 		verifyCollections("/child2/child2.json", "child2");
 		verifyPermissions("/child2/child2.json", "app-user", "read");
 
-		verifyCollections("/parent.json", "ParentCollection");
-		verifyPermissions("/parent.json", "rest-writer", "update");
+		// Differs from parent because it has its own C/P files.
+		verifyCollections("/child3/child3.json", "child3");
+		verifyPermissions("/child3/child3.json", "rest-reader", "read");
+
+		// Should inherit from child3, not parent.
+		verifyCollections("/child3/grandchild3/grandchild3.json", "child3");
+		verifyPermissions("/child3/grandchild3/grandchild3.json", "rest-reader", "read");
+
+		// Should inherit from parent.
+		verifyCollections("/child4/child4.json", PARENT_COLLECTION);
+		verifyPermissions("/child4/child4.json", "rest-writer", "update");
+
+		// Should override parent.
+		verifyCollections("/child4/grandchild4/grandchild4.json", "grandchild4");
+		verifyPermissions("/child4/grandchild4/grandchild4.json", "qconsole-user", "read");
 	}
 
 	@Test
@@ -87,7 +96,32 @@ void cascadingDisabled() {
 		loader = new GenericFileLoader(client);
 
 		loader.loadFiles("src/test/resources/process-files/cascading-metadata-test/parent1-withCP");
-		verifyCollections("/child1_1-noCP/test.json");
-		verifyPermissions("/child1_1-noCP/test.json");
+
+		verifyCollections("/parent.json", PARENT_COLLECTION);
+		verifyPermissions("/parent.json", "rest-writer", "update");
+
+		// Has no C/P files.
+		verifyCollections("/child1/child1.json");
+		verifyPermissions("/child1/child1.json");
+
+		// Has C/P files.
+		verifyCollections("/child2/child2.json", "child2");
+		verifyPermissions("/child2/child2.json", "app-user", "read");
+
+		// Has C/P files.
+		verifyCollections("/child3/child3.json", "child3");
+		verifyPermissions("/child3/child3.json", "rest-reader", "read");
+
+		// Has no C/P files.
+		verifyCollections("/child3/grandchild3/grandchild3.json");
+		verifyPermissions("/child3/grandchild3/grandchild3.json");
+
+		// Has no C/P files.
+		verifyCollections("/child4/child4.json");
+		verifyPermissions("/child4/child4.json");
+
+		// Has C/P files.
+		verifyCollections("/child4/grandchild4/grandchild4.json", "grandchild4");
+		verifyPermissions("/child4/grandchild4/grandchild4.json", "qconsole-user", "read");
 	}
 }

src/test/resources/logback.xml

@@ -24,10 +24,6 @@
 		<appender-ref ref="STDOUT" />
 	</logger>
 
-	<logger name="com.marklogic.client.modulesloader" level="INFO" additivity="false">
-		<appender-ref ref="STDOUT" />
-	</logger>
-
 	<logger name="org.springframework" level="WARN" additivity="false">
 		<appender-ref ref="STDOUT" />
 	</logger>

src/test/resources/process-files/cascading-metadata-test/parent1-withCP/child1_2-withCP/collections.properties

@@ -0,0 +1 @@
+*=child3