Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java Wed Nov 7 14:48:58 2018 @@ -24,7 +24,6 @@ import java.io.InputStream; import java.math.BigDecimal; import java.util.Calendar; -import javax.annotation.Nonnull; import javax.jcr.Binary; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; @@ -41,6 +40,7 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.plugins.value.Conversions; import org.apache.jackrabbit.oak.plugins.value.ErrorValue; import org.apache.jackrabbit.oak.plugins.value.OakValue; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,7 +66,7 @@ class ValueImpl implements JackrabbitVal * @throws IllegalArgumentException if {@code index < propertyState.count()} * @throws RepositoryException if the underlying node state cannot be accessed */ - ValueImpl(@Nonnull PropertyState property, int index, @Nonnull NamePathMapper namePathMapper) + ValueImpl(@NotNull PropertyState property, int index, @NotNull NamePathMapper namePathMapper) throws RepositoryException { checkArgument(index < property.count()); this.propertyState = checkNotNull(property); @@ -83,7 +83,7 @@ class ValueImpl implements JackrabbitVal * @throws IllegalArgumentException if {@code property.isArray()} is {@code true}. * @throws RepositoryException if the underlying node state cannot be accessed */ - ValueImpl(@Nonnull PropertyState property, @Nonnull NamePathMapper namePathMapper) + ValueImpl(@NotNull PropertyState property, @NotNull NamePathMapper namePathMapper) throws RepositoryException { this(checkSingleValued(property), 0, namePathMapper); } @@ -101,8 +101,8 @@ class ValueImpl implements JackrabbitVal * the internal representation. * @throws IllegalArgumentException if {@code index < propertyState.count()} */ - @Nonnull - static Value newValue(@Nonnull PropertyState property, int index, @Nonnull NamePathMapper namePathMapper) { + @NotNull + static Value newValue(@NotNull PropertyState property, int index, @NotNull NamePathMapper namePathMapper) { try { return new ValueImpl(property, index, namePathMapper); } catch (RepositoryException e) { @@ -117,8 +117,8 @@ class ValueImpl implements JackrabbitVal * the internal representation. * @throws IllegalArgumentException if {@code property.isArray()} is {@code true}. */ - @Nonnull - static Value newValue(@Nonnull PropertyState property, @Nonnull NamePathMapper namePathMapper) { + @NotNull + static Value newValue(@NotNull PropertyState property, @NotNull NamePathMapper namePathMapper) { try { return new ValueImpl(property, 0, namePathMapper); } catch (RepositoryException e) { @@ -389,4 +389,4 @@ class ValueImpl implements JackrabbitVal } } -} \ No newline at end of file +}
Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/cluster/ClusterRepositoryInfo.java Wed Nov 7 14:48:58 2018 @@ -20,9 +20,6 @@ import static com.google.common.base.Pre import java.util.UUID; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; @@ -30,6 +27,8 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,8 +59,8 @@ public class ClusterRepositoryInfo { * @param store the NodeStore instance * @return the persistent clusterId */ - @CheckForNull - public static String getOrCreateId(@Nonnull NodeStore store) { + @Nullable + public static String getOrCreateId(@NotNull NodeStore store) { checkNotNull(store, "store is null"); // first try to read an existing clusterId Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java Wed Nov 7 14:48:58 2018 @@ -32,11 +32,10 @@ import java.util.concurrent.Callable; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; - import com.google.common.base.Predicate; import org.apache.jackrabbit.oak.commons.concurrent.NotifyingFutureTask; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -149,10 +148,10 @@ public class BackgroundObserver implemen private volatile boolean stopped; public BackgroundObserver( - @Nonnull Observer observer, - @Nonnull Executor executor, + @NotNull Observer observer, + @NotNull Executor executor, int queueLength, - @Nonnull UncaughtExceptionHandler exceptionHandler) { + @NotNull UncaughtExceptionHandler exceptionHandler) { this.observer = checkNotNull(observer); this.executor = checkNotNull(executor); this.exceptionHandler = checkNotNull(exceptionHandler); @@ -161,8 +160,8 @@ public class BackgroundObserver implemen } public BackgroundObserver( - @Nonnull final Observer observer, - @Nonnull Executor executor, + @NotNull final Observer observer, + @NotNull Executor executor, int queueLength) { this(observer, executor, queueLength, new UncaughtExceptionHandler() { @Override @@ -173,8 +172,8 @@ public class BackgroundObserver implemen } public BackgroundObserver( - @Nonnull Observer observer, - @Nonnull Executor executor) { + @NotNull Observer observer, + @NotNull Executor executor) { this(observer, executor, DEFAULT_QUEUE_SIZE); } @@ -218,7 +217,7 @@ public class BackgroundObserver implemen stopped = true; } - @Nonnull + @NotNull public BackgroundObserverMBean getMBean(){ return new BackgroundObserverMBean() { @Override @@ -264,7 +263,7 @@ public class BackgroundObserver implemen * @throws IllegalStateException if {@link #close()} has already been called. */ @Override - public synchronized void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) { + public synchronized void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) { checkState(!stopped); checkNotNull(root); checkNotNull(info); @@ -311,7 +310,7 @@ public class BackgroundObserver implemen //------------------------------------------------------------< internal >--- - private static Logger getLogger(@Nonnull Observer observer) { + private static Logger getLogger(@NotNull Observer observer) { return LoggerFactory.getLogger(checkNotNull(observer).getClass()); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ChangeDispatcher.java Wed Nov 7 14:48:58 2018 @@ -22,10 +22,9 @@ import static com.google.common.base.Pre import java.io.Closeable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A {@code ChangeDispatcher} instance dispatches content changes @@ -39,14 +38,14 @@ import org.apache.jackrabbit.oak.spi.sta public class ChangeDispatcher implements Observable, Observer { private final CompositeObserver observers = new CompositeObserver(); - @Nonnull + @NotNull private NodeState root; /** * Create a new instance for dispatching content changes * @param root current root node state */ - public ChangeDispatcher(@Nonnull NodeState root) { + public ChangeDispatcher(@NotNull NodeState root) { this.root = checkNotNull(root); } @@ -61,7 +60,7 @@ public class ChangeDispatcher implements * @return a {@link Closeable} instance */ @Override - @Nonnull + @NotNull public synchronized Closeable addObserver(final Observer observer) { observer.contentChanged(root, CommitInfo.EMPTY_EXTERNAL); observers.addObserver(observer); @@ -74,7 +73,7 @@ public class ChangeDispatcher implements } @Override - public synchronized void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) { + public synchronized void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) { checkNotNull(root); checkNotNull(info); observers.contentChanged(root, info); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitContext.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitContext.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitContext.java Wed Nov 7 14:48:58 2018 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.CheckForNull; +import org.jetbrains.annotations.Nullable; /** * A CommitContext instance can be obtained from {@link CommitInfo#getInfo()} @@ -58,7 +58,7 @@ public interface CommitContext { * @return an <code>Object</code> containing the value * of the attribute, or <code>null</code> if the attribute does not exist */ - @CheckForNull + @Nullable Object get(String name); /** Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java Wed Nov 7 14:48:58 2018 @@ -16,10 +16,9 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * Extension point for validating and modifying content changes. Available @@ -49,7 +48,7 @@ public interface CommitHook { * @return content tree to be committed * @throws CommitFailedException if the commit should be rejected */ - @Nonnull + @NotNull NodeState processCommit(NodeState before, NodeState after, CommitInfo info) throws CommitFailedException; Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java Wed Nov 7 14:48:58 2018 @@ -24,12 +24,11 @@ import static com.google.common.base.Pre import java.util.Collections; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Objects; import org.apache.jackrabbit.oak.api.Root; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Commit info instances associate some meta data with a commit. @@ -69,7 +68,7 @@ public final class CommitInfo { * @param userId The user id. */ public CommitInfo( - @Nonnull String sessionId, @Nullable String userId) { + @NotNull String sessionId, @Nullable String userId) { this(sessionId, userId, Collections.<String, Object>emptyMap()); } @@ -80,7 +79,7 @@ public final class CommitInfo { * @param userId The user id. * @param info info map */ - public CommitInfo(@Nonnull String sessionId, @Nullable String userId, Map<String, Object> info) { + public CommitInfo(@NotNull String sessionId, @Nullable String userId, Map<String, Object> info) { this(sessionId, userId, info, false); } @@ -91,7 +90,7 @@ public final class CommitInfo { * @param info info map * @param external indicates if the commit info is from external change */ - public CommitInfo(@Nonnull String sessionId, @Nullable String userId, Map<String, Object> info, boolean external) { + public CommitInfo(@NotNull String sessionId, @Nullable String userId, Map<String, Object> info, boolean external) { this.sessionId = checkNotNull(sessionId); this.userId = (userId == null) ? OAK_UNKNOWN : userId; this.info = checkNotNull(info); @@ -101,7 +100,7 @@ public final class CommitInfo { /** * @return id of the committing session */ - @Nonnull + @NotNull public String getSessionId() { return sessionId; } @@ -109,7 +108,7 @@ public final class CommitInfo { /** * @return user id of the committing user */ - @Nonnull + @NotNull public String getUserId() { return userId; } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeConflictHandler.java Wed Nov 7 14:48:58 2018 @@ -34,11 +34,10 @@ import static org.apache.jackrabbit.oak. import java.util.LinkedList; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * A {@code CompositeConflictHandler} delegates conflict handling @@ -57,7 +56,7 @@ public class CompositeConflictHandler im * handlers. * @param handlers the backing handlers */ - public CompositeConflictHandler(@Nonnull Iterable<ThreeWayConflictHandler> handlers) { + public CompositeConflictHandler(@NotNull Iterable<ThreeWayConflictHandler> handlers) { this.handlers = newLinkedList(checkNotNull(handlers)); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java Wed Nov 7 14:48:58 2018 @@ -22,22 +22,21 @@ import static java.util.Arrays.asList; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import com.google.common.collect.Lists; import java.util.Collection; import java.util.List; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - /** * Aggregation of a list of editors into a single editor. */ public class CompositeEditor implements Editor { - @CheckForNull - public static Editor compose(@Nonnull Collection<? extends Editor> editors) { + @Nullable + public static Editor compose(@NotNull Collection<? extends Editor> editors) { checkNotNull(editors); switch (editors.size()) { case 0: Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java Wed Nov 7 14:48:58 2018 @@ -22,12 +22,11 @@ import static java.util.Arrays.asList; import java.util.Collection; import java.util.List; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import com.google.common.collect.Lists; @@ -38,7 +37,7 @@ public class CompositeEditorProvider imp private static final EditorProvider EMPTY_PROVIDER = new EditorProvider() { - @Override @CheckForNull + @Override @Nullable public Editor getRootEditor( NodeState before, NodeState after, NodeBuilder builder, CommitInfo info) { @@ -46,9 +45,9 @@ public class CompositeEditorProvider imp } }; - @Nonnull + @NotNull public static EditorProvider compose( - @Nonnull Collection<? extends EditorProvider> providers) { + @NotNull Collection<? extends EditorProvider> providers) { checkNotNull(providers); switch (providers.size()) { case 0: @@ -71,7 +70,7 @@ public class CompositeEditorProvider imp this(asList(providers)); } - @Override @CheckForNull + @Override @Nullable public Editor getRootEditor( NodeState before, NodeState after, NodeBuilder builder, CommitInfo info) throws CommitFailedException { Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeHook.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeHook.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeHook.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeHook.java Wed Nov 7 14:48:58 2018 @@ -19,10 +19,9 @@ package org.apache.jackrabbit.oak.spi.co import java.util.Arrays; import java.util.Collection; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * Composite commit hook. Maintains a list of component hooks and takes @@ -30,7 +29,7 @@ import org.apache.jackrabbit.oak.spi.sta */ public class CompositeHook implements CommitHook { - public static CommitHook compose(@Nonnull Collection<CommitHook> hooks) { + public static CommitHook compose(@NotNull Collection<CommitHook> hooks) { switch (hooks.size()) { case 0: return EmptyHook.INSTANCE; @@ -43,7 +42,7 @@ public class CompositeHook implements Co private final Collection<CommitHook> hooks; - private CompositeHook(@Nonnull Collection<CommitHook> hooks) { + private CompositeHook(@NotNull Collection<CommitHook> hooks) { this.hooks = hooks; } @@ -51,7 +50,7 @@ public class CompositeHook implements Co this(Arrays.asList(hooks)); } - @Nonnull + @NotNull @Override public NodeState processCommit( NodeState before, NodeState after, CommitInfo info) Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeObserver.java Wed Nov 7 14:48:58 2018 @@ -22,9 +22,8 @@ import static com.google.common.collect. import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * Composite observer that delegates all content changes to the set of @@ -34,11 +33,11 @@ public class CompositeObserver implement private final Set<Observer> observers = newIdentityHashSet(); - public synchronized void addObserver(@Nonnull Observer observer) { + public synchronized void addObserver(@NotNull Observer observer) { checkState(observers.add(checkNotNull(observer))); } - public synchronized void removeObserver(@Nonnull Observer observer) { + public synchronized void removeObserver(@NotNull Observer observer) { checkState(observers.remove(checkNotNull(observer))); } @@ -46,7 +45,7 @@ public class CompositeObserver implement @Override public synchronized void contentChanged( - @Nonnull NodeState root, @Nonnull CommitInfo info) { + @NotNull NodeState root, @NotNull CommitInfo info) { checkNotNull(root); for (Observer observer : observers) { observer.contentChanged(root, info); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandler.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandler.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandler.java Wed Nov 7 14:48:58 2018 @@ -18,11 +18,10 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * A {@code ConflictHandler} is responsible for handling conflicts which happen @@ -52,7 +51,7 @@ public interface ConflictHandler extends * @return {@link Resolution} of the conflict */ @Override - @Nonnull + @NotNull Resolution addExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs); /** @@ -64,7 +63,7 @@ public interface ConflictHandler extends * @return {@link Resolution} of the conflict */ @Override - @Nonnull + @NotNull Resolution changeDeletedProperty(NodeBuilder parent, PropertyState ours); /** @@ -77,7 +76,7 @@ public interface ConflictHandler extends * @return {@link Resolution} of the conflict */ @Override - @Nonnull + @NotNull Resolution changeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs); /** @@ -89,7 +88,7 @@ public interface ConflictHandler extends * @return {@link Resolution} of the conflict */ @Override - @Nonnull + @NotNull Resolution deleteDeletedProperty(NodeBuilder parent, PropertyState ours); /** @@ -101,7 +100,7 @@ public interface ConflictHandler extends * @return {@link Resolution} of the conflict */ @Override - @Nonnull + @NotNull Resolution deleteChangedProperty(NodeBuilder parent, PropertyState theirs); /** @@ -115,7 +114,7 @@ public interface ConflictHandler extends * @return {@link Resolution} of the conflict */ @Override - @Nonnull + @NotNull Resolution addExistingNode(NodeBuilder parent, String name, NodeState ours, NodeState theirs); /** @@ -128,7 +127,7 @@ public interface ConflictHandler extends * @return {@link Resolution} of the conflict */ @Override - @Nonnull + @NotNull Resolution changeDeletedNode(NodeBuilder parent, String name, NodeState ours); /** @@ -141,7 +140,7 @@ public interface ConflictHandler extends * @return {@link Resolution} of the conflict */ @Override - @Nonnull + @NotNull Resolution deleteChangedNode(NodeBuilder parent, String name, NodeState theirs); /** @@ -153,6 +152,6 @@ public interface ConflictHandler extends * @return {@link Resolution} of the conflict */ @Override - @Nonnull + @NotNull Resolution deleteDeletedNode(NodeBuilder parent, String name); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/DiffObserver.java Wed Nov 7 14:48:58 2018 @@ -18,10 +18,9 @@ package org.apache.jackrabbit.oak.spi.co import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; /** * Abstract base class for observers that use a content diff to determine @@ -42,14 +41,14 @@ public abstract class DiffObserver imple * @return diff handler for this change */ protected abstract NodeStateDiff getRootDiff( - @Nonnull NodeState before, @Nonnull NodeState after, - @Nonnull CommitInfo info); + @NotNull NodeState before, @NotNull NodeState after, + @NotNull CommitInfo info); //----------------------------------------------------------< Observer >-- @Override public final synchronized void contentChanged( - @Nonnull NodeState root, @Nonnull CommitInfo info) { + @NotNull NodeState root, @NotNull CommitInfo info) { checkNotNull(root); if (before != null) { NodeStateDiff diff = getRootDiff(before, root, info); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Editor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Editor.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Editor.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Editor.java Wed Nov 7 14:48:58 2018 @@ -16,12 +16,11 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.CheckForNull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.Nullable; /** * Content change editor. An editor receives information about changes @@ -100,7 +99,7 @@ public interface Editor { * or {@code null} if the subtree does not need processing * @throws CommitFailedException if processing failed */ - @CheckForNull + @Nullable Editor childNodeAdded(String name, NodeState after) throws CommitFailedException; @@ -115,7 +114,7 @@ public interface Editor { * or {@code null} if the subtree does not need processing * @throws CommitFailedException if processing failed */ - @CheckForNull + @Nullable Editor childNodeChanged( String name, NodeState before, NodeState after) throws CommitFailedException; @@ -129,7 +128,7 @@ public interface Editor { * or {@code null} if the subtree does not need processing * @throws CommitFailedException if processing failed */ - @CheckForNull + @Nullable Editor childNodeDeleted(String name, NodeState before) throws CommitFailedException; Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java Wed Nov 7 14:48:58 2018 @@ -19,13 +19,12 @@ package org.apache.jackrabbit.oak.spi.co import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class EditorDiff implements NodeStateDiff { @@ -38,10 +37,10 @@ public class EditorDiff implements NodeS * @param after state of the modified subtree * @return exception if the processing failed, {@code null} otherwise */ - @CheckForNull + @Nullable public static CommitFailedException process( - @CheckForNull Editor editor, - @Nonnull NodeState before, @Nonnull NodeState after) { + @Nullable Editor editor, + @NotNull NodeState before, @NotNull NodeState after) { checkNotNull(before); checkNotNull(after); if (editor != null) { @@ -182,4 +181,4 @@ public class EditorDiff implements NodeS } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorHook.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorHook.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorHook.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorHook.java Wed Nov 7 14:48:58 2018 @@ -16,11 +16,10 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkNotNull; @@ -37,14 +36,14 @@ public class EditorHook implements Commi private final EditorProvider provider; - public EditorHook(@Nonnull EditorProvider provider) { + public EditorHook(@NotNull EditorProvider provider) { this.provider = checkNotNull(provider); } - @Override @Nonnull + @Override @NotNull public NodeState processCommit( - @Nonnull NodeState before, @Nonnull NodeState after, - @Nonnull CommitInfo info) throws CommitFailedException { + @NotNull NodeState before, @NotNull NodeState after, + @NotNull CommitInfo info) throws CommitFailedException { checkNotNull(before); checkNotNull(after); checkNotNull(info); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorProvider.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorProvider.java Wed Nov 7 14:48:58 2018 @@ -19,8 +19,7 @@ package org.apache.jackrabbit.oak.spi.co import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; - -import javax.annotation.CheckForNull; +import org.jetbrains.annotations.Nullable; /** * Extension point for content change editors. Used by the {@link EditorHook} @@ -50,7 +49,7 @@ public interface EditorProvider { * @return editor for processing the changes, or {@code null} * @throws CommitFailedException if processing failed */ - @CheckForNull + @Nullable Editor getRootEditor( NodeState before, NodeState after, NodeBuilder builder, CommitInfo info) throws CommitFailedException; Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyHook.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyHook.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyHook.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyHook.java Wed Nov 7 14:48:58 2018 @@ -16,10 +16,9 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * Basic commit hook implementation that by default doesn't do anything. @@ -43,7 +42,7 @@ public class EmptyHook implements Commit */ public static final CommitHook INSTANCE = new EmptyHook(); - @Nonnull + @NotNull @Override public NodeState processCommit( NodeState before, NodeState after, CommitInfo info) Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java Wed Nov 7 14:48:58 2018 @@ -16,9 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * Basic content change observer that doesn't do anything. Useful as a @@ -34,7 +33,7 @@ public class EmptyObserver implements Ob @Override public void contentChanged( - @Nonnull NodeState root, @Nonnull CommitInfo info) { + @NotNull NodeState root, @NotNull CommitInfo info) { // do nothing } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/MoveTracker.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/MoveTracker.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/MoveTracker.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/MoveTracker.java Wed Nov 7 14:48:58 2018 @@ -20,13 +20,12 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Utility to keep track of the move operations that are performed between two @@ -45,7 +44,7 @@ public class MoveTracker { public MoveTracker() { } - public void addMove(@Nonnull String sourcePath, @Nonnull String destPath) { + public void addMove(@NotNull String sourcePath, @NotNull String destPath) { // calculate original source path String originalSource = sourcePath; for (MoveEntry me : Lists.reverse(entries)) { @@ -67,7 +66,7 @@ public class MoveTracker { return entries.isEmpty(); } - @CheckForNull + @Nullable public String getSourcePath(String destPath) { for (MoveEntry me : Lists.reverse(entries)) { if (me.destPath.equals(destPath)) { @@ -77,7 +76,7 @@ public class MoveTracker { return null; } - @CheckForNull + @Nullable public String getDestPath(String sourcePath) { for (MoveEntry me : Lists.reverse(entries)) { if (me.sourcePath.equals(sourcePath)) { @@ -87,7 +86,7 @@ public class MoveTracker { return null; } - public boolean containsMove(@CheckForNull String path) { + public boolean containsMove(@Nullable String path) { if (path != null) { for (String p : Iterables.concat(parentSourcePaths, parentDestPaths)) { if (Text.isDescendantOrEqual(path, p)) { @@ -109,8 +108,8 @@ public class MoveTracker { private final String sourcePath; private String destPath; - private MoveEntry(@Nonnull String sourcePath, - @Nonnull String destPath) { + private MoveEntry(@NotNull String sourcePath, + @NotNull String destPath) { this.sourcePath = sourcePath; this.destPath = destPath; @@ -118,4 +117,4 @@ public class MoveTracker { parentDestPaths.add(Text.getRelativeParent(destPath, 1)); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Observer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Observer.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Observer.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Observer.java Wed Nov 7 14:48:58 2018 @@ -16,9 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * Extension point for observing changes in an Oak repository. Observer @@ -69,6 +68,6 @@ public interface Observer { * @param root root state of the repository * @param info commit information */ - void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info); + void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java Wed Nov 7 14:48:58 2018 @@ -27,10 +27,9 @@ import static org.apache.jackrabbit.oak. import java.io.Closeable; import java.util.Map; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.commit.Observable; import org.apache.jackrabbit.oak.spi.commit.Observer; +import org.jetbrains.annotations.NotNull; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; @@ -43,11 +42,11 @@ public class ObserverTracker implements private BundleContext bundleContext; private ServiceTracker observerTracker; - public ObserverTracker(@Nonnull Observable observable) { + public ObserverTracker(@NotNull Observable observable) { this.observable = checkNotNull(observable); } - public void start(@Nonnull BundleContext bundleContext) { + public void start(@NotNull BundleContext bundleContext) { checkState(this.bundleContext == null); this.bundleContext = checkNotNull(bundleContext); observerTracker = new ServiceTracker(bundleContext, Observer.class.getName(), this); Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/PartialConflictHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/PartialConflictHandler.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/PartialConflictHandler.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/PartialConflictHandler.java Wed Nov 7 14:48:58 2018 @@ -19,11 +19,10 @@ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.CheckForNull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.Nullable; /** * A {@code PartialConflictHandler} is responsible for handling conflicts which happen @@ -74,7 +73,7 @@ public interface PartialConflictHandler * @param theirs their version of the property * @return {@link Resolution} of the conflict or {@code null} */ - @CheckForNull + @Nullable Resolution addExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs); /** @@ -85,7 +84,7 @@ public interface PartialConflictHandler * @param ours our version of the property * @return {@link Resolution} of the conflict or {@code null} */ - @CheckForNull + @Nullable Resolution changeDeletedProperty(NodeBuilder parent, PropertyState ours); /** @@ -97,7 +96,7 @@ public interface PartialConflictHandler * @param theirs their version of the property * @return {@link Resolution} of the conflict or {@code null} */ - @CheckForNull + @Nullable Resolution changeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs); /** @@ -108,7 +107,7 @@ public interface PartialConflictHandler * @param ours our version of the property * @return {@link Resolution} of the conflict or {@code null} */ - @CheckForNull + @Nullable Resolution deleteDeletedProperty(NodeBuilder parent, PropertyState ours); /** @@ -119,7 +118,7 @@ public interface PartialConflictHandler * @param theirs their version of the property * @return {@link Resolution} of the conflict or {@code null} */ - @CheckForNull + @Nullable Resolution deleteChangedProperty(NodeBuilder parent, PropertyState theirs); /** @@ -132,7 +131,7 @@ public interface PartialConflictHandler * @param theirs their version of the node * @return {@link Resolution} of the conflict or {@code null} */ - @CheckForNull + @Nullable Resolution addExistingNode(NodeBuilder parent, String name, NodeState ours, NodeState theirs); /** @@ -144,7 +143,7 @@ public interface PartialConflictHandler * @param ours our version of the node * @return {@link Resolution} of the conflict or {@code null} */ - @CheckForNull + @Nullable Resolution changeDeletedNode(NodeBuilder parent, String name, NodeState ours); /** @@ -156,7 +155,7 @@ public interface PartialConflictHandler * @param theirs their version of the node * @return {@link Resolution} of the conflict or {@code null} */ - @CheckForNull + @Nullable Resolution deleteChangedNode(NodeBuilder parent, String name, NodeState theirs); /** @@ -167,6 +166,6 @@ public interface PartialConflictHandler * @param name name of the node * @return {@link Resolution} of the conflict or {@code null} */ - @CheckForNull + @Nullable Resolution deleteDeletedNode(NodeBuilder parent, String name); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ProgressNotificationEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ProgressNotificationEditor.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ProgressNotificationEditor.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ProgressNotificationEditor.java Wed Nov 7 14:48:58 2018 @@ -21,13 +21,11 @@ package org.apache.jackrabbit.oak.spi.co import static org.apache.jackrabbit.oak.commons.PathUtils.concat; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; /** @@ -40,8 +38,8 @@ public class ProgressNotificationEditor private final String path; private final Function<String, Void> onProgress; - @CheckForNull - public static Editor wrap(@CheckForNull Editor editor, final Logger logger, final String message) { + @Nullable + public static Editor wrap(@Nullable Editor editor, final Logger logger, final String message) { if (editor != null && !(editor instanceof ProgressNotificationEditor)) { return new ProgressNotificationEditor(editor, "/", new Function<String, Void>() { int count; Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ResetCommitAttributeHook.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ResetCommitAttributeHook.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ResetCommitAttributeHook.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ResetCommitAttributeHook.java Wed Nov 7 14:48:58 2018 @@ -19,17 +19,16 @@ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkNotNull; public enum ResetCommitAttributeHook implements CommitHook { INSTANCE; - @Nonnull + @NotNull @Override public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) throws CommitFailedException { Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeEditor.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeEditor.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/SubtreeEditor.java Wed Nov 7 14:48:58 2018 @@ -19,9 +19,8 @@ package org.apache.jackrabbit.oak.spi.co import static com.google.common.base.Preconditions.checkElementIndex; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.CheckForNull; - import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.Nullable; /** * Editor wrapper that passes only changes in the specified subtree to @@ -58,18 +57,18 @@ public class SubtreeEditor extends Defau } } - @Override @CheckForNull + @Override @Nullable public Editor childNodeAdded(String name, NodeState after) { return descend(name); } - @Override @CheckForNull + @Override @Nullable public Editor childNodeChanged( String name, NodeState before, NodeState after) { return descend(name); } - @Override @CheckForNull + @Override @Nullable public Editor childNodeDeleted(String name, NodeState before) { return descend(name); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ThreeWayConflictHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ThreeWayConflictHandler.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ThreeWayConflictHandler.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ThreeWayConflictHandler.java Wed Nov 7 14:48:58 2018 @@ -18,11 +18,10 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; /** * A {@code ThreeWayConflictHandler} is responsible for handling conflicts which happen @@ -73,9 +72,9 @@ public interface ThreeWayConflictHandler * @param theirs their version of the property * @return {@link Resolution} of the conflict */ - @Nonnull - Resolution addExistingProperty(@Nonnull NodeBuilder parent, @Nonnull PropertyState ours, - @Nonnull PropertyState theirs); + @NotNull + Resolution addExistingProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours, + @NotNull PropertyState theirs); /** * The property {@code ours} has been changed in {@code parent} while it was @@ -86,9 +85,9 @@ public interface ThreeWayConflictHandler * @param base the base version of the property * @return {@link Resolution} of the conflict */ - @Nonnull - Resolution changeDeletedProperty(@Nonnull NodeBuilder parent, @Nonnull PropertyState ours, - @Nonnull PropertyState base); + @NotNull + Resolution changeDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours, + @NotNull PropertyState base); /** * The property {@code ours} has been changed in {@code parent} while it was @@ -100,9 +99,9 @@ public interface ThreeWayConflictHandler * @param base the base version of the property * @return {@link Resolution} of the conflict */ - @Nonnull - Resolution changeChangedProperty(@Nonnull NodeBuilder parent, @Nonnull PropertyState ours, - @Nonnull PropertyState theirs, @Nonnull PropertyState base); + @NotNull + Resolution changeChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours, + @NotNull PropertyState theirs, @NotNull PropertyState base); /** * The property {@code ours} has been removed in {@code parent} while it was @@ -112,8 +111,8 @@ public interface ThreeWayConflictHandler * @param base the base version of the property * @return {@link Resolution} of the conflict */ - @Nonnull - Resolution deleteDeletedProperty(@Nonnull NodeBuilder parent, @Nonnull PropertyState base); + @NotNull + Resolution deleteDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState base); /** * The property {@code theirs} changed in the persistence store while it has been @@ -124,9 +123,9 @@ public interface ThreeWayConflictHandler * @param base the base version of the property * @return {@link Resolution} of the conflict */ - @Nonnull - Resolution deleteChangedProperty(@Nonnull NodeBuilder parent, @Nonnull PropertyState theirs, - @Nonnull PropertyState base); + @NotNull + Resolution deleteChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState theirs, + @NotNull PropertyState base); /** * The node {@code ours} has been added to {@code parent} which conflicts @@ -138,9 +137,9 @@ public interface ThreeWayConflictHandler * @param theirs their version of the node * @return {@link Resolution} of the conflict */ - @Nonnull - Resolution addExistingNode(@Nonnull NodeBuilder parent, @Nonnull String name, @Nonnull NodeState ours, - @Nonnull NodeState theirs); + @NotNull + Resolution addExistingNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState ours, + @NotNull NodeState theirs); /** * The node {@code ours} has been changed in {@code parent} while it was @@ -152,9 +151,9 @@ public interface ThreeWayConflictHandler * @param base the base version of the node * @return {@link Resolution} of the conflict */ - @Nonnull - Resolution changeDeletedNode(@Nonnull NodeBuilder parent, @Nonnull String name, @Nonnull NodeState ours, - @Nonnull NodeState base); + @NotNull + Resolution changeDeletedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState ours, + @NotNull NodeState base); /** * The node {@code theirs} changed in the persistence store while it has been @@ -166,9 +165,9 @@ public interface ThreeWayConflictHandler * @param base the base version of the node * @return {@link Resolution} of the conflict */ - @Nonnull - Resolution deleteChangedNode(@Nonnull NodeBuilder parent, @Nonnull String name, @Nonnull NodeState theirs, - @Nonnull NodeState base); + @NotNull + Resolution deleteChangedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState theirs, + @NotNull NodeState base); /** * The node {@code name} has been removed in {@code parent} while it was @@ -179,6 +178,6 @@ public interface ThreeWayConflictHandler * @param base the base version of the node * @return {@link Resolution} of the conflict */ - @Nonnull - Resolution deleteDeletedNode(@Nonnull NodeBuilder parent, @Nonnull String name, @Nonnull NodeState base); + @NotNull + Resolution deleteDeletedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState base); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Validator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Validator.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Validator.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/Validator.java Wed Nov 7 14:48:58 2018 @@ -19,8 +19,7 @@ package org.apache.jackrabbit.oak.spi.co import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeState; - -import javax.annotation.CheckForNull; +import org.jetbrains.annotations.Nullable; /** * Content change validator. An instance of this interface is used to @@ -64,7 +63,7 @@ public interface Validator extends Edito * should not decent into the subtree rooted at {@code after}. * @throws CommitFailedException if validation fails. */ - @CheckForNull + @Nullable Validator childNodeAdded(String name, NodeState after) throws CommitFailedException; @@ -77,7 +76,7 @@ public interface Validator extends Edito * should not decent into the subtree rooted at {@code after}. * @throws CommitFailedException if validation fails. */ - @CheckForNull + @Nullable Validator childNodeChanged( String name, NodeState before, NodeState after) throws CommitFailedException; @@ -90,7 +89,7 @@ public interface Validator extends Edito * {@code null} if validation should not decent into the subtree * @throws CommitFailedException if validation fails. */ - @CheckForNull + @Nullable Validator childNodeDeleted(String name, NodeState before) throws CommitFailedException; Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java Wed Nov 7 14:48:58 2018 @@ -18,8 +18,7 @@ package org.apache.jackrabbit.oak.spi.co import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; - -import javax.annotation.CheckForNull; +import org.jetbrains.annotations.Nullable; /** * Extension point for plugging in different kinds of validation rules @@ -40,13 +39,13 @@ public abstract class ValidatorProvider * @return validator for checking the modifications, * or {@code null} if this validator is not needed for this commit */ - @CheckForNull + @Nullable protected abstract Validator getRootValidator( NodeState before, NodeState after, CommitInfo info); //----------------------------------------------------< EditorProvider >-- - @Override @CheckForNull + @Override @Nullable public final Editor getRootEditor( NodeState before, NodeState after, NodeBuilder builder, CommitInfo info) { Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java Wed Nov 7 14:48:58 2018 @@ -19,11 +19,10 @@ package org.apache.jackrabbit.oak.spi.co import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.spi.state.NodeStateUtils.isHidden; -import javax.annotation.CheckForNull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.Nullable; /** * Editor wrapper that passes only changes to non-hidden nodes and properties @@ -34,8 +33,8 @@ import org.apache.jackrabbit.oak.spi.sta */ public class VisibleEditor implements Editor { - @CheckForNull - public static Editor wrap(@CheckForNull Editor editor) { + @Nullable + public static Editor wrap(@Nullable Editor editor) { if (editor != null && !(editor instanceof VisibleEditor)) { return new VisibleEditor(editor); } @@ -83,7 +82,7 @@ public class VisibleEditor implements Ed } } - @Override @CheckForNull + @Override @Nullable public Editor childNodeAdded(String name, NodeState after) throws CommitFailedException { if (!isHidden(name)) { @@ -93,7 +92,7 @@ public class VisibleEditor implements Ed } } - @Override @CheckForNull + @Override @Nullable public Editor childNodeChanged( String name, NodeState before, NodeState after) throws CommitFailedException { @@ -104,7 +103,7 @@ public class VisibleEditor implements Ed } } - @Override @CheckForNull + @Override @Nullable public Editor childNodeDeleted(String name, NodeState before) throws CommitFailedException { if (!isHidden(name)) { Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleValidator.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleValidator.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleValidator.java Wed Nov 7 14:48:58 2018 @@ -16,14 +16,12 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Validator implementation that allows to exclude hidden nodes and/or properties @@ -35,7 +33,7 @@ public class VisibleValidator implements private final boolean hideNodes; private final boolean hideProperties; - public VisibleValidator(@Nonnull Validator validator, boolean hideNodes, boolean hideProperties) { + public VisibleValidator(@NotNull Validator validator, boolean hideNodes, boolean hideProperties) { this.validator = validator; this.hideNodes = hideNodes; this.hideProperties = hideProperties; @@ -100,7 +98,7 @@ public class VisibleValidator implements } } - @Override @CheckForNull + @Override @Nullable public Validator childNodeAdded(String name, NodeState after) throws CommitFailedException { if (isVisibleNode(name)) { return getValidator(validator.childNodeAdded(name, after)); @@ -109,7 +107,7 @@ public class VisibleValidator implements } } - @Override @CheckForNull + @Override @Nullable public Validator childNodeChanged(String name, NodeState before, NodeState after) throws CommitFailedException { if (isVisibleNode(name)) { return getValidator(validator.childNodeChanged(name, before, after)); @@ -118,7 +116,7 @@ public class VisibleValidator implements } } - @Override @CheckForNull + @Override @Nullable public Validator childNodeDeleted(String name, NodeState before) throws CommitFailedException { if (isVisibleNode(name)) { @@ -127,4 +125,4 @@ public class VisibleValidator implements return null; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/WhiteboardEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/WhiteboardEditorProvider.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/WhiteboardEditorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/WhiteboardEditorProvider.java Wed Nov 7 14:48:58 2018 @@ -18,8 +18,6 @@ */ package org.apache.jackrabbit.oak.spi.commit; -import javax.annotation.CheckForNull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.CompositeEditorProvider; @@ -28,6 +26,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker; +import org.jetbrains.annotations.Nullable; /** * Dynamic {@link EditorProvider} based on the available @@ -44,7 +43,7 @@ public class WhiteboardEditorProvider //----------------------------------------------------< EditorProvider >-- @Override - @CheckForNull + @Nullable public Editor getRootEditor( NodeState before, NodeState after, NodeBuilder builder, CommitInfo info) throws CommitFailedException { Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/filter/PathFilter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/filter/PathFilter.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/filter/PathFilter.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/filter/PathFilter.java Wed Nov 7 14:48:58 2018 @@ -25,12 +25,11 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Sets.newHashSet; @@ -75,7 +74,7 @@ public class PathFilter { private static final PathFilter ALL = new PathFilter(INCLUDE_ROOT, Collections.<String>emptyList()) { @Override - public Result filter(@Nonnull String path) { + public Result filter(@NotNull String path) { return Result.INCLUDE; } }; @@ -93,7 +92,7 @@ public class PathFilter { * be the nodestate representing the index definition * @return predicate based on the passed definition state */ - public static PathFilter from(@Nonnull NodeBuilder defn) { + public static PathFilter from(@NotNull NodeBuilder defn) { if (!defn.hasProperty(PROP_EXCLUDED_PATHS) && !defn.hasProperty(PROP_INCLUDED_PATHS)) { return ALL; @@ -128,7 +127,7 @@ public class PathFilter { * @param path path to check * @return result indicating if the path needs to be included, excluded or just traversed */ - public Result filter(@Nonnull String path) { + public Result filter(@NotNull String path) { for (String excludedPath : excludedPaths) { if (excludedPath.equals(path) || isAncestor(excludedPath, path)) { return Result.EXCLUDE; Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java Wed Nov 7 14:48:58 2018 @@ -21,9 +21,8 @@ package org.apache.jackrabbit.oak.spi.li import java.util.Arrays; import java.util.Collection; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.jetbrains.annotations.NotNull; /** * Composite repository initializer that delegates the @@ -43,7 +42,7 @@ public class CompositeInitializer implem } @Override - public void initialize(@Nonnull NodeBuilder builder) { + public void initialize(@NotNull NodeBuilder builder) { for (RepositoryInitializer tracker : initializers) { tracker.initialize(builder); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeWorkspaceInitializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeWorkspaceInitializer.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeWorkspaceInitializer.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeWorkspaceInitializer.java Wed Nov 7 14:48:58 2018 @@ -21,9 +21,8 @@ package org.apache.jackrabbit.oak.spi.li import java.util.Arrays; import java.util.Collection; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.jetbrains.annotations.NotNull; /** * Composite repository initializer that delegates the @@ -34,11 +33,11 @@ public class CompositeWorkspaceInitializ private final Collection<WorkspaceInitializer> initializers; - public CompositeWorkspaceInitializer(@Nonnull Collection<WorkspaceInitializer> trackers) { + public CompositeWorkspaceInitializer(@NotNull Collection<WorkspaceInitializer> trackers) { this.initializers = trackers; } - public CompositeWorkspaceInitializer(@Nonnull WorkspaceInitializer... initializers) { + public CompositeWorkspaceInitializer(@NotNull WorkspaceInitializer... initializers) { this.initializers = Arrays.asList(initializers); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/RepositoryInitializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/RepositoryInitializer.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/RepositoryInitializer.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/RepositoryInitializer.java Wed Nov 7 14:48:58 2018 @@ -18,9 +18,8 @@ */ package org.apache.jackrabbit.oak.spi.lifecycle; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.jetbrains.annotations.NotNull; /** * Initializer of repository content. A component that needs to add specific @@ -35,7 +34,7 @@ public interface RepositoryInitializer { */ RepositoryInitializer DEFAULT = new RepositoryInitializer() { @Override - public void initialize(@Nonnull NodeBuilder builder) { + public void initialize(@NotNull NodeBuilder builder) { } }; @@ -47,5 +46,5 @@ public interface RepositoryInitializer { * * @param builder builder for accessing and modifying repository content */ - void initialize(@Nonnull NodeBuilder builder); + void initialize(@NotNull NodeBuilder builder); } Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java Wed Nov 7 14:48:58 2018 @@ -29,10 +29,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import com.google.common.base.Function; import com.google.common.collect.Iterables; @@ -224,12 +223,12 @@ public abstract class AbstractNodeState } @Override - public boolean hasProperty(@Nonnull String name) { + public boolean hasProperty(@NotNull String name) { return getProperty(name) != null; } @Override - public boolean getBoolean(@Nonnull String name) { + public boolean getBoolean(@NotNull String name) { return getBoolean(this, name); } @@ -243,24 +242,24 @@ public abstract class AbstractNodeState return getString(this, name); } - @Nonnull + @NotNull @Override - public Iterable<String> getStrings(@Nonnull String name) { + public Iterable<String> getStrings(@NotNull String name) { return getStrings(this, name); } - @Override @CheckForNull - public String getName(@Nonnull String name) { + @Override @Nullable + public String getName(@NotNull String name) { return getName(this, name); } - @Override @Nonnull - public Iterable<String> getNames(@Nonnull String name) { + @Override @NotNull + public Iterable<String> getNames(@NotNull String name) { return getNames(this, name); } @Override - public PropertyState getProperty(@Nonnull String name) { + public PropertyState getProperty(@NotNull String name) { for (PropertyState property : getProperties()) { if (name.equals(property.getName())) { return property; Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ChildNodeEntry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ChildNodeEntry.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ChildNodeEntry.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/ChildNodeEntry.java Wed Nov 7 14:48:58 2018 @@ -17,11 +17,11 @@ package org.apache.jackrabbit.oak.spi.state; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + /** * A {@code ChildNodeEntry} instance represents the child node states of a * {@link NodeState}. @@ -40,14 +40,14 @@ public interface ChildNodeEntry { * The name of the child node state wrt. to its parent state. * @return name of the child node */ - @Nonnull + @NotNull String getName(); /** * The child node state * @return child node state */ - @Nonnull + @NotNull NodeState getNodeState(); /** Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/Clusterable.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/Clusterable.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/Clusterable.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/Clusterable.java Wed Nov 7 14:48:58 2018 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.state; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Interface for bearing cluster node specific information. @@ -31,7 +31,7 @@ public interface Clusterable { * * @return Cannot be null or empty. */ - @Nonnull + @NotNull String getInstanceId(); /** @@ -84,5 +84,5 @@ public interface Clusterable { * @throws InterruptedException * (optionally) thrown if interrupted while waiting */ - boolean isVisible(@Nonnull String visibilityToken, long maxWaitMillis) throws InterruptedException; -} \ No newline at end of file + boolean isVisible(@NotNull String visibilityToken, long maxWaitMillis) throws InterruptedException; +} Modified: jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/MoveValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/MoveValidator.java?rev=1846038&r1=1846037&r2=1846038&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/MoveValidator.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/MoveValidator.java Wed Nov 7 14:48:58 2018 @@ -19,10 +19,9 @@ package org.apache.jackrabbit.oak.spi.state; -import javax.annotation.CheckForNull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.commit.Validator; +import org.jetbrains.annotations.Nullable; /** * A validator that also receives notifications about moved nodes. @@ -42,14 +41,14 @@ public interface MoveValidator extends V void move(String name, String sourcePath, NodeState moved) throws CommitFailedException; @Override - @CheckForNull + @Nullable MoveValidator childNodeAdded(String name, NodeState after) throws CommitFailedException; @Override - @CheckForNull + @Nullable MoveValidator childNodeChanged(String name, NodeState before, NodeState after) throws CommitFailedException; @Override - @CheckForNull + @Nullable MoveValidator childNodeDeleted(String name, NodeState before) throws CommitFailedException; }