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 2020/10/15 10:34:50 UTC
[jackrabbit-filevault] branch master updated: releng: fix some
SonarQube issues
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new 2607c7b releng: fix some SonarQube issues
2607c7b is described below
commit 2607c7b1ec214a6eed49cbf23447aa624792b6d1
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Oct 15 12:34:36 2020 +0200
releng: fix some SonarQube issues
---
.../vault/validation/spi/impl/AdvancedFilterValidator.java | 9 +--------
.../validation/spi/impl/nodetype/NodeTypeValidator.java | 12 +++++-------
2 files changed, 6 insertions(+), 15 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 2f79fef..17a208a 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
@@ -32,18 +32,11 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
import java.util.stream.Collectors;
-import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.vault.fs.api.FilterSet.Entry;
import org.apache.jackrabbit.vault.fs.api.PathFilter;
@@ -286,7 +279,7 @@ public final class AdvancedFilterValidator implements GenericMetaInfDataValidato
@Override
public @Nullable Collection<ValidationMessage> validateJcrPath(@NotNull NodeContext nodeContext,
- boolean isFolder) {
+ boolean isFolder, boolean isDocViewXml) {
if (!isFolder) {
return validateFileNodePath(nodeContext.getNodePath());
} else {
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidator.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidator.java
index 8d0d3de..c72ec90 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidator.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidator.java
@@ -37,7 +37,6 @@ import javax.jcr.nodetype.NoSuchNodeTypeException;
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.JcrConstants;
-import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.commons.conversion.IllegalNameException;
import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException;
@@ -300,7 +299,7 @@ public class NodeTypeValidator implements DocumentViewXmlValidator, JcrPathValid
List<ValidationMessage> messages = new ArrayList<>();
boolean isImplicit = isImplicit(nodeContext.getNodePath());
if (isFolder) {
- messages.addAll(getOrCreateNewNode(nodeContext, isImplicit, NodeTypeConstants.NT_FOLDER));
+ messages.addAll(getOrCreateNewNode(nodeContext, isImplicit, JcrConstants.NT_FOLDER));
//
if (!nodeContext.getNodePath().equals("/")) {
messages.addAll(finalizeValidationForSiblings(nodeContext));
@@ -312,19 +311,19 @@ public class NodeTypeValidator implements DocumentViewXmlValidator, JcrPathValid
// https://jackrabbit.apache.org/filevault/vaultfs.html#Binary_Properties
if (fileName.endsWith(ValidationExecutor.EXTENSION_BINARY)) {
// create parent if it does not exist yet
- messages.addAll(getOrCreateNewNode(nodeContext, isImplicit, NodeTypeConstants.NT_FOLDER));
+ messages.addAll(getOrCreateNewNode(nodeContext, isImplicit, JcrConstants.NT_FOLDER));
String propertyName = fileName.substring(0, fileName.length() - ValidationExecutor.EXTENSION_BINARY.length());
messages.addAll(addProperty(nodeContext, propertyName, false, DUMMY_BINARY_VALUE));
} else {
// if binary node is not yet there
- messages.addAll(getOrCreateNewNode(nodeContext, isImplicit, NodeTypeConstants.NT_FILE));
+ messages.addAll(getOrCreateNewNode(nodeContext, isImplicit, JcrConstants.NT_FILE));
// if a NT_FILE create a jcr:content sub node of type NT_RESOURCE
if (currentNodeTypeMetaData.getPrimaryNodeType().equals(NameConstants.NT_FILE)) {
// create new node context
nodeContext = new NodeContextImpl(nodeContext.getNodePath() + "/" + JcrConstants.JCR_CONTENT,
nodeContext.getFilePath(), nodeContext.getBasePath());
messages.addAll(
- getOrCreateNewNode(nodeContext, isImplicit(nodeContext.getNodePath()), NodeTypeConstants.NT_RESOURCE));
+ getOrCreateNewNode(nodeContext, isImplicit(nodeContext.getNodePath()), JcrConstants.NT_RESOURCE));
}
messages.addAll(addProperty(nodeContext, JcrConstants.JCR_DATA, false, DUMMY_BINARY_VALUE));
messages.addAll(addProperty(nodeContext, JcrConstants.JCR_MIMETYPE, false, DUMMY_STRING_VALUE));
@@ -349,9 +348,8 @@ public class NodeTypeValidator implements DocumentViewXmlValidator, JcrPathValid
@Override
public @Nullable Collection<ValidationMessage> done() {
// validate any outstanding nodes
- // TODO: use correct node context impl
try {
- return finalizeValidationForSubtree(getNode("/").get(), new NodeContextImpl("/", Paths.get("/"), Paths.get("/")));
+ return finalizeValidationForSubtree(getNode("/").orElseThrow(() -> new IllegalStateException("Cannot get root node")), new NodeContextImpl("/", Paths.get("/"), Paths.get("/")));
} catch (NamespaceException e) {
throw new IllegalStateException("Can not print qualified path", e);
}