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 2019/12/18 10:31:29 UTC
svn commit: r1871737 [1/4] - in /jackrabbit/commons/filevault/trunk: parent/
vault-core/ vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/
vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/
vault-core/src/main/java/org/apache/ja...
Author: kwin
Date: Wed Dec 18 10:31:28 2019
New Revision: 1871737
URL: http://svn.apache.org/viewvc?rev=1871737&view=rev
Log:
JCRVLT-365 switch to Jetbrains null annotations
Modified:
jackrabbit/commons/filevault/trunk/parent/pom.xml
jackrabbit/commons/filevault/trunk/vault-core/pom.xml
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/Dumpable.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/FilterSet.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilter.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilterSet.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathMapping.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RegexpPathMapping.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RepositoryAddress.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/SimplePathMapping.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/ArchiveWrapper.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/CompressionUtil.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Archive.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AutoSave.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/DocViewAnalyzerListener.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ExportInfo.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Serializer.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipArchive.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/spi/impl/jcr20/JcrNamespaceHelper.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/Dependency.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/DependencyUtil.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/JcrPackage.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/JcrPackageDefinition.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/JcrPackageManager.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/NoSuchPackageException.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageExistsException.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageInfo.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageProperties.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/Version.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/events/PackageEvent.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/events/PackageEventListener.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/events/impl/PackageEventDispatcher.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/events/impl/PackageEventDispatcherImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/events/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/ActivityLog.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/DefaultPackageInfo.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackageManagerImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackagePropertiesImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/package-info.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/DependencyReport.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/ExecutionPlan.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/ExecutionPlanBuilder.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageRegistry.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTask.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTaskBuilder.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/AbstractPackageRegistry.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/DependencyReportImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanBuilderImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/InternalPackageRegistry.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageRegistry.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java
jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/PackageTaskImpl.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.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/ValidationExecutorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationViolation.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/package-info.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/DocumentViewXmlValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/FilterValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericJcrDataValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericMetaInfDataValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/JcrPathValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/MetaInfPathValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/NodePathValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/PropertiesValidator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationContext.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/Validator.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidatorFactory.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/EmptyElementsValidatorFactory.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/PrimaryNodeTypeValidatorFactory.java
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/package-info.java
Modified: jackrabbit/commons/filevault/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/parent/pom.xml?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/parent/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/parent/pom.xml Wed Dec 18 10:31:28 2019
@@ -394,9 +394,9 @@ Apache Jackrabbit FileVault is a project
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.2</version>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>18.0.0</version>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/commons/filevault/trunk/vault-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/pom.xml?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/pom.xml Wed Dec 18 10:31:28 2019
@@ -191,8 +191,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/Dumpable.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/Dumpable.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/Dumpable.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/Dumpable.java Wed Dec 18 10:31:28 2019
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.vault.fs.api;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* {@code Dumpable}...
@@ -31,5 +31,5 @@ public interface Dumpable {
* @param ctx the dump context
* @param isLast specifies if this is the last element to dump on this level
*/
- void dump(@Nonnull DumpContext ctx, boolean isLast);
-}
\ No newline at end of file
+ void dump(@NotNull DumpContext ctx, boolean isLast);
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/FilterSet.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/FilterSet.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/FilterSet.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/FilterSet.java Wed Dec 18 10:31:28 2019
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* The item filter set holds a set of item filters each attributed as include
@@ -41,13 +41,13 @@ public abstract class FilterSet<E extend
/**
* root path of this definition
*/
- @Nonnull
+ @NotNull
private String root;
/**
* root patten to check for inclusion
*/
- @Nonnull
+ @NotNull
private String rootPattern;
/**
@@ -64,7 +64,7 @@ public abstract class FilterSet<E extend
/**
* import mode. defaults to {@link ImportMode#REPLACE}.
*/
- @Nonnull
+ @NotNull
private ImportMode mode = ImportMode.REPLACE;
/**
@@ -86,7 +86,7 @@ public abstract class FilterSet<E extend
* Returns the root path
* @return root path
*/
- @Nonnull
+ @NotNull
public String getRoot() {
return "".equals(root) ? "/" : root;
}
@@ -95,7 +95,7 @@ public abstract class FilterSet<E extend
* Sets the root path
* @param path root path
*/
- public void setRoot(@Nonnull String path) {
+ public void setRoot(@NotNull String path) {
if (sealed) {
throw new UnsupportedOperationException("FilterSet is sealed.");
}
@@ -114,7 +114,7 @@ public abstract class FilterSet<E extend
*
* @return the import mode.
*/
- @Nonnull
+ @NotNull
public ImportMode getImportMode() {
return mode;
}
@@ -123,7 +123,7 @@ public abstract class FilterSet<E extend
* Sets the import mode.
* @param mode import mode
*/
- public void setImportMode(@Nonnull ImportMode mode) {
+ public void setImportMode(@NotNull ImportMode mode) {
if (sealed) {
throw new UnsupportedOperationException("FilterSet is sealed.");
}
@@ -134,7 +134,7 @@ public abstract class FilterSet<E extend
* Seals this list, i.e. makes it unmodifiable.
* @return this list
*/
- @Nonnull
+ @NotNull
public FilterSet seal() {
if (!sealed) {
if (entries == null) {
@@ -160,8 +160,8 @@ public abstract class FilterSet<E extend
* @param set the set of entries
* @return {@code this} suitable for chaining.
*/
- @Nonnull
- public FilterSet addAll(@Nonnull FilterSet<E> set) {
+ @NotNull
+ public FilterSet addAll(@NotNull FilterSet<E> set) {
if (sealed) {
throw new UnsupportedOperationException("FilterSet is sealed.");
}
@@ -177,8 +177,8 @@ public abstract class FilterSet<E extend
* @param filter the filter
* @return {@code this} suitable for chaining.
*/
- @Nonnull
- public FilterSet addInclude(@Nonnull E filter) {
+ @NotNull
+ public FilterSet addInclude(@NotNull E filter) {
addEntry(new Entry<>(filter, true));
return this;
}
@@ -188,8 +188,8 @@ public abstract class FilterSet<E extend
* @param filter the filter
* @return {@code this} suitable for chaining.
*/
- @Nonnull
- public FilterSet addExclude(@Nonnull E filter) {
+ @NotNull
+ public FilterSet addExclude(@NotNull E filter) {
addEntry(new Entry<>(filter, false));
return this;
}
@@ -198,7 +198,7 @@ public abstract class FilterSet<E extend
* Internally adds a new entry to the list
* @param e the entry
*/
- private void addEntry(@Nonnull Entry<E> e) {
+ private void addEntry(@NotNull Entry<E> e) {
if (sealed) {
throw new UnsupportedOperationException("FilterSet is sealed.");
}
@@ -212,7 +212,7 @@ public abstract class FilterSet<E extend
* Returns the list of entries
* @return the list of entries
*/
- @Nonnull
+ @NotNull
public List<Entry<E>> getEntries() {
seal();
//noinspection ConstantConditions
@@ -234,7 +234,7 @@ public abstract class FilterSet<E extend
* @param path path of the item
* @return {@code true} if this set covers the given item
*/
- public boolean covers(@Nonnull String path) {
+ public boolean covers(@NotNull String path) {
return path.equals(root) || path.startsWith(rootPattern);
}
@@ -243,7 +243,7 @@ public abstract class FilterSet<E extend
* @param path path of the item to check
* @return {@code true} if the given item is an ancestor
*/
- public boolean isAncestor(@Nonnull String path) {
+ public boolean isAncestor(@NotNull String path) {
return path.equals(root) || root.startsWith(path + "/") || "/".equals(path);
}
@@ -251,7 +251,7 @@ public abstract class FilterSet<E extend
* {@inheritDoc}
*/
@Override
- public void dump(@Nonnull DumpContext ctx, boolean isLast) {
+ public void dump(@NotNull DumpContext ctx, boolean isLast) {
ctx.printf(false, "root: %s", getRoot());
if (entries != null) {
Iterator<Entry<E>> iter = entries.iterator();
@@ -302,7 +302,7 @@ public abstract class FilterSet<E extend
/**
* The item filter
*/
- @Nonnull
+ @NotNull
protected final E filter;
/**
@@ -315,7 +315,7 @@ public abstract class FilterSet<E extend
* @param filter the filter
* @param include the include flag
*/
- public Entry(@Nonnull E filter, boolean include) {
+ public Entry(@NotNull E filter, boolean include) {
this.filter = filter;
this.include = include;
}
@@ -324,7 +324,7 @@ public abstract class FilterSet<E extend
* Returns the filter of this entry
* @return the filter
*/
- @Nonnull
+ @NotNull
public E getFilter() {
return filter;
}
@@ -341,7 +341,7 @@ public abstract class FilterSet<E extend
* {@inheritDoc}
*/
@Override
- public void dump(@Nonnull DumpContext ctx, boolean isLast) {
+ public void dump(@NotNull DumpContext ctx, boolean isLast) {
if (include) {
ctx.println(isLast, "include");
} else {
@@ -382,4 +382,4 @@ public abstract class FilterSet<E extend
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java Wed Dec 18 10:31:28 2019
@@ -19,10 +19,9 @@ package org.apache.jackrabbit.vault.fs.a
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.vault.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Implements a path mapping that supports multiple symlinks
@@ -40,7 +39,7 @@ public class MultiPathMapping implements
* @param dst destination path
* @return this
*/
- public MultiPathMapping link(@Nonnull String src, @Nonnull String dst) {
+ public MultiPathMapping link(@NotNull String src, @NotNull String dst) {
links.put(src, dst);
reverseLinks.put(dst, src);
return this;
@@ -51,7 +50,7 @@ public class MultiPathMapping implements
* @param base base mapping
* @return this
*/
- @Nonnull
+ @NotNull
public MultiPathMapping merge(@Nullable MultiPathMapping base) {
if (base != null) {
this.links.putAll(base.links);
@@ -64,8 +63,8 @@ public class MultiPathMapping implements
* {@inheritDoc}
*/
@Override
- @Nonnull
- public String map(@Nonnull String path) {
+ @NotNull
+ public String map(@NotNull String path) {
return map(path, false);
}
@@ -73,8 +72,8 @@ public class MultiPathMapping implements
* {@inheritDoc}
*/
@Override
- @Nonnull
- public String map(@Nonnull String path, boolean reverse) {
+ @NotNull
+ public String map(@NotNull String path, boolean reverse) {
if (path.length() == 0 || "/".equals(path)) {
return path;
}
@@ -90,4 +89,4 @@ public class MultiPathMapping implements
}
return ret;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilter.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilter.java Wed Dec 18 10:31:28 2019
@@ -20,10 +20,9 @@ package org.apache.jackrabbit.vault.fs.a
import java.io.PrintWriter;
import java.io.StringWriter;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* The item filter is used to include or exclude a set of paths.
@@ -142,7 +141,7 @@ public interface PathFilter extends Filt
* @return {@code true} if this filter matches the criteria;
* {@code false} otherwise.
*/
- boolean matches(@Nonnull String path);
+ boolean matches(@NotNull String path);
/**
* Checks if the pattern is absolute, i.e. does not start with a wildcard.
@@ -156,6 +155,6 @@ public interface PathFilter extends Filt
* @return the new filter
* @since 2.4.10
*/
- @Nonnull
+ @NotNull
PathFilter translate(@Nullable PathMapping mapping);
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilterSet.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilterSet.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilterSet.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathFilterSet.java Wed Dec 18 10:31:28 2019
@@ -19,8 +19,8 @@ package org.apache.jackrabbit.vault.fs.a
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* The path filter set holds a set of path filters each attributes as include
@@ -75,7 +75,7 @@ public class PathFilterSet extends Filte
* Creates a new path filter set and sets the respective root path
* @param root path
*/
- public PathFilterSet(@Nonnull String root) {
+ public PathFilterSet(@NotNull String root) {
super(root);
}
@@ -90,7 +90,7 @@ public class PathFilterSet extends Filte
* @param path the path to check
* @return {@code true} if this set matches the item
*/
- public boolean contains(@Nonnull String path) {
+ public boolean contains(@NotNull String path) {
if (!covers(path)) {
return false;
}
@@ -109,7 +109,7 @@ public class PathFilterSet extends Filte
}
@Override
- @Nonnull
+ @NotNull
public FilterSet seal() {
if (!isSealed()) {
super.seal();
@@ -131,7 +131,7 @@ public class PathFilterSet extends Filte
* @return the new filter
* @since 2.4.10
*/
- @Nonnull
+ @NotNull
public PathFilterSet translate(@Nullable PathMapping mapping) {
if (mapping == null) {
return this;
@@ -174,9 +174,9 @@ public class PathFilterSet extends Filte
* @param type the type
* @return this.
*/
- @Nonnull
+ @NotNull
public PathFilterSet setType(@Nullable String type) {
this.type = type;
return this;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathMapping.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathMapping.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathMapping.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/PathMapping.java Wed Dec 18 10:31:28 2019
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.vault.fs.api;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Provides an interface for a general path mapping.
@@ -46,8 +46,8 @@ public interface PathMapping {
* @param path the path
* @return the mapped path.
*/
- @Nonnull
- String map(@Nonnull String path);
+ @NotNull
+ String map(@NotNull String path);
/**
* Maps the given path to a new location.
@@ -55,8 +55,8 @@ public interface PathMapping {
* @param reverse if {@code true} a reverse mapping is applied
* @return the mapped path.
*/
- @Nonnull
- String map(@Nonnull String path, boolean reverse);
+ @NotNull
+ String map(@NotNull String path, boolean reverse);
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RegexpPathMapping.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RegexpPathMapping.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RegexpPathMapping.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RegexpPathMapping.java Wed Dec 18 10:31:28 2019
@@ -22,8 +22,8 @@ import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Implements a path mapping that supports regular expressions, i.e. {@code /etc/(.*)=/dummy/$1/custom}
@@ -31,7 +31,7 @@ import javax.annotation.Nullable;
*/
public final class RegexpPathMapping implements PathMapping {
- @Nonnull
+ @NotNull
private final Map<Pattern, String> pathsMapping = new HashMap<>();
/**
@@ -44,8 +44,8 @@ public final class RegexpPathMapping imp
* @param <K> KEey type
* @return this
*/
- @Nonnull
- public <K, V> RegexpPathMapping addAllMappings(@Nonnull Map<K, V> pathsMappingMap) {
+ @NotNull
+ public <K, V> RegexpPathMapping addAllMappings(@NotNull Map<K, V> pathsMappingMap) {
for (Entry<K, V> entry : pathsMappingMap.entrySet()) {
final K key = entry.getKey();
final V value = entry.getValue();
@@ -63,8 +63,8 @@ public final class RegexpPathMapping imp
* @param toPattern the replacing pattern, i.e. <code>/dummy/$1/custom</code>
* @return this
*/
- @Nonnull
- public RegexpPathMapping addMapping(@Nonnull String fromPattern, @Nonnull String toPattern) {
+ @NotNull
+ public RegexpPathMapping addMapping(@NotNull String fromPattern, @NotNull String toPattern) {
pathsMapping.put(Pattern.compile(fromPattern), toPattern);
return this;
}
@@ -75,7 +75,7 @@ public final class RegexpPathMapping imp
* @param base base mapping
* @return this
*/
- @Nonnull
+ @NotNull
public RegexpPathMapping merge(@Nullable RegexpPathMapping base) {
if (base != null) {
this.pathsMapping.putAll(base.pathsMapping);
@@ -87,8 +87,8 @@ public final class RegexpPathMapping imp
* {@inheritDoc}
*/
@Override
- @Nonnull
- public String map(@Nonnull String path) {
+ @NotNull
+ public String map(@NotNull String path) {
for (Entry<Pattern, String> pathMapping : pathsMapping.entrySet()) {
Matcher matcher = pathMapping.getKey().matcher(path);
if (matcher.matches()) {
@@ -102,8 +102,8 @@ public final class RegexpPathMapping imp
* {@inheritDoc}
*/
@Override
- @Nonnull
- public String map(@Nonnull String path, boolean reverse) {
+ @NotNull
+ public String map(@NotNull String path, boolean reverse) {
if (reverse) {
throw new IllegalArgumentException("No reverse mapping not supported with regexp mapping");
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RepositoryAddress.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RepositoryAddress.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RepositoryAddress.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/RepositoryAddress.java Wed Dec 18 10:31:28 2019
@@ -22,12 +22,12 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.BitSet;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
import javax.jcr.SimpleCredentials;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* The repository address locates a jcr repository in with a URI representation.
* It is composed out of a uri and accepts the following formats:
@@ -71,7 +71,7 @@ public class RepositoryAddress {
* @param uri the uri
* @throws URISyntaxException if the uri is not valid
*/
- public RepositoryAddress(@Nonnull String uri) throws URISyntaxException {
+ public RepositoryAddress(@NotNull String uri) throws URISyntaxException {
this(new URI(uri));
}
@@ -80,7 +80,7 @@ public class RepositoryAddress {
* @param uri the uri
* @throws URISyntaxException if the uri is not valid
*/
- public RepositoryAddress(@Nonnull URI uri) throws URISyntaxException {
+ public RepositoryAddress(@NotNull URI uri) throws URISyntaxException {
// decode uri
String path = uri.getPath();
String workspace;
@@ -181,7 +181,7 @@ public class RepositoryAddress {
* @param workspace the workspace
* @param path the path
*/
- private RepositoryAddress(@Nonnull URI uri, @Nonnull URI specific, @Nullable String workspace, @Nonnull String path) {
+ private RepositoryAddress(@NotNull URI uri, @NotNull URI specific, @Nullable String workspace, @NotNull String path) {
this.uri = uri;
this.specific = specific;
this.workspace = workspace;
@@ -193,7 +193,7 @@ public class RepositoryAddress {
* Returns the uri of this address
* @return the uri of this address
*/
- @Nonnull
+ @NotNull
public URI getURI() {
return uri;
}
@@ -203,8 +203,8 @@ public class RepositoryAddress {
* @param path the path to include in the new address
* @return a new repository address
*/
- @Nonnull
- public RepositoryAddress resolve(@CheckForNull String path) {
+ @NotNull
+ public RepositoryAddress resolve(@Nullable String path) {
if (path == null || path.length() == 0 || ".".equals(path) || "./".equals(path)) {
return this;
}
@@ -229,7 +229,7 @@ public class RepositoryAddress {
* workspace is used.
* @return the name of the workspace or {@code null}
*/
- @CheckForNull
+ @Nullable
public String getWorkspace() {
return "-".equals(workspace) ? null : workspace;
}
@@ -239,7 +239,7 @@ public class RepositoryAddress {
* actually connect to the repository
* @return the specific part
*/
- @Nonnull
+ @NotNull
public URI getSpecificURI() {
return specific;
}
@@ -249,7 +249,7 @@ public class RepositoryAddress {
* by this address the root path '/' is returned.
* @return the path to a repository item.
*/
- @Nonnull
+ @NotNull
public String getPath() {
return path;
}
@@ -259,7 +259,7 @@ public class RepositoryAddress {
* is specified.
* @return the creds
*/
- @CheckForNull
+ @Nullable
public Credentials getCredentials() {
String userinfo = uri.getUserInfo();
if (userinfo == null) {
@@ -283,7 +283,7 @@ public class RepositoryAddress {
* @return same as {@link #getURI() getURI().toString()} with obfuscated user info
*/
@Override
- @Nonnull
+ @NotNull
public String toString() {
final URI uri = getURI();
final String userInfo = uri.getRawUserInfo();
@@ -356,8 +356,8 @@ public class RepositoryAddress {
* @return the escaped string
* @throws NullPointerException if {@code string} is @{code null}.
*/
- @Nonnull
- private static String escapePath(@Nonnull String string) {
+ @NotNull
+ private static String escapePath(@NotNull String string) {
try {
byte[] bytes = string.getBytes("utf-8");
StringBuilder out = new StringBuilder(bytes.length);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/SimplePathMapping.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/SimplePathMapping.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/SimplePathMapping.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/SimplePathMapping.java Wed Dec 18 10:31:28 2019
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.vault.fs.api;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Implements a simple path mapping that strips and prefixes a path.
@@ -24,10 +24,10 @@ import javax.annotation.Nonnull;
*/
public class SimplePathMapping implements PathMapping {
- @Nonnull
+ @NotNull
private final String strip;
- @Nonnull
+ @NotNull
private final String root;
/**
@@ -35,7 +35,7 @@ public class SimplePathMapping implement
* @param strip the string to strip from the beginning of the path
* @param root the prefix to add to the path.
*/
- public SimplePathMapping(@Nonnull String strip, @Nonnull String root) {
+ public SimplePathMapping(@NotNull String strip, @NotNull String root) {
this.strip = strip;
this.root = root;
}
@@ -44,8 +44,8 @@ public class SimplePathMapping implement
* {@inheritDoc}
*/
@Override
- @Nonnull
- public String map(@Nonnull String path) {
+ @NotNull
+ public String map(@NotNull String path) {
return map(path, false);
}
@@ -53,8 +53,8 @@ public class SimplePathMapping implement
* {@inheritDoc}
*/
@Override
- @Nonnull
- public String map(@Nonnull String path, boolean reverse) {
+ @NotNull
+ public String map(@NotNull String path, boolean reverse) {
String strip = reverse ? this.root : this.strip;
String root = reverse ? this.strip : this.root;
if (path.startsWith(strip)) {
@@ -63,4 +63,4 @@ public class SimplePathMapping implement
return path;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/WorkspaceFilter.java Wed Dec 18 10:31:28 2019
@@ -20,12 +20,13 @@ package org.apache.jackrabbit.vault.fs.a
import java.io.InputStream;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* {@code WorkspaceFilter} defined a filter for items (node or property).
*/
@@ -35,14 +36,14 @@ public interface WorkspaceFilter extends
* Returns a list of path filter sets for node items.
* @return the list of path filter sets.
*/
- @Nonnull
+ @NotNull
List<PathFilterSet> getFilterSets();
/**
* Returns a list of path filter sets for property items.
* @return the list of path filter sets.
*/
- @Nonnull
+ @NotNull
List<PathFilterSet> getPropertyFilterSets();
/**
@@ -51,7 +52,7 @@ public interface WorkspaceFilter extends
* @return the filter set or {@code null}
*/
@Nullable
- PathFilterSet getCoveringFilterSet(@Nonnull String path);
+ PathFilterSet getCoveringFilterSet(@NotNull String path);
/**
* Returns the import mode for the given node path.
@@ -59,8 +60,8 @@ public interface WorkspaceFilter extends
* @return the import mode or {@link ImportMode#REPLACE} if the given path
* is not covered by this filter.
*/
- @Nonnull
- ImportMode getImportMode(@Nonnull String path);
+ @NotNull
+ ImportMode getImportMode(@NotNull String path);
/**
* Checks if the given node path is contained (and by that also covered)
@@ -75,7 +76,7 @@ public interface WorkspaceFilter extends
* @param path to check
* @return {@code true} if the given path is included in this filter.
*/
- boolean contains(@Nonnull String path);
+ boolean contains(@NotNull String path);
/**
* Checks if the given node path is covered in this workspace filter.
@@ -89,7 +90,7 @@ public interface WorkspaceFilter extends
* @param path the path to check
* @return {@code true} if the given path is covered by this filter.
*/
- boolean covers(@Nonnull String path);
+ boolean covers(@NotNull String path);
/**
* Checks if the given node path is an ancestor of any of the filter sets.
@@ -97,7 +98,7 @@ public interface WorkspaceFilter extends
* @param path the item to check
* @return {@code true} if the given item is an ancestor
*/
- boolean isAncestor(@Nonnull String path);
+ boolean isAncestor(@NotNull String path);
/**
* Checks if the given node path is globally ignored.
@@ -105,7 +106,7 @@ public interface WorkspaceFilter extends
* @param path the path to check.
* @return {@code true} if the item is globally ignored.
*/
- boolean isGloballyIgnored(@Nonnull String path);
+ boolean isGloballyIgnored(@NotNull String path);
/**
* Returns the source xml that constructs this filter
@@ -113,14 +114,14 @@ public interface WorkspaceFilter extends
*
* @return the source xml
*/
- @Nonnull
+ @NotNull
InputStream getSource();
/**
* Returns the source xml that constructs this filter
* @return the source xml
*/
- @Nonnull
+ @NotNull
String getSourceAsString();
/**
@@ -130,7 +131,7 @@ public interface WorkspaceFilter extends
* @return a new workspace filter
* @since 2.4.10
*/
- @Nonnull
+ @NotNull
WorkspaceFilter translate(@Nullable PathMapping mapping);
/**
@@ -139,7 +140,7 @@ public interface WorkspaceFilter extends
* @param listener listener
* @throws RepositoryException if an error occurs
*/
- void dumpCoverage(@Nonnull Node rootNode, @Nonnull ProgressTrackerListener listener)
+ void dumpCoverage(@NotNull Node rootNode, @NotNull ProgressTrackerListener listener)
throws RepositoryException;
/**
@@ -152,6 +153,6 @@ public interface WorkspaceFilter extends
* @param skipJcrContent {@code true} to skip jcr:content nodes
* @throws RepositoryException if an error occurs
*/
- void dumpCoverage(@Nonnull Session session, @Nonnull ProgressTrackerListener listener, boolean skipJcrContent)
+ void dumpCoverage(@NotNull Session session, @NotNull ProgressTrackerListener listener, boolean skipJcrContent)
throws RepositoryException;
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java Wed Dec 18 10:31:28 2019
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.7.0")
+@Version("2.7.1")
package org.apache.jackrabbit.vault.fs.api;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java Wed Dec 18 10:31:28 2019
@@ -30,8 +30,6 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.NamespaceException;
import org.apache.commons.io.FileUtils;
@@ -47,6 +45,8 @@ import org.apache.jackrabbit.vault.fs.sp
import org.apache.jackrabbit.vault.fs.spi.ServiceProviderFactory;
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -105,7 +105,7 @@ public class DefaultMetaInf implements M
*
* @since 3.1.32
*/
- public boolean load(@Nullable InputStream in, @Nonnull String systemId) throws IOException, ConfigurationException {
+ public boolean load(@Nullable InputStream in, @NotNull String systemId) throws IOException, ConfigurationException {
if (systemId.endsWith("/" + Constants.PACKAGE_DEFINITION_XML)) {
setHasDefinition(true);
log.trace("Contains package definition {}.", systemId);
@@ -156,7 +156,7 @@ public class DefaultMetaInf implements M
* @throws ConfigurationException
* @throws IOException
*/
- public void loadFilter(@Nonnull InputStream in, @Nonnull String systemId)
+ public void loadFilter(@NotNull InputStream in, @NotNull String systemId)
throws ConfigurationException, IOException {
DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter();
filter.load(in);
@@ -171,14 +171,14 @@ public class DefaultMetaInf implements M
* @throws ConfigurationException
* @throws IOException
*/
- public void loadConfig(@Nonnull InputStream in, @Nonnull String systemId)
+ public void loadConfig(@NotNull InputStream in, @NotNull String systemId)
throws ConfigurationException, IOException {
VaultFsConfig config = AbstractVaultFsConfig.load(in, systemId);
setConfig(config);
log.trace("Loaded config from {}.", systemId);
}
- public void loadSettings(@Nonnull InputStream in, @Nonnull String systemId)
+ public void loadSettings(@NotNull InputStream in, @NotNull String systemId)
throws ConfigurationException, IOException {
VaultSettings settings = new VaultSettings();
settings.load(in);
@@ -192,7 +192,7 @@ public class DefaultMetaInf implements M
* @param systemId
* @throws IOException
*/
- public void loadProperties(@Nonnull InputStream in, @Nonnull String systemId)
+ public void loadProperties(@NotNull InputStream in, @NotNull String systemId)
throws IOException {
Properties props = new Properties();
// prevent the input stream from being closed for achieving a consistent behaviour
@@ -207,7 +207,7 @@ public class DefaultMetaInf implements M
* @param systemId
* @throws IOException
*/
- public void loadPrivileges(@Nonnull InputStream in, @Nonnull String systemId)
+ public void loadPrivileges(@NotNull InputStream in, @NotNull String systemId)
throws IOException {
try {
PrivilegeDefinitionReader reader = new PrivilegeDefinitionReader(in, "text/xml");
@@ -222,7 +222,7 @@ public class DefaultMetaInf implements M
log.trace("Loaded privileges from {}.", systemId);
}
- public void save(@Nonnull File metaDir) throws IOException {
+ public void save(@NotNull File metaDir) throws IOException {
if (metaDir.isDirectory()) {
saveConfig(metaDir);
saveFilter(metaDir);
@@ -313,7 +313,7 @@ public class DefaultMetaInf implements M
this.hasDefinition = hasDefinition;
}
- protected void loadSettings(@Nonnull File metaDir)
+ protected void loadSettings(@NotNull File metaDir)
throws ConfigurationException, IOException {
File file = new File(metaDir, Constants.SETTINGS_XML);
if (file.isFile()) {
@@ -325,14 +325,14 @@ public class DefaultMetaInf implements M
}
}
- protected void saveSettings(@Nonnull File metaDir) throws IOException {
+ protected void saveSettings(@NotNull File metaDir) throws IOException {
if (settings != null) {
File file = new File(metaDir, Constants.SETTINGS_XML);
settings.save(file);
}
}
- protected void loadConfig(@Nonnull File metaDir)
+ protected void loadConfig(@NotNull File metaDir)
throws ConfigurationException, IOException {
File file = new File(metaDir, Constants.CONFIG_XML);
if (file.isFile()) {
@@ -340,7 +340,7 @@ public class DefaultMetaInf implements M
}
}
- protected void saveConfig(@Nonnull File metaDir)
+ protected void saveConfig(@NotNull File metaDir)
throws IOException {
if (config != null) {
File file = new File(metaDir, Constants.CONFIG_XML);
@@ -350,7 +350,7 @@ public class DefaultMetaInf implements M
}
}
- protected void loadFilter(@Nonnull File metaDir, boolean vltMode)
+ protected void loadFilter(@NotNull File metaDir, boolean vltMode)
throws ConfigurationException, IOException {
File file = new File(metaDir, Constants.FILTER_XML);
if (vltMode) {
@@ -367,7 +367,7 @@ public class DefaultMetaInf implements M
}
}
- protected void saveFilter(@Nonnull File metaDir)
+ protected void saveFilter(@NotNull File metaDir)
throws IOException {
if (filter != null) {
File file = new File(metaDir, Constants.FILTER_XML);
@@ -377,7 +377,7 @@ public class DefaultMetaInf implements M
}
}
- protected void loadProperties(@Nonnull File metaDir) throws IOException {
+ protected void loadProperties(@NotNull File metaDir) throws IOException {
File file = new File(metaDir, Constants.PROPERTIES_XML);
if (file.isFile()) {
try (InputStream input = FileUtils.openInputStream(file)) {
@@ -388,7 +388,7 @@ public class DefaultMetaInf implements M
}
}
- protected void saveProperties(@Nonnull File metaDir) throws IOException {
+ protected void saveProperties(@NotNull File metaDir) throws IOException {
if (properties != null) {
File file = new File(metaDir, Constants.PROPERTIES_XML);
try (OutputStream output = FileUtils.openOutputStream(file)) {
@@ -397,7 +397,7 @@ public class DefaultMetaInf implements M
}
}
- protected void loadPrivileges(@Nonnull File metaDir) throws IOException {
+ protected void loadPrivileges(@NotNull File metaDir) throws IOException {
File file = new File(metaDir, Constants.PRIVILEGES_XML);
if (file.isFile()) {
try (InputStream in = FileUtils.openInputStream(file)) {
@@ -406,7 +406,7 @@ public class DefaultMetaInf implements M
}
}
- protected void loadCNDs(@Nonnull File metaDir) throws IOException {
+ protected void loadCNDs(@NotNull File metaDir) throws IOException {
File[] files = metaDir.listFiles();
if (files == null) {
return;
@@ -424,4 +424,4 @@ public class DefaultMetaInf implements M
}
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/MetaInf.java Wed Dec 18 10:31:28 2019
@@ -20,14 +20,13 @@ package org.apache.jackrabbit.vault.fs.c
import java.util.Collection;
import java.util.Properties;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.vault.fs.api.VaultFsConfig;
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.spi.NodeTypeSet;
import org.apache.jackrabbit.vault.fs.spi.PrivilegeDefinitions;
import org.apache.jackrabbit.vault.packaging.PackageType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Abstracts the way of accessing the vault specific meta-info of a checkout.
@@ -77,35 +76,35 @@ public interface MetaInf {
* Returns the vault settings.
* @return the vault settings.
*/
- @CheckForNull
+ @Nullable
VaultSettings getSettings();
/**
* Returns the workspace filter.
* @return the workspace filter.
*/
- @CheckForNull
+ @Nullable
WorkspaceFilter getFilter();
/**
* Returns the vault config
* @return the vault config
*/
- @CheckForNull
+ @Nullable
VaultFsConfig getConfig();
/**
* Returns the properties
* @return the properties
*/
- @CheckForNull
+ @Nullable
Properties getProperties();
/**
* Returns the node types
* @return the node types
*/
- @Nonnull
+ @NotNull
Collection<NodeTypeSet> getNodeTypes();
/**
@@ -113,7 +112,7 @@ public interface MetaInf {
* @return a collection of custom privileges.
* @since 3.0
*/
- @CheckForNull
+ @Nullable
PrivilegeDefinitions getPrivileges();
/**
@@ -122,4 +121,4 @@ public interface MetaInf {
*/
boolean hasDefinition();
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/package-info.java Wed Dec 18 10:31:28 2019
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.6.0")
+@Version("2.6.1")
package org.apache.jackrabbit.vault.fs.config;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/ArchiveWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/ArchiveWrapper.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/ArchiveWrapper.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/ArchiveWrapper.java Wed Dec 18 10:31:28 2019
@@ -19,13 +19,11 @@ package org.apache.jackrabbit.vault.fs.i
import java.io.IOException;
import java.io.InputStream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.vault.fs.api.VaultInputSource;
import org.apache.jackrabbit.vault.fs.config.MetaInf;
import org.apache.jackrabbit.vault.fs.io.Archive;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Wrapper class that hides all implementation details from the underlying archive.
@@ -45,44 +43,44 @@ public final class ArchiveWrapper implem
}
@Override
- @CheckForNull
+ @Nullable
public InputStream openInputStream(@Nullable Entry entry) throws IOException {
return archive.openInputStream(entry);
}
@Override
- @CheckForNull
+ @Nullable
public VaultInputSource getInputSource(@Nullable Entry entry) throws IOException {
return archive.getInputSource(entry);
}
@Override
- @CheckForNull
+ @Nullable
public Entry getJcrRoot() throws IOException {
return archive.getJcrRoot();
}
@Override
- @Nonnull
+ @NotNull
public Entry getRoot() throws IOException {
return archive.getRoot();
}
@Override
- @Nonnull
+ @NotNull
public MetaInf getMetaInf() {
return archive.getMetaInf();
}
@Override
- @CheckForNull
- public Entry getEntry(@Nonnull String path) throws IOException {
+ @Nullable
+ public Entry getEntry(@NotNull String path) throws IOException {
return archive.getEntry(path);
}
@Override
- @CheckForNull
- public Archive getSubArchive(@Nonnull String root, boolean asJcrRoot) throws IOException {
+ @Nullable
+ public Archive getSubArchive(@NotNull String root, boolean asJcrRoot) throws IOException {
return archive.getSubArchive(root, asJcrRoot);
}
@@ -90,4 +88,4 @@ public final class ArchiveWrapper implem
public void close() {
archive.close();
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java Wed Dec 18 10:31:28 2019
@@ -23,14 +23,12 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.vault.fs.api.VaultInputSource;
import org.apache.jackrabbit.vault.fs.config.MetaInf;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static org.apache.jackrabbit.vault.packaging.impl.JcrPackageManagerImpl.ARCHIVE_PACKAGE_ROOT_PATH;
@@ -52,38 +50,38 @@ public class SubPackageFilterArchive imp
}
@Override
- @CheckForNull
+ @Nullable
public InputStream openInputStream(@Nullable Entry entry) throws IOException {
return base.openInputStream(entry);
}
@Override
- @CheckForNull
+ @Nullable
public VaultInputSource getInputSource(@Nullable Entry entry) throws IOException {
return base.getInputSource(entry);
}
@Override
- @CheckForNull
+ @Nullable
public Entry getJcrRoot() throws IOException {
return new FilterEntry(base.getJcrRoot(), 1);
}
@Override
- @Nonnull
+ @NotNull
public Entry getRoot() throws IOException {
return new FilterEntry(base.getRoot(), 0);
}
@Override
- @Nonnull
+ @NotNull
public MetaInf getMetaInf() {
return base.getMetaInf();
}
@Override
- @CheckForNull
- public Entry getEntry(@Nonnull String path) throws IOException {
+ @Nullable
+ public Entry getEntry(@NotNull String path) throws IOException {
if (path.length() == 0 || "/".equals(path)) {
return getRoot();
}
@@ -100,8 +98,8 @@ public class SubPackageFilterArchive imp
}
@Override
- @CheckForNull
- public Archive getSubArchive(@Nonnull String root, boolean asJcrRoot) throws IOException {
+ @Nullable
+ public Archive getSubArchive(@NotNull String root, boolean asJcrRoot) throws IOException {
return base.getSubArchive(root, asJcrRoot);
}
@@ -124,7 +122,7 @@ public class SubPackageFilterArchive imp
return entries;
}
- private void findSubPackageEntries(@Nonnull List<Entry> entries, @Nonnull Entry folder) {
+ private void findSubPackageEntries(@NotNull List<Entry> entries, @NotNull Entry folder) {
for (Archive.Entry e: folder.getChildren()) {
final String name = e.getName();
if (e.isDirectory()) {
@@ -156,7 +154,7 @@ public class SubPackageFilterArchive imp
}
@Override
- @Nonnull
+ @NotNull
public String getName() {
return base.getName();
}
@@ -179,7 +177,7 @@ public class SubPackageFilterArchive imp
}
@Override
- @Nonnull
+ @NotNull
public Collection<? extends Entry> getChildren() {
Collection<? extends Entry> children = base.getChildren();
List<Entry> ret = new ArrayList<>(children.size());
@@ -193,11 +191,11 @@ public class SubPackageFilterArchive imp
}
@Override
- @CheckForNull
- public Entry getChild(@Nonnull String name) {
+ @Nullable
+ public Entry getChild(@NotNull String name) {
return filterChild(base.getChild(name));
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/CompressionUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/CompressionUtil.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/CompressionUtil.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/CompressionUtil.java Wed Dec 18 10:31:28 2019
@@ -28,12 +28,12 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.api.Artifact;
import org.apache.jackrabbit.vault.fs.api.SerializationType;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -104,7 +104,7 @@ public final class CompressionUtil {
* @return A negative integer, a positive integer or zero depending on whether the artifact
* is estimated to be incompressible, compressible or if the estimate did not run.
*/
- public static int isCompressible(@Nonnull Artifact artifact) {
+ public static int isCompressible(@NotNull Artifact artifact) {
if (SerializationType.GENERIC == artifact.getSerializationType()) {
@@ -146,15 +146,15 @@ public final class CompressionUtil {
return 0;
}
- static boolean isCompressibleContentType(@Nonnull String mimeType) {
+ static boolean isCompressibleContentType(@NotNull String mimeType) {
return mimeType.startsWith("text/") || COMPRESSIBLE_MIME_TYPES.contains(mimeType);
}
- static boolean isIncompressibleContentType(@Nonnull String mimeType) {
+ static boolean isIncompressibleContentType(@NotNull String mimeType) {
return INCOMPRESSIBLE_MIME_TYPES.contains(mimeType);
}
- static int seemsCompressible(@Nonnull Artifact artifact) {
+ static int seemsCompressible(@NotNull Artifact artifact) {
try (InputStream stream = artifact.getInputStream()) {
byte[] sample = IOUtils.toByteArray(stream, SAMPLE_LENGTH);
return isCompressible(sample, SAMPLE_LENGTH) ? 1 : -1;
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java Wed Dec 18 10:31:28 2019
@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import javax.annotation.Nonnull;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.Item;
import javax.jcr.ItemNotFoundException;
@@ -71,6 +70,7 @@ import org.apache.jackrabbit.vault.util.
import org.apache.jackrabbit.vault.util.MimeTypes;
import org.apache.jackrabbit.vault.util.RejectingEntityDefaultHandler;
import org.apache.jackrabbit.vault.util.Text;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
@@ -1275,8 +1275,8 @@ public class DocViewSAXImporter extends
* @return cugHandling for CUG related nodes, aclHandling for
* everything else
*/
- @Nonnull
- private AccessControlHandling getAcHandling(@Nonnull String nodeName) {
+ @NotNull
+ private AccessControlHandling getAcHandling(@NotNull String nodeName) {
if (cugHandling != null && "rep:cugPolicy".equals(nodeName)) {
return cugHandling;
} else {
@@ -1511,4 +1511,4 @@ class NameSpace {
this.prefix = prefix;
this.uri = uri;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Archive.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Archive.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Archive.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Archive.java Wed Dec 18 10:31:28 2019
@@ -22,12 +22,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.vault.fs.api.VaultInputSource;
import org.apache.jackrabbit.vault.fs.config.MetaInf;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Specifies a filevault archive.
@@ -48,7 +46,7 @@ public interface Archive extends Closeab
* @return the input stream or {@code null} if the entry can't be read
* @throws IOException if an error occurs
*/
- @CheckForNull
+ @Nullable
InputStream openInputStream(@Nullable Entry entry) throws IOException;
/**
@@ -57,7 +55,7 @@ public interface Archive extends Closeab
* @return the input source or {@code null} if the entry can't be read
* @throws IOException if an error occurs
*/
- @CheckForNull
+ @Nullable
VaultInputSource getInputSource(@Nullable Entry entry) throws IOException;
/**
@@ -66,7 +64,7 @@ public interface Archive extends Closeab
* @return the jcr_root entry or {@code null}
* @throws IOException if an error occurs
*/
- @CheckForNull
+ @Nullable
Entry getJcrRoot() throws IOException;
/**
@@ -74,7 +72,7 @@ public interface Archive extends Closeab
* @return the root entry.
* @throws IOException if an error occurs
*/
- @Nonnull
+ @NotNull
Entry getRoot() throws IOException;
/**
@@ -83,7 +81,7 @@ public interface Archive extends Closeab
*
* @return the meta inf.
*/
- @Nonnull
+ @NotNull
MetaInf getMetaInf();
/**
@@ -92,8 +90,8 @@ public interface Archive extends Closeab
* @return the entry or {@code null} if not found.
* @throws IOException if an error occurs
*/
- @CheckForNull
- Entry getEntry(@Nonnull String path) throws IOException;
+ @Nullable
+ Entry getEntry(@NotNull String path) throws IOException;
/**
* Returns a sub archive that is rooted at the given path.
@@ -106,8 +104,8 @@ public interface Archive extends Closeab
* does not exist.
* @throws IOException if an error occurs
*/
- @CheckForNull
- Archive getSubArchive(@Nonnull String root, boolean asJcrRoot) throws IOException;
+ @Nullable
+ Archive getSubArchive(@NotNull String root, boolean asJcrRoot) throws IOException;
/**
* closes the archive
@@ -123,7 +121,7 @@ public interface Archive extends Closeab
* Returns the (file) name of the entry
* @return the name
*/
- @Nonnull
+ @NotNull
String getName();
/**
@@ -136,7 +134,7 @@ public interface Archive extends Closeab
* Returns a collection of child entries.
* @return a collection of child entries.
*/
- @Nonnull
+ @NotNull
Collection<? extends Entry> getChildren();
/**
@@ -144,8 +142,8 @@ public interface Archive extends Closeab
* @param name name of the child entry
* @return the entry or {@code null} if does not exist.
*/
- @CheckForNull
- Entry getChild(@Nonnull String name);
+ @Nullable
+ Entry getChild(@NotNull String name);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AutoSave.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AutoSave.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AutoSave.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AutoSave.java Wed Dec 18 10:31:28 2019
@@ -20,12 +20,12 @@ package org.apache.jackrabbit.vault.fs.i
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.jackrabbit.vault.fs.spi.ProgressTracker;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -208,11 +208,11 @@ public class AutoSave {
return needsSave();
}
- public void markMissing(@Nonnull String path) {
+ public void markMissing(@NotNull String path) {
missingMandatory.add(path);
}
- public void markResolved(@Nonnull String path) {
+ public void markResolved(@NotNull String path) {
missingMandatory.remove(path);
}
@@ -220,4 +220,4 @@ public class AutoSave {
public String toString() {
return String.valueOf(threshold);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/DocViewAnalyzerListener.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/DocViewAnalyzerListener.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/DocViewAnalyzerListener.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/DocViewAnalyzerListener.java Wed Dec 18 10:31:28 2019
@@ -17,9 +17,8 @@
package org.apache.jackrabbit.vault.fs.io;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -35,5 +34,5 @@ public interface DocViewAnalyzerListener
* @param intermediate {@code true} if intermediate node
* @param nodeType the primary type of the node or {@code null} if empty.
*/
- void onNode(@Nonnull String path, boolean intermediate, @Nullable String nodeType);
-}
\ No newline at end of file
+ void onNode(@NotNull String path, boolean intermediate, @Nullable String nodeType);
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ExportInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ExportInfo.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ExportInfo.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ExportInfo.java Wed Dec 18 10:31:28 2019
@@ -20,9 +20,8 @@ package org.apache.jackrabbit.vault.fs.i
import java.util.Map;
import java.util.TreeMap;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.vault.util.PathComparator;
+import org.jetbrains.annotations.NotNull;
/**
* Provides information about an export
@@ -40,7 +39,7 @@ public class ExportInfo {
NOP
}
- public void update(@Nonnull Type type, @Nonnull String path) {
+ public void update(@NotNull Type type, @NotNull String path) {
Entry e = entries.get(path);
if (e == null) {
e = new Entry(type, path);
@@ -51,7 +50,7 @@ public class ExportInfo {
entries.put(path, e);
}
- @Nonnull
+ @NotNull
public Map<String, Entry> getEntries() {
return entries;
}
@@ -72,4 +71,4 @@ public class ExportInfo {
return type + " " + path;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java Wed Dec 18 10:31:28 2019
@@ -26,7 +26,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
@@ -41,6 +40,7 @@ import org.apache.jackrabbit.vault.fs.co
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.JcrConstants;
import org.apache.jackrabbit.vault.util.Text;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +71,7 @@ public class JcrArchive extends Abstract
* @param archiveRoot root node for this archive
* @param rootPath root path
*/
- public JcrArchive(@Nonnull Node archiveRoot, @Nonnull String rootPath) {
+ public JcrArchive(@NotNull Node archiveRoot, @NotNull String rootPath) {
this.archiveRoot = archiveRoot;
this.rootPath = rootPath;
}
@@ -416,4 +416,4 @@ public class JcrArchive extends Abstract
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java Wed Dec 18 10:31:28 2019
@@ -20,19 +20,17 @@ import org.apache.jackrabbit.vault.fs.ap
import org.apache.jackrabbit.vault.fs.api.VaultInputSource;
import org.apache.jackrabbit.vault.fs.config.MetaInf;
import org.apache.jackrabbit.vault.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
-
/**
* Implements an archive that remaps the entries of an underlying archive using a {@link PathMapping}.
*/
@@ -67,7 +65,7 @@ public class MappedArchive extends Abstr
* @param src source entry parent
* @param dst destination entry parent
*/
- private void applyMapping(@Nonnull Entry src, @Nonnull VirtualEntry dst) {
+ private void applyMapping(@NotNull Entry src, @NotNull VirtualEntry dst) {
for (Entry child: src.getChildren()) {
VirtualEntry dstChild = dst.add(child.getName(), child);
if ("/jcr_root".equals(dstChild.getPath())) {
@@ -86,7 +84,7 @@ public class MappedArchive extends Abstr
* @param src the source entry
* @param jcrPath the jcr path of the source entry
*/
- private void applyMapping(@Nonnull Entry src, @Nonnull String jcrPath) {
+ private void applyMapping(@NotNull Entry src, @NotNull String jcrPath) {
for (Entry child: src.getChildren()) {
String path = jcrPath + "/" + child.getName();
String mappedPath = mapping.map(path);
@@ -108,7 +106,7 @@ public class MappedArchive extends Abstr
}
@Override
- @CheckForNull
+ @Nullable
public InputStream openInputStream(@Nullable Entry entry) throws IOException {
if (entry == null) {
return null;
@@ -117,7 +115,7 @@ public class MappedArchive extends Abstr
}
@Override
- @CheckForNull
+ @Nullable
public VaultInputSource getInputSource(@Nullable Entry entry) throws IOException {
if (entry == null) {
return null;
@@ -126,7 +124,7 @@ public class MappedArchive extends Abstr
}
@Override
- @Nonnull
+ @NotNull
public Entry getRoot() throws IOException {
return root;
}
@@ -137,7 +135,7 @@ public class MappedArchive extends Abstr
}
@Override
- @Nonnull
+ @NotNull
public MetaInf getMetaInf() {
return base.getMetaInf();
}
@@ -155,7 +153,7 @@ public class MappedArchive extends Abstr
@Nullable
private final VirtualEntry parent;
- @Nonnull
+ @NotNull
private final String name;
@Nullable
@@ -170,7 +168,7 @@ public class MappedArchive extends Abstr
this.baseEntry = null;
}
- private VirtualEntry(@Nonnull VirtualEntry parent, @Nonnull String name, @Nullable Archive.Entry baseEntry) {
+ private VirtualEntry(@NotNull VirtualEntry parent, @NotNull String name, @Nullable Archive.Entry baseEntry) {
this.parent = parent;
this.name = name;
this.baseEntry = baseEntry;
@@ -180,18 +178,18 @@ public class MappedArchive extends Abstr
* {@inheritDoc}
*/
@Override
- @Nonnull
+ @NotNull
public String getName() {
return name;
}
- @Nonnull
+ @NotNull
public String getPath() {
return getPath(new StringBuilder()).toString();
}
- @Nonnull
- private StringBuilder getPath(@Nonnull StringBuilder sb) {
+ @NotNull
+ private StringBuilder getPath(@NotNull StringBuilder sb) {
return parent == null ? sb : parent.getPath(sb).append('/').append(name);
}
@@ -207,7 +205,7 @@ public class MappedArchive extends Abstr
* {@inheritDoc}
*/
@Override
- @Nonnull
+ @NotNull
public Collection<? extends Entry> getChildren() {
return children == null ? Collections.<Entry>emptyList() : children.values();
}
@@ -227,8 +225,8 @@ public class MappedArchive extends Abstr
* @param baseEntry the base archive's entry or
* @return the new entry
*/
- @Nonnull
- public VirtualEntry add(@Nonnull String name, @Nullable Archive.Entry baseEntry) {
+ @NotNull
+ public VirtualEntry add(@NotNull String name, @Nullable Archive.Entry baseEntry) {
if (children != null) {
VirtualEntry ret = children.get(name);
if (ret != null) {
@@ -243,4 +241,4 @@ public class MappedArchive extends Abstr
return ve;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java Wed Dec 18 10:31:28 2019
@@ -27,9 +27,6 @@ import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.api.VaultInputSource;
import org.apache.jackrabbit.vault.fs.config.DefaultMetaInf;
@@ -38,6 +35,8 @@ import org.apache.jackrabbit.vault.fs.co
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.InputStreamPump;
import org.apache.jackrabbit.vault.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -232,13 +231,13 @@ public class MemoryArchive extends Abstr
return name;
}
- @Nonnull
+ @NotNull
public String getPath() {
return getPath(new StringBuilder()).toString();
}
- @Nonnull
- private StringBuilder getPath(@Nonnull StringBuilder sb) {
+ @NotNull
+ private StringBuilder getPath(@NotNull StringBuilder sb) {
return parent == null ? sb : parent.getPath(sb).append('/').append(name);
}
@@ -273,8 +272,8 @@ public class MemoryArchive extends Abstr
* @param data data or {@code null}
* @return the new entry
*/
- @Nonnull
- public VirtualEntry add(@Nonnull String name, long time, @Nullable byte[] data) {
+ @NotNull
+ public VirtualEntry add(@NotNull String name, long time, @Nullable byte[] data) {
if (children != null) {
VirtualEntry ret = children.get(name);
if (ret != null) {
@@ -304,4 +303,4 @@ public class MemoryArchive extends Abstr
return 0;
}
}
-}
\ No newline at end of file
+}