You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/11/07 13:57:58 UTC
svn commit: r1846014 [5/14] - in /jackrabbit/oak/branches/1.8: ./ oak-core/
oak-core/src/main/java/org/apache/jackrabbit/oak/
oak-core/src/main/java/org/apache/jackrabbit/oak/core/
oak-core/src/main/java/org/apache/jackrabbit/oak/management/ oak-core/s...
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java Wed Nov 7 13:57:55 2018
@@ -29,13 +29,12 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Joiner;
import com.google.common.collect.Iterators;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* This {@code Filter} implementation supports filtering on paths using
@@ -74,7 +73,7 @@ public class GlobbingPathFilter implemen
private final List<String> pattern;
private final Map<String, Pattern> patternMap;
- private GlobbingPathFilter(@Nonnull List<String> pattern, Map<String, Pattern> patternMap) {
+ private GlobbingPathFilter(@NotNull List<String> pattern, Map<String, Pattern> patternMap) {
// OAK-5589 : for internal constructor case don't copy the pattern, refer to the same one
// this will work fine given the public constructors make a copy and internally we're
// never fiddling with the pattern list
@@ -82,7 +81,7 @@ public class GlobbingPathFilter implemen
this.patternMap = checkNotNull(patternMap);
}
- public GlobbingPathFilter(@Nonnull String pattern, Map<String, Pattern> patternMap) {
+ public GlobbingPathFilter(@NotNull String pattern, Map<String, Pattern> patternMap) {
// OAK-5589 : use the fastest way to create a List based on an unknown deep pattern
this.pattern = new ArrayList<String>(10);
Iterators.addAll(this.pattern, elements(checkNotNull(pattern)).iterator());
@@ -90,7 +89,7 @@ public class GlobbingPathFilter implemen
}
/** for testing only - use variant which passes the patternMap for productive code **/
- public GlobbingPathFilter(@Nonnull String pattern) {
+ public GlobbingPathFilter(@NotNull String pattern) {
this(pattern, new HashMap<String, Pattern>());
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java Wed Nov 7 13:57:55 2018
@@ -19,10 +19,9 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
+import org.jetbrains.annotations.NotNull;
/**
* Factory for {@link PermissionProvider} instances.
@@ -33,6 +32,6 @@ public interface PermissionProviderFacto
* Create a new {@code PermissionProvider} instance.
* @return
*/
- @Nonnull
+ @NotNull
PermissionProvider create(Root root);
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java Wed Nov 7 13:57:55 2018
@@ -21,11 +21,10 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* Predicate on property values. This property holds if and only if
@@ -41,7 +40,7 @@ public class PropertyPredicate implement
* @param propertyPredicate predicate on the named property
*/
public PropertyPredicate(
- @Nonnull String name, @Nonnull Predicate<PropertyState> propertyPredicate) {
+ @NotNull String name, @NotNull Predicate<PropertyState> propertyPredicate) {
this.name = checkNotNull(name);
this.propertyPredicate = checkNotNull(propertyPredicate);
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java Wed Nov 7 13:57:55 2018
@@ -22,12 +22,11 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.observation.filter.UniversalFilter.Selector;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A selector for selecting a node at a relative path from the node selected by
@@ -44,22 +43,22 @@ public class RelativePathSelector implem
* @param path path to select from
* @param selector selector to base {@code path} upon
*/
- public RelativePathSelector(@Nonnull String path, @Nonnull Selector selector) {
+ public RelativePathSelector(@NotNull String path, @NotNull Selector selector) {
this.path = elements(checkNotNull(path));
this.selector = checkNotNull(selector);
}
- @Nonnull
+ @NotNull
@Override
- public NodeState select(@Nonnull UniversalFilter filter,
- @CheckForNull PropertyState before, @CheckForNull PropertyState after) {
+ public NodeState select(@NotNull UniversalFilter filter,
+ @Nullable PropertyState before, @Nullable PropertyState after) {
return select(selector.select(filter, before, after));
}
- @Nonnull
+ @NotNull
@Override
- public NodeState select(@Nonnull UniversalFilter filter,
- @Nonnull String name, @Nonnull NodeState before, @Nonnull NodeState after) {
+ public NodeState select(@NotNull UniversalFilter filter,
+ @NotNull String name, @NotNull NodeState before, @NotNull NodeState after) {
return select(selector.select(filter, name, before, after));
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java Wed Nov 7 13:57:55 2018
@@ -21,12 +21,11 @@ package org.apache.jackrabbit.oak.plugin
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.PropertyState;
import org.apache.jackrabbit.oak.plugins.observation.filter.UniversalFilter.Selector;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Common {@code Selector} implementations
@@ -51,8 +50,8 @@ public final class Selectors {
* @param relPath relative path
* @return selector for {@code relPath} from {@code THIS}
*/
- @Nonnull
- public static Selector fromThis(@Nonnull String relPath) {
+ @NotNull
+ public static Selector fromThis(@NotNull String relPath) {
return new RelativePathSelector(relPath, THIS);
}
@@ -62,8 +61,8 @@ public final class Selectors {
* @param relPath relative path
* @return selector for {@code relPath} from {@code PARENT}
*/
- @Nonnull
- public static Selector fromParent(@Nonnull String relPath) {
+ @NotNull
+ public static Selector fromParent(@NotNull String relPath) {
return new RelativePathSelector(relPath, PARENT);
}
@@ -72,14 +71,14 @@ public final class Selectors {
private static class ThisSelector implements Selector {
@Override
- public NodeState select(@Nonnull UniversalFilter filter,
- @CheckForNull PropertyState before, @CheckForNull PropertyState after) {
+ public NodeState select(@NotNull UniversalFilter filter,
+ @Nullable PropertyState before, @Nullable PropertyState after) {
return MISSING_NODE;
}
@Override
- public NodeState select(@Nonnull UniversalFilter filter, @Nonnull String name,
- @Nonnull NodeState before, @Nonnull NodeState after) {
+ public NodeState select(@NotNull UniversalFilter filter, @NotNull String name,
+ @NotNull NodeState before, @NotNull NodeState after) {
return after.exists()
? after
: before;
@@ -88,16 +87,16 @@ public final class Selectors {
private static class ParentSelector implements Selector {
@Override
- public NodeState select(@Nonnull UniversalFilter filter,
- @CheckForNull PropertyState before, @CheckForNull PropertyState after) {
+ public NodeState select(@NotNull UniversalFilter filter,
+ @Nullable PropertyState before, @Nullable PropertyState after) {
return after != null
? filter.getAfterState()
: filter.getBeforeState();
}
@Override
- public NodeState select(@Nonnull UniversalFilter filter, @Nonnull String name,
- @Nonnull NodeState before, @Nonnull NodeState after) {
+ public NodeState select(@NotNull UniversalFilter filter, @NotNull String name,
+ @NotNull NodeState before, @NotNull NodeState after) {
return after.exists()
? filter.getAfterState()
: filter.getBeforeState();
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java Wed Nov 7 13:57:55 2018
@@ -22,13 +22,12 @@ package org.apache.jackrabbit.oak.plugin
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 com.google.common.base.Predicate;
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;
/**
* An universal {@code Filter} implementation, which can be parametrised by
@@ -52,8 +51,8 @@ public class UniversalFilter implements
* @param predicate predicate for determining whether to include or to exclude an event
*/
public UniversalFilter(
- @Nonnull NodeState before, @Nonnull NodeState after,
- @Nonnull Selector selector, @Nonnull Predicate<NodeState> predicate) {
+ @NotNull NodeState before, @NotNull NodeState after,
+ @NotNull Selector selector, @NotNull Predicate<NodeState> predicate) {
this.beforeState = checkNotNull(before);
this.afterState = checkNotNull(after);
this.predicate = checkNotNull(predicate);
@@ -75,9 +74,9 @@ public class UniversalFilter implements
* {@link EventFilter#includeDelete(PropertyState)}
* @return a {@code NodeState} instance for basing the filtering criterion (predicate) upon
*/
- @Nonnull
- NodeState select(@Nonnull UniversalFilter filter,
- @CheckForNull PropertyState before, @CheckForNull PropertyState after);
+ @NotNull
+ NodeState select(@NotNull UniversalFilter filter,
+ @Nullable PropertyState before, @Nullable PropertyState after);
/**
* Map a node event.
@@ -89,15 +88,15 @@ public class UniversalFilter implements
* {@link EventFilter#includeDelete(String, NodeState)}
* @return a NodeState instance for basing the filtering criterion (predicate) upon
*/
- @Nonnull
- NodeState select(@Nonnull UniversalFilter filter, @Nonnull String name,
- @Nonnull NodeState before, @Nonnull NodeState after);
+ @NotNull
+ NodeState select(@NotNull UniversalFilter filter, @NotNull String name,
+ @NotNull NodeState before, @NotNull NodeState after);
}
/**
* @return before state for this filter
*/
- @Nonnull
+ @NotNull
public NodeState getBeforeState() {
return beforeState;
}
@@ -105,7 +104,7 @@ public class UniversalFilter implements
/**
* @return after state for this filter
*/
- @Nonnull
+ @NotNull
public NodeState getAfterState() {
return afterState;
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java Wed Nov 7 13:57:55 2018
@@ -22,12 +22,11 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* A predicate for matching against a list of UUIDs. This predicate holds
@@ -41,7 +40,7 @@ public class UuidPredicate implements Pr
/**
* @param uuids uuids
*/
- public UuidPredicate(@Nonnull String[] uuids) {
+ public UuidPredicate(@NotNull String[] uuids) {
this.uuids = checkNotNull(uuids);
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/RootFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/RootFactory.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/RootFactory.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/RootFactory.java Wed Nov 7 13:57:55 2018
@@ -16,9 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.tree.factories;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.core.ImmutableRoot;
@@ -32,6 +29,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
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;
/**
* Factory to obtain immutable {@code Root} objects.
@@ -42,21 +41,21 @@ public final class RootFactory {
private RootFactory() {}
- @Nonnull
- public static Root createReadOnlyRoot(@Nonnull NodeState rootState) {
+ @NotNull
+ public static Root createReadOnlyRoot(@NotNull NodeState rootState) {
return new ImmutableRoot(rootState);
}
- @Nonnull
- public static Root createReadOnlyRoot(@Nonnull Root root) {
+ @NotNull
+ public static Root createReadOnlyRoot(@NotNull Root root) {
return ImmutableRoot.getInstance(root);
}
/**
* @deprecated with Oak 1.7.2 due to the usage of deprecated {@link QueryEngineSettings}
*/
- @Nonnull
- public static Root createSystemRoot(@Nonnull NodeStore store,
+ @NotNull
+ public static Root createSystemRoot(@NotNull NodeStore store,
@Nullable CommitHook hook,
@Nullable String workspaceName,
@Nullable SecurityProvider securityProvider,
@@ -71,8 +70,8 @@ public final class RootFactory {
}
- @Nonnull
- public static Root createSystemRoot(@Nonnull NodeStore store,
+ @NotNull
+ public static Root createSystemRoot(@NotNull NodeStore store,
@Nullable CommitHook hook,
@Nullable String workspaceName,
@Nullable SecurityProvider securityProvider,
@@ -84,4 +83,4 @@ public final class RootFactory {
(indexProvider == null) ? new CompositeQueryIndexProvider() : indexProvider);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/TreeFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/TreeFactory.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/TreeFactory.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/TreeFactory.java Wed Nov 7 13:57:55 2018
@@ -16,13 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.tree.factories;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree;
import org.apache.jackrabbit.oak.plugins.tree.impl.NodeBuilderTree;
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.checkArgument;
@@ -36,16 +35,16 @@ public final class TreeFactory {
private TreeFactory() {}
- public static Tree createTree(@Nonnull NodeBuilder builder) {
+ public static Tree createTree(@NotNull NodeBuilder builder) {
return new NodeBuilderTree("", builder);
}
- public static Tree createReadOnlyTree(@Nonnull NodeState rootState) {
+ public static Tree createReadOnlyTree(@NotNull NodeState rootState) {
return new ImmutableTree(rootState);
}
- public static Tree createReadOnlyTree(@Nonnull Tree readOnlyParent, @Nonnull String childName, @Nonnull NodeState childState) {
+ public static Tree createReadOnlyTree(@NotNull Tree readOnlyParent, @NotNull String childName, @NotNull NodeState childState) {
checkArgument(readOnlyParent instanceof ImmutableTree);
return new ImmutableTree((ImmutableTree) readOnlyParent, childName, childState);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java Wed Nov 7 13:57:55 2018
@@ -27,15 +27,14 @@ import static org.apache.jackrabbit.oak.
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.plugins.tree.TreeConstants;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* {@code AbstractMutableTree} extends {@code AbstractTree} with implementations
@@ -67,9 +66,9 @@ public abstract class AbstractMutableTre
}
}
- @Nonnull
+ @NotNull
@Override
- public Tree addChild(@Nonnull String name) throws IllegalArgumentException {
+ public Tree addChild(@NotNull String name) throws IllegalArgumentException {
checkArgument(!isHidden(name));
if (!hasChild(name)) {
NodeBuilder nodeBuilder = getNodeBuilder();
@@ -170,26 +169,26 @@ public abstract class AbstractMutableTre
}
@Override
- public void setProperty(@Nonnull PropertyState property) {
+ public void setProperty(@NotNull PropertyState property) {
checkArgument(!isHidden(checkNotNull(property).getName()));
getNodeBuilder().setProperty(property);
}
@Override
- public <T> void setProperty(@Nonnull String name, @Nonnull T value) throws IllegalArgumentException {
+ public <T> void setProperty(@NotNull String name, @NotNull T value) throws IllegalArgumentException {
checkArgument(!isHidden(checkNotNull(name)));
getNodeBuilder().setProperty(name, checkNotNull(value));
}
@Override
- public <T> void setProperty(@Nonnull String name, @Nonnull T value, @Nonnull Type<T> type)
+ public <T> void setProperty(@NotNull String name, @NotNull T value, @NotNull Type<T> type)
throws IllegalArgumentException {
checkArgument(!isHidden(checkNotNull(name)));
getNodeBuilder().setProperty(name, checkNotNull(value), checkNotNull(type));
}
@Override
- public void removeProperty(@Nonnull String name) {
+ public void removeProperty(@NotNull String name) {
getNodeBuilder().removeProperty(checkNotNull(name));
}
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java Wed Nov 7 13:57:55 2018
@@ -35,9 +35,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@@ -51,6 +48,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
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;
/**
* {@code AbstractTree} provides default implementations for most
@@ -73,19 +72,19 @@ public abstract class AbstractTree imple
* @throws IllegalArgumentException if the given name string is empty
* or contains the forward slash character
*/
- @Nonnull
- protected abstract AbstractTree createChild(@Nonnull String name) throws IllegalArgumentException;
+ @NotNull
+ protected abstract AbstractTree createChild(@NotNull String name) throws IllegalArgumentException;
/**
* @return the parent of this tree or {@code null} for the root
*/
- @CheckForNull
+ @Nullable
protected abstract AbstractTree getParentOrNull();
/**
* @return The {@code NodeBuilder} for the underlying node state
*/
- @Nonnull
+ @NotNull
protected abstract NodeBuilder getNodeBuilder();
/**
@@ -95,11 +94,11 @@ public abstract class AbstractTree imple
* @param name name of an item
* @return {@code true} if the item is hidden, {@code false} otherwise.
*/
- protected boolean isHidden(@Nonnull String name) {
+ protected boolean isHidden(@NotNull String name) {
return NodeStateUtils.isHidden(name);
}
- @Nonnull
+ @NotNull
protected String[] getInternalNodeNames() {
return INTERNAL_NODE_NAMES;
}
@@ -107,7 +106,7 @@ public abstract class AbstractTree imple
/**
* @return the underlying {@code NodeState} of this tree
*/
- @Nonnull
+ @NotNull
public NodeState getNodeState() {
return getNodeBuilder().getNodeState();
}
@@ -126,7 +125,7 @@ public abstract class AbstractTree imple
*
* @return the list of child names.
*/
- @Nonnull
+ @NotNull
protected Iterable<String> getChildNames() {
NodeBuilder nodeBuilder = getNodeBuilder();
PropertyState order = nodeBuilder.getProperty(OAK_CHILD_ORDER);
@@ -189,7 +188,7 @@ public abstract class AbstractTree imple
}
@Override
- @Nonnull
+ @NotNull
public String getPath() {
if (isRoot()) {
return PathUtils.ROOT_PATH;
@@ -200,7 +199,7 @@ public abstract class AbstractTree imple
}
}
- protected void buildPath(@Nonnull StringBuilder sb) {
+ protected void buildPath(@NotNull StringBuilder sb) {
AbstractTree parent = getParentOrNull();
if (parent != null) {
parent.buildPath(sb);
@@ -209,7 +208,7 @@ public abstract class AbstractTree imple
}
@Override
- @Nonnull
+ @NotNull
public Status getStatus() {
NodeBuilder nodeBuilder = getNodeBuilder();
if (nodeBuilder.isNew() || nodeBuilder.isReplaced()) {
@@ -227,7 +226,7 @@ public abstract class AbstractTree imple
}
@Override
- @Nonnull
+ @NotNull
public AbstractTree getParent() {
AbstractTree parent = getParentOrNull();
checkState(parent != null, "root tree does not have a parent");
@@ -235,8 +234,8 @@ public abstract class AbstractTree imple
}
@Override
- @Nonnull
- public Tree getChild(@Nonnull String name) throws IllegalArgumentException {
+ @NotNull
+ public Tree getChild(@NotNull String name) throws IllegalArgumentException {
if (!isHidden(name)) {
return createChild(name);
} else {
@@ -245,15 +244,15 @@ public abstract class AbstractTree imple
}
@Override
- @CheckForNull
- public PropertyState getProperty(@Nonnull String name) {
+ @Nullable
+ public PropertyState getProperty(@NotNull String name) {
return !isHidden(name)
? getNodeBuilder().getProperty(name)
: null;
}
@Override
- public boolean hasProperty(@Nonnull String name) {
+ public boolean hasProperty(@NotNull String name) {
return (!isHidden(name)) && getNodeBuilder().hasProperty(name);
}
@@ -263,8 +262,8 @@ public abstract class AbstractTree imple
}
@Override
- @CheckForNull
- public Status getPropertyStatus(@Nonnull String name) {
+ @Nullable
+ public Status getPropertyStatus(@NotNull String name) {
NodeBuilder nodeBuilder = getNodeBuilder();
if (!hasProperty(name)) {
return null;
@@ -278,7 +277,7 @@ public abstract class AbstractTree imple
}
@Override
- @Nonnull
+ @NotNull
public Iterable<? extends PropertyState> getProperties() {
return filter(getNodeBuilder().getProperties(),
new Predicate<PropertyState>() {
@@ -290,7 +289,7 @@ public abstract class AbstractTree imple
}
@Override
- public boolean hasChild(@Nonnull String name) {
+ public boolean hasChild(@NotNull String name) {
return getNodeBuilder().hasChildNode(name) && !isHidden(name);
}
@@ -318,7 +317,7 @@ public abstract class AbstractTree imple
}
@Override
- @Nonnull
+ @NotNull
public Iterable<Tree> getChildren() {
Iterable<Tree> children = transform(getChildNames(),
new Function<String, Tree>() {
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/HiddenTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/HiddenTree.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/HiddenTree.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/HiddenTree.java Wed Nov 7 13:57:55 2018
@@ -23,14 +23,12 @@ import static com.google.common.base.Pre
import java.util.Collections;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Instances of this class represent trees that are inaccessible because
@@ -57,7 +55,7 @@ class HiddenTree implements Tree {
//------------------------------------------------------------< Tree >---
- @Nonnull
+ @NotNull
@Override
public String getName() {
return name;
@@ -68,13 +66,13 @@ class HiddenTree implements Tree {
return false;
}
- @Nonnull
+ @NotNull
@Override
public String getPath() {
return PathUtils.concat(parent.getPath(), name);
}
- @Nonnull
+ @NotNull
@Override
public Status getStatus() {
return Status.UNCHANGED;
@@ -85,26 +83,26 @@ class HiddenTree implements Tree {
return false;
}
- @Nonnull
+ @NotNull
@Override
public Tree getParent() {
return parent;
}
@Override
- @CheckForNull
- public PropertyState getProperty(@Nonnull String name) {
+ @Nullable
+ public PropertyState getProperty(@NotNull String name) {
return null;
}
@Override
- @CheckForNull
- public Status getPropertyStatus(@Nonnull String name) {
+ @Nullable
+ public Status getPropertyStatus(@NotNull String name) {
return null;
}
@Override
- public boolean hasProperty(@Nonnull String name) {
+ public boolean hasProperty(@NotNull String name) {
return false;
}
@@ -113,20 +111,20 @@ class HiddenTree implements Tree {
return 0;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return Collections.emptyList();
}
- @Nonnull
+ @NotNull
@Override
- public Tree getChild(@Nonnull String name) {
+ public Tree getChild(@NotNull String name) {
return new HiddenTree(this, checkNotNull(name));
}
@Override
- public boolean hasChild(@Nonnull String name) {
+ public boolean hasChild(@NotNull String name) {
return false;
}
@@ -135,7 +133,7 @@ class HiddenTree implements Tree {
return 0;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<Tree> getChildren() {
return Collections.emptyList();
@@ -146,9 +144,9 @@ class HiddenTree implements Tree {
return false;
}
- @Nonnull
+ @NotNull
@Override
- public Tree addChild(@Nonnull String name) {
+ public Tree addChild(@NotNull String name) {
throw nonExistingTree();
}
@@ -163,22 +161,22 @@ class HiddenTree implements Tree {
}
@Override
- public void setProperty(@Nonnull PropertyState property) {
+ public void setProperty(@NotNull PropertyState property) {
throw nonExistingTree();
}
@Override
- public <T> void setProperty(@Nonnull String name, @Nonnull T value) {
+ public <T> void setProperty(@NotNull String name, @NotNull T value) {
throw nonExistingTree();
}
@Override
- public <T> void setProperty(@Nonnull String name, @Nonnull T value, @Nonnull Type<T> type) {
+ public <T> void setProperty(@NotNull String name, @NotNull T value, @NotNull Type<T> type) {
throw nonExistingTree();
}
@Override
- public void removeProperty(@Nonnull String name) {
+ public void removeProperty(@NotNull String name) {
throw nonExistingTree();
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTree.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTree.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTree.java Wed Nov 7 13:57:55 2018
@@ -16,10 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.tree.impl;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Objects;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
@@ -31,6 +27,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.ReadOnlyBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Immutable implementation of the {@code Tree} interface in order to provide
@@ -98,34 +96,34 @@ public final class ImmutableTree extends
private TreeType type;
- public ImmutableTree(@Nonnull NodeState rootState) {
+ public ImmutableTree(@NotNull NodeState rootState) {
this(ParentProvider.ROOT_PROVIDER, PathUtils.ROOT_NAME, rootState);
}
- public ImmutableTree(@Nonnull ImmutableTree parent, @Nonnull String name, @Nonnull NodeState state) {
+ public ImmutableTree(@NotNull ImmutableTree parent, @NotNull String name, @NotNull NodeState state) {
this(new DefaultParentProvider(parent), name, state);
}
- public ImmutableTree(@Nonnull ParentProvider parentProvider, @Nonnull String name, @Nonnull NodeState state) {
+ public ImmutableTree(@NotNull ParentProvider parentProvider, @NotNull String name, @NotNull NodeState state) {
this.nodeBuilder = new ReadOnlyBuilder(state);
this.name = name;
this.parentProvider = parentProvider;
}
//----------------------------------------------------------< TypeAware >---
- @CheckForNull
+ @Nullable
public TreeType getType() {
return type;
}
- public void setType(@Nonnull TreeType type) {
+ public void setType(@NotNull TreeType type) {
this.type = type;
}
//-------------------------------------------------------< AbstractTree >---
@Override
- @Nonnull
- protected ImmutableTree createChild(@Nonnull String name) {
+ @NotNull
+ protected ImmutableTree createChild(@NotNull String name) {
return new ImmutableTree(this, name, nodeBuilder.getNodeState().getChildNode(name));
}
@@ -135,23 +133,23 @@ public final class ImmutableTree extends
}
@Override
- @CheckForNull
+ @Nullable
protected AbstractTree getParentOrNull() {
return parentProvider.getParent();
}
- @Nonnull
+ @NotNull
@Override
protected NodeBuilder getNodeBuilder() {
return nodeBuilder;
}
@Override
- protected boolean isHidden(@Nonnull String name) {
+ protected boolean isHidden(@NotNull String name) {
return false;
}
- @Nonnull
+ @NotNull
@Override
protected String[] getInternalNodeNames() {
return new String[0];
@@ -159,14 +157,14 @@ public final class ImmutableTree extends
//---------------------------------------------------------------< Tree >---
- @Nonnull
+ @NotNull
@Override
public String getName() {
return name;
}
@Override
- @Nonnull
+ @NotNull
public String getPath() {
if (path == null) {
path = super.getPath();
@@ -174,9 +172,9 @@ public final class ImmutableTree extends
return path;
}
- @Nonnull
+ @NotNull
@Override
- public ImmutableTree getChild(@Nonnull String name) throws IllegalArgumentException {
+ public ImmutableTree getChild(@NotNull String name) throws IllegalArgumentException {
return createChild(name);
}
@@ -187,8 +185,8 @@ public final class ImmutableTree extends
}
@Override
- @Nonnull
- public Tree addChild(@Nonnull String name) {
+ @NotNull
+ public Tree addChild(@NotNull String name) {
throw new UnsupportedOperationException();
}
@@ -203,22 +201,22 @@ public final class ImmutableTree extends
}
@Override
- public void setProperty(@Nonnull PropertyState property) {
+ public void setProperty(@NotNull PropertyState property) {
throw new UnsupportedOperationException();
}
@Override
- public <T> void setProperty(@Nonnull String name, @Nonnull T value) {
+ public <T> void setProperty(@NotNull String name, @NotNull T value) {
throw new UnsupportedOperationException();
}
@Override
- public <T> void setProperty(@Nonnull String name, @Nonnull T value, @Nonnull Type<T> type) {
+ public <T> void setProperty(@NotNull String name, @NotNull T value, @NotNull Type<T> type) {
throw new UnsupportedOperationException();
}
@Override
- public void removeProperty(@Nonnull String name) {
+ public void removeProperty(@NotNull String name) {
throw new UnsupportedOperationException();
}
@@ -259,14 +257,14 @@ public final class ImmutableTree extends
}
};
- @CheckForNull
+ @Nullable
ImmutableTree getParent();
}
public static final class DefaultParentProvider implements ParentProvider {
private final ImmutableTree parent;
- DefaultParentProvider(@Nonnull ImmutableTree parent) {
+ DefaultParentProvider(@NotNull ImmutableTree parent) {
this.parent = parent;
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/NodeBuilderTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/NodeBuilderTree.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/NodeBuilderTree.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/NodeBuilderTree.java Wed Nov 7 13:57:55 2018
@@ -21,11 +21,9 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A mutable {@code Tree} implementation based on an underlying
@@ -46,38 +44,38 @@ public final class NodeBuilderTree exten
* @param nodeBuilder {@code NodeBuilder} for the underlying node state
* @param name name of the tree
*/
- public NodeBuilderTree(@Nonnull String name, @Nonnull NodeBuilder nodeBuilder) {
+ public NodeBuilderTree(@NotNull String name, @NotNull NodeBuilder nodeBuilder) {
this(null, nodeBuilder, name);
}
- protected NodeBuilderTree(@Nullable NodeBuilderTree parent, @Nonnull NodeBuilder nodeBuilder,
- @Nonnull String name) {
+ protected NodeBuilderTree(@Nullable NodeBuilderTree parent, @NotNull NodeBuilder nodeBuilder,
+ @NotNull String name) {
this.parent = parent;
this.name = name;
this.nodeBuilder = nodeBuilder;
}
@Override
- @CheckForNull
+ @Nullable
protected AbstractMutableTree getParentOrNull() {
return parent;
}
- @Nonnull
+ @NotNull
@Override
protected NodeBuilder getNodeBuilder() {
return nodeBuilder;
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return name;
}
@Override
- @Nonnull
- protected NodeBuilderTree createChild(@Nonnull String name) throws IllegalArgumentException {
+ @NotNull
+ protected NodeBuilderTree createChild(@NotNull String name) throws IllegalArgumentException {
return new NodeBuilderTree(this, nodeBuilder.getChildNode(checkNotNull(name)), name);
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/RootProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/RootProviderService.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/RootProviderService.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/RootProviderService.java Wed Nov 7 13:57:55 2018
@@ -16,35 +16,34 @@
*/
package org.apache.jackrabbit.oak.plugins.tree.impl;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.plugins.tree.RootProvider;
import org.apache.jackrabbit.oak.plugins.tree.factories.RootFactory;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
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.osgi.service.component.annotations.Component;
@Component(service = {RootProvider.class})
public class RootProviderService implements RootProvider {
- @Nonnull
+ @NotNull
@Override
- public Root createReadOnlyRoot(@Nonnull NodeState rootState) {
+ public Root createReadOnlyRoot(@NotNull NodeState rootState) {
return RootFactory.createReadOnlyRoot(rootState);
}
- @Nonnull
+ @NotNull
@Override
- public Root createReadOnlyRoot(@Nonnull Root root) {
+ public Root createReadOnlyRoot(@NotNull Root root) {
return RootFactory.createReadOnlyRoot(root);
}
- @Nonnull
+ @NotNull
@Override
- public Root createSystemRoot(@Nonnull NodeStore store, @Nullable CommitHook hook) {
+ public Root createSystemRoot(@NotNull NodeStore store, @Nullable CommitHook hook) {
return RootFactory.createSystemRoot(store, hook, null, null, null);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeProviderService.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeProviderService.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeProviderService.java Wed Nov 7 13:57:55 2018
@@ -16,24 +16,23 @@
*/
package org.apache.jackrabbit.oak.plugins.tree.impl;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
import org.apache.jackrabbit.oak.plugins.tree.factories.TreeFactory;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.osgi.service.component.annotations.Component;
@Component(service = {TreeProvider.class})
public class TreeProviderService implements TreeProvider {
@Override
- public Tree createReadOnlyTree(@Nonnull NodeState rootState) {
+ public Tree createReadOnlyTree(@NotNull NodeState rootState) {
return TreeFactory.createReadOnlyTree(rootState);
}
@Override
- public Tree createReadOnlyTree(@Nonnull Tree readOnlyParent, @Nonnull String childName, @Nonnull NodeState childState) {
+ public Tree createReadOnlyTree(@NotNull Tree readOnlyParent, @NotNull String childName, @NotNull NodeState childState) {
return TreeFactory.createReadOnlyTree(readOnlyParent, childName, childState);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java Wed Nov 7 13:57:55 2018
@@ -18,13 +18,13 @@
*/
package org.apache.jackrabbit.oak.plugins.version;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.util.ISO8601;
+import org.jetbrains.annotations.NotNull;
/**
* <i>Inspired by Jackrabbit 2.x</i>
@@ -64,7 +64,7 @@ class DateVersionSelector implements Ver
}
@Override
- public NodeBuilder select(@Nonnull NodeBuilder history)
+ public NodeBuilder select(@NotNull NodeBuilder history)
throws RepositoryException {
long latestDate = Long.MIN_VALUE;
NodeBuilder latestVersion = null;
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java Wed Nov 7 13:57:55 2018
@@ -18,8 +18,6 @@
*/
package org.apache.jackrabbit.oak.plugins.version;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
@@ -36,6 +34,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,20 +54,20 @@ public abstract class ReadOnlyVersionMan
* returned {@code Tree} instance must be up-to-date with the
* {@code Root} returned by {@link #getWorkspaceRoot()}.
*/
- @Nonnull
+ @NotNull
protected abstract Tree getVersionStorage();
/**
/**
* @return the {@code Root} of the workspace.
*/
- @Nonnull
+ @NotNull
protected abstract Root getWorkspaceRoot();
/**
* @return the node type manager of this repository.
*/
- @Nonnull
+ @NotNull
protected abstract ReadOnlyNodeTypeManager getNodeTypeManager();
//--------------------------------------------------------------------------
@@ -80,23 +80,23 @@ public abstract class ReadOnlyVersionMan
* @param namePathMapper The {@code NamePathMapper} to use.
* @return a new instance of {@code ReadOnlyVersionManager}.
*/
- @Nonnull
+ @NotNull
public static ReadOnlyVersionManager getInstance(final Root root,
final NamePathMapper namePathMapper) {
return new ReadOnlyVersionManager() {
- @Nonnull
+ @NotNull
@Override
protected Tree getVersionStorage() {
return root.getTree(VersionConstants.VERSION_STORE_PATH);
}
- @Nonnull
+ @NotNull
@Override
protected Root getWorkspaceRoot() {
return root;
}
- @Nonnull
+ @NotNull
@Override
protected ReadOnlyNodeTypeManager getNodeTypeManager() {
return ReadOnlyNodeTypeManager.getInstance(root, namePathMapper);
@@ -111,7 +111,7 @@ public abstract class ReadOnlyVersionMan
* @param tree the tree to check.
* @return whether the tree is checked out or not.
*/
- public boolean isCheckedOut(@Nonnull Tree tree) {
+ public boolean isCheckedOut(@NotNull Tree tree) {
if (checkNotNull(tree).exists()) {
PropertyState p = tree.getProperty(VersionConstants.JCR_ISCHECKEDOUT);
if (p != null) {
@@ -145,8 +145,8 @@ public abstract class ReadOnlyVersionMan
* @throws RepositoryException if an error occurs while checking the node
* type of the tree.
*/
- @CheckForNull
- public Tree getVersionHistory(@Nonnull Tree versionable)
+ @Nullable
+ public Tree getVersionHistory(@NotNull Tree versionable)
throws UnsupportedRepositoryOperationException,
RepositoryException {
checkVersionable(versionable);
@@ -160,8 +160,8 @@ public abstract class ReadOnlyVersionMan
* @param uuid the uuid of the version tree.
* @return the version tree or {@code null} if there is none.
*/
- @CheckForNull
- public Tree getVersion(@Nonnull String uuid) {
+ @Nullable
+ public Tree getVersion(@NotNull String uuid) {
return getIdentifierManager().getTree(uuid);
}
@@ -173,8 +173,8 @@ public abstract class ReadOnlyVersionMan
* @param uuid the uuid of the versionable node
* @return the relative path of the version history for the given uuid.
*/
- @Nonnull
- public String getVersionHistoryPath(@Nonnull String uuid) {
+ @NotNull
+ public String getVersionHistoryPath(@NotNull String uuid) {
String relPath = "";
for (int i = 0; i < 3; i++) {
String name = uuid.substring(i * 2, i * 2 + 2);
@@ -196,8 +196,8 @@ public abstract class ReadOnlyVersionMan
* @throws RepositoryException if an error occurs while checking the node
* type of the tree.
*/
- @CheckForNull
- public Tree getBaseVersion(@Nonnull Tree versionable)
+ @Nullable
+ public Tree getBaseVersion(@NotNull Tree versionable)
throws UnsupportedRepositoryOperationException,
RepositoryException {
checkVersionable(versionable);
@@ -218,7 +218,7 @@ public abstract class ReadOnlyVersionMan
* @return {@code true} if the target node has {@link VersionConstants#REP_VERSIONSTORAGE}
* defines as primary node type; {@code false} otherwise.
*/
- public static boolean isVersionStoreTree(@Nonnull Tree tree) {
+ public static boolean isVersionStoreTree(@NotNull Tree tree) {
return VersionConstants.REP_VERSIONSTORAGE.equals(TreeUtil.getPrimaryTypeName(tree));
}
@@ -256,8 +256,8 @@ public abstract class ReadOnlyVersionMan
* @see VersionablePathHook
* @see VersionConstants#MIX_REP_VERSIONABLE_PATHS
*/
- @CheckForNull
- public Tree getVersionable(@Nonnull Tree versionTree, @Nonnull String workspaceName) {
+ @Nullable
+ public Tree getVersionable(@NotNull Tree versionTree, @NotNull String workspaceName) {
Root root = getWorkspaceRoot();
String relPath = "";
Tree t = versionTree;
@@ -305,8 +305,8 @@ public abstract class ReadOnlyVersionMan
* @throws RepositoryException if an error occurs while checking the node
* type of the tree.
*/
- @Nonnull
- protected Tree checkVersionable(@Nonnull Tree tree)
+ @NotNull
+ protected Tree checkVersionable(@NotNull Tree tree)
throws UnsupportedRepositoryOperationException,
RepositoryException {
if (!isVersionable(checkNotNull(tree))) {
@@ -323,7 +323,7 @@ public abstract class ReadOnlyVersionMan
* @param tree the tree to check.
* @return whether the {@code tree} is versionable.
*/
- protected boolean isVersionable(@Nonnull Tree tree) {
+ protected boolean isVersionable(@NotNull Tree tree) {
return getNodeTypeManager().isNodeType(
checkNotNull(tree), VersionConstants.MIX_VERSIONABLE);
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java Wed Nov 7 13:57:55 2018
@@ -25,9 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import com.google.common.collect.ImmutableList;
@@ -50,6 +47,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -91,19 +90,19 @@ public class ReadWriteVersionManager ext
this.isVersion = new TypePredicate(workspaceRoot.getNodeState(), NT_VERSION);
}
- @Nonnull
+ @NotNull
@Override
protected Tree getVersionStorage() {
return TreeFactory.createReadOnlyTree(versionStorageNode.getNodeState());
}
- @Nonnull
+ @NotNull
@Override
protected Root getWorkspaceRoot() {
return RootFactory.createReadOnlyRoot(workspaceRoot.getNodeState());
}
- @Nonnull
+ @NotNull
@Override
protected ReadOnlyNodeTypeManager getNodeTypeManager() {
if (ntMgr == null) {
@@ -123,8 +122,8 @@ public class ReadWriteVersionManager ext
* @throws IllegalArgumentException if the given node does not have a
* {@code jcr:uuid} property.
*/
- @Nonnull
- public NodeBuilder getOrCreateVersionHistory(@Nonnull NodeBuilder versionable, @Nonnull Map<String, Object> infoMap)
+ @NotNull
+ public NodeBuilder getOrCreateVersionHistory(@NotNull NodeBuilder versionable, @NotNull Map<String, Object> infoMap)
throws CommitFailedException {
checkNotNull(versionable);
String vUUID = uuidFromNode(versionable);
@@ -224,15 +223,15 @@ public class ReadWriteVersionManager ext
versionable.setProperty(JCR_PREDECESSORS, predecessors, Type.REFERENCES);
}
- public void checkin(@Nonnull NodeBuilder versionable)
+ public void checkin(@NotNull NodeBuilder versionable)
throws CommitFailedException {
NodeBuilder history = getOrCreateVersionHistory(versionable,
Collections.<String, Object>emptyMap());
createVersion(history, versionable);
}
- public void restore(@Nonnull NodeBuilder versionable,
- @Nonnull String versionUUID,
+ public void restore(@NotNull NodeBuilder versionable,
+ @NotNull String versionUUID,
@Nullable VersionSelector selector)
throws CommitFailedException {
String versionPath = getIdentifierManager().getPath(versionUUID);
@@ -265,9 +264,9 @@ public class ReadWriteVersionManager ext
* @param versionable the versionable node where the version is restored to.
* @throws CommitFailedException if an error occurs while restoring.
*/
- void restore(@Nonnull String historyIdentifier,
- @Nonnull VersionSelector selector,
- @Nonnull NodeBuilder versionable)
+ void restore(@NotNull String historyIdentifier,
+ @NotNull VersionSelector selector,
+ @NotNull NodeBuilder versionable)
throws CommitFailedException, RepositoryException {
String historyPath = getIdentifierManager().getPath(historyIdentifier);
String historyRelPath = PathUtils.relativize(VERSION_STORE_PATH, historyPath);
@@ -298,8 +297,8 @@ public class ReadWriteVersionManager ext
* @throws CommitFailedException if there is no such version history or if
* there is no label with the given name.
*/
- public void removeVersionLabel(@Nonnull String historyRelPath,
- @Nonnull String label)
+ public void removeVersionLabel(@NotNull String historyRelPath,
+ @NotNull String label)
throws CommitFailedException {
NodeBuilder labels = getVersionLabelsFor(checkNotNull(historyRelPath));
if (!labels.hasProperty(checkNotNull(label))) {
@@ -315,7 +314,7 @@ public class ReadWriteVersionManager ext
*
* @param versionable the versionable node.
*/
- void removeEmptyHistory(@Nonnull NodeState versionable) {
+ void removeEmptyHistory(@NotNull NodeState versionable) {
NodeBuilder history = getVersionHistory(versionable);
if (isEmptyHistory(history.getNodeState())) {
history.remove();
@@ -334,7 +333,7 @@ public class ReadWriteVersionManager ext
* @param relPath a relative path.
* @return the resolved node.
*/
- @Nonnull
+ @NotNull
private NodeBuilder resolve(NodeBuilder node, String relPath) {
checkArgument(!PathUtils.isAbsolute(relPath), "Not a relative path");
for (String name : PathUtils.elements(relPath)) {
@@ -355,8 +354,8 @@ public class ReadWriteVersionManager ext
* @throws CommitFailedException if creating the version fails. E.g. because
* the versionable node contains a OPV item with ABORT.
*/
- private NodeBuilder createVersion(@Nonnull NodeBuilder vHistory,
- @Nonnull NodeBuilder versionable)
+ private NodeBuilder createVersion(@NotNull NodeBuilder vHistory,
+ @NotNull NodeBuilder versionable)
throws IllegalArgumentException, CommitFailedException {
List<String> predecessors;
NodeBuilder version;
@@ -426,9 +425,9 @@ public class ReadWriteVersionManager ext
* @param vHistoryUUID the uuid of the version history node.
* @param versionable the versionable node.
*/
- private void connectHistory(@Nonnull NodeBuilder rootVersion,
- @Nonnull String vHistoryUUID,
- @Nonnull NodeBuilder versionable) {
+ private void connectHistory(@NotNull NodeBuilder rootVersion,
+ @NotNull String vHistoryUUID,
+ @NotNull NodeBuilder versionable) {
String rootVersionUUID = uuidFromNode(rootVersion);
versionable.setProperty(JCR_ISCHECKEDOUT, true, Type.BOOLEAN);
versionable.setProperty(JCR_VERSIONHISTORY, vHistoryUUID, Type.REFERENCE);
@@ -480,8 +479,8 @@ public class ReadWriteVersionManager ext
* @return the new version name
* @throws IllegalStateException if mandatory version properties are missing.
*/
- protected String calculateVersion(@Nonnull NodeBuilder history,
- @Nonnull NodeBuilder versionable)
+ protected String calculateVersion(@NotNull NodeBuilder history,
+ @NotNull NodeBuilder versionable)
throws IllegalStateException {
// 1. search a predecessor, suitable for generating the new name
@@ -552,8 +551,8 @@ public class ReadWriteVersionManager ext
return history.child(JCR_VERSIONLABELS);
}
- @Nonnull
- private Iterable<String> getVersionLabels(@Nonnull String historyRelPath, @Nonnull String versionId) throws CommitFailedException {
+ @NotNull
+ private Iterable<String> getVersionLabels(@NotNull String historyRelPath, @NotNull String versionId) throws CommitFailedException {
List<String> labels = new ArrayList<String>();
NodeBuilder labelNode = getVersionLabelsFor(historyRelPath);
for (PropertyState ps : labelNode.getProperties()) {
@@ -566,8 +565,8 @@ public class ReadWriteVersionManager ext
return labels;
}
- @CheckForNull
- private NodeBuilder getVersionById(@Nonnull NodeBuilder vhBuilder, @Nonnull String versionId) {
+ @Nullable
+ private NodeBuilder getVersionById(@NotNull NodeBuilder vhBuilder, @NotNull String versionId) {
for (String childName : vhBuilder.getChildNodeNames()) {
NodeBuilder nb = vhBuilder.getChildNode(childName);
PropertyState uuid = nb.getProperty(JCR_UUID);
@@ -587,8 +586,8 @@ public class ReadWriteVersionManager ext
* @throws IllegalArgumentException if the given node does not have a
* {@code jcr:uuid} property.
*/
- @Nonnull
- private NodeBuilder getVersionHistory(@Nonnull NodeState versionable) {
+ @NotNull
+ private NodeBuilder getVersionHistory(@NotNull NodeState versionable) {
checkNotNull(versionable);
String vUUID = uuidFromNode(versionable);
String relPath = getVersionHistoryPath(vUUID);
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java Wed Nov 7 13:57:55 2018
@@ -23,13 +23,12 @@ import static org.apache.jackrabbit.JcrC
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
import static org.apache.jackrabbit.oak.api.CommitFailedException.CONSTRAINT;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* {@code Utils} provide some utility methods.
@@ -45,14 +44,14 @@ final class Utils {
* @return the value of the jcr:uuid property.
* @throws IllegalArgumentException if the node is not referenceable.
*/
- @Nonnull
- static String uuidFromNode(@Nonnull NodeBuilder node)
+ @NotNull
+ static String uuidFromNode(@NotNull NodeBuilder node)
throws IllegalArgumentException {
return uuidFromNode(node.getNodeState());
}
- @Nonnull
- static String uuidFromNode(@Nonnull NodeState node) {
+ @NotNull
+ static String uuidFromNode(@NotNull NodeState node) {
PropertyState p = checkNotNull(node).getProperty(JCR_UUID);
if (p == null) {
throw new IllegalArgumentException("Not referenceable");
@@ -69,8 +68,8 @@ final class Utils {
* @throws IllegalStateException if the node does not have a {@code jcr:primaryType}
* property.
*/
- @Nonnull
- static String primaryTypeOf(@Nonnull NodeBuilder node)
+ @NotNull
+ static String primaryTypeOf(@NotNull NodeBuilder node)
throws IllegalStateException {
String primaryType = checkNotNull(node).getName(JCR_PRIMARYTYPE);
if (primaryType == null) {
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java Wed Nov 7 13:57:55 2018
@@ -25,8 +25,6 @@ import static org.apache.jackrabbit.JcrC
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import static org.apache.jackrabbit.oak.spi.version.VersionConstants.RESTORE_PREFIX;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.version.OnParentVersionAction;
@@ -41,6 +39,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.version.VersionConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* TODO document
@@ -57,18 +57,18 @@ class VersionEditor implements Editor {
private boolean isReadOnly;
private CommitInfo commitInfo;
- public VersionEditor(@Nonnull NodeBuilder versionStore,
- @Nonnull NodeBuilder workspaceRoot,
- @Nonnull CommitInfo commitInfo) {
+ public VersionEditor(@NotNull NodeBuilder versionStore,
+ @NotNull NodeBuilder workspaceRoot,
+ @NotNull CommitInfo commitInfo) {
this(null, new ReadWriteVersionManager(checkNotNull(versionStore),
checkNotNull(workspaceRoot)), workspaceRoot, "", commitInfo);
}
VersionEditor(@Nullable VersionEditor parent,
- @Nonnull ReadWriteVersionManager vMgr,
- @Nonnull NodeBuilder node,
- @Nonnull String name,
- @Nonnull CommitInfo commitInfo) {
+ @NotNull ReadWriteVersionManager vMgr,
+ @NotNull NodeBuilder node,
+ @NotNull String name,
+ @NotNull CommitInfo commitInfo) {
this.parent = parent;
this.vMgr = checkNotNull(vMgr);
this.node = checkNotNull(node);
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java Wed Nov 7 13:57:55 2018
@@ -25,13 +25,12 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.commit.EditorProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.service.component.annotations.Component;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.util.List;
import java.util.Set;
-
import static com.google.common.collect.Collections2.transform;
import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Sets.newHashSet;
@@ -68,7 +67,7 @@ import static org.apache.jackrabbit.oak.
@Component(service = CommitHook.class)
public class VersionHook implements CommitHook {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) throws CommitFailedException {
Set<String> existingVersionables = newHashSet();
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java Wed Nov 7 13:57:55 2018
@@ -18,11 +18,11 @@
*/
package org.apache.jackrabbit.oak.plugins.version;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* <i>Inspired by Jackrabbit 2.x</i>
@@ -56,6 +56,6 @@ interface VersionSelector {
* @return A version or {@code null}.
* @throws RepositoryException if an error occurs.
*/
- @CheckForNull
- NodeBuilder select(@Nonnull NodeBuilder versionHistory) throws RepositoryException;
+ @Nullable
+ NodeBuilder select(@NotNull NodeBuilder versionHistory) throws RepositoryException;
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java Wed Nov 7 13:57:55 2018
@@ -16,14 +16,13 @@
*/
package org.apache.jackrabbit.oak.plugins.version;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
import org.apache.jackrabbit.oak.spi.commit.Editor;
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;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -48,16 +47,16 @@ class VersionStorageEditor extends Defau
private final String path;
private ReadWriteVersionManager vMgr;
- VersionStorageEditor(@Nonnull NodeBuilder versionStorageNode,
- @Nonnull NodeBuilder workspaceRoot) {
+ VersionStorageEditor(@NotNull NodeBuilder versionStorageNode,
+ @NotNull NodeBuilder workspaceRoot) {
this(versionStorageNode, workspaceRoot, versionStorageNode,
VERSION_STORE_PATH);
}
- private VersionStorageEditor(@Nonnull NodeBuilder versionStorageNode,
- @Nonnull NodeBuilder workspaceRoot,
- @Nonnull NodeBuilder builder,
- @Nonnull String path) {
+ private VersionStorageEditor(@NotNull NodeBuilder versionStorageNode,
+ @NotNull NodeBuilder workspaceRoot,
+ @NotNull NodeBuilder builder,
+ @NotNull String path) {
this.versionStorageNode = checkNotNull(versionStorageNode);
this.workspaceRoot = checkNotNull(workspaceRoot);
this.builder = checkNotNull(builder);
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java Wed Nov 7 13:57:55 2018
@@ -20,8 +20,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.JcrConstants;
@@ -39,6 +37,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
+import org.jetbrains.annotations.NotNull;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
@@ -56,7 +55,7 @@ public class VersionablePathHook impleme
this.workspaceName = workspaceName;
}
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(
NodeState before, NodeState after, CommitInfo info)
@@ -84,9 +83,9 @@ public class VersionablePathHook impleme
private final Node nodeAfter;
private final List<CommitFailedException> exceptions;
- private Diff(@Nonnull ReadWriteVersionManager versionManager,
- @Nonnull Node node,
- @Nonnull List<CommitFailedException> exceptions) {
+ private Diff(@NotNull ReadWriteVersionManager versionManager,
+ @NotNull Node node,
+ @NotNull List<CommitFailedException> exceptions) {
this.versionManager = versionManager;
this.nodeAfter = node;
this.exceptions = exceptions;
@@ -165,4 +164,4 @@ public class VersionablePathHook impleme
return versionManager.isVersionable(tree);
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java Wed Nov 7 13:57:55 2018
@@ -48,8 +48,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.nodetype.PropertyDefinition;
@@ -71,6 +69,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -109,11 +109,11 @@ class VersionableState {
private final ReadWriteVersionManager vMgr;
private final ReadOnlyNodeTypeManager ntMgr;
- private VersionableState(@Nonnull NodeBuilder version,
- @Nonnull NodeBuilder history,
- @Nonnull NodeBuilder versionable,
- @Nonnull ReadWriteVersionManager vMgr,
- @Nonnull ReadOnlyNodeTypeManager ntMgr) {
+ private VersionableState(@NotNull NodeBuilder version,
+ @NotNull NodeBuilder history,
+ @NotNull NodeBuilder versionable,
+ @NotNull ReadWriteVersionManager vMgr,
+ @NotNull ReadOnlyNodeTypeManager ntMgr) {
this.version = checkNotNull(version);
this.history = checkNotNull(history);
this.frozenNode = version.child(JCR_FROZENNODE);
@@ -134,12 +134,12 @@ class VersionableState {
* @param ntMgr the node type manager.
* @return a versionable state
*/
- @Nonnull
- static VersionableState fromVersion(@Nonnull NodeBuilder version,
- @Nonnull NodeBuilder history,
- @Nonnull NodeBuilder versionable,
- @Nonnull ReadWriteVersionManager vMgr,
- @Nonnull ReadOnlyNodeTypeManager ntMgr) {
+ @NotNull
+ static VersionableState fromVersion(@NotNull NodeBuilder version,
+ @NotNull NodeBuilder history,
+ @NotNull NodeBuilder versionable,
+ @NotNull ReadWriteVersionManager vMgr,
+ @NotNull ReadOnlyNodeTypeManager ntMgr) {
VersionableState state = new VersionableState(
version, history, versionable, vMgr, ntMgr);
return state.initFrozen(version.child(JCR_FROZENNODE),
@@ -156,11 +156,11 @@ class VersionableState {
* @param ntMgr the node type manager.
* @return a versionable state.
*/
- static VersionableState forRestore(@Nonnull NodeBuilder version,
- @Nonnull NodeBuilder history,
- @Nonnull NodeBuilder versionable,
- @Nonnull ReadWriteVersionManager vMgr,
- @Nonnull ReadOnlyNodeTypeManager ntMgr) {
+ static VersionableState forRestore(@NotNull NodeBuilder version,
+ @NotNull NodeBuilder history,
+ @NotNull NodeBuilder versionable,
+ @NotNull ReadWriteVersionManager vMgr,
+ @NotNull ReadOnlyNodeTypeManager ntMgr) {
return new VersionableState(version, history, versionable, vMgr, ntMgr);
}
@@ -247,10 +247,10 @@ class VersionableState {
* @param name the name of the source node.
* @param selector the version selector.
*/
- private void restoreState(@Nonnull NodeBuilder src,
- @Nonnull NodeBuilder destParent,
- @Nonnull String name,
- @Nonnull VersionSelector selector)
+ private void restoreState(@NotNull NodeBuilder src,
+ @NotNull NodeBuilder destParent,
+ @NotNull String name,
+ @NotNull VersionSelector selector)
throws RepositoryException, CommitFailedException {
checkNotNull(name);
checkNotNull(destParent);
@@ -275,9 +275,9 @@ class VersionableState {
/**
* Restore a nt:frozenNode.
*/
- private void restoreFrozen(@Nonnull NodeBuilder frozen,
- @Nonnull NodeBuilder dest,
- @Nonnull VersionSelector selector)
+ private void restoreFrozen(@NotNull NodeBuilder frozen,
+ @NotNull NodeBuilder dest,
+ @NotNull VersionSelector selector)
throws RepositoryException, CommitFailedException {
// 15.7.2 Restoring Type and Identifier
restoreFrozenTypeAndUUID(frozen, dest);
@@ -323,8 +323,8 @@ class VersionableState {
* Restores the basic frozen properties (jcr:primaryType, jcr:mixinTypes
* and jcr:uuid).
*/
- private void restoreFrozenTypeAndUUID(@Nonnull NodeBuilder frozen,
- @Nonnull NodeBuilder dest) {
+ private void restoreFrozenTypeAndUUID(@NotNull NodeBuilder frozen,
+ @NotNull NodeBuilder dest) {
dest.setProperty(JCR_PRIMARYTYPE,
frozen.getName(JCR_FROZENPRIMARYTYPE), Type.NAME);
String id = frozen.getProperty(JCR_FROZENUUID).getValue(Type.STRING);
@@ -425,8 +425,8 @@ class VersionableState {
/**
* 15.7.7 Simple vs. Full Versioning after Restore
*/
- private void restoreVersionable(@Nonnull NodeBuilder versionable,
- @Nonnull NodeBuilder version) {
+ private void restoreVersionable(@NotNull NodeBuilder versionable,
+ @NotNull NodeBuilder version) {
checkNotNull(versionable).setProperty(JCR_ISCHECKEDOUT,
false, Type.BOOLEAN);
versionable.setProperty(JCR_VERSIONHISTORY,
@@ -544,7 +544,7 @@ class VersionableState {
}
}
- private static boolean isHiddenProperty(@Nonnull String propName) {
+ private static boolean isHiddenProperty(@NotNull String propName) {
return NodeStateUtils.isHidden(propName) && !TreeConstants.OAK_CHILD_ORDER.equals(propName);
}