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/01/30 08:31:43 UTC
svn commit: r1873355 - in /jackrabbit/commons/filevault/trunk:
vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/
vault-validation/
vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/
vault-validation/src/main/java/...
Author: kwin
Date: Thu Jan 30 08:31:43 2020
New Revision: 1873355
URL: http://svn.apache.org/viewvc?rev=1873355&view=rev
Log:
trivial: add some more null annotations
Added:
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorException.java
- copied, changed from r1873354, jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidatorException.java
Removed:
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidatorException.java
Modified:
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/DefaultPackageProperties.java
jackrabbit/commons/filevault/trunk/vault-validation/pom.xml
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutor.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidationMessageErrorHandler.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorSettingsImpl.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationMessage.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidatorSettings.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/package-info.java
jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorTest.java
jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorTest.java
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/DefaultPackageProperties.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/DefaultPackageProperties.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/DefaultPackageProperties.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/DefaultPackageProperties.java Thu Jan 30 08:31:43 2020
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.vault.packaging.impl;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
@@ -25,8 +24,7 @@ import java.util.InvalidPropertiesFormat
import java.util.Properties;
import org.apache.commons.io.input.CloseShieldInputStream;
-import org.apache.jackrabbit.vault.packaging.PackageProperties;
-import org.apache.jackrabbit.vault.packaging.impl.PackagePropertiesImpl;
+import org.jetbrains.annotations.NotNull;
/**
* Implementing {@link PackageProperties} on top of an existing {@link File} or {@link InputStream}.
@@ -53,7 +51,7 @@ public class DefaultPackageProperties ex
* @return the package properties deserialized from the given input
* @throws IOException in case deserializing from the input stream failed
*/
- public static DefaultPackageProperties fromInputStream(InputStream input) throws IOException {
+ public static @NotNull DefaultPackageProperties fromInputStream(InputStream input) throws IOException {
return new DefaultPackageProperties(input);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/pom.xml?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/pom.xml Thu Jan 30 08:31:43 2020
@@ -77,9 +77,6 @@
<executions>
<execution>
<id>baseline</id>
- <configuration>
- <skip>true</skip> <!-- skip until the first release is done -->
- </configuration>
</execution>
</executions>
</plugin>
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutor.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutor.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutor.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutor.java Thu Jan 30 08:31:43 2020
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.vault.util.
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
import org.apache.jackrabbit.vault.validation.impl.util.EnhancedBufferedInputStream;
import org.apache.jackrabbit.vault.validation.impl.util.ResettableInputStream;
+import org.apache.jackrabbit.vault.validation.impl.util.ValidatorException;
import org.apache.jackrabbit.vault.validation.spi.DocumentViewXmlValidator;
import org.apache.jackrabbit.vault.validation.spi.FilterValidator;
import org.apache.jackrabbit.vault.validation.spi.GenericJcrDataValidator;
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java Thu Jan 30 08:31:43 2020
@@ -33,7 +33,6 @@ import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.util.DocViewNode;
import org.apache.jackrabbit.vault.util.DocViewProperty;
import org.apache.jackrabbit.vault.validation.ValidationViolation;
-import org.apache.jackrabbit.vault.validation.ValidatorException;
import org.apache.jackrabbit.vault.validation.spi.DocumentViewXmlValidator;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
@@ -46,7 +45,7 @@ import org.xml.sax.helpers.DefaultHandle
/** TODO: reuse more logic from DocViewSAXImporter (https://issues.apache.org/jira/browse/JCRVLT-357) */
public class DocumentViewXmlContentHandler extends DefaultHandler {
- private final Map<String, Integer> nodePathsAndLineNumbers;
+ private final @NotNull Map<String, Integer> nodePathsAndLineNumbers;
private String rootNodeName;
private String rootNodeParentPath; // must not end with "/"
private final Path filePath;
@@ -56,7 +55,7 @@ public class DocumentViewXmlContentHandl
private Deque<String> nodePathStack;
private final Map<String, DocumentViewXmlValidator> validators;
- private List<ValidationViolation> violations;
+ private @NotNull List<ValidationViolation> violations;
public @NotNull List<ValidationViolation> getViolations() {
return violations;
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidationMessageErrorHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidationMessageErrorHandler.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidationMessageErrorHandler.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidationMessageErrorHandler.java Thu Jan 30 08:31:43 2020
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
+import org.jetbrains.annotations.NotNull;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
@@ -36,7 +37,7 @@ public class ValidationMessageErrorHandl
this.errorMessageSeverity = errorMessageSeverity;
}
- private void print(SAXParseException x, ValidationMessageSeverity severity) {
+ private void print(@NotNull SAXParseException x, @NotNull ValidationMessageSeverity severity) {
ValidationMessage message = new ValidationMessage(severity, x.getMessage(), Integer.valueOf(x.getLineNumber()),
Integer.valueOf(x.getColumnNumber()), null);
messages.add(message);
Copied: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorException.java (from r1873354, jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidatorException.java)
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorException.java?p2=jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorException.java&p1=jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidatorException.java&r1=1873354&r2=1873355&rev=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidatorException.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorException.java Thu Jan 30 08:31:43 2020
@@ -14,10 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.vault.validation;
+package org.apache.jackrabbit.vault.validation.impl.util;
import java.nio.file.Path;
+/**
+ * Exception wrapping all sorts of runtime exceptions being thrown from a validator
+ */
public class ValidatorException extends RuntimeException {
private ValidatorException(String id, String messageSuffix, Throwable cause) {
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorSettingsImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorSettingsImpl.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorSettingsImpl.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/ValidatorSettingsImpl.java Thu Jan 30 08:31:43 2020
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
public class ValidatorSettingsImpl implements ValidatorSettings {
private boolean isDisabled;
@@ -45,7 +46,7 @@ public class ValidatorSettingsImpl imple
}
@Override
- public ValidationMessageSeverity getDefaultSeverity() {
+ public @NotNull ValidationMessageSeverity getDefaultSeverity() {
if (defaultSeverity == null) {
return ValidationMessageSeverity.ERROR;
}
@@ -53,7 +54,7 @@ public class ValidatorSettingsImpl imple
}
@Override
- public Map<String, String> getOptions() {
+ public @NotNull Map<String, String> getOptions() {
if (options == null) {
return Collections.emptyMap();
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationMessage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationMessage.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationMessage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationMessage.java Thu Jan 30 08:31:43 2020
@@ -24,8 +24,8 @@ import org.jetbrains.annotations.Nullabl
*/
public class ValidationMessage {
- private final ValidationMessageSeverity severity;
- private final String message;
+ private final @NotNull ValidationMessageSeverity severity;
+ private final @NotNull String message;
/** if this is file based, may indicate the line where the issue happened, 0 for unspecified */
private final int line;
/** if this is file based, may indicate the column where the issue happened, 0 for unspecified */
@@ -115,10 +115,7 @@ public class ValidationMessage {
return false;
if (line != other.line)
return false;
- if (message == null) {
- if (other.message != null)
- return false;
- } else if (!message.equals(other.message))
+ if (!message.equals(other.message))
return false;
if (severity != other.severity)
return false;
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidatorSettings.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidatorSettings.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidatorSettings.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidatorSettings.java Thu Jan 30 08:31:43 2020
@@ -46,6 +46,6 @@ public interface ValidatorSettings {
*
* @return {@code true} in case validator is disabled otherwise {@code false}
*/
- @NotNull boolean isDisabled();
+ boolean isDisabled();
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java Thu Jan 30 08:31:43 2020
@@ -159,7 +159,7 @@ public final class AdvancedFilterValidat
}
@Override
- public Collection<ValidationMessage> validate(WorkspaceFilter filter) {
+ public Collection<ValidationMessage> validate(@NotNull WorkspaceFilter filter) {
if (isSubPackage) {
return null; // not relevant for sub packages
}
@@ -250,7 +250,7 @@ public final class AdvancedFilterValidat
}
@Override
- public Collection<ValidationMessage> validateMetaInfData(InputStream input, Path filePath) throws IOException {
+ public Collection<ValidationMessage> validateMetaInfData(@NotNull InputStream input, @NotNull Path filePath) throws IOException {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
try (InputStream xsdInput = getClass().getResourceAsStream("/filter.xsd")) {
@@ -296,7 +296,7 @@ public final class AdvancedFilterValidat
}
@Override
- public boolean shouldValidateMetaInfData(Path filePath) {
+ public boolean shouldValidateMetaInfData(@NotNull Path filePath) {
return FILTER_XML_PATH.equals(filePath);
}
@@ -324,7 +324,7 @@ public final class AdvancedFilterValidat
}
@Override
- public Collection<ValidationMessage> validate(String nodePath) {
+ public Collection<ValidationMessage> validate(@NotNull String nodePath) {
if (isSubPackage) {
return null; // not relevant for sub packages
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorFactory.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorFactory.java Thu Jan 30 08:31:43 2020
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.Validator;
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
import org.kohsuke.MetaInfServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +55,7 @@ public final class AdvancedFilterValidat
private static final Logger log = LoggerFactory.getLogger(AdvancedFilterValidatorFactory.class);
@Override
- public Validator createValidator(ValidationContext context, ValidatorSettings settings) {
+ public Validator createValidator(@NotNull ValidationContext context, @NotNull ValidatorSettings settings) {
final ValidationMessageSeverity severityForUncoveredAncestorNode;
if (settings.getOptions().containsKey(OPTION_SEVERITY_FOR_UNCOVERED_ANCESTOR_NODES)) {
String optionValue = settings.getOptions().get(OPTION_SEVERITY_FOR_UNCOVERED_ANCESTOR_NODES);
@@ -101,7 +102,7 @@ public final class AdvancedFilterValidat
}
@Override
- public String getId() {
+ public @NotNull String getId() {
return ID;
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidator.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidator.java Thu Jan 30 08:31:43 2020
@@ -34,6 +34,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.PropertiesValidator;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
+import org.jetbrains.annotations.NotNull;
public final class AdvancedPropertiesValidator implements GenericMetaInfDataValidator {
@@ -59,7 +60,7 @@ public final class AdvancedPropertiesVal
}
@Override
- public Collection<ValidationMessage> validateMetaInfData(InputStream input, Path filePath) {
+ public Collection<ValidationMessage> validateMetaInfData(@NotNull InputStream input, @NotNull Path filePath) {
Collection<ValidationMessage> messages = new LinkedList<>();
try {
PackageProperties properties = DefaultPackageProperties.fromInputStream(input);
@@ -80,7 +81,7 @@ public final class AdvancedPropertiesVal
}
@Override
- public boolean shouldValidateMetaInfData(Path filePath) {
+ public boolean shouldValidateMetaInfData(@NotNull Path filePath) {
return PROPERTIES_XML_PATH.equals(filePath);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidatorFactory.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidatorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedPropertiesValidatorFactory.java Thu Jan 30 08:31:43 2020
@@ -20,13 +20,14 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.Validator;
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
import org.kohsuke.MetaInfServices;
@MetaInfServices
public final class AdvancedPropertiesValidatorFactory implements ValidatorFactory {
@Override
- public Validator createValidator(ValidationContext context, ValidatorSettings settings) {
+ public Validator createValidator(@NotNull ValidationContext context, @NotNull ValidatorSettings settings) {
return new AdvancedPropertiesValidator(settings.getDefaultSeverity());
}
@@ -37,7 +38,7 @@ public final class AdvancedPropertiesVal
}
@Override
- public String getId() {
+ public @NotNull String getId() {
return ValidatorFactory.ID_PREFIX_JACKRABBIT + "properties";
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidator.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidator.java Thu Jan 30 08:31:43 2020
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.validation.spi.PropertiesValidator;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
+import org.jetbrains.annotations.NotNull;
public final class DependencyValidator implements PropertiesValidator {
@@ -37,7 +38,7 @@ public final class DependencyValidator i
private final ValidationMessageSeverity severity;
private final ValidationMessageSeverity severityForUnresolvedDependencies;
- public DependencyValidator(ValidationMessageSeverity severity, ValidationMessageSeverity severityForUnresolvedDependencies, Collection<PackageInfo> dependenciesMetaInfo) {
+ public DependencyValidator(@NotNull ValidationMessageSeverity severity, ValidationMessageSeverity severityForUnresolvedDependencies, Collection<PackageInfo> dependenciesMetaInfo) {
this.dependenciesMetaInfo = dependenciesMetaInfo;
this.severity = severity;
this.severityForUnresolvedDependencies = severityForUnresolvedDependencies;
@@ -49,7 +50,7 @@ public final class DependencyValidator i
}
@Override
- public Collection<ValidationMessage> validate(PackageProperties properties) {
+ public Collection<ValidationMessage> validate(@NotNull PackageProperties properties) {
// use resolved dependencies
Collection<ValidationMessage> messages = new LinkedList<>();
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidatorFactory.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidatorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DependencyValidatorFactory.java Thu Jan 30 08:31:43 2020
@@ -21,6 +21,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.Validator;
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
import org.kohsuke.MetaInfServices;
@MetaInfServices
@@ -32,7 +33,7 @@ public final class DependencyValidatorFa
private static final ValidationMessageSeverity DEFAULT_SEVERITY_FOR_UNRESOLVED_DEPENDENCIES = ValidationMessageSeverity.WARN;
@Override
- public Validator createValidator(ValidationContext context, ValidatorSettings settings) {
+ public Validator createValidator(@NotNull ValidationContext context, @NotNull ValidatorSettings settings) {
final ValidationMessageSeverity severityForUnresolvedDependencies;
if (settings.getOptions().containsKey(OPTION_SEVERITY_FOR_UNRESOLVED_DEPENDENCIES)) {
String optionValue = settings.getOptions().get(OPTION_SEVERITY_FOR_UNRESOLVED_DEPENDENCIES);
@@ -49,7 +50,7 @@ public final class DependencyValidatorFa
}
@Override
- public String getId() {
+ public @NotNull String getId() {
return ID;
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidator.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidator.java Thu Jan 30 08:31:43 2020
@@ -41,6 +41,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.GenericJcrDataValidator;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
+import org.jetbrains.annotations.NotNull;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -68,7 +69,7 @@ public class DocumentViewParserValidator
}
@Override
- public Collection<ValidationMessage> validateJcrData(InputStream input, Path filePath, Map<String, Integer> nodePathsAndLineNumbers) throws IOException {
+ public Collection<ValidationMessage> validateJcrData(@NotNull InputStream input, @NotNull Path filePath, @NotNull Map<String, Integer> nodePathsAndLineNumbers) throws IOException {
Collection<ValidationMessage> messages = new LinkedList<>();
// TODO: support other formats like sysview xml or generic xml
// (https://jackrabbit.apache.org/filevault/vaultfs.html#Deserialization)
@@ -155,7 +156,7 @@ public class DocumentViewParserValidator
// support upper case extensions?
@Override
- public boolean shouldValidateJcrData(Path filePath) {
+ public boolean shouldValidateJcrData(@NotNull Path filePath) {
return filePath.toString().endsWith(".xml");
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidatorFactory.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidatorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/DocumentViewParserValidatorFactory.java Thu Jan 30 08:31:43 2020
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.Validator;
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
import org.kohsuke.MetaInfServices;
import org.xml.sax.SAXException;
@@ -41,7 +42,7 @@ public class DocumentViewParserValidator
saxParser = spf.newSAXParser();
}
@Override
- public Validator createValidator(ValidationContext context, ValidatorSettings settings) {
+ public Validator createValidator(@NotNull ValidationContext context, @NotNull ValidatorSettings settings) {
return new DocumentViewParserValidator(saxParser, settings.getDefaultSeverity());
}
@@ -51,7 +52,7 @@ public class DocumentViewParserValidator
}
@Override
- public String getId() {
+ public @NotNull String getId() {
return ValidatorFactory.ID_PREFIX_JACKRABBIT + "docviewparser";
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidator.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidator.java Thu Jan 30 08:31:43 2020
@@ -34,6 +34,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.GenericJcrDataValidator;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
+import org.jetbrains.annotations.NotNull;
/**
* Check for empty elements (used for ordering purposes)
@@ -79,7 +80,7 @@ public class EmptyElementsValidator impl
}
@Override
- public Collection<ValidationMessage> validate(DocViewNode node, String nodePath, Path filePath, boolean isRoot) {
+ public Collection<ValidationMessage> validate(@NotNull DocViewNode node, @NotNull String nodePath, @NotNull Path filePath, boolean isRoot) {
if (isBelowAffectedFilterRoots(nodePath)) {
if (node.primary == null && node.mixins == null && node.props.isEmpty() && filter.contains(nodePath) && filter.getImportMode(nodePath) == ImportMode.REPLACE) {
// only relevant if no other merge mode
@@ -92,7 +93,7 @@ public class EmptyElementsValidator impl
}
@Override
- public Collection<ValidationMessage> validateJcrData(InputStream input, Path filePath, Map<String, Integer> nodePathsAndLineNumbers) {
+ public Collection<ValidationMessage> validateJcrData(@NotNull InputStream input, @NotNull Path filePath, @NotNull Map<String, Integer> nodePathsAndLineNumbers) {
// never validate actual input
// this should never be called
return null;
@@ -108,7 +109,7 @@ public class EmptyElementsValidator impl
}
@Override
- public boolean shouldValidateJcrData(Path filePath) {
+ public boolean shouldValidateJcrData(@NotNull Path filePath) {
String nodePath = ValidationExecutor.filePathToNodePath(filePath);
if (isBelowAffectedFilterRoots(nodePath)) {
nonEmptyNodePaths.add(nodePath);
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorFactory.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorFactory.java Thu Jan 30 08:31:43 2020
@@ -20,6 +20,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.Validator;
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.kohsuke.MetaInfServices;
@@ -27,7 +28,7 @@ import org.kohsuke.MetaInfServices;
public final class EmptyElementsValidatorFactory implements ValidatorFactory {
@Override
- public @Nullable Validator createValidator(ValidationContext context, ValidatorSettings settings) {
+ public @Nullable Validator createValidator(@NotNull ValidationContext context, @NotNull ValidatorSettings settings) {
return new EmptyElementsValidator(settings.getDefaultSeverity(), context.getFilter());
}
@@ -37,7 +38,7 @@ public final class EmptyElementsValidato
}
@Override
- public String getId() {
+ public @NotNull String getId() {
return ValidatorFactory.ID_PREFIX_JACKRABBIT + "emptyelements";
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidator.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidator.java Thu Jan 30 08:31:43 2020
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.vault.util.
import org.apache.jackrabbit.vault.validation.spi.DocumentViewXmlValidator;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
+import org.jetbrains.annotations.NotNull;
/**
* @see <a href="https://issues.apache.org/jira/browse/JCRVLT-255">JCRVLT-255</a>
@@ -58,7 +59,7 @@ public class MergeLimitationsValidator i
}
@Override
- public Collection<ValidationMessage> validate(DocViewNode node, String nodePath, Path filePath, boolean isRoot) {
+ public Collection<ValidationMessage> validate(@NotNull DocViewNode node, @NotNull String nodePath, @NotNull Path filePath, boolean isRoot) {
// find out if one of the filter roots is pointing to any of the aggregator's non-root nodes
if (!isRoot && !node.props.isEmpty() && rootNodePathsOfMergeRules.contains(nodePath)) {
return Collections.singleton(new ValidationMessage(severity, String.format(PACKAGE_NON_ROOT_NODE_MERGED, nodePath)));
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidatorFactory.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidatorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/MergeLimitationsValidatorFactory.java Thu Jan 30 08:31:43 2020
@@ -20,6 +20,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.Validator;
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.kohsuke.MetaInfServices;
@@ -27,7 +28,7 @@ import org.kohsuke.MetaInfServices;
public final class MergeLimitationsValidatorFactory implements ValidatorFactory {
@Override
- public @Nullable Validator createValidator(ValidationContext context, ValidatorSettings settings) {
+ public @Nullable Validator createValidator(@NotNull ValidationContext context, @NotNull ValidatorSettings settings) {
return new MergeLimitationsValidator(settings.getDefaultSeverity(), context.getFilter());
}
@@ -37,7 +38,7 @@ public final class MergeLimitationsValid
}
@Override
- public String getId() {
+ public @NotNull String getId() {
return ValidatorFactory.ID_PREFIX_JACKRABBIT + "mergelimitations";
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidator.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidator.java Thu Jan 30 08:31:43 2020
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.FilterValidator;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/** Validates that packages not having the property {@code allowIndexDefinitions=true} must not contain index definitions.
@@ -50,7 +51,7 @@ public final class OakIndexDefinitionVal
this.defaultMessageSeverity = defaultMessageSeverity;
}
@Override
- public @Nullable Collection<ValidationMessage> validate(WorkspaceFilter filter) {
+ public @Nullable Collection<ValidationMessage> validate(@NotNull WorkspaceFilter filter) {
Collection<ValidationMessage> violations = new LinkedList<>();
violations.addAll(collectIndexPaths(filter.getFilterSets()));
return violations;
@@ -73,7 +74,7 @@ public final class OakIndexDefinitionVal
}
@Override
- public @Nullable Collection<ValidationMessage> validate(DocViewNode node, String nodePath, Path filePath, boolean isRoot) {
+ public @Nullable Collection<ValidationMessage> validate(@NotNull DocViewNode node, @NotNull String nodePath, @NotNull Path filePath, boolean isRoot) {
ValidationMessage violation = null;
if (IndexConstants.INDEX_DEFINITIONS_NODE_TYPE.equals(node.primary)) {
violation = new ValidationMessage(defaultMessageSeverity, String.format(MESSAGE_INDEX_AT_NODE, packageRootPathOfNotAllowedIndexDefinition, nodePath));
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidatorFactory.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidatorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/OakIndexDefinitionValidatorFactory.java Thu Jan 30 08:31:43 2020
@@ -23,6 +23,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.Validator;
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.kohsuke.MetaInfServices;
@@ -30,7 +31,7 @@ import org.kohsuke.MetaInfServices;
public final class OakIndexDefinitionValidatorFactory implements ValidatorFactory {
@Override
- public @Nullable Validator createValidator(ValidationContext context, ValidatorSettings settings) {
+ public @Nullable Validator createValidator(@NotNull ValidationContext context, @NotNull ValidatorSettings settings) {
// only validate in case allowIndexDefinitions is not set for any of the validated packages
Path path = getPathOfNotAllowedIndexDefinition(context);
if (path != null) {
@@ -62,7 +63,7 @@ public final class OakIndexDefinitionVal
}
@Override
- public String getId() {
+ public @NotNull String getId() {
return ValidatorFactory.ID_PREFIX_JACKRABBIT + "oakindex";
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidator.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidator.java Thu Jan 30 08:31:43 2020
@@ -101,7 +101,7 @@ public final class PackageTypeValidator
}
@Override
- public @Nullable Collection<ValidationMessage> validate(String nodePath) {
+ public @Nullable Collection<ValidationMessage> validate(@NotNull String nodePath) {
if (type == null) {
return null;
}
@@ -139,7 +139,7 @@ public final class PackageTypeValidator
}
@Override
- public Collection<ValidationMessage> validate(WorkspaceFilter filter) {
+ public Collection<ValidationMessage> validate(@NotNull WorkspaceFilter filter) {
if (type == null) {
return null;
}
@@ -158,7 +158,7 @@ public final class PackageTypeValidator
}
@Override
- public Collection<ValidationMessage> validate(PackageProperties properties) {
+ public Collection<ValidationMessage> validate(@NotNull PackageProperties properties) {
if (properties.getPackageType() == null) {
return Collections.singleton(new ValidationMessage(severityForNoPackageType, MESSAGE_NO_PACKAGE_TYPE_SET));
}
@@ -172,46 +172,49 @@ public final class PackageTypeValidator
}
}
- switch (properties.getPackageType()) {
- case APPLICATION:
- // must not contain hooks (this detects external hooks)
- if (!properties.getExternalHooks().isEmpty()) {
- messages.add(new ValidationMessage(severity,
- String.format(MESSAGE_PACKAGE_HOOKS, properties.getPackageType(), properties.getExternalHooks())));
- }
- // must not include oak:index
- if (OakIndexDefinitionValidatorFactory.areIndexDefinitionsAllowed(properties)) {
- messages.add(new ValidationMessage(severity, String.format(MESSAGE_INDEX_DEFINITIONS, properties.getPackageType())));
- }
- if (prohibitImmutableContent) {
- messages.add(new ValidationMessage(ValidationMessageSeverity.ERROR, String.format(MESSAGE_PROHIBITED_IMMUTABLE_PACKAGE_TYPE, properties.getPackageType())));
- }
- break;
- case CONTENT:
- if (prohibitMutableContent) {
- messages.add(new ValidationMessage(ValidationMessageSeverity.ERROR, String.format(MESSAGE_PROHIBITED_MUTABLE_PACKAGE_TYPE, properties.getPackageType())));
- }
- break;
- case CONTAINER:
- // no dependencies
- if (properties.getDependencies() != null && properties.getDependencies().length > 0) {
- messages.add(new ValidationMessage(severity,
- String.format(MESSAGE_DEPENDENCY, properties.getPackageType(), StringUtils.join(properties.getDependencies()))));
- }
- if (prohibitImmutableContent) {
- messages.add(new ValidationMessage(ValidationMessageSeverity.ERROR, String.format(MESSAGE_PROHIBITED_IMMUTABLE_PACKAGE_TYPE, properties.getPackageType())));
- }
- break;
- case MIXED:
- messages.add(
- new ValidationMessage(severityForLegacyType, String.format(MESSAGE_LEGACY_TYPE, properties.getPackageType())));
- if (prohibitImmutableContent) {
- messages.add(new ValidationMessage(ValidationMessageSeverity.ERROR, String.format(MESSAGE_PROHIBITED_IMMUTABLE_PACKAGE_TYPE, properties.getPackageType())));
- }
- if (prohibitMutableContent) {
- messages.add(new ValidationMessage(ValidationMessageSeverity.ERROR, String.format(MESSAGE_PROHIBITED_MUTABLE_PACKAGE_TYPE, properties.getPackageType())));
+ PackageType packageType = properties.getPackageType();
+ if (packageType != null) {
+ switch (packageType) {
+ case APPLICATION:
+ // must not contain hooks (this detects external hooks)
+ if (!properties.getExternalHooks().isEmpty()) {
+ messages.add(new ValidationMessage(severity,
+ String.format(MESSAGE_PACKAGE_HOOKS, properties.getPackageType(), properties.getExternalHooks())));
+ }
+ // must not include oak:index
+ if (OakIndexDefinitionValidatorFactory.areIndexDefinitionsAllowed(properties)) {
+ messages.add(new ValidationMessage(severity, String.format(MESSAGE_INDEX_DEFINITIONS, properties.getPackageType())));
+ }
+ if (prohibitImmutableContent) {
+ messages.add(new ValidationMessage(severity, String.format(MESSAGE_PROHIBITED_IMMUTABLE_PACKAGE_TYPE, properties.getPackageType())));
+ }
+ break;
+ case CONTENT:
+ if (prohibitMutableContent) {
+ messages.add(new ValidationMessage(severity, String.format(MESSAGE_PROHIBITED_MUTABLE_PACKAGE_TYPE, properties.getPackageType())));
+ }
+ break;
+ case CONTAINER:
+ // no dependencies
+ if (properties.getDependencies() != null && properties.getDependencies().length > 0) {
+ messages.add(new ValidationMessage(severity,
+ String.format(MESSAGE_DEPENDENCY, properties.getPackageType(), StringUtils.join(properties.getDependencies()))));
+ }
+ if (prohibitImmutableContent) {
+ messages.add(new ValidationMessage(ValidationMessageSeverity.ERROR, String.format(MESSAGE_PROHIBITED_IMMUTABLE_PACKAGE_TYPE, properties.getPackageType())));
+ }
+ break;
+ case MIXED:
+ messages.add(
+ new ValidationMessage(severityForLegacyType, String.format(MESSAGE_LEGACY_TYPE, properties.getPackageType())));
+ if (prohibitImmutableContent) {
+ messages.add(new ValidationMessage(ValidationMessageSeverity.ERROR, String.format(MESSAGE_PROHIBITED_IMMUTABLE_PACKAGE_TYPE, properties.getPackageType())));
+ }
+ if (prohibitMutableContent) {
+ messages.add(new ValidationMessage(ValidationMessageSeverity.ERROR, String.format(MESSAGE_PROHIBITED_MUTABLE_PACKAGE_TYPE, properties.getPackageType())));
+ }
+ break;
}
- break;
}
return messages;
}
@@ -255,7 +258,7 @@ public final class PackageTypeValidator
@Override
- public Collection<ValidationMessage> validateMetaInfPath(Path filePath) {
+ public Collection<ValidationMessage> validateMetaInfPath(@NotNull Path filePath) {
if (type == null) {
return null;
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidatorFactory.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidatorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidatorFactory.java Thu Jan 30 08:31:43 2020
@@ -23,6 +23,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.Validator;
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.kohsuke.MetaInfServices;
@@ -49,7 +50,7 @@ public final class PackageTypeValidatorF
private static final ValidationMessageSeverity DEFAULT_SEVERITY_FOR_NO_TYPE = ValidationMessageSeverity.WARN;
@Override
- public @Nullable Validator createValidator(ValidationContext context, ValidatorSettings settings) {
+ public @Nullable Validator createValidator(@NotNull ValidationContext context, @NotNull ValidatorSettings settings) {
// evaluate options
final Pattern jcrInstallerNodePathRegex;
if (settings.getOptions().containsKey(OPTION_JCR_INSTALLER_NODE_PATH_REGEX)) {
@@ -93,7 +94,7 @@ public final class PackageTypeValidatorF
}
@Override
- public String getId() {
+ public @NotNull String getId() {
return ValidatorFactory.ID_PREFIX_JACKRABBIT + "packagetype";
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidator.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidator.java Thu Jan 30 08:31:43 2020
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.vault.util.
import org.apache.jackrabbit.vault.validation.spi.DocumentViewXmlValidator;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
+import org.jetbrains.annotations.NotNull;
/**
* Makes sure that each node in a docview file containing at least one other property defines the primary type
@@ -32,10 +33,10 @@ import org.apache.jackrabbit.vault.valid
public class PrimaryNodeTypeValidator implements DocumentViewXmlValidator {
protected static final String MESSAGE_MISSING_PRIMARY_TYPE = "Mandatory jcr:primaryType missing on node '%s'";
- private final ValidationMessageSeverity severity;
- private final WorkspaceFilter filter;
+ private final @NotNull ValidationMessageSeverity severity;
+ private final @NotNull WorkspaceFilter filter;
- public PrimaryNodeTypeValidator(ValidationMessageSeverity severity, WorkspaceFilter filter) {
+ public PrimaryNodeTypeValidator(@NotNull ValidationMessageSeverity severity, @NotNull WorkspaceFilter filter) {
super();
this.severity = severity;
this.filter = filter;
@@ -47,7 +48,7 @@ public class PrimaryNodeTypeValidator im
}
@Override
- public Collection<ValidationMessage> validate(DocViewNode node, String nodePath, Path filePath, boolean isRoot) {
+ public Collection<ValidationMessage> validate(@NotNull DocViewNode node, @NotNull String nodePath, @NotNull Path filePath, boolean isRoot) {
if (node.primary == null) {
// only an issue if contained in the filter
// if other properties are set this node is not only used for ordering purposes
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorFactory.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorFactory.java Thu Jan 30 08:31:43 2020
@@ -20,6 +20,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.Validator;
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidatorSettings;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.kohsuke.MetaInfServices;
@@ -27,7 +28,7 @@ import org.kohsuke.MetaInfServices;
public final class PrimaryNodeTypeValidatorFactory implements ValidatorFactory {
@Override
- public @Nullable Validator createValidator(ValidationContext context, ValidatorSettings settings) {
+ public @Nullable Validator createValidator(@NotNull ValidationContext context, @NotNull ValidatorSettings settings) {
return new PrimaryNodeTypeValidator(settings.getDefaultSeverity(), context.getFilter());
}
@@ -37,7 +38,7 @@ public final class PrimaryNodeTypeValida
}
@Override
- public String getId() {
+ public @NotNull String getId() {
return ValidatorFactory.ID_PREFIX_JACKRABBIT + "primarynodetype";
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/package-info.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/package-info.java Thu Jan 30 08:31:43 2020
@@ -18,7 +18,7 @@
/**
* The FileVault validation framework SPI. Provides classes/interfaces to implement validators on FileVault packages.
*/
-@Version("1.0.0")
+@Version("1.0.1")
package org.apache.jackrabbit.vault.validation.spi;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorTest.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/EmptyElementsValidatorTest.java Thu Jan 30 08:31:43 2020
@@ -87,11 +87,11 @@ public class EmptyElementsValidatorTest
// order node only (no other property)
DocViewNode node = new DocViewNode("jcr:root", "jcr:root", null, Collections.emptyMap(), null, "nt:unstructured");
- Assert.assertThat(validator.validate(node, "somepath1", null, false), AnyValidationMessageMatcher.noValidationInCollection());
+ Assert.assertThat(validator.validate(node, "somepath1", Paths.get("/some/path"), false), AnyValidationMessageMatcher.noValidationInCollection());
// primary node type set with additional properties
node = new DocViewNode("jcr:root", "jcr:root", null, props, null, "nt:unstructured");
- Assert.assertThat(validator.validate(node, "somepath2", null, false), AnyValidationMessageMatcher.noValidationInCollection());
+ Assert.assertThat(validator.validate(node, "somepath2", Paths.get("/some/path"), false), AnyValidationMessageMatcher.noValidationInCollection());
Assert.assertNull(validator.done());
}
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorTest.java?rev=1873355&r1=1873354&r2=1873355&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/PrimaryNodeTypeValidatorTest.java Thu Jan 30 08:31:43 2020
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.vault.vali
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Paths;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -53,19 +54,19 @@ public class PrimaryNodeTypeValidatorTes
// order node only (no other property)
DocViewNode node = new DocViewNode("jcr:root", "jcr:root", null, Collections.emptyMap(), null, null);
- Assert.assertThat(validator.validate(node, "/apps/test", null, false), AnyValidationMessageMatcher.noValidationInCollection());
+ Assert.assertThat(validator.validate(node, "/apps/test", Paths.get("/some/path"), false), AnyValidationMessageMatcher.noValidationInCollection());
// primary node type set with additional properties
node = new DocViewNode("jcr:root", "jcr:root", null, props, null, "nt:unstructured");
- Assert.assertThat(validator.validate(node, "/apps/test", null, false), AnyValidationMessageMatcher.noValidationInCollection());
+ Assert.assertThat(validator.validate(node, "/apps/test", Paths.get("/some/path"), false), AnyValidationMessageMatcher.noValidationInCollection());
// missing node type but not contained in filter (with properties)
node = new DocViewNode("jcr:root", "jcr:root", null, props, null, null);
- Assert.assertThat(validator.validate(node, "/apps/test2/invalid", null, false), AnyValidationMessageMatcher.noValidationInCollection());
+ Assert.assertThat(validator.validate(node, "/apps/test2/invalid", Paths.get("/some/path"), false), AnyValidationMessageMatcher.noValidationInCollection());
// missing node type and contained in filter (with properties)
ValidationExecutorTest.assertViolation(
- validator.validate(node, "/apps/test", null, false),
+ validator.validate(node, "/apps/test", Paths.get("/some/path"), false),
new ValidationMessage(ValidationMessageSeverity.ERROR, String.format(PrimaryNodeTypeValidator.MESSAGE_MISSING_PRIMARY_TYPE, "/apps/test")));
}
}