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/07/18 14:37:11 UTC
svn commit: r1836177 [4/14] - in /jackrabbit/oak/trunk/oak-core: ./
src/main/java/org/apache/jackrabbit/oak/
src/main/java/org/apache/jackrabbit/oak/core/
src/main/java/org/apache/jackrabbit/oak/management/
src/main/java/org/apache/jackrabbit/oak/namep...
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java Wed Jul 18 14:37:06 2018
@@ -53,8 +53,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -82,6 +80,8 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.plugins.nodetype.constraint.Constraints;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -185,7 +185,7 @@ class NodeTypeImpl extends AbstractTypeD
*
* @return declared property definitions
*/
- @Override @Nonnull
+ @Override @NotNull
public PropertyDefinition[] getDeclaredPropertyDefinitions() {
Map<Integer, PropertyDefinition> definitions = newTreeMap();
for (Tree child : Iterables.filter(definition.getChildren(), PrimaryTypePredicate.PROPERTY_DEF_PREDICATE)) {
@@ -199,7 +199,7 @@ class NodeTypeImpl extends AbstractTypeD
*
* @return declared child node definitions
*/
- @Override @Nonnull
+ @Override @NotNull
public NodeDefinition[] getDeclaredChildNodeDefinitions() {
Map<Integer, NodeDefinition> definitions = newTreeMap();
for (Tree child : Iterables.filter(definition.getChildren(), PrimaryTypePredicate.CHILDNODE_DEF_PREDICATE)) {
@@ -485,7 +485,7 @@ class NodeTypeImpl extends AbstractTypeD
private ReadOnlyNodeTypeManager getManager() {
final Tree types = definition.getParent();
return new ReadOnlyNodeTypeManager() {
- @Override @CheckForNull
+ @Override @Nullable
protected Tree getTypes() {
return types;
}
@@ -687,7 +687,7 @@ class NodeTypeImpl extends AbstractTypeD
return true;
}
- private static int getIndex(@Nonnull Tree tree) {
+ private static int getIndex(@NotNull Tree tree) {
String name = tree.getName();
int i = name.lastIndexOf('[');
return (i == -1) ? 1 : Integer.valueOf(name.substring(i+1, name.lastIndexOf(']')));
@@ -707,7 +707,7 @@ class NodeTypeImpl extends AbstractTypeD
private final String primaryTypeName;
- private PrimaryTypePredicate(@Nonnull String primaryTypeName) {
+ private PrimaryTypePredicate(@NotNull String primaryTypeName) {
this.primaryTypeName = primaryTypeName;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java Wed Jul 18 14:37:06 2018
@@ -28,8 +28,6 @@ import static org.apache.jackrabbit.oak.
import java.util.Iterator;
import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
@@ -59,6 +57,8 @@ import org.apache.jackrabbit.oak.spi.nod
import org.apache.jackrabbit.oak.spi.nodetype.EffectiveNodeType;
import org.apache.jackrabbit.oak.spi.nodetype.EffectiveNodeTypeProvider;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Base implementation of a {@link NodeTypeManager} with support for reading
@@ -76,7 +76,7 @@ public abstract class ReadOnlyNodeTypeMa
* @throws javax.jcr.RepositoryException If there is no valid internal representation
* of the specified JCR name.
*/
- @Nonnull
+ @NotNull
protected final String getOakName(String jcrName) throws RepositoryException {
return getNamePathMapper().getOakName(jcrName);
}
@@ -85,7 +85,7 @@ public abstract class ReadOnlyNodeTypeMa
* @return {@link org.apache.jackrabbit.oak.api.Tree} instance where the node types
* are stored or {@code null} if none.
*/
- @CheckForNull
+ @Nullable
protected abstract Tree getTypes();
/**
@@ -93,7 +93,7 @@ public abstract class ReadOnlyNodeTypeMa
* If {@code null} the former returns {@code null}.
* @return {@code ValueFactory} instance or {@code null}.
*/
- @CheckForNull
+ @Nullable
protected ValueFactory getValueFactory() {
return null;
}
@@ -106,7 +106,7 @@ public abstract class ReadOnlyNodeTypeMa
*
* @return {@link NameMapper} instance.
*/
- @Nonnull
+ @NotNull
protected NamePathMapper getNamePathMapper() {
return NamePathMapper.DEFAULT;
}
@@ -121,7 +121,7 @@ public abstract class ReadOnlyNodeTypeMa
* @param namePathMapper The {@code NamePathMapper} to use.
* @return a new instance of {@code ReadOnlyNodeTypeManager}.
*/
- @Nonnull
+ @NotNull
public static ReadOnlyNodeTypeManager getInstance(final Root root,
final NamePathMapper namePathMapper) {
return new ReadOnlyNodeTypeManager() {
@@ -130,7 +130,7 @@ public abstract class ReadOnlyNodeTypeMa
return root.getTree(NODE_TYPES_PATH);
}
- @Nonnull
+ @NotNull
@Override
protected NamePathMapper getNamePathMapper() {
return namePathMapper;
@@ -284,8 +284,8 @@ public abstract class ReadOnlyNodeTypeMa
}
@Override
- public boolean isNodeType(@CheckForNull String primaryTypeName, @Nonnull Iterator<String> mixinTypes,
- @Nonnull String nodeTypeName) throws NoSuchNodeTypeException, RepositoryException {
+ public boolean isNodeType(@Nullable String primaryTypeName, @NotNull Iterator<String> mixinTypes,
+ @NotNull String nodeTypeName) throws NoSuchNodeTypeException, RepositoryException {
// shortcut
if (JcrConstants.NT_BASE.equals(nodeTypeName)) {
return true;
@@ -367,15 +367,15 @@ public abstract class ReadOnlyNodeTypeMa
//-------------------------------------------------< DefinitionProvider >---
- @Nonnull
+ @NotNull
@Override
public NodeDefinition getRootDefinition() throws RepositoryException {
return new RootNodeDefinition(this);
}
- @Nonnull
+ @NotNull
@Override
- public NodeDefinition getDefinition(@Nonnull Tree parent, @Nonnull String nodeName)
+ public NodeDefinition getDefinition(@NotNull Tree parent, @NotNull String nodeName)
throws RepositoryException {
checkNotNull(parent);
checkNotNull(nodeName);
@@ -383,10 +383,10 @@ public abstract class ReadOnlyNodeTypeMa
return effective.getNodeDefinition(nodeName, null);
}
- @Nonnull
+ @NotNull
@Override
public NodeDefinition getDefinition(
- @Nonnull Tree parent, @Nonnull Tree targetNode)
+ @NotNull Tree parent, @NotNull Tree targetNode)
throws RepositoryException {
checkNotNull(parent);
checkNotNull(targetNode);
@@ -396,7 +396,7 @@ public abstract class ReadOnlyNodeTypeMa
return eff.getNodeDefinition(name, getEffectiveNodeType(targetNode));
}
- @Nonnull
+ @NotNull
@Override
public PropertyDefinition getDefinition(
Tree parent, PropertyState property, boolean exactTypeMatch)
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java Wed Jul 18 14:37:06 2018
@@ -40,8 +40,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.PropertyType;
import javax.jcr.Value;
@@ -59,6 +57,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.NodeStateUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -138,9 +138,9 @@ public class TypeEditor extends DefaultE
* @return a new TypeEditor instance
* @throws CommitFailedException when the primary type of mixin definition is incorrect
*/
- public static TypeEditor create(@Nonnull ConstraintViolationCallback callback, Set<String> typesToCheck,
- @Nonnull NodeState types, String primary, Iterable<String> mixins,
- @Nonnull NodeBuilder builder) throws CommitFailedException {
+ public static TypeEditor create(@NotNull ConstraintViolationCallback callback, Set<String> typesToCheck,
+ @NotNull NodeState types, String primary, Iterable<String> mixins,
+ @NotNull NodeBuilder builder) throws CommitFailedException {
return new TypeEditor(callback, typesToCheck, types, primary, mixins, builder);
}
@@ -183,8 +183,8 @@ public class TypeEditor extends DefaultE
}
private TypeEditor(
- @Nonnull TypeEditor parent, @Nonnull String name,
- @CheckForNull String primary, @Nonnull Iterable<String> mixins, @Nonnull NodeBuilder builder,
+ @NotNull TypeEditor parent, @NotNull String name,
+ @Nullable String primary, @NotNull Iterable<String> mixins, @NotNull NodeBuilder builder,
boolean validate)
throws CommitFailedException {
this.callback= parent.callback;
@@ -320,10 +320,10 @@ public class TypeEditor extends DefaultE
}
//-----------------------------------------------------------< private >--
- @Nonnull
+ @NotNull
private EffectiveType createEffectiveType(
- @CheckForNull EffectiveType parent, @CheckForNull String name,
- @CheckForNull String primary, @Nonnull Iterable<String> mixins)
+ @Nullable EffectiveType parent, @Nullable String name,
+ @Nullable String primary, @NotNull Iterable<String> mixins)
throws CommitFailedException {
List<NodeState> list = Lists.newArrayList();
@@ -364,7 +364,7 @@ public class TypeEditor extends DefaultE
return new EffectiveType(list);
}
- @Nonnull
+ @NotNull
private EffectiveType getEffective() {
return effective;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java Wed Jul 18 14:37:06 2018
@@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Arrays;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
@@ -29,6 +26,8 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.in;
@@ -51,8 +50,8 @@ import static org.apache.jackrabbit.oak.
*/
public class TypePredicate implements Predicate<NodeState> {
- @Nonnull
- public static TypePredicate isOrderable(@Nonnull NodeState root) {
+ @NotNull
+ public static TypePredicate isOrderable(@NotNull NodeState root) {
Set<String> orderable = newHashSet();
NodeState types = checkNotNull(root)
.getChildNode(JCR_SYSTEM)
@@ -84,7 +83,7 @@ public class TypePredicate implements Pr
* @param root root node state
* @param name Oak name of the node type to check for
*/
- public TypePredicate(@Nonnull NodeState root, @Nonnull String name) {
+ public TypePredicate(@NotNull NodeState root, @NotNull String name) {
this(root, singleton(name));
}
@@ -96,7 +95,7 @@ public class TypePredicate implements Pr
* @param root root node state
* @param names Oak names of the node types to check for
*/
- public TypePredicate(@Nonnull NodeState root, @Nonnull Iterable<String> names) {
+ public TypePredicate(@NotNull NodeState root, @NotNull Iterable<String> names) {
this.root = root;
this.names = names;
}
@@ -109,7 +108,7 @@ public class TypePredicate implements Pr
* @param root root node state
* @param names Oak names of the node types to check for
*/
- public TypePredicate(@Nonnull NodeState root, @Nonnull String[] names) {
+ public TypePredicate(@NotNull NodeState root, @NotNull String[] names) {
this(root, Arrays.asList(names));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NameConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NameConstraint.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NameConstraint.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NameConstraint.java Wed Jul 18 14:37:06 2018
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype.constraint;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import com.google.common.base.Predicate;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NumericConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NumericConstraint.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NumericConstraint.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NumericConstraint.java Wed Jul 18 14:37:06 2018
@@ -19,11 +19,11 @@ package org.apache.jackrabbit.oak.plugin
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import com.google.common.base.Predicate;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/PathConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/PathConstraint.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/PathConstraint.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/PathConstraint.java Wed Jul 18 14:37:06 2018
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype.constraint;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java Wed Jul 18 14:37:06 2018
@@ -22,8 +22,6 @@ import static org.apache.jackrabbit.JcrC
import static org.apache.jackrabbit.JcrConstants.JCR_ONPARENTVERSION;
import static org.apache.jackrabbit.JcrConstants.JCR_PROTECTED;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.ItemDefinition;
@@ -34,6 +32,8 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.namepath.NameMapper;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Base class for the node and property definition template implementations
@@ -105,7 +105,7 @@ abstract class ItemDefinitionTemplate ex
*
* @return JCR name, "*", or {@code null}
*/
- @Override @CheckForNull
+ @Override @Nullable
public String getName() {
if (residual) {
return NodeTypeConstants.RESIDUAL_NAME;
@@ -122,7 +122,7 @@ abstract class ItemDefinitionTemplate ex
* @throws ConstraintViolationException if the name is invalid
*/
@Override
- public void setName(@Nonnull String jcrName)
+ public void setName(@NotNull String jcrName)
throws ConstraintViolationException {
residual = NodeTypeConstants.RESIDUAL_NAME.equals(jcrName);
if (!residual) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java Wed Jul 18 14:37:06 2018
@@ -16,13 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype.write;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.nodetype.ConstraintViolationException;
import org.apache.jackrabbit.oak.namepath.JcrNameParser;
import org.apache.jackrabbit.oak.namepath.NameMapper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Abstract base class for the template implementations in this package.
@@ -35,11 +34,11 @@ abstract class NamedTemplate {
private String oakName = null; // not defined by default
- protected NamedTemplate(@Nonnull NameMapper mapper) {
+ protected NamedTemplate(@NotNull NameMapper mapper) {
this.mapper = mapper;
}
- protected NamedTemplate(@Nonnull NameMapper mapper, @Nullable String jcrName)
+ protected NamedTemplate(@NotNull NameMapper mapper, @Nullable String jcrName)
throws ConstraintViolationException {
this(mapper);
if (jcrName != null) {
@@ -53,7 +52,7 @@ abstract class NamedTemplate {
*
* @return Oak name, or {@code null}
*/
- @CheckForNull
+ @Nullable
protected String getOakName() {
return oakName;
}
@@ -66,7 +65,7 @@ abstract class NamedTemplate {
*
* @return JCR name, or {@code null}
*/
- @CheckForNull
+ @Nullable
public String getName() {
return getJcrNameAllowNull(oakName);
}
@@ -77,7 +76,7 @@ abstract class NamedTemplate {
* @param jcrName JCR name
* @throws ConstraintViolationException if the name is invalid
*/
- public void setName(@Nonnull String jcrName)
+ public void setName(@NotNull String jcrName)
throws ConstraintViolationException {
this.oakName = getOakNameOrThrowConstraintViolation(jcrName);
}
@@ -93,8 +92,8 @@ abstract class NamedTemplate {
* @param oakName Oak name, or {@code null}
* @return JCR name, or {@code null}
*/
- @CheckForNull
- protected String getJcrNameAllowNull(@CheckForNull String oakName) {
+ @Nullable
+ protected String getJcrNameAllowNull(@Nullable String oakName) {
if (oakName != null) {
return mapper.getJcrName(oakName);
} else {
@@ -110,8 +109,8 @@ abstract class NamedTemplate {
* @param oakNames Oak names, or {@code null}
* @return JCR names, or {@code null}
*/
- @CheckForNull
- protected String[] getJcrNamesAllowNull(@CheckForNull String[] oakNames) {
+ @Nullable
+ protected String[] getJcrNamesAllowNull(@Nullable String[] oakNames) {
String[] jcrNames = null;
if (oakNames != null) {
jcrNames = new String[oakNames.length];
@@ -131,8 +130,8 @@ abstract class NamedTemplate {
* @return Oak name
* @throws ConstraintViolationException if name is invalid or {@code null}
*/
- @Nonnull
- protected String getOakNameOrThrowConstraintViolation(@CheckForNull String jcrName)
+ @NotNull
+ protected String getOakNameOrThrowConstraintViolation(@Nullable String jcrName)
throws ConstraintViolationException {
if (jcrName == null) {
throw new ConstraintViolationException("Missing JCR name");
@@ -154,8 +153,8 @@ abstract class NamedTemplate {
* @return Oak name, or {@code null}
* @throws ConstraintViolationException if the name is invalid
*/
- @CheckForNull
- protected String getOakNameAllowNullOrThrowConstraintViolation(@CheckForNull String jcrName)
+ @Nullable
+ protected String getOakNameAllowNullOrThrowConstraintViolation(@Nullable String jcrName)
throws ConstraintViolationException {
if (jcrName == null) {
return null;
@@ -174,8 +173,8 @@ abstract class NamedTemplate {
* @return Oak names
* @throws ConstraintViolationException if names are invalid or {@code null}
*/
- @Nonnull
- protected String[] getOakNamesOrThrowConstraintViolation(@CheckForNull String[] jcrNames)
+ @NotNull
+ protected String[] getOakNamesOrThrowConstraintViolation(@Nullable String[] jcrNames)
throws ConstraintViolationException {
if (jcrNames != null) {
String[] oakNames = new String[jcrNames.length];
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java Wed Jul 18 14:37:06 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import javax.annotation.Nonnull;
import javax.jcr.NamespaceRegistry;
import javax.jcr.RepositoryException;
import javax.jcr.ValueFactory;
@@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.namepath.impl.NamePathMapperImpl;
import org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry;
import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl;
+import org.jetbrains.annotations.NotNull;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NODE_TYPES_PATH;
@@ -56,7 +56,7 @@ public final class NodeTypeRegistry {
return root.getTree(NODE_TYPES_PATH);
}
- @Nonnull
+ @NotNull
@Override
protected Root getWriteRoot() {
return root;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java Wed Jul 18 14:37:06 2018
@@ -35,8 +35,6 @@ import static org.apache.jackrabbit.oak.
import java.util.Arrays;
import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NodeDefinition;
@@ -53,6 +51,8 @@ import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.namepath.NameMapper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
class NodeTypeTemplateImpl extends NamedTemplate implements NodeTypeTemplate {
@@ -72,18 +72,18 @@ class NodeTypeTemplateImpl extends Named
private String primaryItemOakName = null; // not defined by default
- @Nonnull
+ @NotNull
private String[] superTypeOakNames = new String[0];
private List<PropertyDefinitionTemplateImpl> propertyDefinitionTemplates = null;
private List<NodeDefinitionTemplateImpl> nodeDefinitionTemplates = null;
- NodeTypeTemplateImpl(@Nonnull NameMapper mapper) {
+ NodeTypeTemplateImpl(@NotNull NameMapper mapper) {
super(mapper);
}
- NodeTypeTemplateImpl(@Nonnull NameMapper mapper, @Nonnull NodeTypeDefinition definition)
+ NodeTypeTemplateImpl(@NotNull NameMapper mapper, @NotNull NodeTypeDefinition definition)
throws ConstraintViolationException {
super(mapper, definition.getName());
@@ -129,7 +129,7 @@ class NodeTypeTemplateImpl extends Named
* @return The node type tree.
* @throws RepositoryException if this type could not be written
*/
- Tree writeTo(@Nonnull Tree parent, boolean allowUpdate) throws RepositoryException {
+ Tree writeTo(@NotNull Tree parent, boolean allowUpdate) throws RepositoryException {
String oakName = getOakName();
if (oakName == null) {
throw new RepositoryException("Cannot register node type: name is missing.");
@@ -178,8 +178,8 @@ class NodeTypeTemplateImpl extends Named
return type;
}
- private static void writeItemDefinitions(@Nonnull Tree nodeTypeTree, @CheckForNull List<? extends ItemDefinitionTemplate> itemDefTemplates,
- @Nonnull String nodeName, @Nonnull String primaryTypeName) throws RepositoryException {
+ private static void writeItemDefinitions(@NotNull Tree nodeTypeTree, @Nullable List<? extends ItemDefinitionTemplate> itemDefTemplates,
+ @NotNull String nodeName, @NotNull String primaryTypeName) throws RepositoryException {
// first remove existing
for (Tree t : filter(nodeTypeTree.getChildren(), new SameNamePredicate(nodeName))) {
t.remove();
@@ -328,4 +328,4 @@ class NodeTypeTemplateImpl extends Named
return String.format("NodeTypeTemplate(%s)", getOakName());
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java Wed Jul 18 14:37:06 2018
@@ -23,7 +23,6 @@ import static org.apache.jackrabbit.oak.
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
@@ -39,6 +38,7 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
+import org.jetbrains.annotations.NotNull;
/**
* {@code ReadWriteNodeTypeManager} extends the {@link ReadOnlyNodeTypeManager}
@@ -78,7 +78,7 @@ public abstract class ReadWriteNodeTypeM
*
* @return fresh {@link Root} instance.
*/
- @Nonnull
+ @NotNull
protected Root getWriteRoot() {
throw new UnsupportedOperationException();
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProvider.java Wed Jul 18 14:37:06 2018
@@ -20,9 +20,6 @@ package org.apache.jackrabbit.oak.plugin
import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -34,6 +31,8 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.observation.ChangeSet;
import org.apache.jackrabbit.oak.spi.observation.ChangeSetBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Modified;
@@ -113,7 +112,7 @@ public class ChangeCollectorProvider ext
final int maxPathDepth;
final ChangeSetBuilder changeSetBuilder;
- public CollectorSupport(@Nonnull CommitInfo info, @Nonnull ChangeSetBuilder changeSetBuilder,
+ public CollectorSupport(@NotNull CommitInfo info, @NotNull ChangeSetBuilder changeSetBuilder,
int maxPathDepth) {
this.info = info;
this.changeSetBuilder = changeSetBuilder;
@@ -149,18 +148,18 @@ public class ChangeCollectorProvider ext
private boolean changed;
- private static ChangeCollector newRootCollector(@Nonnull CommitInfo info, int maxItems, int maxPathDepth) {
+ private static ChangeCollector newRootCollector(@NotNull CommitInfo info, int maxItems, int maxPathDepth) {
ChangeSetBuilder changeSetBuilder = new ChangeSetBuilder(maxItems, maxPathDepth);
CollectorSupport support = new CollectorSupport(info, changeSetBuilder, maxPathDepth);
return new ChangeCollector(support, true, null, null, "/", null, 0);
}
- private ChangeCollector newChildCollector(@Nullable NodeState beforeParentNodeOrNull, @Nullable NodeState afterParentNodeOrNull, @Nonnull String childName) {
+ private ChangeCollector newChildCollector(@Nullable NodeState beforeParentNodeOrNull, @Nullable NodeState afterParentNodeOrNull, @NotNull String childName) {
return new ChangeCollector(support, false, beforeParentNodeOrNull, afterParentNodeOrNull, concat(path, childName), childName, level + 1);
}
- private ChangeCollector(@Nonnull CollectorSupport support, boolean isRoot, @Nullable NodeState beforeParentNodeOrNull,
- @Nullable NodeState afterParentNodeOrNull, @Nonnull String path, @Nullable String childNameOrNull, int level) {
+ private ChangeCollector(@NotNull CollectorSupport support, boolean isRoot, @Nullable NodeState beforeParentNodeOrNull,
+ @Nullable NodeState afterParentNodeOrNull, @NotNull String path, @Nullable String childNameOrNull, int level) {
this.support = support;
this.isRoot = isRoot;
this.beforeParentNodeOrNull = beforeParentNodeOrNull;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiter.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiter.java Wed Jul 18 14:37:06 2018
@@ -23,13 +23,12 @@ import static org.apache.jackrabbit.oak.
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,7 +88,7 @@ public class CommitRateLimiter implement
}
}
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before, NodeState after, CommitInfo info)
throws CommitFailedException {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java Wed Jul 18 14:37:06 2018
@@ -31,12 +31,11 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import javax.annotation.Nonnull;
-
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.apache.jackrabbit.oak.commons.PerfLogger;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.LoggerFactory;
/**
@@ -86,8 +85,8 @@ public class EventGenerator {
* Creates a new generator instance for processing the given changes.
*/
public EventGenerator(
- @Nonnull NodeState before, @Nonnull NodeState after,
- @Nonnull EventHandler handler) {
+ @NotNull NodeState before, @NotNull NodeState after,
+ @NotNull EventHandler handler) {
continuations.addFirst(new Continuation(handler, before, after, 0));
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventHandler.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventHandler.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventHandler.java Wed Jul 18 14:37:06 2018
@@ -18,10 +18,9 @@
*/
package org.apache.jackrabbit.oak.plugins.observation;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
/**
* Handler of content change events. Used to decouple processing of changes
@@ -72,7 +71,7 @@ public interface EventHandler {
* @param after after state of the child node, possibly non-existent
* @return handler of events within the child node, or {@code null}
*/
- @CheckForNull
+ @Nullable
EventHandler getChildHandler(
String name, NodeState before, NodeState after);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/Filter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/Filter.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/Filter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/Filter.java Wed Jul 18 14:37:06 2018
@@ -18,10 +18,9 @@
*/
package org.apache.jackrabbit.oak.plugins.observation;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* A filter is used by the FilteringObserver to decide whether or not a content
@@ -40,6 +39,6 @@ public interface Filter {
* @return true to exclude this content change (not forward), false to
* include it (forward)
*/
- boolean excludes(@Nonnull NodeState root, @Nonnull CommitInfo info);
+ boolean excludes(@NotNull NodeState root, @NotNull CommitInfo info);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteredHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteredHandler.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteredHandler.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteredHandler.java Wed Jul 18 14:37:06 2018
@@ -18,11 +18,10 @@
*/
package org.apache.jackrabbit.oak.plugins.observation;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.observation.filter.EventFilter;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
/**
* Filtered event handler. This decorator class applies an {@link EventFilter}
@@ -51,7 +50,7 @@ public class FilteredHandler extends Def
handler.leave(before, after);
}
- @Override @CheckForNull
+ @Override @Nullable
public EventHandler getChildHandler(
String name, NodeState before, NodeState after) {
EventFilter f = filter.create(name, before, after);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringAwareObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringAwareObserver.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringAwareObserver.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringAwareObserver.java Wed Jul 18 14:37:06 2018
@@ -18,11 +18,10 @@
*/
package org.apache.jackrabbit.oak.plugins.observation;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A FilteringAwareObserver is the stateless-variant of
@@ -44,6 +43,6 @@ public interface FilteringAwareObserver
* @param after the after NodeState
* @param info the associated CommitInfo
*/
- void contentChanged(@Nonnull NodeState before, @Nonnull NodeState after, @Nonnull CommitInfo info);
+ void contentChanged(@NotNull NodeState before, @NotNull NodeState after, @NotNull CommitInfo info);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringDispatcher.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringDispatcher.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringDispatcher.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringDispatcher.java Wed Jul 18 14:37:06 2018
@@ -20,11 +20,10 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* Part of the FilteringObserver: the FilteringDispatcher is used
@@ -44,8 +43,8 @@ public class FilteringDispatcher impleme
}
@Override
- public void contentChanged(@Nonnull NodeState root,
- @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root,
+ @NotNull CommitInfo info) {
if (before != null) {
// avoid null being passed as before to observer
// before == null happens only at startup
@@ -55,4 +54,4 @@ public class FilteringDispatcher impleme
}
before = root;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringObserver.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringObserver.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringObserver.java Wed Jul 18 14:37:06 2018
@@ -23,12 +23,11 @@ import static com.google.common.base.Pre
import java.io.Closeable;
import java.util.concurrent.Executor;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* An observer that implements filtering of content changes
@@ -69,8 +68,8 @@ public class FilteringObserver implement
* are delivered after going through a chain of
* FilteringObserver->BackgroundObserver->FilteringDispatcher.
*/
- public FilteringObserver(@Nonnull Executor executor, int queueLength, @Nonnull Filter filter,
- @Nonnull FilteringAwareObserver observer) {
+ public FilteringObserver(@NotNull Executor executor, int queueLength, @NotNull Filter filter,
+ @NotNull FilteringAwareObserver observer) {
this(new BackgroundObserver(new FilteringDispatcher(checkNotNull(observer)), checkNotNull(executor),
queueLength), filter);
}
@@ -80,7 +79,7 @@ public class FilteringObserver implement
* @param backgroundObserver the BackgroundObserver to be used by this FilteringObserver
* @param filter the Filter to be used for filtering
*/
- public FilteringObserver(@Nonnull BackgroundObserver backgroundObserver, @Nonnull Filter filter) {
+ public FilteringObserver(@NotNull BackgroundObserver backgroundObserver, @NotNull Filter filter) {
this.backgroundObserver = backgroundObserver;
this.filter = checkNotNull(filter);
}
@@ -90,7 +89,7 @@ public class FilteringObserver implement
}
@Override
- public final void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public final void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) {
if (filter.excludes(root, info)) {
lastNoop = root;
return;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserver.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserver.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserver.java Wed Jul 18 14:37:06 2018
@@ -25,8 +25,6 @@ import static org.apache.jackrabbit.oak.
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.commons.PerfLogger;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,12 +78,12 @@ public abstract class NodeObserver imple
* @param commitInfo commit info associated with this change.
*/
protected abstract void added(
- @Nonnull String path,
- @Nonnull Set<String> added,
- @Nonnull Set<String> deleted,
- @Nonnull Set<String> changed,
- @Nonnull Map<String, String> properties,
- @Nonnull CommitInfo commitInfo);
+ @NotNull String path,
+ @NotNull Set<String> added,
+ @NotNull Set<String> deleted,
+ @NotNull Set<String> changed,
+ @NotNull Map<String, String> properties,
+ @NotNull CommitInfo commitInfo);
/**
* A node at {@code path} has been deleted.
@@ -96,12 +95,12 @@ public abstract class NodeObserver imple
* @param commitInfo commit info associated with this change.
*/
protected abstract void deleted(
- @Nonnull String path,
- @Nonnull Set<String> added,
- @Nonnull Set<String> deleted,
- @Nonnull Set<String> changed,
- @Nonnull Map<String, String> properties,
- @Nonnull CommitInfo commitInfo);
+ @NotNull String path,
+ @NotNull Set<String> added,
+ @NotNull Set<String> deleted,
+ @NotNull Set<String> changed,
+ @NotNull Map<String, String> properties,
+ @NotNull CommitInfo commitInfo);
/**
* A node at {@code path} has been changed.
@@ -113,15 +112,15 @@ public abstract class NodeObserver imple
* @param commitInfo commit info associated with this change.
*/
protected abstract void changed(
- @Nonnull String path,
- @Nonnull Set<String> added,
- @Nonnull Set<String> deleted,
- @Nonnull Set<String> changed,
- @Nonnull Map<String, String> properties,
- @Nonnull CommitInfo commitInfo);
+ @NotNull String path,
+ @NotNull Set<String> added,
+ @NotNull Set<String> deleted,
+ @NotNull Set<String> changed,
+ @NotNull Map<String, String> properties,
+ @NotNull CommitInfo commitInfo);
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) {
if (previousRoot != null) {
try {
long start = PERF_LOGGER.start();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java Wed Jul 18 14:37:06 2018
@@ -21,13 +21,12 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.tree.factories.TreeFactory;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* {@code EventTypeFilter} filters based on the access rights of the observing session.
@@ -46,11 +45,11 @@ public final class ACFilter implements E
private TreePermission treePermission;
- private ACFilter(@Nonnull NodeState before,
- @Nonnull NodeState after,
- @Nonnull String name,
- @Nonnull PermissionProvider permissionProvider,
- @Nonnull ACFilter parentFilter) {
+ private ACFilter(@NotNull NodeState before,
+ @NotNull NodeState after,
+ @NotNull String name,
+ @NotNull PermissionProvider permissionProvider,
+ @NotNull ACFilter parentFilter) {
this.before = checkNotNull(before);
this.after = checkNotNull(after);
this.name = checkNotNull(name);
@@ -66,9 +65,9 @@ public final class ACFilter implements E
* @param after after state
* @param permissionProvider permission provider for access control evaluation
*/
- public ACFilter(@Nonnull NodeState before,
- @Nonnull NodeState after,
- @Nonnull PermissionProvider permissionProvider) {
+ public ACFilter(@NotNull NodeState before,
+ @NotNull NodeState after,
+ @NotNull PermissionProvider permissionProvider) {
this.before = checkNotNull(before);
this.after = checkNotNull(after);
this.name = null;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java Wed Jul 18 14:37:06 2018
@@ -26,11 +26,10 @@ import java.util.Iterator;
import java.util.Set;
import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.observation.ChangeSet;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,14 +56,14 @@ public class ChangeSetFilterImpl impleme
parentNodeTypes+", propertyNames="+propertyNames+"]";
}
- public ChangeSetFilterImpl(@Nonnull Set<String> includedParentPaths, boolean isDeep,
+ public ChangeSetFilterImpl(@NotNull Set<String> includedParentPaths, boolean isDeep,
@Nullable Set<String> additionalIncludedParentPaths, Set<String> excludedParentPaths,
Set<String> parentNodeNames, Set<String> parentNodeTypes, Set<String> propertyNames) {
this(includedParentPaths, isDeep, additionalIncludedParentPaths, excludedParentPaths, parentNodeNames, parentNodeTypes, propertyNames,
MAX_EXCLUDED_PATHS);
}
- public ChangeSetFilterImpl(@Nonnull Set<String> includedParentPaths, boolean isDeep,
+ public ChangeSetFilterImpl(@NotNull Set<String> includedParentPaths, boolean isDeep,
@Nullable Set<String> additionalIncludedParentPaths, Set<String> excludedParentPaths,
Set<String> parentNodeNames, Set<String> parentNodeTypes, Set<String> propertyNames,
int maxExcludedPaths) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventFilter.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventFilter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventFilter.java Wed Jul 18 14:37:06 2018
@@ -18,10 +18,9 @@
*/
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
/**
* Filter for determining what changes to report the the event listener.
@@ -92,6 +91,6 @@ public interface EventFilter {
* @return filter instance for filtering the child node or {@code null} to
* exclude the sub tree rooted at this child node.
*/
- @CheckForNull
+ @Nullable
EventFilter create(String name, NodeState before, NodeState after);
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java Wed Jul 18 14:37:06 2018
@@ -36,9 +36,6 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
@@ -50,6 +47,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.observation.ChangeSet;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Builder for {@link FilterProvider} instances.
@@ -75,12 +74,12 @@ public final class FilterBuilder {
private EventAggregator aggregator;
public interface Condition {
- @Nonnull
- EventFilter createFilter(@Nonnull NodeState before, @Nonnull NodeState after);
+ @NotNull
+ EventFilter createFilter(@NotNull NodeState before, @NotNull NodeState after);
}
- @Nonnull
- public FilterBuilder setChangeSetFilter(@Nonnull ChangeSetFilter changeSetFilter) {
+ @NotNull
+ public FilterBuilder setChangeSetFilter(@NotNull ChangeSetFilter changeSetFilter) {
this.changeSetFilter = changeSetFilter;
return this;
}
@@ -96,8 +95,8 @@ public final class FilterBuilder {
* @param absPath absolute path
* @return this instance
*/
- @Nonnull
- public FilterBuilder addSubTree(@Nonnull String absPath) {
+ @NotNull
+ public FilterBuilder addSubTree(@NotNull String absPath) {
if (absPath.endsWith("/")) {
absPath = absPath.substring(0, absPath.length() - 1);
}
@@ -115,7 +114,7 @@ public final class FilterBuilder {
* @param paths
* @return
*/
- public FilterBuilder addPathsForMBean(@Nonnull Set<String> paths) {
+ public FilterBuilder addPathsForMBean(@NotNull Set<String> paths) {
pathsForMBean.addAll(paths);
return this;
}
@@ -125,7 +124,7 @@ public final class FilterBuilder {
* @return list of paths
* @see #addSubTree(String)
*/
- @Nonnull
+ @NotNull
private Iterable<String> getSubTrees() {
return subTrees.isEmpty() ? ImmutableList.of("/") : subTrees;
}
@@ -141,7 +140,7 @@ public final class FilterBuilder {
* otherwise session local changes are not included.
* @return this instance
*/
- @Nonnull
+ @NotNull
public FilterBuilder includeSessionLocal(boolean include) {
this.includeSessionLocal = include;
return this;
@@ -153,7 +152,7 @@ public final class FilterBuilder {
* otherwise cluster external changes are not included.
* @return this instance
*/
- @Nonnull
+ @NotNull
public FilterBuilder includeClusterExternal(boolean include) {
this.includeClusterExternal = include;
return this;
@@ -165,7 +164,7 @@ public final class FilterBuilder {
* otherwise cluster local changes are not included.
* @return this instance
*/
- @Nonnull
+ @NotNull
public FilterBuilder includeClusterLocal(boolean include) {
this.includeClusterLocal = include;
return this;
@@ -179,8 +178,8 @@ public final class FilterBuilder {
* @param condition the conditions to apply
* @return this instance
*/
- @Nonnull
- public FilterBuilder condition(@Nonnull Condition condition) {
+ @NotNull
+ public FilterBuilder condition(@NotNull Condition condition) {
this.condition = checkNotNull(condition);
return this;
}
@@ -191,7 +190,7 @@ public final class FilterBuilder {
* A condition the always holds
* @return true condition
*/
- @Nonnull
+ @NotNull
public Condition includeAll() {
return ConstantCondition.INCLUDE_ALL;
}
@@ -200,7 +199,7 @@ public final class FilterBuilder {
* A condition that never holds
* @return false condition
*/
- @Nonnull
+ @NotNull
public Condition excludeAll() {
return ConstantCondition.EXCLUDE_ALL;
}
@@ -213,8 +212,8 @@ public final class FilterBuilder {
* @return access control condition
* @see ACFilter
*/
- @Nonnull
- public Condition accessControl(@Nonnull PermissionProviderFactory permissionProviderFactory) {
+ @NotNull
+ public Condition accessControl(@NotNull PermissionProviderFactory permissionProviderFactory) {
return new ACCondition(checkNotNull(permissionProviderFactory));
}
@@ -224,8 +223,8 @@ public final class FilterBuilder {
* @return path condition
* @see GlobbingPathFilter
*/
- @Nonnull
- public Condition path(@Nonnull String pathPattern) {
+ @NotNull
+ public Condition path(@NotNull String pathPattern) {
return new PathCondition(checkNotNull(pathPattern));
}
@@ -235,7 +234,7 @@ public final class FilterBuilder {
* @return event type condition
* @see EventTypeFilter
*/
- @Nonnull
+ @NotNull
public Condition eventType(int eventTypes) {
if ((ALL_EVENTS & eventTypes) == 0) {
return excludeAll();
@@ -253,8 +252,8 @@ public final class FilterBuilder {
* always matches if empty.
* @return node type condition
*/
- @Nonnull
- public Condition nodeType(@Nonnull Selector selector, @CheckForNull String[] ntNames) {
+ @NotNull
+ public Condition nodeType(@NotNull Selector selector, @Nullable String[] ntNames) {
if (ntNames == null) {
return includeAll();
} else if (ntNames.length == 0) {
@@ -271,8 +270,8 @@ public final class FilterBuilder {
* always matches if empty.
* @return node type condition
*/
- @Nonnull
- public Condition uuid(@Nonnull Selector selector, @CheckForNull String[] uuids) {
+ @NotNull
+ public Condition uuid(@NotNull Selector selector, @Nullable String[] uuids) {
if (uuids == null) {
return includeAll();
} else if (uuids.length == 0) {
@@ -289,9 +288,9 @@ public final class FilterBuilder {
* @param predicate the predicate to check on the named property
* @return property condition
*/
- @Nonnull
- public Condition property(@Nonnull Selector selector, @Nonnull String name,
- @Nonnull Predicate<PropertyState> predicate) {
+ @NotNull
+ public Condition property(@NotNull Selector selector, @NotNull String name,
+ @NotNull Predicate<PropertyState> predicate) {
return new UniversalCondition(
checkNotNull(selector),
@@ -304,15 +303,15 @@ public final class FilterBuilder {
* @param predicate the predicate to check on the selected node
* @return universal condition
*/
- @Nonnull
- public Condition universal(@Nonnull Selector selector, @Nonnull Predicate<NodeState> predicate) {
+ @NotNull
+ public Condition universal(@NotNull Selector selector, @NotNull Predicate<NodeState> predicate) {
return new UniversalCondition(checkNotNull(selector), checkNotNull(predicate));
}
/**
* @return a condition that holds for children of added nodes.
*/
- @Nonnull
+ @NotNull
public Condition addSubtree() {
return new AddSubtreeTreeCondition();
}
@@ -320,7 +319,7 @@ public final class FilterBuilder {
/**
* @return a condition that holds for children of deleted nodes.
*/
- @Nonnull
+ @NotNull
public Condition deleteSubtree() {
return new DeleteSubtreeTreeCondition();
}
@@ -328,7 +327,7 @@ public final class FilterBuilder {
/**
* @return a condition that holds for children of the target of a moved node
*/
- @Nonnull
+ @NotNull
public Condition moveSubtree() {
return new MoveCondition();
}
@@ -340,8 +339,8 @@ public final class FilterBuilder {
* @param conditions conditions of which any must hold in order for this condition to hold
* @return any condition
*/
- @Nonnull
- public Condition any(@Nonnull Condition... conditions) {
+ @NotNull
+ public Condition any(@NotNull Condition... conditions) {
return new AnyCondition(newArrayList(checkNotNull(conditions)));
}
@@ -350,8 +349,8 @@ public final class FilterBuilder {
* @param conditions conditions of which all must hold in order for this condition to hold
* @return any condition
*/
- @Nonnull
- public Condition all(@Nonnull Condition... conditions) {
+ @NotNull
+ public Condition all(@NotNull Condition... conditions) {
return new AllCondition(newArrayList(checkNotNull(conditions)));
}
@@ -360,8 +359,8 @@ public final class FilterBuilder {
* @param conditions conditions of which all must hold in order for this condition to hold
* @return any condition
*/
- @Nonnull
- public Condition all(@Nonnull List<Condition> conditions) {
+ @NotNull
+ public Condition all(@NotNull List<Condition> conditions) {
return new AllCondition(checkNotNull(conditions));
}
@@ -370,8 +369,8 @@ public final class FilterBuilder {
* @param condition condition which must not hold in order for this condition to hold
* @return not condition
*/
- @Nonnull
- public Condition not(@Nonnull Condition condition) {
+ @NotNull
+ public Condition not(@NotNull Condition condition) {
return new NotCondition(checkNotNull(condition));
}
@@ -380,8 +379,8 @@ public final class FilterBuilder {
* @param conditions conditions of which any must hold in order for this condition to hold
* @return any condition
*/
- @Nonnull
- public Condition any(@Nonnull Iterable<Condition> conditions) {
+ @NotNull
+ public Condition any(@NotNull Iterable<Condition> conditions) {
return new AnyCondition(checkNotNull(conditions));
}
@@ -390,8 +389,8 @@ public final class FilterBuilder {
* @param conditions conditions of which all must hold in order for this condition to hold
* @return any condition
*/
- @Nonnull
- public Condition all(@Nonnull Iterable<Condition> conditions) {
+ @NotNull
+ public Condition all(@NotNull Iterable<Condition> conditions) {
return new AllCondition(checkNotNull(conditions));
}
@@ -399,7 +398,7 @@ public final class FilterBuilder {
* Create a {@code FilterProvider} reflecting the current state of this builder.
* @return filter provider of the current state of this builder
*/
- @Nonnull
+ @NotNull
public FilterProvider build() {
return new FilterProvider() {
final boolean includeSessionLocal = FilterBuilder.this.includeSessionLocal;
@@ -416,19 +415,19 @@ public final class FilterBuilder {
}
@Override
- public boolean includeCommit(@Nonnull String sessionId, @CheckForNull CommitInfo info) {
+ public boolean includeCommit(@NotNull String sessionId, @Nullable CommitInfo info) {
return (includeSessionLocal || !isLocal(checkNotNull(sessionId), info))
&& (includeClusterExternal || !isExternal(info))
&& (includeClusterLocal || isExternal(info));
}
- @Nonnull
+ @NotNull
@Override
- public EventFilter getFilter(@Nonnull NodeState before, @Nonnull NodeState after) {
+ public EventFilter getFilter(@NotNull NodeState before, @NotNull NodeState after) {
return condition.createFilter(checkNotNull(before), checkNotNull(after));
}
- @Nonnull
+ @NotNull
@Override
public Iterable<String> getSubTrees() {
return subTrees;
@@ -459,7 +458,7 @@ public final class FilterBuilder {
};
}
- @Nonnull
+ @NotNull
private FilterConfigMBean getConfigMBean(){
return new FilterConfigMBean() {
@Override
@@ -564,7 +563,7 @@ public final class FilterBuilder {
this.predicate = predicate;
}
- @Nonnull
+ @NotNull
@Override
public EventFilter createFilter(NodeState before, NodeState after) {
return new UniversalFilter(before, after, selector, predicate);
@@ -572,25 +571,25 @@ public final class FilterBuilder {
}
protected static class AddSubtreeTreeCondition implements Condition {
- @Nonnull
+ @NotNull
@Override
- public EventFilter createFilter(@Nonnull NodeState before, @Nonnull NodeState after) {
+ public EventFilter createFilter(@NotNull NodeState before, @NotNull NodeState after) {
return AddSubtreeFilter.getInstance();
}
}
protected static class DeleteSubtreeTreeCondition implements Condition {
- @Nonnull
+ @NotNull
@Override
- public EventFilter createFilter(@Nonnull NodeState before, @Nonnull NodeState after) {
+ public EventFilter createFilter(@NotNull NodeState before, @NotNull NodeState after) {
return DeleteSubtreeFilter.getInstance();
}
}
protected static class MoveCondition implements Condition {
- @Nonnull
+ @NotNull
@Override
- public EventFilter createFilter(@Nonnull NodeState before, @Nonnull NodeState after) {
+ public EventFilter createFilter(@NotNull NodeState before, @NotNull NodeState after) {
return new MoveFilter();
}
}
@@ -656,7 +655,7 @@ public final class FilterBuilder {
this.condition = condition;
}
- @Nonnull
+ @NotNull
@Override
public EventFilter createFilter(NodeState before, NodeState after) {
if (condition == ConstantCondition.EXCLUDE_ALL) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java Wed Jul 18 14:37:06 2018
@@ -19,11 +19,10 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Instance of this class provide a {@link EventFilter} for observation
@@ -44,7 +43,7 @@ public interface FilterProvider extends
* commit, {@code false} otherwise.
* @see org.apache.jackrabbit.oak.spi.commit.Observer
*/
- boolean includeCommit(@Nonnull String sessionId, @CheckForNull CommitInfo info);
+ boolean includeCommit(@NotNull String sessionId, @Nullable CommitInfo info);
/**
* Factory method for creating a {@code Filter} for the passed before and after
@@ -54,8 +53,8 @@ public interface FilterProvider extends
* @param after after state
* @return new {@code Filter} instance
*/
- @Nonnull
- EventFilter getFilter(@Nonnull NodeState before, @Nonnull NodeState after);
+ @NotNull
+ EventFilter getFilter(@NotNull NodeState before, @NotNull NodeState after);
/**
@@ -63,7 +62,7 @@ public interface FilterProvider extends
* @return list of paths
* @see org.apache.jackrabbit.oak.plugins.observation.filter.FilterBuilder#addSubTree(String)
*/
- @Nonnull
+ @NotNull
Iterable<String> getSubTrees();
FilterConfigMBean getConfigMBean();
@@ -73,6 +72,6 @@ public interface FilterProvider extends
* is used to adjust (aggregate) the event identifier before event
* creation (ie after event filtering).
*/
- @CheckForNull
+ @Nullable
EventAggregator getEventAggregator();
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java Wed Jul 18 14:37:06 2018
@@ -24,12 +24,11 @@ import static org.apache.jackrabbit.oak.
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
/**
* This utility class provides common {@link EventFilter} instances
@@ -45,8 +44,8 @@ public final class Filters {
* @param filter filter which must not match
* @return {@code true} if {@code filter} does not match.
*/
- @Nonnull
- public static EventFilter not(@Nonnull final EventFilter filter) {
+ @NotNull
+ public static EventFilter not(@NotNull final EventFilter filter) {
return new EventFilter() {
@Override
public boolean includeAdd(PropertyState after) {
@@ -99,8 +98,8 @@ public final class Filters {
* @param filters filters of which any must match
* @return {@code true} if any of {@code filters} match.
*/
- @Nonnull
- public static EventFilter any(@Nonnull final EventFilter... filters) {
+ @NotNull
+ public static EventFilter any(@NotNull final EventFilter... filters) {
return any(Lists.newArrayList(checkNotNull(filters)));
}
@@ -110,15 +109,15 @@ public final class Filters {
* @param filters filters of which all must match
* @return {@code true} if all of {@code filters} match.
*/
- @Nonnull
- public static EventFilter all(@Nonnull final EventFilter... filters) {
+ @NotNull
+ public static EventFilter all(@NotNull final EventFilter... filters) {
return all(Lists.newArrayList(checkNotNull(filters)));
}
/**
* @return Filter that includes everything
*/
- @Nonnull
+ @NotNull
public static EventFilter includeAll() {
return INCLUDE_ALL;
}
@@ -126,7 +125,7 @@ public final class Filters {
/**
* @return Filter that excludes everything
*/
- @Nonnull
+ @NotNull
public static EventFilter excludeAll() {
return EXCLUDE_ALL;
}
@@ -137,8 +136,8 @@ public final class Filters {
* @param filters filters of which any must match
* @return {@code true} if any of {@code filters} match.
*/
- @Nonnull
- public static EventFilter any(@Nonnull final List<EventFilter> filters) {
+ @NotNull
+ public static EventFilter any(@NotNull final List<EventFilter> filters) {
if (checkNotNull(filters).isEmpty()) {
return EXCLUDE_ALL;
} else if (filters.size() == 1) {
@@ -236,8 +235,8 @@ public final class Filters {
* @param filters filters of which all must match
* @return {@code true} if all of {@code filters} match.
*/
- @Nonnull
- public static EventFilter all(@Nonnull final List<EventFilter> filters) {
+ @NotNull
+ public static EventFilter all(@NotNull final List<EventFilter> filters) {
if (checkNotNull(filters).isEmpty()) {
return INCLUDE_ALL;
} else if (filters.size() == 1) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java Wed Jul 18 14:37:06 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/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java Wed Jul 18 14:37:06 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/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java Wed Jul 18 14:37:06 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/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java Wed Jul 18 14:37:06 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));
}