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 [11/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/...
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java Wed Nov 7 13:57:55 2018
@@ -16,13 +16,13 @@
*/
package org.apache.jackrabbit.oak.security.user;
-import javax.annotation.Nonnull;
import javax.jcr.AccessDeniedException;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
class Utils {
@@ -46,8 +46,8 @@ class Utils {
* @throws AccessDeniedException If the any intermediate tree does not exist
* and cannot be created.
*/
- @Nonnull
- static Tree getOrAddTree(@Nonnull Tree tree, @Nonnull String relativePath, @Nonnull String primaryTypeName) throws AccessDeniedException {
+ @NotNull
+ static Tree getOrAddTree(@NotNull Tree tree, @NotNull String relativePath, @NotNull String primaryTypeName) throws AccessDeniedException {
if (PathUtils.denotesCurrent(relativePath)) {
return tree;
} else if (PathUtils.denotesParent(relativePath)) {
@@ -76,4 +76,4 @@ class Utils {
}
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java Wed Nov 7 13:57:55 2018
@@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import java.util.Iterator;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -31,6 +28,8 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Implementation of the user management that allows to set the autosave flag.
@@ -187,7 +186,7 @@ public class AutoSaveEnabledManager impl
}
}
- @CheckForNull
+ @Nullable
Authorizable wrap(@Nullable Authorizable authorizable) {
if (authorizable == null) {
return null;
@@ -199,13 +198,13 @@ public class AutoSaveEnabledManager impl
}
}
- @Nonnull
- User wrap(@Nonnull User user) {
+ @NotNull
+ User wrap(@NotNull User user) {
return new UserImpl(user, this);
}
- @Nonnull
- Group wrap(@Nonnull Group group) {
+ @NotNull
+ Group wrap(@NotNull Group group) {
return new GroupImpl(group, this);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/GroupImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/GroupImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/GroupImpl.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/GroupImpl.java Wed Nov 7 13:57:55 2018
@@ -18,11 +18,11 @@ package org.apache.jackrabbit.oak.securi
import java.util.Iterator;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
+import org.jetbrains.annotations.NotNull;
class GroupImpl extends AuthorizableImpl implements Group {
@@ -76,7 +76,7 @@ class GroupImpl extends AuthorizableImpl
}
@Override
- public Set<String> addMembers(@Nonnull String... memberIds) throws RepositoryException {
+ public Set<String> addMembers(@NotNull String... memberIds) throws RepositoryException {
try {
return getDelegate().addMembers(memberIds);
} finally {
@@ -98,7 +98,7 @@ class GroupImpl extends AuthorizableImpl
}
@Override
- public Set<String> removeMembers(@Nonnull String... memberIds) throws RepositoryException {
+ public Set<String> removeMembers(@NotNull String... memberIds) throws RepositoryException {
try {
return getDelegate().removeMembers(memberIds);
} finally {
@@ -109,4 +109,4 @@ class GroupImpl extends AuthorizableImpl
private boolean isValid(Authorizable a) {
return a instanceof AuthorizableImpl;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java Wed Nov 7 13:57:55 2018
@@ -20,14 +20,13 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import com.google.common.base.Predicate;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.UserManager;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,8 +73,8 @@ class GroupPredicate implements Predicat
return false;
}
- @CheckForNull
- private String saveGetId(@CheckForNull Authorizable authorizable) {
+ @Nullable
+ private String saveGetId(@Nullable Authorizable authorizable) {
if (authorizable != null) {
try {
return authorizable.getID();
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java Wed Nov 7 13:57:55 2018
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user.query;
-import javax.annotation.Nonnull;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -29,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
+import org.jetbrains.annotations.NotNull;
/**
* Common utilities used for user/group queries.
@@ -45,7 +45,7 @@ public final class QueryUtil {
* @param config The configuration parameters.
* @return The path of search root for the specified authorizable type.
*/
- @Nonnull
+ @NotNull
public static String getSearchRoot(AuthorizableType type, ConfigurationParameters config) {
String path = UserUtil.getAuthorizableRootPath(config, type);
return QueryConstants.SEARCH_ROOT_PATH + path;
@@ -57,8 +57,8 @@ public final class QueryUtil {
* @param type The authorizable type.
* @return The corresponding node type name.
*/
- @Nonnull
- public static String getNodeTypeName(@Nonnull AuthorizableType type) {
+ @NotNull
+ public static String getNodeTypeName(@NotNull AuthorizableType type) {
if (type == AuthorizableType.USER) {
return UserConstants.NT_REP_USER;
} else if (type == AuthorizableType.GROUP) {
@@ -74,13 +74,13 @@ public final class QueryUtil {
* @param string string to escape
* @return escaped string
*/
- @Nonnull
- public static String escapeNodeName(@Nonnull String string) {
+ @NotNull
+ public static String escapeNodeName(@NotNull String string) {
return QueryUtils.escapeNodeName(string);
}
- @Nonnull
- public static String format(@Nonnull Value value) throws RepositoryException {
+ @NotNull
+ public static String format(@NotNull Value value) throws RepositoryException {
switch (value.getType()) {
case PropertyType.STRING:
case PropertyType.BOOLEAN:
@@ -98,18 +98,18 @@ public final class QueryUtil {
}
}
- @Nonnull
- public static String escapeForQuery(@Nonnull String oakName, @Nonnull NamePathMapper namePathMapper) {
+ @NotNull
+ public static String escapeForQuery(@NotNull String oakName, @NotNull NamePathMapper namePathMapper) {
return escapeForQuery(namePathMapper.getJcrName(oakName));
}
- @Nonnull
- public static String escapeForQuery(@Nonnull String value) {
+ @NotNull
+ public static String escapeForQuery(@NotNull String value) {
return QueryUtils.escapeForQuery(value);
}
- @Nonnull
- public static RelationOp getCollation(@Nonnull QueryBuilder.Direction direction) throws RepositoryException {
+ @NotNull
+ public static RelationOp getCollation(@NotNull QueryBuilder.Direction direction) throws RepositoryException {
switch (direction) {
case ASCENDING:
return RelationOp.GT;
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java Wed Nov 7 13:57:55 2018
@@ -16,9 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user.query;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import com.google.common.base.Function;
@@ -31,6 +28,8 @@ import org.apache.jackrabbit.oak.securit
import org.apache.jackrabbit.oak.spi.query.QueryConstants;
import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +45,7 @@ class ResultRowToAuthorizable implements
private final Root root;
private final AuthorizableType targetType;
- ResultRowToAuthorizable(@Nonnull UserManagerImpl userManager, @Nonnull Root root,
+ ResultRowToAuthorizable(@NotNull UserManagerImpl userManager, @NotNull Root root,
@Nullable AuthorizableType targetType) {
this.userManager = userManager;
this.root = root;
@@ -60,8 +59,8 @@ class ResultRowToAuthorizable implements
}
//------------------------------------------------------------< private >---
- @CheckForNull
- private Authorizable getAuthorizable(@CheckForNull ResultRow row) {
+ @Nullable
+ private Authorizable getAuthorizable(@Nullable ResultRow row) {
Authorizable authorizable = null;
if (row != null) {
String resultPath = row.getValue(QueryConstants.JCR_PATH).getValue(Type.STRING);
@@ -81,4 +80,4 @@ class ResultRowToAuthorizable implements
}
return authorizable;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java Wed Nov 7 13:57:55 2018
@@ -24,9 +24,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -50,6 +47,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
import org.apache.jackrabbit.util.ISO9075;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,10 +64,10 @@ public class UserQueryManager {
private final ConfigurationParameters config;
private final Root root;
- public UserQueryManager(@Nonnull UserManagerImpl userManager,
- @Nonnull NamePathMapper namePathMapper,
- @Nonnull ConfigurationParameters config,
- @Nonnull Root root) {
+ public UserQueryManager(@NotNull UserManagerImpl userManager,
+ @NotNull NamePathMapper namePathMapper,
+ @NotNull ConfigurationParameters config,
+ @NotNull Root root) {
this.userManager = userManager;
this.namePathMapper = namePathMapper;
this.config = config;
@@ -82,8 +81,8 @@ public class UserQueryManager {
* @return An iterator of authorizables that match the specified query.
* @throws RepositoryException If an error occurs.
*/
- @Nonnull
- public Iterator<Authorizable> findAuthorizables(@Nonnull Query query) throws RepositoryException {
+ @NotNull
+ public Iterator<Authorizable> findAuthorizables(@NotNull Query query) throws RepositoryException {
XPathQueryBuilder builder = new XPathQueryBuilder();
query.build(builder);
@@ -133,10 +132,10 @@ public class UserQueryManager {
* found.
* @throws javax.jcr.RepositoryException If an error occurs.
*/
- @Nonnull
- public Iterator<Authorizable> findAuthorizables(@Nonnull String relPath,
+ @NotNull
+ public Iterator<Authorizable> findAuthorizables(@NotNull String relPath,
@Nullable String value,
- @Nonnull AuthorizableType authorizableType) throws RepositoryException {
+ @NotNull AuthorizableType authorizableType) throws RepositoryException {
return findAuthorizables(relPath, value, authorizableType, true);
}
@@ -158,20 +157,20 @@ public class UserQueryManager {
* found.
* @throws javax.jcr.RepositoryException If an error occurs.
*/
- @Nonnull
- public Iterator<Authorizable> findAuthorizables(@Nonnull String relPath,
+ @NotNull
+ public Iterator<Authorizable> findAuthorizables(@NotNull String relPath,
@Nullable String value,
- @Nonnull AuthorizableType authorizableType,
+ @NotNull AuthorizableType authorizableType,
boolean exact) throws RepositoryException {
String statement = buildXPathStatement(relPath, value, authorizableType, exact);
return findAuthorizables(statement, Long.MAX_VALUE, 0, authorizableType);
}
//------------------------------------------------------------< private >---
- @Nonnull
- private String buildXPathStatement(@Nonnull String relPath,
+ @NotNull
+ private String buildXPathStatement(@NotNull String relPath,
@Nullable String value,
- @Nonnull AuthorizableType type, boolean exact) {
+ @NotNull AuthorizableType type, boolean exact) {
StringBuilder stmt = new StringBuilder();
String searchRoot = namePathMapper.getJcrPath(QueryUtil.getSearchRoot(type, config));
if (!"/".equals(searchRoot)) {
@@ -221,8 +220,8 @@ public class UserQueryManager {
return stmt.toString();
}
- @Nonnull
- private String buildXPathStatement(@Nonnull XPathQueryBuilder builder) throws RepositoryException {
+ @NotNull
+ private String buildXPathStatement(@NotNull XPathQueryBuilder builder) throws RepositoryException {
Condition condition = builder.getCondition();
String sortCol = builder.getSortProperty();
QueryBuilder.Direction sortDir = builder.getSortDirection();
@@ -268,8 +267,8 @@ public class UserQueryManager {
return statement.toString();
}
- @Nonnull
- private Iterator<Authorizable> findAuthorizables(@Nonnull String statement,
+ @NotNull
+ private Iterator<Authorizable> findAuthorizables(@NotNull String statement,
long limit,
long offset,
@Nullable AuthorizableType type) throws RepositoryException {
@@ -286,8 +285,8 @@ public class UserQueryManager {
}
}
- @CheckForNull
- private static String getQueryPath(@Nonnull String relPath) {
+ @Nullable
+ private static String getQueryPath(@NotNull String relPath) {
if (relPath.indexOf('/') == -1) {
// just a single segment -> don't include the path in the query
return null;
@@ -307,12 +306,12 @@ public class UserQueryManager {
}
}
- @CheckForNull
- private static boolean isReserved(@Nonnull String propName) {
+ @Nullable
+ private static boolean isReserved(@NotNull String propName) {
return UserConstants.GROUP_PROPERTY_NAMES.contains(propName) || UserConstants.USER_PROPERTY_NAMES.contains(propName);
}
- private boolean isEveryone(@Nonnull String groupId) throws RepositoryException {
+ private boolean isEveryone(@NotNull String groupId) throws RepositoryException {
Group gr = userManager.getAuthorizable(groupId, Group.class);
if (gr == null) {
// compatibility with original code that didn't check for existence of the group
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProvider.java Wed Nov 7 13:57:55 2018
@@ -18,13 +18,12 @@ package org.apache.jackrabbit.oak.securi
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableAction;
import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider;
import org.apache.jackrabbit.oak.spi.security.user.action.CompositeActionProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker;
+import org.jetbrains.annotations.NotNull;
/**
* Dynamic {@link AuthorizableActionProvider} based on the available
@@ -38,10 +37,10 @@ public class WhiteboardAuthorizableActio
super(AuthorizableActionProvider.class);
}
- @Nonnull
+ @NotNull
@Override
- public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) {
+ public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) {
AuthorizableActionProvider actionProvider = new CompositeActionProvider(getServices());
return actionProvider.getAuthorizableActions(securityProvider);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeName.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeName.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeName.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeName.java Wed Nov 7 13:57:55 2018
@@ -17,10 +17,9 @@
package org.apache.jackrabbit.oak.security.user.whiteboard;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.security.user.AuthorizableNodeName;
import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker;
+import org.jetbrains.annotations.NotNull;
/**
* Dynamic {@link AuthorizableNodeName} based on the available
@@ -34,9 +33,9 @@ public class WhiteboardAuthorizableNodeN
super(AuthorizableNodeName.class);
}
- @Nonnull
+ @NotNull
@Override
- public String generateNodeName(@Nonnull String authorizableId) {
+ public String generateNodeName(@NotNull String authorizableId) {
List<AuthorizableNodeName> services = getServices();
if (services.isEmpty()) {
return AuthorizableNodeName.DEFAULT.generateNodeName(authorizableId);
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactory.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactory.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactory.java Wed Nov 7 13:57:55 2018
@@ -17,15 +17,13 @@
package org.apache.jackrabbit.oak.security.user.whiteboard;
import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.security.authentication.Authentication;
import org.apache.jackrabbit.oak.spi.security.user.UserAuthenticationFactory;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Dynamic {@link org.apache.jackrabbit.oak.spi.security.user.UserAuthenticationFactory}
@@ -43,9 +41,9 @@ public class WhiteboardUserAuthenticatio
this.defaultFactory = defaultFactory;
}
- @CheckForNull
+ @Nullable
@Override
- public Authentication getAuthentication(@Nonnull UserConfiguration userConfiguration, @Nonnull Root root, @Nullable String userId) {
+ public Authentication getAuthentication(@NotNull UserConfiguration userConfiguration, @NotNull Root root, @Nullable String userId) {
List<UserAuthenticationFactory> services = getServices();
if (services.isEmpty() && defaultFactory != null) {
return defaultFactory.getAuthentication(userConfiguration, root, userId);
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java Wed Nov 7 13:57:55 2018
@@ -22,8 +22,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.UUID;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.RepositoryException;
@@ -67,6 +65,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
@@ -225,7 +225,7 @@ public abstract class AbstractSecurityTe
return getValueFactory(root);
}
- protected ValueFactory getValueFactory(@Nonnull Root root) {
+ protected ValueFactory getValueFactory(@NotNull Root root) {
return new ValueFactoryImpl(root, getNamePathMapper());
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java Wed Nov 7 13:57:55 2018
@@ -24,7 +24,6 @@ import java.util.concurrent.RejectedExec
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nonnull;
import javax.jcr.NoSuchWorkspaceException;
import com.google.common.collect.Lists;
@@ -50,6 +49,7 @@ import org.apache.jackrabbit.oak.spi.whi
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.plugins.index.WhiteboardIndexEditorProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.hamcrest.Matchers.empty;
@@ -220,8 +220,8 @@ public class OakTest {
List<CommitInfo> infos = Lists.newArrayList();
@Override
- public synchronized NodeState merge(@Nonnull NodeBuilder builder, @Nonnull CommitHook commitHook,
- @Nonnull CommitInfo info) throws CommitFailedException {
+ public synchronized NodeState merge(@NotNull NodeBuilder builder, @NotNull CommitHook commitHook,
+ @NotNull CommitInfo info) throws CommitFailedException {
if (info.getSessionId().equals(OakInitializer.SESSION_ID)) {
this.infos.add(info);
}
@@ -231,4 +231,4 @@ public class OakTest {
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java Wed Nov 7 13:57:55 2018
@@ -21,13 +21,12 @@ package org.apache.jackrabbit.oak.cache.
import java.util.Map;
import java.util.Random;
-import javax.annotation.Nonnull;
-
import com.codahale.metrics.Counter;
import com.codahale.metrics.MetricRegistry;
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.apache.jackrabbit.oak.cache.impl.CacheStatsMetrics.ELEMENT;
@@ -90,7 +89,7 @@ public class CacheStatsMetricsTest {
private static class TestStats extends AbstractCacheStats {
- TestStats(@Nonnull String name) {
+ TestStats(@NotNull String name) {
super(name);
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableRootTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableRootTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableRootTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableRootTest.java Wed Nov 7 13:57:55 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.core;
import java.security.Principal;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.security.auth.Subject;
import org.apache.jackrabbit.oak.api.Root;
@@ -35,6 +34,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -53,14 +53,14 @@ public class MutableRootTest {
@Before
public void before() {
SecurityProvider sp = new OpenSecurityProvider() {
- @Nonnull
+ @NotNull
@Override
- public <T> T getConfiguration(@Nonnull Class<T> configClass) {
+ public <T> T getConfiguration(@NotNull Class<T> configClass) {
if (AuthorizationConfiguration.class == configClass) {
return (T) new OpenAuthorizationConfiguration() {
- @Nonnull
+ @NotNull
@Override
- public PermissionProvider getPermissionProvider(@Nonnull Root root, @Nonnull String workspaceName, @Nonnull Set<Principal> principals) {
+ public PermissionProvider getPermissionProvider(@NotNull Root root, @NotNull String workspaceName, @NotNull Set<Principal> principals) {
return permissionProvider;
}
};
@@ -100,7 +100,7 @@ public class MutableRootTest {
assertEquals(nb2.exists(), nb.exists());
}
- private boolean canReadRootTree(@Nonnull Tree t) {
+ private boolean canReadRootTree(@NotNull Tree t) {
return permissionProvider.getTreePermission(t, TreePermission.EMPTY).canRead();
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TestPermissionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TestPermissionProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TestPermissionProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TestPermissionProvider.java Wed Nov 7 13:57:55 2018
@@ -17,15 +17,14 @@
package org.apache.jackrabbit.oak.core;
import java.util.Set;
-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.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.RepositoryPermission;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Dummy permission provider implementation that grants read access to all trees
@@ -42,14 +41,14 @@ final class TestPermissionProvider imple
boolean denyAll;
- private TreePermission getTreePermission(@Nonnull String name) {
+ private TreePermission getTreePermission(@NotNull String name) {
if (denyAll) {
return TreePermission.EMPTY;
} else {
return new TreePermission() {
- @Nonnull
+ @NotNull
@Override
- public TreePermission getChildPermission(@Nonnull String childName, @Nonnull NodeState childState) {
+ public TreePermission getChildPermission(@NotNull String childName, @NotNull NodeState childState) {
return getTreePermission(childName);
}
@@ -59,7 +58,7 @@ final class TestPermissionProvider imple
}
@Override
- public boolean canRead(@Nonnull PropertyState property) {
+ public boolean canRead(@NotNull PropertyState property) {
return canReadProperties || !property.getName().contains(NAME_NON_ACCESSIBLE);
}
@@ -79,7 +78,7 @@ final class TestPermissionProvider imple
}
@Override
- public boolean isGranted(long permissions, @Nonnull PropertyState property) {
+ public boolean isGranted(long permissions, @NotNull PropertyState property) {
throw new UnsupportedOperationException();
}
};
@@ -91,36 +90,36 @@ final class TestPermissionProvider imple
denyAll = !denyAll;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
throw new UnsupportedOperationException();
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String... privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull String... privilegeNames) {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreePermission parentPermission) {
return getTreePermission(tree.getName());
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property, long permissions) {
throw new UnsupportedOperationException();
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String jcrActions) {
throw new UnsupportedOperationException();
}
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java Wed Nov 7 13:57:55 2018
@@ -47,9 +47,6 @@ import java.util.concurrent.ScheduledFut
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -69,6 +66,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -188,7 +187,7 @@ public class AtomicCounterEditorTest {
*
* @param properties
*/
- private static void assertNoCounters(@Nonnull final Iterable<? extends PropertyState> properties) {
+ private static void assertNoCounters(@NotNull final Iterable<? extends PropertyState> properties) {
checkNotNull(properties);
for (PropertyState p : properties) {
@@ -202,7 +201,7 @@ public class AtomicCounterEditorTest {
*
* @param properties
*/
- private static void assertTotalCountersValue(@Nonnull final Iterable<? extends PropertyState> properties,
+ private static void assertTotalCountersValue(@NotNull final Iterable<? extends PropertyState> properties,
int expected) {
int total = 0;
for (PropertyState p : checkNotNull(properties)) {
@@ -214,13 +213,13 @@ public class AtomicCounterEditorTest {
assertEquals("the total amount of :oak-counter properties does not match", expected, total);
}
- private static NodeBuilder setMixin(@Nonnull final NodeBuilder builder) {
+ private static NodeBuilder setMixin(@NotNull final NodeBuilder builder) {
return checkNotNull(builder).setProperty(JCR_MIXINTYPES, of(MIX_ATOMIC_COUNTER), NAMES);
}
- private static void assertCounterNodeState(@Nonnull NodeBuilder builder,
- @Nonnull Set<String> hiddenProps,
+ private static void assertCounterNodeState(@NotNull NodeBuilder builder,
+ @NotNull Set<String> hiddenProps,
long expectedCounter) {
checkNotNull(builder);
checkNotNull(hiddenProps);
@@ -246,7 +245,7 @@ public class AtomicCounterEditorTest {
.getValue(LONG).longValue());
}
- private static NodeBuilder incrementBy(@Nonnull NodeBuilder builder, @Nonnull PropertyState increment) {
+ private static NodeBuilder incrementBy(@NotNull NodeBuilder builder, @NotNull PropertyState increment) {
return checkNotNull(builder).setProperty(checkNotNull(increment));
}
@@ -470,7 +469,7 @@ public class AtomicCounterEditorTest {
throw new UnsupportedOperationException("Not implemented");
}
- private synchronized void addToQueue(@SuppressWarnings("rawtypes") @Nonnull ScheduledFuture future) {
+ private synchronized void addToQueue(@SuppressWarnings("rawtypes") @NotNull ScheduledFuture future) {
fifo.add(future);
}
@@ -558,7 +557,7 @@ public class AtomicCounterEditorTest {
* @throws InterruptedException
* @throws ExecutionException
*/
- @CheckForNull
+ @Nullable
public Object execute() throws InterruptedException, ExecutionException {
ScheduledFuture<?> f = getFromQueue();
if (f == null) {
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/commit/JcrLastModifiedConflictHandlerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/commit/JcrLastModifiedConflictHandlerTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/commit/JcrLastModifiedConflictHandlerTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/commit/JcrLastModifiedConflictHandlerTest.java Wed Nov 7 13:57:55 2018
@@ -25,8 +25,6 @@ import static org.apache.jackrabbit.oak.
import java.util.Calendar;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -36,6 +34,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.util.ISO8601;
+import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
import org.junit.Test;
@@ -79,7 +78,7 @@ public class JcrLastModifiedConflictHand
Assert.assertEquals(p1, root.getTree("/c").getProperty(JCR_LASTMODIFIED));
}
- public static PropertyState createDateProperty(@Nonnull String name) {
+ public static PropertyState createDateProperty(@NotNull String name) {
String now = ISO8601.format(Calendar.getInstance());
return PropertyStates.createProperty(name, now, DATE);
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java Wed Nov 7 13:57:55 2018
@@ -52,9 +52,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.management.openmbean.CompositeData;
import com.google.common.collect.ImmutableList;
@@ -93,6 +90,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.ProxyNodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.util.ISO8601;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Test;
@@ -310,9 +309,9 @@ public class AsyncIndexUpdateTest {
final Semaphore retrieve = new Semaphore(1);
final Semaphore checkpoint = new Semaphore(0);
NodeStore store = new MemoryNodeStore() {
- @CheckForNull
+ @Nullable
@Override
- public NodeState retrieve(@Nonnull String checkpoint) {
+ public NodeState retrieve(@NotNull String checkpoint) {
retrieve.acquireUninterruptibly();
try {
return super.retrieve(checkpoint);
@@ -321,9 +320,9 @@ public class AsyncIndexUpdateTest {
}
}
- @Nonnull
+ @NotNull
@Override
- public String checkpoint(long lifetime, @Nonnull Map<String, String> properties) {
+ public String checkpoint(long lifetime, @NotNull Map<String, String> properties) {
try {
return super.checkpoint(lifetime, properties);
} finally {
@@ -384,10 +383,10 @@ public class AsyncIndexUpdateTest {
public void failOnConflict() throws Exception {
final Map<Thread, Semaphore> locks = Maps.newIdentityHashMap();
NodeStore store = new MemoryNodeStore() {
- @Nonnull
+ @NotNull
@Override
- public NodeState merge(@Nonnull NodeBuilder builder,
- @Nonnull CommitHook commitHook, @Nonnull CommitInfo info)
+ public NodeState merge(@NotNull NodeBuilder builder,
+ @NotNull CommitHook commitHook, @NotNull CommitInfo info)
throws CommitFailedException {
Semaphore s = locks.get(Thread.currentThread());
if (s != null) {
@@ -892,8 +891,8 @@ public class AsyncIndexUpdateTest {
private final FaultyIndexEditor faulty = new FaultyIndexEditor();
@Override
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
- @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition,
+ @NotNull NodeState root, @NotNull IndexUpdateCallback callback)
throws CommitFailedException {
return faulty;
}
@@ -1083,7 +1082,7 @@ public class AsyncIndexUpdateTest {
final Set<String> knownCheckpoints = Sets.newHashSet();
MemoryNodeStore store = new MemoryNodeStore(){
@Override
- public synchronized NodeState retrieve(@Nonnull String checkpoint) {
+ public synchronized NodeState retrieve(@NotNull String checkpoint) {
if (!knownCheckpoints.isEmpty() && !knownCheckpoints.contains(checkpoint)){
return null;
}
@@ -1544,7 +1543,7 @@ public class AsyncIndexUpdateTest {
final List<NodeState> rootStates = Lists.newArrayList();
store.addObserver(new Observer() {
@Override
- public void contentChanged(@Nonnull NodeState root, @Nullable CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @Nullable CommitInfo info) {
rootStates.add(root);
}
});
@@ -1940,8 +1939,8 @@ public class AsyncIndexUpdateTest {
private static class TestIndexEditorProvider extends PropertyIndexEditorProvider {
private String indexPathToFail;
@Override
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition, @Nonnull NodeState root,
- @Nonnull IndexUpdateCallback callback) {
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition, @NotNull NodeState root,
+ @NotNull IndexUpdateCallback callback) {
IndexingContext context = ((ContextAwareCallback)callback).getIndexingContext();
if (indexPathToFail != null && indexPathToFail.equals(context.getIndexPath())){
RuntimeException e = new RuntimeException();
@@ -1963,8 +1962,8 @@ public class AsyncIndexUpdateTest {
private static class IndexingContextCapturingProvider extends PropertyIndexEditorProvider {
IndexingContext lastIndexingContext;
@Override
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition, @Nonnull NodeState root,
- @Nonnull IndexUpdateCallback callback) {
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition, @NotNull NodeState root,
+ @NotNull IndexUpdateCallback callback) {
lastIndexingContext = ((ContextAwareCallback)callback).getIndexingContext();
return super.getIndexEditor(type, definition, root, callback);
}
@@ -2016,7 +2015,7 @@ public class AsyncIndexUpdateTest {
List<CommitInfo> infos = Lists.newArrayList();
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) {
if (info != CommitInfo.EMPTY_EXTERNAL){
infos.add(info);
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java Wed Nov 7 13:57:55 2018
@@ -23,8 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean;
@@ -44,6 +42,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
+import org.jetbrains.annotations.NotNull;
import org.junit.Rule;
import org.junit.Test;
@@ -176,7 +175,7 @@ public class AsyncIndexerServiceTest {
}
private static class FakeClusterableMemoryNodeStore extends MemoryNodeStore implements Clusterable {
- @Nonnull
+ @NotNull
@Override
public String getInstanceId() {
return "foo";
@@ -192,4 +191,4 @@ public class AsyncIndexerServiceTest {
return true;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java Wed Nov 7 13:57:55 2018
@@ -47,8 +47,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-
import ch.qos.logback.classic.Level;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
@@ -80,6 +78,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.util.ISO8601;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import com.google.common.collect.ImmutableSet;
@@ -661,8 +660,8 @@ public class IndexUpdateTest {
IndexUpdateCallback callback;
@Override
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
- @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback) {
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition,
+ @NotNull NodeState root, @NotNull IndexUpdateCallback callback) {
Editor editor = super.getIndexEditor(type, definition, root, callback);
if (editor != null){
this.callback = callback;
@@ -694,8 +693,8 @@ public class IndexUpdateTest {
private static IndexEditorProvider emptyProvider() {
return new IndexEditorProvider() {
@Override
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
- @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition,
+ @NotNull NodeState root, @NotNull IndexUpdateCallback callback)
throws CommitFailedException {
return null;
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/MountsNodeCounterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/MountsNodeCounterTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/MountsNodeCounterTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/MountsNodeCounterTest.java Wed Nov 7 13:57:55 2018
@@ -39,13 +39,12 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
-import javax.annotation.Nullable;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterIndexTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterIndexTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterIndexTest.java Wed Nov 7 13:57:55 2018
@@ -24,8 +24,6 @@ import static org.junit.Assert.assertTru
import java.text.ParseException;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.ContentSession;
@@ -46,6 +44,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java Wed Nov 7 13:57:55 2018
@@ -26,8 +26,6 @@ import java.io.StringWriter;
import java.util.Properties;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.common.io.Files;
@@ -60,6 +58,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.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -452,8 +451,8 @@ public class IndexImporterTest {
ClusterNodeStoreLock lock = new ClusterNodeStoreLock(store);
provider = new PropertyIndexEditorProvider() {
@Override
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
- @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback) {
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition,
+ @NotNull NodeState root, @NotNull IndexUpdateCallback callback) {
throw new RuntimeException(exceptionMessage);
}
};
@@ -537,4 +536,4 @@ public class IndexImporterTest {
printer.print(pw, Format.JSON, false);
Files.write(sw.toString(), file, UTF_8);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiPropertyOrTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiPropertyOrTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiPropertyOrTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiPropertyOrTest.java Wed Nov 7 13:57:55 2018
@@ -27,7 +27,6 @@ import java.text.ParseException;
import java.util.List;
import java.util.Random;
-import javax.annotation.Nonnull;
import javax.jcr.query.Query;
import com.google.common.collect.ImmutableList;
@@ -44,6 +43,7 @@ import org.apache.jackrabbit.oak.query.A
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
/**
@@ -56,7 +56,7 @@ public class MultiPropertyOrTest extends
return new Oak().with(new InitialContent())
.with(new RepositoryInitializer() {
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
NodeBuilder index = IndexUtils.getOrCreateOakIndex(builder);
IndexUtils.createIndexDefinition(
index, "xyz", true, false,
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultipleIndicesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultipleIndicesTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultipleIndicesTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultipleIndicesTest.java Wed Nov 7 13:57:55 2018
@@ -21,8 +21,6 @@ import static org.apache.jackrabbit.oak.
import java.util.ArrayList;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentRepository;
@@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.query.A
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
@@ -44,7 +43,7 @@ public class MultipleIndicesTest extends
.with(new InitialContent())
.with(new RepositoryInitializer() {
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
createIndexDefinition(
getOrCreateOakIndex(builder), "pid",
true, false, ImmutableList.of("pid"), null);
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java Wed Nov 7 13:57:55 2018
@@ -26,8 +26,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.PropertyValue;
@@ -39,6 +37,7 @@ import org.apache.jackrabbit.oak.spi.lif
import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
import org.junit.Ignore;
import org.junit.Test;
@@ -61,7 +60,7 @@ public class PropertyIndexQueryTest exte
*
* @return
*/
- @Nonnull
+ @NotNull
Oak getOakRepositoryInstance() {
return new Oak().with(new InitialContent())
.with(new OpenSecurityProvider())
@@ -88,7 +87,7 @@ public class PropertyIndexQueryTest exte
.with(new RepositoryInitializer(){
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
createIndexDefinition(
builder.child(INDEX_DEFINITIONS_NAME),
"foo",
@@ -144,4 +143,4 @@ public class PropertyIndexQueryTest exte
test("sql2.txt");
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/RelativePathTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/RelativePathTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/RelativePathTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/RelativePathTest.java Wed Nov 7 13:57:55 2018
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTru
import java.util.List;
-import javax.annotation.Nonnull;
import javax.jcr.query.Query;
import com.google.common.collect.ImmutableList;
@@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.query.A
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
/**
@@ -46,7 +46,7 @@ public class RelativePathTest extends Ab
return new Oak().with(new InitialContent())
.with(new RepositoryInitializer() {
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
NodeBuilder index = IndexUtils.getOrCreateOakIndex(builder);
IndexUtils.createIndexDefinition(index, "myProp", true,
false, ImmutableList.<String>of("myProp"), null);
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/report/AssertingPeriodicReporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/report/AssertingPeriodicReporter.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/report/AssertingPeriodicReporter.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/report/AssertingPeriodicReporter.java Wed Nov 7 13:57:55 2018
@@ -21,13 +21,12 @@ package org.apache.jackrabbit.oak.plugin
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import org.jetbrains.annotations.NotNull;
-import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.any;
import static org.hamcrest.CoreMatchers.anyOf;
@@ -53,12 +52,12 @@ class AssertingPeriodicReporter extends
}
@Override
- protected void reportPeriodicNode(final long count, @Nonnull final ReportingNodeState nodeState) {
+ protected void reportPeriodicNode(final long count, @NotNull final ReportingNodeState nodeState) {
reportedNodes.put(count, nodeState.getPath());
}
@Override
- protected void reportPeriodicProperty(final long count, @Nonnull final ReportingNodeState parent, @Nonnull final String propertyName) {
+ protected void reportPeriodicProperty(final long count, @NotNull final ReportingNodeState parent, @NotNull final String propertyName) {
reportedProperties.put(count, PathUtils.concat(parent.getPath(), propertyName));
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java Wed Nov 7 13:57:55 2018
@@ -42,7 +42,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.List;
-import javax.annotation.Nonnull;
import javax.jcr.NamespaceRegistry;
import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.ValueFactory;
@@ -73,6 +72,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -85,7 +85,7 @@ public class NodeTypeRegistryTest {
private Root root;
private ContentSession session = null;
- static void registerNodeType(@Nonnull Root root, @Nonnull String resourceName) throws IOException {
+ static void registerNodeType(@NotNull Root root, @NotNull String resourceName) throws IOException {
checkArgument(!Strings.isNullOrEmpty(resourceName));
checkNotNull(root);
@@ -187,7 +187,7 @@ public class NodeTypeRegistryTest {
return root.getTree(NODE_TYPES_PATH);
}
- @Nonnull
+ @NotNull
@Override
protected Root getWriteRoot() {
return root;
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java Wed Nov 7 13:57:55 2018
@@ -34,7 +34,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
@@ -58,6 +57,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authentication.SystemSubject;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
@@ -86,7 +86,7 @@ public class ChangeCollectorProviderTest
List<ContentChange> changes = new LinkedList<ContentChange>();
@Override
- public void contentChanged(@Nonnull NodeState root,@Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root,@NotNull CommitInfo info) {
changes.add(new ContentChange(root, info));
}
@@ -706,4 +706,4 @@ public class ChangeCollectorProviderTest
expectedPropertyNames.toArray(new String[0]));
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserverTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserverTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserverTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserverTest.java Wed Nov 7 13:57:55 2018
@@ -28,13 +28,12 @@ import static org.junit.Assert.assertTru
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
@@ -144,12 +143,12 @@ public class NodeObserverTest {
@Override
protected 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) {
this.added.put(path, newHashSet(added));
if (!properties.isEmpty()) {
this.properties.put(path, newHashMap(properties));
@@ -158,12 +157,12 @@ public class NodeObserverTest {
@Override
protected 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) {
this.deleted.put(path, newHashSet(deleted));
if (!properties.isEmpty()) {
this.properties.put(path, newHashMap(properties));
@@ -172,12 +171,12 @@ public class NodeObserverTest {
@Override
protected 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) {
this.changed.put(path, newHashSet(changed));
if (!properties.isEmpty()) {
this.properties.put(path, newHashMap(properties));
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTreeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTreeTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTreeTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTreeTest.java Wed Nov 7 13:57:55 2018
@@ -19,9 +19,6 @@
package org.apache.jackrabbit.oak.plugins.tree.impl;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -36,6 +33,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
import org.apache.jackrabbit.oak.util.NodeUtil;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -260,7 +259,7 @@ public class ImmutableTreeTest extends A
assertSequence(tree.getChildren(), "node3", "node2", "node1");
}
- private static ImmutableTree getHiddenTree(@Nonnull ImmutableTree immutable) {
+ private static ImmutableTree getHiddenTree(@NotNull ImmutableTree immutable) {
return (ImmutableTree) TreeUtil.getTree(immutable, HIDDEN_PATH);
}
@@ -314,4 +313,4 @@ public class ImmutableTreeTest extends A
assertEquals(TreeType.HIDDEN, typeProvider.getType(t, TreeType.ACCESS_CONTROL));
assertEquals(TreeType.HIDDEN, typeProvider.getType(t, TreeType.VERSION));
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerTest.java Wed Nov 7 13:57:55 2018
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.version;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.JcrConstants;
@@ -29,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.nod
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
import org.apache.jackrabbit.oak.util.NodeUtil;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -126,7 +126,7 @@ public class ReadOnlyVersionManagerTest
}
- private void assertVersionable(@Nonnull String expectedPath, @Nonnull Tree versionTree) {
+ private void assertVersionable(@NotNull String expectedPath, @NotNull Tree versionTree) {
String p = versionTree.getPath();
assertTrue(p, versionTree.exists());
@@ -216,4 +216,4 @@ public class ReadOnlyVersionManagerTest
assertTrue(history.exists());
assertEquals(historyUuid, history.getProperty(JCR_UUID).getValue(Type.STRING));
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java Wed Nov 7 13:57:55 2018
@@ -32,7 +32,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
import javax.jcr.PropertyType;
import com.google.common.collect.Lists;
@@ -59,6 +58,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.query.QueryEngineImpl.QuerySelectionMode;
import org.apache.jackrabbit.oak.query.xpath.XPathToSQL2Converter;
import org.apache.jackrabbit.oak.spi.query.QueryConstants;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -318,7 +318,7 @@ public abstract class AbstractQueryTest
}
- protected static void assertResult(@Nonnull List<String> expected, @Nonnull List<String> actual) {
+ protected static void assertResult(@NotNull List<String> expected, @NotNull List<String> actual) {
for (String p : checkNotNull(expected)) {
assertTrue("Expected path " + p + " not found, got " + actual, checkNotNull(actual)
.contains(p));
@@ -331,7 +331,7 @@ public abstract class AbstractQueryTest
((QueryEngineImpl) qe).setTraversalEnabled(traversalEnabled);
}
- protected void setQuerySelectionMode(@Nonnull QuerySelectionMode querySelectionMode) {
+ protected void setQuerySelectionMode(@NotNull QuerySelectionMode querySelectionMode) {
((QueryEngineImpl) qe).setQuerySelectionMode(checkNotNull(querySelectionMode));
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/SQL2OptimiseQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/SQL2OptimiseQueryTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/SQL2OptimiseQueryTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/SQL2OptimiseQueryTest.java Wed Nov 7 13:57:55 2018
@@ -36,7 +36,6 @@ import static org.junit.Assert.assertTru
import java.text.ParseException;
import java.util.List;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.oak.Oak;
@@ -52,6 +51,7 @@ import org.apache.jackrabbit.oak.Initial
import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
/**
@@ -157,10 +157,10 @@ public class SQL2OptimiseQueryTest exten
assertOrToUnionResults(expected, original, optimised, cheapest);
}
- private static void assertOrToUnionResults(@Nonnull List<String> expected,
- @Nonnull List<String> original,
- @Nonnull List<String> optimised,
- @Nonnull List<String> cheapest) {
+ private static void assertOrToUnionResults(@NotNull List<String> expected,
+ @NotNull List<String> original,
+ @NotNull List<String> optimised,
+ @NotNull List<String> cheapest) {
// checks that all the three list are the expected content
assertThat(checkNotNull(original), is(checkNotNull(expected)));
assertThat(checkNotNull(optimised), is(expected));
@@ -172,8 +172,8 @@ public class SQL2OptimiseQueryTest exten
assertThat(cheapest, is(original));
}
- private static Tree addChildWithProperty(@Nonnull Tree father, @Nonnull String name,
- @Nonnull String propName, @Nonnull String propValue) {
+ private static Tree addChildWithProperty(@NotNull Tree father, @NotNull String name,
+ @NotNull String propName, @NotNull String propValue) {
Tree t = checkNotNull(father).addChild(checkNotNull(name));
t.setProperty(JCR_PRIMARYTYPE, NT_OAK_UNSTRUCTURED, NAME);
t.setProperty(checkNotNull(propName), checkNotNull(propValue));
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/TraversalAvoidanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/TraversalAvoidanceTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/TraversalAvoidanceTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/TraversalAvoidanceTest.java Wed Nov 7 13:57:55 2018
@@ -18,9 +18,6 @@ import static org.junit.Assert.assertNot
import java.util.List;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
@@ -39,6 +36,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -190,7 +189,7 @@ public class TraversalAvoidanceTest exte
queryIndex.resetPlans();
}
- @Nonnull
+ @NotNull
@Override
public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) {
return ImmutableList.of(queryIndex);