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 [3/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...
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageRegistry.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageRegistry.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageRegistry.java Wed Dec 18 10:31:28 2019
@@ -21,13 +21,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.NoSuchPackageException;
import org.apache.jackrabbit.vault.packaging.PackageExistsException;
import org.apache.jackrabbit.vault.packaging.PackageId;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -45,14 +44,14 @@ public interface PackageRegistry {
* @return {@code true} if the package is registered.
* @throws IOException if an I/O error occurrs.
*/
- boolean contains(@Nonnull PackageId id) throws IOException;
+ boolean contains(@NotNull PackageId id) throws IOException;
/**
* Returns as set of all packages registered in this registry.
* @return a set of package ids.
* @throws IOException if an I/O error occurrs.
*/
- @Nonnull
+ @NotNull
Set<PackageId> packages() throws IOException;
/**
@@ -62,7 +61,7 @@ public interface PackageRegistry {
* @throws IOException if an I/O error occurrs.
*/
@Nullable
- RegisteredPackage open(@Nonnull PackageId id) throws IOException;
+ RegisteredPackage open(@NotNull PackageId id) throws IOException;
/**
* Registers a package provided via an input stream. The method fails, if a package with the same id already exists,
@@ -74,8 +73,8 @@ public interface PackageRegistry {
* @throws IOException if an I/O error occurrs.
* @throws PackageExistsException if the package exists and {@code replace} is {@code false}.
*/
- @Nonnull
- PackageId register(@Nonnull InputStream in, boolean replace) throws IOException, PackageExistsException;
+ @NotNull
+ PackageId register(@NotNull InputStream in, boolean replace) throws IOException, PackageExistsException;
/**
* Registers a package provided via a file. The method fails, if a package with the same id already exists,
@@ -87,8 +86,8 @@ public interface PackageRegistry {
* @throws IOException if an I/O error occurrs.
* @throws PackageExistsException if the package exists and {@code replace} is {@code false}.
*/
- @Nonnull
- PackageId register(@Nonnull File file, boolean replace) throws IOException, PackageExistsException;
+ @NotNull
+ PackageId register(@NotNull File file, boolean replace) throws IOException, PackageExistsException;
/**
* Registers a package provided via an external file. The binary data of the package will not be copied into the
@@ -104,8 +103,8 @@ public interface PackageRegistry {
* @throws IOException if an I/O error occurrs.
* @throws PackageExistsException if the package exists and {@code replace} is {@code false}.
*/
- @Nonnull
- PackageId registerExternal(@Nonnull File file, boolean replace) throws IOException, PackageExistsException;
+ @NotNull
+ PackageId registerExternal(@NotNull File file, boolean replace) throws IOException, PackageExistsException;
/**
* Removes the package from this registry.
@@ -113,7 +112,7 @@ public interface PackageRegistry {
* @throws IOException if an I/O error occurrs.
* @throws NoSuchPackageException if the package does not exist
*/
- void remove(@Nonnull PackageId id) throws IOException, NoSuchPackageException;
+ void remove(@NotNull PackageId id) throws IOException, NoSuchPackageException;
/**
* Creates a dependency report that lists the resolved and unresolved dependencies.
@@ -123,8 +122,8 @@ public interface PackageRegistry {
* @throws IOException if an error accessing the repository occurrs
* @throws NoSuchPackageException if the package with the given {@code id} does not exist.
*/
- @Nonnull
- DependencyReport analyzeDependencies(@Nonnull PackageId id, boolean onlyInstalled) throws IOException, NoSuchPackageException;
+ @NotNull
+ DependencyReport analyzeDependencies(@NotNull PackageId id, boolean onlyInstalled) throws IOException, NoSuchPackageException;
/**
* Tries to resolve the given dependency and returns the id of the package that matches the dependency filter best.
@@ -134,7 +133,7 @@ public interface PackageRegistry {
* @throws IOException if an I/O error occurrs.
*/
@Nullable
- PackageId resolve(@Nonnull Dependency dependency, boolean onlyInstalled) throws IOException;
+ PackageId resolve(@NotNull Dependency dependency, boolean onlyInstalled) throws IOException;
/**
* Returns the package ids of installed packages that depend on the given package.
@@ -143,8 +142,8 @@ public interface PackageRegistry {
* @return the array of package ids.
* @throws IOException if an I/O error occurs.
*/
- @Nonnull
- PackageId[] usage(@Nonnull PackageId id) throws IOException;
+ @NotNull
+ PackageId[] usage(@NotNull PackageId id) throws IOException;
/**
* Creates a new execution plan builder. The builder allows to create an execution plan for package installation
@@ -152,6 +151,6 @@ public interface PackageRegistry {
*
* @return a new builder
*/
- @Nonnull
+ @NotNull
ExecutionPlanBuilder createExecutionPlan();
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTask.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTask.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTask.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTask.java Wed Dec 18 10:31:28 2019
@@ -16,10 +16,9 @@
*/
package org.apache.jackrabbit.vault.packaging.registry;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.vault.packaging.PackageId;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -80,21 +79,21 @@ public interface PackageTask {
* Returns the package id of this task.
* @return the package id.
*/
- @Nonnull
+ @NotNull
PackageId getPackageId();
/**
* Returns the task type.
* @return the task type.
*/
- @Nonnull
+ @NotNull
Type getType();
/**
* Returns the task state
* @return the task state
*/
- @Nonnull
+ @NotNull
State getState();
/**
@@ -103,4 +102,4 @@ public interface PackageTask {
*/
@Nullable
Throwable getError();
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTaskBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTaskBuilder.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTaskBuilder.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/PackageTaskBuilder.java Wed Dec 18 10:31:28 2019
@@ -16,9 +16,8 @@
*/
package org.apache.jackrabbit.vault.packaging.registry;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.vault.packaging.PackageId;
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -32,15 +31,15 @@ public interface PackageTaskBuilder {
* @param id the package id
* @return this.
*/
- @Nonnull
- PackageTaskBuilder with(@Nonnull PackageId id);
+ @NotNull
+ PackageTaskBuilder with(@NotNull PackageId id);
/**
* Sets the type of this task
* @param type the type
* @return this.
*/
- @Nonnull
- ExecutionPlanBuilder with(@Nonnull PackageTask.Type type);
+ @NotNull
+ ExecutionPlanBuilder with(@NotNull PackageTask.Type type);
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/RegisteredPackage.java Wed Dec 18 10:31:28 2019
@@ -19,14 +19,13 @@ package org.apache.jackrabbit.vault.pack
import java.io.IOException;
import java.util.Calendar;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -39,7 +38,7 @@ public interface RegisteredPackage exten
* Returns the id of this package
* @return the id of this package.
*/
- @Nonnull
+ @NotNull
PackageId getId();
/**
@@ -47,21 +46,21 @@ public interface RegisteredPackage exten
* @return the package
* @throws IOException if an I/O error occurs
*/
- @Nonnull
+ @NotNull
VaultPackage getPackage() throws IOException;
/**
* Returns the dependencies of this package
* @return the dependencies of this package.
*/
- @Nonnull
+ @NotNull
Dependency[] getDependencies();
/**
* Returns the {@code WorkspaceFilter} of this package
* @return {@code WorkspaceFilter} of this package
*/
- @Nonnull
+ @NotNull
WorkspaceFilter getWorkspaceFilter();
/**
@@ -69,7 +68,7 @@ public interface RegisteredPackage exten
* @return {@code PackageProperties} of this package
* @throws IOException if an I/O error occurs
*/
- @Nonnull
+ @NotNull
PackageProperties getPackageProperties() throws IOException;
/**
@@ -96,4 +95,4 @@ public interface RegisteredPackage exten
*/
void close();
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/AbstractPackageRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/AbstractPackageRegistry.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/AbstractPackageRegistry.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/AbstractPackageRegistry.java Wed Dec 18 10:31:28 2019
@@ -25,7 +25,6 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
-import javax.annotation.Nonnull;
import javax.jcr.Session;
import org.apache.jackrabbit.vault.fs.io.ImportOptions;
@@ -38,6 +37,7 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.packaging.registry.ExecutionPlanBuilder;
import org.apache.jackrabbit.vault.packaging.registry.PackageRegistry;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
+import org.jetbrains.annotations.NotNull;
/**
* Abstraction for shared methods of PackageRegistry & InternalPackageRegistry implementations
@@ -118,9 +118,9 @@ public abstract class AbstractPackageReg
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
- public DependencyReport analyzeDependencies(@Nonnull PackageId id, boolean onlyInstalled) throws IOException, NoSuchPackageException {
+ public DependencyReport analyzeDependencies(@NotNull PackageId id, boolean onlyInstalled) throws IOException, NoSuchPackageException {
List<Dependency> unresolved = new LinkedList<Dependency>();
List<PackageId> resolved = new LinkedList<PackageId>();
try (RegisteredPackage pkg = open(id)) {
@@ -152,7 +152,7 @@ public abstract class AbstractPackageReg
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
public PackageId[] usage(PackageId id) throws IOException {
TreeSet<PackageId> usages = new TreeSet<PackageId>();
@@ -176,7 +176,7 @@ public abstract class AbstractPackageReg
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
public ExecutionPlanBuilder createExecutionPlan() {
return new ExecutionPlanBuilderImpl(this);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/DependencyReportImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/DependencyReportImpl.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/DependencyReportImpl.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/DependencyReportImpl.java Wed Dec 18 10:31:28 2019
@@ -16,11 +16,10 @@
*/
package org.apache.jackrabbit.vault.packaging.registry.impl;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.registry.DependencyReport;
+import org.jetbrains.annotations.NotNull;
/**
* {@code UsageReportImpl}...
@@ -39,21 +38,21 @@ public class DependencyReportImpl implem
this.resolved = resolved;
}
- @Nonnull
+ @NotNull
@Override
public PackageId getId() {
return id;
}
- @Nonnull
+ @NotNull
@Override
public Dependency[] getUnresolvedDependencies() {
return unresolved;
}
- @Nonnull
+ @NotNull
@Override
public PackageId[] getResolvedDependencies() {
return resolved;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanBuilderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanBuilderImpl.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanBuilderImpl.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanBuilderImpl.java Wed Dec 18 10:31:28 2019
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.Session;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -53,6 +52,7 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.util.RejectingEntityResolver;
import org.apache.jackrabbit.vault.util.xml.serialize.FormattingXmlStreamWriter;
import org.apache.jackrabbit.vault.util.xml.serialize.OutputFormat;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -97,9 +97,9 @@ public class ExecutionPlanBuilderImpl im
this.registry = registry;
}
- @Nonnull
+ @NotNull
@Override
- public ExecutionPlanBuilder save(@Nonnull OutputStream out) throws IOException, PackageException {
+ public ExecutionPlanBuilder save(@NotNull OutputStream out) throws IOException, PackageException {
validate();
try (FormattingXmlStreamWriter writer = FormattingXmlStreamWriter.create(out, new OutputFormat(4, false))) {
writer.writeStartDocument();
@@ -119,9 +119,9 @@ public class ExecutionPlanBuilderImpl im
return this;
}
- @Nonnull
+ @NotNull
@Override
- public ExecutionPlanBuilder load(@Nonnull InputStream in) throws IOException {
+ public ExecutionPlanBuilder load(@NotNull InputStream in) throws IOException {
tasks.clear();
try {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -171,7 +171,7 @@ public class ExecutionPlanBuilderImpl im
addTask().with(id).with(type);
}
- @Nonnull
+ @NotNull
@Override
public PackageTaskBuilder addTask() {
TaskBuilder task = new TaskBuilder();
@@ -180,21 +180,21 @@ public class ExecutionPlanBuilderImpl im
return task;
}
- @Nonnull
+ @NotNull
@Override
- public ExecutionPlanBuilder with(@Nonnull Session session) {
+ public ExecutionPlanBuilder with(@NotNull Session session) {
this.session = session;
return this;
}
- @Nonnull
+ @NotNull
@Override
- public ExecutionPlanBuilder with(@Nonnull ProgressTrackerListener listener) {
+ public ExecutionPlanBuilder with(@NotNull ProgressTrackerListener listener) {
this.listener = listener;
return this;
}
- @Nonnull
+ @NotNull
@Override
public ExecutionPlanBuilder validate() throws IOException, PackageException {
Map<PackageId, PackageTask> installTasks = new HashMap<PackageId, PackageTask>();
@@ -314,7 +314,7 @@ public class ExecutionPlanBuilderImpl im
uninstallTasks.put(id, PackageTaskImpl.MARKER);
}
- @Nonnull
+ @NotNull
@Override
public ExecutionPlan execute() throws IOException, PackageException {
if (plan == null) {
@@ -335,14 +335,14 @@ public class ExecutionPlanBuilderImpl im
private PackageId id;
private PackageTask.Type type;
- public PackageTaskBuilder with(@Nonnull PackageId id) {
+ public PackageTaskBuilder with(@NotNull PackageId id) {
this.id = id;
return this;
}
- @Nonnull
+ @NotNull
@Override
- public ExecutionPlanBuilder with(@Nonnull PackageTask.Type type) {
+ public ExecutionPlanBuilder with(@NotNull PackageTask.Type type) {
this.type = type;
return ExecutionPlanBuilderImpl.this;
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanImpl.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanImpl.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/ExecutionPlanImpl.java Wed Dec 18 10:31:28 2019
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
import javax.jcr.Session;
import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
@@ -28,6 +27,7 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.packaging.registry.ExecutionPlan;
import org.apache.jackrabbit.vault.packaging.registry.PackageRegistry;
import org.apache.jackrabbit.vault.packaging.registry.PackageTask;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,7 +59,7 @@ public class ExecutionPlanImpl implement
return tasks;
}
- @Nonnull
+ @NotNull
@Override
public String getId() {
return id;
@@ -117,7 +117,7 @@ public class ExecutionPlanImpl implement
return false;
}
- @Nonnull
+ @NotNull
public ExecutionPlan execute() throws IOException, PackageException {
if (isExecuted()) {
log.warn("executing plan that was already executed.");
@@ -135,4 +135,4 @@ public class ExecutionPlanImpl implement
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallState.java Wed Dec 18 10:31:28 2019
@@ -29,8 +29,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -51,6 +49,8 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.util.RejectingEntityResolver;
import org.apache.jackrabbit.vault.util.xml.serialize.FormattingXmlStreamWriter;
import org.apache.jackrabbit.vault.util.xml.serialize.OutputFormat;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -109,7 +109,7 @@ public class FSInstallState {
private WorkspaceFilter filter;
private Properties properties = new Properties();
- public FSInstallState(@Nonnull PackageId pid, @Nonnull FSPackageStatus status) {
+ public FSInstallState(@NotNull PackageId pid, @NotNull FSPackageStatus status) {
this.packageId = pid;
this.status = status;
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java Wed Dec 18 10:31:28 2019
@@ -33,8 +33,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -66,6 +64,8 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.util.InputStreamPump;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
import org.apache.jackrabbit.vault.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -129,7 +129,7 @@ public class FSPackageRegistry extends A
* @param homeDir the directory in which packages and their metadata is stored
* @throws IOException If an I/O error occurs.
*/
- public FSPackageRegistry(@Nonnull File homeDir) throws IOException {
+ public FSPackageRegistry(@NotNull File homeDir) throws IOException {
this(homeDir, InstallationScope.UNSCOPED);
}
@@ -140,7 +140,7 @@ public class FSPackageRegistry extends A
* @param scope to set a corresponding workspacefilter
* @throws IOException If an I/O error occurs.
*/
- public FSPackageRegistry(@Nonnull File homeDir, InstallationScope scope) throws IOException {
+ public FSPackageRegistry(@NotNull File homeDir, InstallationScope scope) throws IOException {
this.homeDir = homeDir;
this.scope = scope;
loadPackageCache();
@@ -209,7 +209,7 @@ public class FSPackageRegistry extends A
* @param id package id
* @param related related packages
*/
- public void dispatch(@Nonnull PackageEvent.Type type, @Nonnull PackageId id, @Nullable PackageId[] related) {
+ public void dispatch(@NotNull PackageEvent.Type type, @NotNull PackageId id, @Nullable PackageId[] related) {
if (dispatcher == null) {
return;
}
@@ -218,18 +218,18 @@ public class FSPackageRegistry extends A
@Nullable
@Override
- public RegisteredPackage open(@Nonnull PackageId id) throws IOException {
+ public RegisteredPackage open(@NotNull PackageId id) throws IOException {
FSInstallState state = getInstallState(id);
return FSPackageStatus.NOTREGISTERED != state.getStatus() ? new FSRegisteredPackage(this, state) : null;
}
@Override
- public boolean contains(@Nonnull PackageId id) throws IOException {
+ public boolean contains(@NotNull PackageId id) throws IOException {
return stateCache.containsKey(id);
}
@Nullable
- private File getPackageFile(@Nonnull PackageId id) {
+ private File getPackageFile(@NotNull PackageId id) {
try {
FSInstallState state = getInstallState(id);
if (FSPackageStatus.NOTREGISTERED == state.getStatus()) {
@@ -243,7 +243,7 @@ public class FSPackageRegistry extends A
return null;
}
- private File buildPackageFile(@Nonnull PackageId id) {
+ private File buildPackageFile(@NotNull PackageId id) {
String path = getInstallationPath(id);
return new File(getHomeDir(), path + ".zip");
}
@@ -254,8 +254,8 @@ public class FSPackageRegistry extends A
* @param id The package Id.
* @return the meta data file.
*/
- @Nonnull
- private File getPackageMetaDataFile(@Nonnull PackageId id) {
+ @NotNull
+ private File getPackageMetaDataFile(@NotNull PackageId id) {
final String path = getInstallationPath(id);
return new File(getHomeDir(), path + ".xml");
}
@@ -266,8 +266,8 @@ public class FSPackageRegistry extends A
* @return the package
* @throws IOException if an I/O error occurrs.
*/
- @Nonnull
- protected VaultPackage openPackageFile(@Nonnull PackageId id) throws IOException {
+ @NotNull
+ protected VaultPackage openPackageFile(@NotNull PackageId id) throws IOException {
File pkg = getPackageFile(id);
if (pkg == null) {
throw new IOException("Could not find package file for id " + id);
@@ -288,9 +288,9 @@ public class FSPackageRegistry extends A
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
- public DependencyReport analyzeDependencies(@Nonnull PackageId id, boolean onlyInstalled) throws IOException, NoSuchPackageException {
+ public DependencyReport analyzeDependencies(@NotNull PackageId id, boolean onlyInstalled) throws IOException, NoSuchPackageException {
List<Dependency> unresolved = new LinkedList<>();
List<PackageId> resolved = new LinkedList<>();
FSInstallState state = getInstallState(id);
@@ -355,17 +355,17 @@ public class FSPackageRegistry extends A
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
- public PackageId register(@Nonnull InputStream in, boolean replace) throws IOException, PackageExistsException {
+ public PackageId register(@NotNull InputStream in, boolean replace) throws IOException, PackageExistsException {
return register(in, replace, null);
}
/**
* {@inheritDoc}
*/
- @Nonnull
- private PackageId register(@Nonnull InputStream in, boolean replace, Dependency autoDependency) throws IOException, PackageExistsException {
+ @NotNull
+ private PackageId register(@NotNull InputStream in, boolean replace, Dependency autoDependency) throws IOException, PackageExistsException {
ZipVaultPackage pkg = upload(in, replace);
Map<PackageId, SubPackageHandling.Option> subpackages = registerSubPackages(pkg, replace);
@@ -527,9 +527,9 @@ public class FSPackageRegistry extends A
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
- public PackageId register(@Nonnull File file, boolean replace) throws IOException, PackageExistsException {
+ public PackageId register(@NotNull File file, boolean replace) throws IOException, PackageExistsException {
ZipVaultPackage pack = new ZipVaultPackage(file, false, true);
try {
File pkgFile = buildPackageFile(pack.getId());
@@ -560,9 +560,9 @@ public class FSPackageRegistry extends A
}
}
- @Nonnull
+ @NotNull
@Override
- public PackageId registerExternal(@Nonnull File file, boolean replace) throws IOException, PackageExistsException {
+ public PackageId registerExternal(@NotNull File file, boolean replace) throws IOException, PackageExistsException {
if (!replace && pathIdMapping.containsKey(file.toPath())) {
PackageId pid = pathIdMapping.get(file.toPath());
throw new PackageExistsException("Package already exists: " + pid).setId(pid);
@@ -605,7 +605,7 @@ public class FSPackageRegistry extends A
* {@inheritDoc}
*/
@Override
- public void remove(@Nonnull PackageId id) throws IOException, NoSuchPackageException {
+ public void remove(@NotNull PackageId id) throws IOException, NoSuchPackageException {
FSInstallState state = getInstallState(id);
File metaData = getPackageMetaDataFile(id);
@@ -624,7 +624,7 @@ public class FSPackageRegistry extends A
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
public Set<PackageId> packages() throws IOException {
return packagesInitializied ? stateCache.keySet() : loadPackageCache();
@@ -675,7 +675,7 @@ public class FSPackageRegistry extends A
* {@inheritDoc}
*/
@Override
- public void installPackage(@Nonnull Session session, @Nonnull RegisteredPackage pkg, @Nonnull ImportOptions opts,
+ public void installPackage(@NotNull Session session, @NotNull RegisteredPackage pkg, @NotNull ImportOptions opts,
boolean extract) throws IOException, PackageException {
// For now FS based persistence only supports extraction but no reversible installation
@@ -722,7 +722,7 @@ public class FSPackageRegistry extends A
* Uninstallation not supported for FS based PackageRegistry
*/
@Override
- public void uninstallPackage(@Nonnull Session session, @Nonnull RegisteredPackage pkg, @Nonnull ImportOptions opts) throws IOException, PackageException {
+ public void uninstallPackage(@NotNull Session session, @NotNull RegisteredPackage pkg, @NotNull ImportOptions opts) throws IOException, PackageException {
String msg = "Uninstallation not supported by FS based registry";
log.error(msg);
throw new PackageException(msg);
@@ -757,7 +757,7 @@ public class FSPackageRegistry extends A
* @param state
* @throws IOException
*/
- private void setInstallState(@Nonnull FSInstallState state) throws IOException {
+ private void setInstallState(@NotNull FSInstallState state) throws IOException {
PackageId pid = state.getPackageId();
File metaData = getPackageMetaDataFile(pid);
@@ -780,7 +780,7 @@ public class FSPackageRegistry extends A
*
* @throws IOException if an I/O error occurs.
*/
- @Nonnull
+ @NotNull
public FSInstallState getInstallState(PackageId pid) throws IOException {
if (stateCache.containsKey(pid)) {
return stateCache.get(pid);
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackage.java Wed Dec 18 10:31:28 2019
@@ -19,15 +19,14 @@ package org.apache.jackrabbit.vault.pack
import java.io.IOException;
import java.util.Calendar;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,13 +59,13 @@ public class FSRegisteredPackage impleme
this.size = installState.getSize();
}
- @Nonnull
+ @NotNull
@Override
public PackageId getId() {
return this.id;
}
- @Nonnull
+ @NotNull
@Override
public VaultPackage getPackage() throws IOException {
if (this.vltPkg == null) {
@@ -90,7 +89,7 @@ public class FSRegisteredPackage impleme
return size;
}
- @CheckForNull
+ @Nullable
@Override
public Calendar getInstallationTime() {
Calendar cal = Calendar.getInstance();
@@ -136,4 +135,4 @@ public class FSRegisteredPackage impleme
public PackageProperties getPackageProperties() throws IOException {
return this.packageProperties;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/InternalPackageRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/InternalPackageRegistry.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/InternalPackageRegistry.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/InternalPackageRegistry.java Wed Dec 18 10:31:28 2019
@@ -18,20 +18,20 @@ package org.apache.jackrabbit.vault.pack
import java.io.IOException;
-import javax.annotation.Nonnull;
import javax.jcr.Session;
import org.apache.jackrabbit.vault.fs.io.ImportOptions;
import org.apache.jackrabbit.vault.packaging.PackageException;
import org.apache.jackrabbit.vault.packaging.registry.PackageRegistry;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
+import org.jetbrains.annotations.NotNull;
public interface InternalPackageRegistry extends PackageRegistry {
- void installPackage(@Nonnull Session session, @Nonnull RegisteredPackage pkg, @Nonnull ImportOptions opts,
+ void installPackage(@NotNull Session session, @NotNull RegisteredPackage pkg, @NotNull ImportOptions opts,
boolean extract) throws IOException, PackageException;
- void uninstallPackage(@Nonnull Session session, @Nonnull RegisteredPackage pkg, @Nonnull ImportOptions opts)
+ void uninstallPackage(@NotNull Session session, @NotNull RegisteredPackage pkg, @NotNull ImportOptions opts)
throws IOException, PackageException;
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageRegistry.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageRegistry.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageRegistry.java Wed Dec 18 10:31:28 2019
@@ -27,8 +27,6 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Binary;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
@@ -66,6 +64,8 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.util.InputStreamPump;
import org.apache.jackrabbit.vault.util.JcrConstants;
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;
@@ -123,7 +123,7 @@ public class JcrPackageRegistry extends
* @param session the JCR session that is used to access the repository.
* @param roots the root paths to store the packages.
*/
- public JcrPackageRegistry(@Nonnull Session session, @Nullable String ... roots) {
+ public JcrPackageRegistry(@NotNull Session session, @Nullable String ... roots) {
this.session = session;
if (roots == null || roots.length == 0) {
packRootPaths = new String[]{DEFAULT_PACKAGE_ROOT_PATH};
@@ -156,7 +156,7 @@ public class JcrPackageRegistry extends
* @param id package id
* @param related related packages
*/
- public void dispatch(@Nonnull PackageEvent.Type type, @Nonnull PackageId id, @Nullable PackageId[] related) {
+ public void dispatch(@NotNull PackageEvent.Type type, @NotNull PackageId id, @Nullable PackageId[] related) {
if (dispatcher == null) {
return;
}
@@ -194,7 +194,7 @@ public class JcrPackageRegistry extends
* Returns the package root paths this registry is created with.
* @return the package root paths.
*/
- @Nonnull
+ @NotNull
public String[] getPackRootPaths() {
return packRootPaths;
}
@@ -228,7 +228,7 @@ public class JcrPackageRegistry extends
* @return the list of package roots.
* @throws RepositoryException if an error occurs.
*/
- @Nonnull
+ @NotNull
public List<Node> getPackageRoots() throws RepositoryException {
List<Node> roots = new ArrayList<>(packRootPaths.length);
for (int i=0; i<packRootPaths.length; i++) {
@@ -246,7 +246,7 @@ public class JcrPackageRegistry extends
@Nullable
@Override
- public RegisteredPackage open(@Nonnull PackageId id) throws IOException {
+ public RegisteredPackage open(@NotNull PackageId id) throws IOException {
try {
Node node = getPackageNode(id);
if (node == null && baseRegistry != null) {
@@ -259,7 +259,7 @@ public class JcrPackageRegistry extends
}
@Override
- public boolean contains(@Nonnull PackageId id) throws IOException {
+ public boolean contains(@NotNull PackageId id) throws IOException {
try {
boolean result = getPackageNode(id) != null;
if (result == false && baseRegistry != null) {
@@ -272,7 +272,7 @@ public class JcrPackageRegistry extends
}
@Nullable
- private Node getPackageNode(@Nonnull PackageId id) throws RepositoryException {
+ private Node getPackageNode(@NotNull PackageId id) throws RepositoryException {
String relPath = getRelativeInstallationPath(id);
for (String pfx: packRootPaths) {
String path = pfx + relPath;
@@ -344,9 +344,9 @@ public class JcrPackageRegistry extends
}
}
- @Nonnull
+ @NotNull
@Override
- public PackageId register(@Nonnull InputStream in, boolean replace) throws IOException, PackageExistsException {
+ public PackageId register(@NotNull InputStream in, boolean replace) throws IOException, PackageExistsException {
try (JcrPackage pkg = upload(in, replace)){
//noinspection resource
return pkg.getPackage().getId();
@@ -441,9 +441,9 @@ public class JcrPackageRegistry extends
}
}
- @Nonnull
+ @NotNull
@Override
- public PackageId register(@Nonnull File file, boolean replace) throws IOException, PackageExistsException {
+ public PackageId register(@NotNull File file, boolean replace) throws IOException, PackageExistsException {
ZipVaultPackage pack = new ZipVaultPackage(file, false, true);
try (JcrPackage pkg = upload(pack, replace)) {
//noinspection resource
@@ -453,9 +453,9 @@ public class JcrPackageRegistry extends
}
}
- @Nonnull
+ @NotNull
@Override
- public PackageId registerExternal(@Nonnull File file, boolean replace) throws IOException, PackageExistsException {
+ public PackageId registerExternal(@NotNull File file, boolean replace) throws IOException, PackageExistsException {
throw new UnsupportedOperationException("linking files to repository persistence is not supported.");
}
@@ -588,8 +588,8 @@ public class JcrPackageRegistry extends
*
* @since 2.3.0
*/
- @Nonnull
- public JcrPackage createNew(@Nonnull Node parent, @Nonnull PackageId pid, @Nullable VaultPackage pack, boolean autoSave)
+ @NotNull
+ public JcrPackage createNew(@NotNull Node parent, @NotNull PackageId pid, @Nullable VaultPackage pack, boolean autoSave)
throws RepositoryException, IOException {
Node node = parent.addNode(Text.getName(getInstallationPath(pid) + ".zip"), JcrConstants.NT_FILE);
Node content = node.addNode(JcrConstants.JCR_CONTENT, JcrConstants.NT_RESOURCE);
@@ -636,8 +636,8 @@ public class JcrPackageRegistry extends
*
* @since 3.1
*/
- @Nonnull
- private JcrPackage createNew(@Nonnull Node parent, @Nonnull PackageId pid, @Nonnull Binary bin, @Nonnull MemoryArchive archive)
+ @NotNull
+ private JcrPackage createNew(@NotNull Node parent, @NotNull PackageId pid, @NotNull Binary bin, @NotNull MemoryArchive archive)
throws RepositoryException, IOException {
Node node = parent.addNode(Text.getName(getInstallationPath(pid) + ".zip"), JcrConstants.NT_FILE);
Node content = node.addNode(JcrConstants.JCR_CONTENT, JcrConstants.NT_RESOURCE);
@@ -658,7 +658,7 @@ public class JcrPackageRegistry extends
@SuppressWarnings("resource")
@Override
- public void remove(@Nonnull PackageId id) throws IOException, NoSuchPackageException {
+ public void remove(@NotNull PackageId id) throws IOException, NoSuchPackageException {
JcrRegisteredPackage pkg = (JcrRegisteredPackage) open(id);
if (pkg == null) {
throw new NoSuchPackageException().setId(id);
@@ -723,7 +723,7 @@ public class JcrPackageRegistry extends
}
- @Nonnull
+ @NotNull
@Override
public Set<PackageId> packages() throws IOException {
try {
@@ -779,7 +779,7 @@ public class JcrPackageRegistry extends
}
@Override
- public void installPackage(@Nonnull Session session, @Nonnull RegisteredPackage pkg, @Nonnull ImportOptions opts,
+ public void installPackage(@NotNull Session session, @NotNull RegisteredPackage pkg, @NotNull ImportOptions opts,
boolean extract) throws IOException, PackageException {
try (JcrPackage jcrPkg = ((JcrRegisteredPackage) pkg).getJcrPackage()) {
if (extract) {
@@ -793,7 +793,7 @@ public class JcrPackageRegistry extends
}
@Override
- public void uninstallPackage(@Nonnull Session session, @Nonnull RegisteredPackage pkg, @Nonnull ImportOptions opts)
+ public void uninstallPackage(@NotNull Session session, @NotNull RegisteredPackage pkg, @NotNull ImportOptions opts)
throws IOException, PackageException {
try (JcrPackage jcrPkg = ((JcrRegisteredPackage) pkg).getJcrPackage()) {
jcrPkg.uninstall(opts);
@@ -802,4 +802,4 @@ public class JcrPackageRegistry extends
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrRegisteredPackage.java Wed Dec 18 10:31:28 2019
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.vault.pack
import java.io.IOException;
import java.util.Calendar;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
@@ -32,6 +30,8 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.jackrabbit.vault.packaging.impl.JcrWorkspaceFilter;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* {@code JcrRegisteredPackage}...
@@ -51,13 +51,13 @@ public class JcrRegisteredPackage implem
return pkg;
}
- @Nonnull
+ @NotNull
@Override
public PackageId getId() {
return vltPkg.getId();
}
- @Nonnull
+ @NotNull
@Override
public VaultPackage getPackage() throws IOException {
return vltPkg;
@@ -77,7 +77,7 @@ public class JcrRegisteredPackage implem
return pkg.getSize();
}
- @CheckForNull
+ @Nullable
@Override
public Calendar getInstallationTime() {
try {
@@ -120,4 +120,4 @@ public class JcrRegisteredPackage implem
public PackageProperties getPackageProperties() throws IOException {
return getPackage().getProperties();
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/PackageTaskImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/PackageTaskImpl.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/PackageTaskImpl.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/PackageTaskImpl.java Wed Dec 18 10:31:28 2019
@@ -18,9 +18,6 @@ package org.apache.jackrabbit.vault.pack
import java.io.IOException;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.vault.fs.io.ImportOptions;
import org.apache.jackrabbit.vault.packaging.DependencyHandling;
import org.apache.jackrabbit.vault.packaging.NoSuchPackageException;
@@ -29,6 +26,8 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.packaging.registry.PackageRegistry;
import org.apache.jackrabbit.vault.packaging.registry.PackageTask;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,24 +51,24 @@ public class PackageTaskImpl implements
private Throwable error;
- PackageTaskImpl(@Nonnull PackageId id, @Nonnull Type type) {
+ PackageTaskImpl(@NotNull PackageId id, @NotNull Type type) {
this.id = id;
this.type = type;
}
- @Nonnull
+ @NotNull
@Override
public PackageId getPackageId() {
return id;
}
- @Nonnull
+ @NotNull
@Override
public Type getType() {
return type;
}
- @Nonnull
+ @NotNull
@Override
public State getState() {
return state;
@@ -182,4 +181,4 @@ public class PackageTaskImpl implements
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java Wed Dec 18 10:31:28 2019
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.vault.pack
import java.security.Principal;
import java.util.List;
-import javax.annotation.Nonnull;
import javax.jcr.Node;
import javax.jcr.ValueFactory;
import javax.jcr.security.AccessControlEntry;
@@ -33,6 +32,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
+import org.jetbrains.annotations.NotNull;
import org.junit.Ignore;
import org.junit.Test;
@@ -91,7 +91,7 @@ public class TestAceOrder extends Integr
}
}
- private void assertACEs(@Nonnull String path) throws Exception {
+ private void assertACEs(@NotNull String path) throws Exception {
JackrabbitAccessControlList list = AccessControlUtils.getAccessControlList(acMgr, path);
AccessControlEntry[] entries = list.getAccessControlEntries();
@@ -108,4 +108,4 @@ public class TestAceOrder extends Integr
assertNodeExists("/testroot/secured");
assertACEs("/testroot/secured");
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/pom.xml?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/pom.xml Wed Dec 18 10:31:28 2019
@@ -108,8 +108,8 @@
</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-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=1871737&r1=1871736&r2=1871737&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 Wed Dec 18 10:31:28 2019
@@ -27,8 +27,6 @@ import java.util.Map;
import java.util.function.BiPredicate;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-
import org.apache.commons.io.FilenameUtils;
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
@@ -49,6 +47,7 @@ import org.apache.jackrabbit.vault.valid
import org.apache.jackrabbit.vault.validation.spi.impl.AdvancedFilterValidator;
import org.apache.jackrabbit.vault.validation.spi.impl.AdvancedPropertiesValidator;
import org.apache.jackrabbit.vault.validation.spi.impl.DocumentViewParserValidator;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +79,7 @@ public class ValidationExecutor {
*
* @param validatorsById a map of validator ids and actual validators
*/
- public ValidationExecutor(@Nonnull Map<String, Validator> validatorsById) {
+ public ValidationExecutor(@NotNull Map<String, Validator> validatorsById) {
this.validatorsById = validatorsById;
this.documentViewXmlValidators = ValidationExecutor.filterValidatorsByClass(validatorsById, DocumentViewXmlValidator.class);
this.nodePathValidators = ValidationExecutor.filterValidatorsByClass(validatorsById, NodePathValidator.class);
@@ -109,7 +108,7 @@ public class ValidationExecutor {
* Returns all bound validators by id.
* @return a map with all validators (key=validator id, value=actual validator)
*/
- public @Nonnull Map<String, Validator> getAllValidatorsById() {
+ public @NotNull Map<String, Validator> getAllValidatorsById() {
return validatorsById;
}
@@ -119,7 +118,7 @@ public class ValidationExecutor {
*
* @return a map with all unused validators (key=validator id, value=actual validator)
*/
- public @Nonnull Map<String, Validator> getUnusedValidatorsById() {
+ public @NotNull Map<String, Validator> getUnusedValidatorsById() {
Map<String, Validator> unusedValidators = new HashMap<>(validatorsById);
unusedValidators.keySet().removeAll(documentViewXmlValidators.keySet());
unusedValidators.keySet().removeAll(nodePathValidators.keySet());
@@ -141,7 +140,7 @@ public class ValidationExecutor {
* @param basePath the path to which the file path is relative
* @return the list of validation messages
* @throws IOException in case the input stream could not be accessed */
- public @Nonnull Collection<ValidationViolation> validateMetaInf(@Nonnull InputStream input, @Nonnull Path filePath, @Nonnull Path basePath) throws IOException {
+ public @NotNull Collection<ValidationViolation> validateMetaInf(@NotNull InputStream input, @NotNull Path filePath, @NotNull Path basePath) throws IOException {
if (filePath.isAbsolute()) {
throw new IllegalArgumentException("Given file path must not be absolute");
}
@@ -166,7 +165,7 @@ public class ValidationExecutor {
* @return the list of validation messages
* @throws IOException in case the input stream could not be accessed
*/
- public @Nonnull Collection<ValidationViolation> validateJcrRoot(@Nonnull InputStream input, @Nonnull Path filePath, @Nonnull Path basePath) throws IOException {
+ public @NotNull Collection<ValidationViolation> validateJcrRoot(@NotNull InputStream input, @NotNull Path filePath, @NotNull Path basePath) throws IOException {
if (filePath.isAbsolute()) {
throw new IllegalArgumentException("Given path is not relative " + filePath);
}
@@ -188,7 +187,7 @@ public class ValidationExecutor {
*
* @return the list of additional validation violations (might be empty) which have not been reported before
*/
- public @Nonnull Collection<ValidationViolation> done() {
+ public @NotNull Collection<ValidationViolation> done() {
Collection<ValidationViolation> allViolations = new LinkedList<>();
// go through all validators (even the nested ones)
for (Map.Entry<String, Validator>entry : validatorsById.entrySet()) {
@@ -304,7 +303,7 @@ public class ValidationExecutor {
* @param filePath the relative file path to convert
* @return the node path
*/
- public static @Nonnull String filePathToNodePath(@Nonnull Path filePath) {
+ public static @NotNull String filePathToNodePath(@NotNull Path filePath) {
// convert to forward slashes and make absolute by prefixing it with "/"
String platformPath = "/" + FilenameUtils.separatorsToUnix(filePath.toString());
return PlatformNameFormat.getRepositoryPath(platformPath, true);
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutorFactory.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutorFactory.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutorFactory.java Wed Dec 18 10:31:28 2019
@@ -26,15 +26,14 @@ import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.vault.validation.impl.util.ValidatorSettingsImpl;
import org.apache.jackrabbit.vault.validation.spi.ValidationContext;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +79,7 @@ public class ValidationExecutorFactory {
* @param validatorSettingsById a map of {@link ValidatorSettings}. The key is the validator id. May be {@code null}.
* @return either {@code null} or an executor (if at least one validator is registered)
*/
- public @CheckForNull ValidationExecutor createValidationExecutor(@Nonnull ValidationContext context, boolean isSubPackage, boolean enforceSubpackageValidation, Map<String, ? extends ValidatorSettings> validatorSettingsById) {
+ public @Nullable ValidationExecutor createValidationExecutor(@NotNull ValidationContext context, boolean isSubPackage, boolean enforceSubpackageValidation, Map<String, ? extends ValidatorSettings> validatorSettingsById) {
Map<String, Validator> validatorsById = createValidators(context, isSubPackage, enforceSubpackageValidation, validatorSettingsById != null ? validatorSettingsById : Collections.emptyMap());
if (validatorsById.isEmpty()) {
return null;
@@ -88,7 +87,7 @@ public class ValidationExecutorFactory {
return new ValidationExecutor(validatorsById);
}
- private @Nonnull Map<String, Validator> createValidators(@Nonnull ValidationContext context, boolean isSubPackage, boolean enforceSubpackageValidation, Map<String, ? extends ValidatorSettings> validatorSettingsById) {
+ private @NotNull Map<String, Validator> createValidators(@NotNull ValidationContext context, boolean isSubPackage, boolean enforceSubpackageValidation, Map<String, ? extends ValidatorSettings> validatorSettingsById) {
Map<String, Validator> validatorsById = new LinkedHashMap<>();
Set<String> validatorSettingsIds = new HashSet<>(validatorSettingsById.keySet());
for (ValidatorFactory validatorFactory : validatorFactories) {
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationViolation.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationViolation.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationViolation.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationViolation.java Wed Dec 18 10:31:28 2019
@@ -20,11 +20,10 @@ import java.nio.file.Path;
import java.util.Collection;
import java.util.LinkedList;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.vault.validation.spi.ValidatorFactory;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
+import org.jetbrains.annotations.Nullable;
/**
* A ValidationViolation is a {@link ValidationMessage} enriched with additional meta information like
@@ -97,7 +96,7 @@ public class ValidationViolation extends
* Returns the file path bound to this message.
* @return the absolute file path or {@code null} if the message does not belong to a file
*/
- public @CheckForNull Path getFilePath() {
+ public @Nullable Path getFilePath() {
if (basePath != null && filePath != null) {
return basePath.resolve(filePath);
}
@@ -108,7 +107,7 @@ public class ValidationViolation extends
* Returns the node path bound to this message.
* @return the node path or {@code null} if the message does not belong to a specific node
*/
- public @CheckForNull String getNodePath() {
+ public @Nullable String getNodePath() {
return nodePath;
}
@@ -116,7 +115,7 @@ public class ValidationViolation extends
* Returns the validator id bound to this message.
* @return the validator id or {@code null} if the message does not belong to a specific {@link ValidatorFactory}
*/
- public @CheckForNull String getValidatorId() {
+ public @Nullable String getValidatorId() {
return validatorId;
}
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=1871737&r1=1871736&r2=1871737&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 Wed Dec 18 10:31:28 2019
@@ -25,8 +25,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl;
@@ -38,6 +36,7 @@ import org.apache.jackrabbit.vault.valid
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;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -58,7 +57,7 @@ public class DocumentViewXmlContentHandl
private List<ValidationViolation> violations;
- public @Nonnull List<ValidationViolation> getViolations() {
+ public @NotNull List<ValidationViolation> getViolations() {
return violations;
}
@@ -175,7 +174,7 @@ public class DocumentViewXmlContentHandl
}
/** @return a Collection of absolute node paths (i.e. starting with "/") with "/" as path delimiter. */
- public @Nonnull Map<String, Integer> getNodePaths() {
+ public @NotNull Map<String, Integer> getNodePaths() {
return nodePathsAndLineNumbers;
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/package-info.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/package-info.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/package-info.java Wed Dec 18 10:31:28 2019
@@ -20,4 +20,4 @@
@Version("1.0.0")
package org.apache.jackrabbit.vault.validation;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/DocumentViewXmlValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/DocumentViewXmlValidator.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/DocumentViewXmlValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/DocumentViewXmlValidator.java Wed Dec 18 10:31:28 2019
@@ -19,11 +19,10 @@ package org.apache.jackrabbit.vault.vali
import java.nio.file.Path;
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.vault.util.DocViewNode;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -46,5 +45,5 @@ public interface DocumentViewXmlValidato
* @param isRoot {@code true} in case this is the root node of the docview file otherwise {@code false}
* @return validation messages or {@code null}
*/
- @CheckForNull Collection<ValidationMessage> validate(@Nonnull DocViewNode node, @Nonnull String nodePath, @Nonnull Path filePath, boolean isRoot);
+ @Nullable Collection<ValidationMessage> validate(@NotNull DocViewNode node, @NotNull String nodePath, @NotNull Path filePath, boolean isRoot);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/FilterValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/FilterValidator.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/FilterValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/FilterValidator.java Wed Dec 18 10:31:28 2019
@@ -18,10 +18,9 @@ package org.apache.jackrabbit.vault.vali
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -36,5 +35,5 @@ public interface FilterValidator extends
* @param filter the deserialized filter
* @return validation messages or {@code null}
*/
- @CheckForNull Collection<ValidationMessage> validate(@Nonnull WorkspaceFilter filter);
+ @Nullable Collection<ValidationMessage> validate(@NotNull WorkspaceFilter filter);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericJcrDataValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericJcrDataValidator.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericJcrDataValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericJcrDataValidator.java Wed Dec 18 10:31:28 2019
@@ -22,8 +22,7 @@ import java.nio.file.Path;
import java.util.Collection;
import java.util.Map;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -44,7 +43,7 @@ public interface GenericJcrDataValidator
* @return a collection of validation messages or {@code null}
* @throws IOException in case the input stream could not be accessed
*/
- Collection<ValidationMessage> validateJcrData(@Nonnull InputStream input, @Nonnull Path filePath, @Nonnull Map<String, Integer> nodePathsAndLineNumbers) throws IOException;
+ Collection<ValidationMessage> validateJcrData(@NotNull InputStream input, @NotNull Path filePath, @NotNull Map<String, Integer> nodePathsAndLineNumbers) throws IOException;
/**
* Called for each file below jcr_root.
@@ -52,5 +51,5 @@ public interface GenericJcrDataValidator
* @param filePath file path relative to the jcr_root directory (i.e. does not start with {@code jcr_root})
* @return {@code true} in case the file should be validated, otherwise {@code false}
*/
- boolean shouldValidateJcrData(@Nonnull Path filePath);
+ boolean shouldValidateJcrData(@NotNull Path filePath);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericMetaInfDataValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericMetaInfDataValidator.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericMetaInfDataValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/GenericMetaInfDataValidator.java Wed Dec 18 10:31:28 2019
@@ -21,9 +21,8 @@ import java.io.InputStream;
import java.nio.file.Path;
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -45,7 +44,7 @@ public interface GenericMetaInfDataValid
* @return a collection of validation messages or {@code null}
* @throws IOException in case the input stream could not be accessed
*/
- @CheckForNull Collection<ValidationMessage> validateMetaInfData(@Nonnull InputStream input, @Nonnull Path filePath) throws IOException;
+ @Nullable Collection<ValidationMessage> validateMetaInfData(@NotNull InputStream input, @NotNull Path filePath) throws IOException;
/**
* Called for each file below META-INF.
@@ -53,7 +52,7 @@ public interface GenericMetaInfDataValid
* @param filePath file path relative to the META-INF directory (i.e. does not start with {@code META-INF})
* @return {@code true} in case the file should be validated, otherwise {@code false}
*/
- boolean shouldValidateMetaInfData(@Nonnull Path filePath);
+ boolean shouldValidateMetaInfData(@NotNull Path filePath);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/JcrPathValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/JcrPathValidator.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/JcrPathValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/JcrPathValidator.java Wed Dec 18 10:31:28 2019
@@ -19,9 +19,8 @@ package org.apache.jackrabbit.vault.vali
import java.nio.file.Path;
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
@@ -37,6 +36,6 @@ public interface JcrPathValidator extend
* @param filePath the relative file path to the jcr_root directory
* @return validation messages or {@code null}
*/
- @CheckForNull Collection<ValidationMessage> validateJcrPath(@Nonnull Path filePath);
+ @Nullable Collection<ValidationMessage> validateJcrPath(@NotNull Path filePath);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/MetaInfPathValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/MetaInfPathValidator.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/MetaInfPathValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/MetaInfPathValidator.java Wed Dec 18 10:31:28 2019
@@ -19,9 +19,8 @@ package org.apache.jackrabbit.vault.vali
import java.nio.file.Path;
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
@@ -37,6 +36,6 @@ public interface MetaInfPathValidator ex
* @param filePath the relative file path to the META-INF directory
* @return validation messages or {@code null}
*/
- @CheckForNull Collection<ValidationMessage> validateMetaInfPath(@Nonnull Path filePath);
+ @Nullable Collection<ValidationMessage> validateMetaInfPath(@NotNull Path filePath);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/NodePathValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/NodePathValidator.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/NodePathValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/NodePathValidator.java Wed Dec 18 10:31:28 2019
@@ -18,9 +18,8 @@ package org.apache.jackrabbit.vault.vali
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
@@ -38,6 +37,6 @@ public interface NodePathValidator exten
* @param nodePath the absolute node path
* @return validation messages or {@code null}
*/
- @CheckForNull Collection<ValidationMessage> validate(@Nonnull String nodePath);
+ @Nullable Collection<ValidationMessage> validate(@NotNull String nodePath);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/PropertiesValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/PropertiesValidator.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/PropertiesValidator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/PropertiesValidator.java Wed Dec 18 10:31:28 2019
@@ -18,10 +18,9 @@ package org.apache.jackrabbit.vault.vali
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.vault.packaging.PackageProperties;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -36,5 +35,5 @@ public interface PropertiesValidator ext
* @param properties the deserialized properties.xml
* @return validation messages or {@code null}
*/
- @CheckForNull Collection<ValidationMessage> validate(@Nonnull PackageProperties properties);
+ @Nullable Collection<ValidationMessage> validate(@NotNull PackageProperties properties);
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationContext.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationContext.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/ValidationContext.java Wed Dec 18 10:31:28 2019
@@ -19,11 +19,10 @@ package org.apache.jackrabbit.vault.vali
import java.nio.file.Path;
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.vault.packaging.PackageInfo;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -38,19 +37,19 @@ public interface ValidationContext exten
*
* @return the package properties or some exception in case none could be found (will always point to the root package's properties).
*/
- @Nonnull PackageProperties getProperties();
+ @NotNull PackageProperties getProperties();
/**
* Returns the validation context of the container package.
* @return the validation context of the container in case this is the context of a sub package otherwise {@code null}.
*/
- @CheckForNull ValidationContext getContainerValidationContext();
+ @Nullable ValidationContext getContainerValidationContext();
/**
* Returns the root path of the package.
* @return either the path to the ZIP file or a directory containing an exploded package.
*/
- @Nonnull Path getPackageRootPath();
+ @NotNull Path getPackageRootPath();
/**
* PackageInfo for all resolved package dependencies.
@@ -58,5 +57,5 @@ public interface ValidationContext exten
* carry the main metadata of the dependencies.
* @return the package info of all resolved package dependencies (i.e. the ones for which an artifact was found).
*/
- @Nonnull Collection<PackageInfo> getDependenciesMetaInfo();
+ @NotNull Collection<PackageInfo> getDependenciesMetaInfo();
}
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=1871737&r1=1871736&r2=1871737&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 Wed Dec 18 10:31:28 2019
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.vault.validation.spi;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Class encapsulating the actual message together with a {@link ValidationMessageSeverity}.
@@ -33,15 +33,15 @@ public class ValidationMessage {
/** the underlying exception if there was any, may be null */
private final Throwable throwable;
- public ValidationMessage(@Nonnull ValidationMessageSeverity severity, @Nonnull String message) {
+ public ValidationMessage(@NotNull ValidationMessageSeverity severity, @NotNull String message) {
this(severity, message, 0, 0, null);
}
- public ValidationMessage(@Nonnull ValidationMessageSeverity severity, @Nonnull String message, Throwable throwable) {
+ public ValidationMessage(@NotNull ValidationMessageSeverity severity, @NotNull String message, Throwable throwable) {
this(severity, message, 0, 0, throwable);
}
- public ValidationMessage(@Nonnull ValidationMessageSeverity severity, @Nonnull String message, int line, int column, Throwable throwable) {
+ public ValidationMessage(@NotNull ValidationMessageSeverity severity, @NotNull String message, int line, int column, Throwable throwable) {
this.severity = severity;
this.message = message;
this.line = line;
@@ -55,7 +55,7 @@ public class ValidationMessage {
* Returns the severity of this message.
* @return the severity of this message
*/
- public @Nonnull ValidationMessageSeverity getSeverity() {
+ public @NotNull ValidationMessageSeverity getSeverity() {
return severity;
}
@@ -63,7 +63,7 @@ public class ValidationMessage {
* Returns the message text.
* @return the message text
*/
- public @Nonnull String getMessage() {
+ public @NotNull String getMessage() {
return message;
}
@@ -87,7 +87,7 @@ public class ValidationMessage {
* Returns the underlying throwable.
* @return the throwable bound to this message or {@code null} if the message has no underlying throwable
*/
- public @CheckForNull Throwable getThrowable() {
+ public @Nullable Throwable getThrowable() {
return throwable;
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/Validator.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/Validator.java?rev=1871737&r1=1871736&r2=1871737&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/Validator.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/Validator.java Wed Dec 18 10:31:28 2019
@@ -18,8 +18,7 @@ package org.apache.jackrabbit.vault.vali
import java.util.Collection;
-import javax.annotation.CheckForNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -35,7 +34,7 @@ public interface Validator {
* Called when the validation is done for one {@link ValidationContext} (this instance is no longer needed)
* @return validation messages or {@code null}
*/
- @CheckForNull Collection<ValidationMessage> done();
+ @Nullable Collection<ValidationMessage> done();
}