You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2022/03/27 08:27:24 UTC
[jackrabbit-filevault] 01/01: JCRVLT-620 fix orphan filter detection for folders (nt:folder nodes)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/JCRVLT-620-orphan-detection-for-folders
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit f05c43cfa3fdded9a8b6b0c250e258c380ab6def
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Sun Mar 27 10:27:14 2022 +0200
JCRVLT-620 fix orphan filter detection for folders (nt:folder nodes)
---
.../vault/validation/spi/impl/AdvancedFilterValidator.java | 12 ++++++------
.../validation/spi/impl/AdvancedFilterValidatorTest.java | 4 +++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java
index a58187e..65dea02 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java
@@ -240,12 +240,6 @@ public final class AdvancedFilterValidator implements GenericMetaInfDataValidato
* @return
*/
private Collection<ValidationMessage> validateNodePath(@NotNull String nodePath) {
- if (isSubPackage) {
- return null; // not relevant for sub packages
- }
- // remove from orphaned list
- removeFromOrphanedFilterEntries(nodePath);
-
// now go through all includes
if (!filter.contains(nodePath)) {
if (filter.isAncestor(nodePath)) {
@@ -286,6 +280,12 @@ public final class AdvancedFilterValidator implements GenericMetaInfDataValidato
@Override
public @Nullable Collection<ValidationMessage> validateJcrPath(@NotNull NodeContext nodeContext,
boolean isFolder, boolean isDocViewXml) {
+ if (isSubPackage) {
+ return null; // not relevant for sub packages
+ }
+ // remove from orphaned list
+ removeFromOrphanedFilterEntries(nodeContext.getNodePath());
+
if (!isFolder) {
return validateNodePath(nodeContext.getNodePath());
} else {
diff --git a/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java b/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java
index 0b78b21..7fd37cd 100644
--- a/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java
+++ b/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java
@@ -347,11 +347,13 @@ public class AdvancedFilterValidatorTest {
new ValidationMessage(ValidationMessageSeverity.ERROR,
String.format(AdvancedFilterValidator.MESSAGE_ANCESTOR_NODE_NOT_COVERED, "/apps/test2/something")));
+ MatcherAssert.assertThat(validator.validateJcrPath(getStandardNodeContext("/apps/test4/test"), true, false),
+ AnyValidationViolationMessageMatcher.noValidationViolationMessageInCollection());
messages = validator.done();
ValidationExecutorTest.assertViolation(messages, ValidationMessageSeverity.INFO,
new ValidationMessage(ValidationMessageSeverity.WARN,
String.format(AdvancedFilterValidator.MESSAGE_ORPHANED_FILTER_ENTRIES,
- "entry with root '/apps/test', includes [regex: .*/valid] below root '/apps/test2', entry with root '/apps/test4/test'")));
+ "entry with root '/apps/test', includes [regex: .*/valid] below root '/apps/test2'")));
}
@Test