Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java Wed Nov 7 14:10:06 2018 @@ -26,9 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PathNotFoundException; import javax.jcr.Repository; import javax.jcr.RepositoryException; @@ -70,6 +67,8 @@ import org.apache.jackrabbit.oak.stats.S import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.MeterStats; import org.apache.jackrabbit.oak.stats.TimerStats; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -115,9 +114,9 @@ public class SessionContext implements N private final boolean fastQueryResultSize; public SessionContext( - @Nonnull Repository repository, @Nonnull StatisticManager statisticManager, - @Nonnull SecurityProvider securityProvider, @Nonnull Whiteboard whiteboard, - @Nonnull Map<String, Object> attributes, @Nonnull final SessionDelegate delegate, + @NotNull Repository repository, @NotNull StatisticManager statisticManager, + @NotNull SecurityProvider securityProvider, @NotNull Whiteboard whiteboard, + @NotNull Map<String, Object> attributes, @NotNull final SessionDelegate delegate, int observationQueueLength, CommitRateLimiter commitRateLimiter) { this(repository, statisticManager, securityProvider, whiteboard, attributes, delegate, @@ -125,9 +124,9 @@ public class SessionContext implements N } public SessionContext( - @Nonnull Repository repository, @Nonnull StatisticManager statisticManager, - @Nonnull SecurityProvider securityProvider, @Nonnull Whiteboard whiteboard, - @Nonnull Map<String, Object> attributes, @Nonnull final SessionDelegate delegate, + @NotNull Repository repository, @NotNull StatisticManager statisticManager, + @NotNull SecurityProvider securityProvider, @NotNull Whiteboard whiteboard, + @NotNull Map<String, Object> attributes, @NotNull final SessionDelegate delegate, int observationQueueLength, CommitRateLimiter commitRateLimiter, MountInfoProvider mountInfoProvider, boolean fastQueryResultSize) { this.repository = checkNotNull(repository); @@ -189,32 +188,32 @@ public class SessionContext implements N return new WorkspaceImpl(this); } - @Nonnull + @NotNull public StatisticManager getStatisticManager() { return statisticManager; } - @Nonnull + @NotNull public MeterStats getMeter(Type type){ return statisticManager.getMeter(type); } - @Nonnull + @NotNull public TimerStats getTimer(Type type) { return statisticManager.getTimer(type); } - @Nonnull + @NotNull public CounterStats getCount(Type type) { return statisticManager.getStatsCounter(type); } - @Nonnull + @NotNull public Repository getRepository() { return repository; } - @Nonnull + @NotNull public SessionDelegate getSessionDelegate() { return delegate; } @@ -224,7 +223,7 @@ public class SessionContext implements N } @Override - @Nonnull + @NotNull public Map<String, String> getSessionLocalMappings() { return getNamespaces().getSessionLocalMappings(); } @@ -233,7 +232,7 @@ public class SessionContext implements N return valueFactory; } - @Nonnull + @NotNull public AccessControlManager getAccessControlManager() throws RepositoryException { if (accessControlManager == null) { AccessControlManager acm = getConfig(AuthorizationConfiguration.class) @@ -248,7 +247,7 @@ public class SessionContext implements N return accessControlManager; } - @Nonnull + @NotNull public PrincipalManager getPrincipalManager() { if (principalManager == null) { principalManager = new PrincipalManagerDelegator(delegate, @@ -258,7 +257,7 @@ public class SessionContext implements N return principalManager; } - @Nonnull + @NotNull public UserManager getUserManager() { if (userManager == null) { userManager = new UserManagerDelegator(delegate, getConfig(UserConfiguration.class) @@ -267,7 +266,7 @@ public class SessionContext implements N return userManager; } - @Nonnull + @NotNull public PrivilegeManager getPrivilegeManager() { if (privilegeManager == null) { privilegeManager = new PrivilegeManagerDelegator(delegate, @@ -277,7 +276,7 @@ public class SessionContext implements N return privilegeManager; } - @Nonnull + @NotNull public List<ProtectedItemImporter> getProtectedItemImporters() { // TODO: take non-security related importers into account as well (proper configuration) List<ProtectedItemImporter> importers = new ArrayList<ProtectedItemImporter>(); @@ -288,7 +287,7 @@ public class SessionContext implements N } - @Nonnull + @NotNull public ObservationManager getObservationManager() throws UnsupportedRepositoryOperationException { if (observationManager == null) { observationManager = new ObservationManagerImpl( @@ -329,31 +328,31 @@ public class SessionContext implements N //-----------------------------------------------------< NamePathMapper >--- @Override - @Nonnull - public String getOakName(@Nonnull String jcrName) throws RepositoryException { + @NotNull + public String getOakName(@NotNull String jcrName) throws RepositoryException { return namePathMapper.getOakName(jcrName); } @Override - @CheckForNull - public String getOakNameOrNull(@Nonnull String jcrName) { + @Nullable + public String getOakNameOrNull(@NotNull String jcrName) { return namePathMapper.getOakNameOrNull(jcrName); } - @Nonnull + @NotNull @Override - public String getJcrName(@Nonnull String oakName) { + public String getJcrName(@NotNull String oakName) { return namePathMapper.getJcrName(oakName); } @Override - @CheckForNull + @Nullable public String getOakPath(String jcrPath) { return namePathMapper.getOakPath(jcrPath); } @Override - @Nonnull + @NotNull public String getJcrPath(String oakPath) { return namePathMapper.getJcrPath(oakPath); } @@ -366,7 +365,7 @@ public class SessionContext implements N * @return Oak path * @throws javax.jcr.RepositoryException if the path can not be mapped */ - @Nonnull + @NotNull public String getOakPathOrThrow(String jcrPath) throws RepositoryException { String oakPath = getOakPath(jcrPath); if (oakPath != null) { @@ -384,7 +383,7 @@ public class SessionContext implements N * @return Oak path * @throws javax.jcr.PathNotFoundException if the path can not be mapped */ - @Nonnull + @NotNull public String getOakPathOrThrowNotFound(String jcrPath) throws PathNotFoundException { String oakPath = getOakPath(jcrPath); if (oakPath != null) { @@ -394,7 +393,7 @@ public class SessionContext implements N } } - @Nonnull + @NotNull public AccessManager getAccessManager() throws RepositoryException { if (accessManager == null) { accessManager = new AccessManager(delegate, delegate.getPermissionProvider()); @@ -402,7 +401,7 @@ public class SessionContext implements N return accessManager; } - @Nonnull + @NotNull public SecurityProvider getSecurityProvider() { return securityProvider; } @@ -448,7 +447,7 @@ public class SessionContext implements N }); } - @Nonnull + @NotNull private <T> T getConfig(Class<T> clss) { return securityProvider.getConfiguration(clss); }
Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java Wed Nov 7 14:10:06 2018 @@ -28,8 +28,6 @@ import java.security.AccessControlExcept import java.util.Collections; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.AccessDeniedException; import javax.jcr.Credentials; import javax.jcr.InvalidSerializedDataException; @@ -71,6 +69,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions; import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.ContentHandler; @@ -144,8 +144,8 @@ public class SessionImpl implements Jack sd.checkAlive(); } - @Nonnull - private String getOakPathOrThrow(@Nonnull String absPath) + @NotNull + private String getOakPathOrThrow(@NotNull String absPath) throws RepositoryException { String p = sessionContext.getOakPathOrThrow(absPath); if (!PathUtils.isAbsolute(p)) { @@ -154,14 +154,14 @@ public class SessionImpl implements Jack return p; } - @Nonnull - private String getOakPathOrThrowNotFound(@Nonnull String absPath) + @NotNull + private String getOakPathOrThrowNotFound(@NotNull String absPath) throws PathNotFoundException { return sessionContext.getOakPathOrThrowNotFound(absPath); } - @CheckForNull - private ItemImpl<?> getItemInternal(@Nonnull String oakPath) + @Nullable + private ItemImpl<?> getItemInternal(@NotNull String oakPath) throws RepositoryException { checkAlive(); ItemDelegate item = sd.getItem(oakPath); @@ -175,7 +175,7 @@ public class SessionImpl implements Jack } @Override - @CheckForNull + @Nullable public Node getNodeOrNull(final String absPath) throws RepositoryException { checkNotNull(absPath); checkAlive(); @@ -192,7 +192,7 @@ public class SessionImpl implements Jack } @Override - @CheckForNull + @Nullable public Property getPropertyOrNull(final String absPath) throws RepositoryException { checkAlive(); if (checkNotNull(absPath).equals("/")) { @@ -219,7 +219,7 @@ public class SessionImpl implements Jack } @Override - @CheckForNull + @Nullable public Item getItemOrNull(final String absPath) throws RepositoryException { checkNotNull(absPath); checkAlive(); @@ -234,7 +234,7 @@ public class SessionImpl implements Jack //------------------------------------------------------------< Session >--- @Override - @Nonnull + @NotNull public Repository getRepository() { return sessionContext.getRepository(); } @@ -260,13 +260,13 @@ public class SessionImpl implements Jack return attribute; } - @Override @Nonnull + @Override @NotNull public Workspace getWorkspace() { return sessionContext.getWorkspace(); } @Override - @Nonnull + @NotNull public Session impersonate(Credentials credentials) throws RepositoryException { checkAlive(); @@ -276,18 +276,18 @@ public class SessionImpl implements Jack } @Override - @Nonnull + @NotNull public ValueFactory getValueFactory() throws RepositoryException { checkAlive(); return sessionContext.getValueFactory(); } @Override - @Nonnull + @NotNull public Node getRootNode() throws RepositoryException { checkAlive(); return sd.perform(new ReadOperation<Node>("getRootNode") { - @Nonnull + @NotNull @Override public Node perform() throws RepositoryException { NodeDelegate nd = sd.getRootNode(); @@ -313,11 +313,11 @@ public class SessionImpl implements Jack return getNodeOrNull(checkNotNull(absPath)) != null; } - @Nonnull - private Node getNodeById(@Nonnull final String id) throws RepositoryException { + @NotNull + private Node getNodeById(@NotNull final String id) throws RepositoryException { checkAlive(); return sd.perform(new ReadOperation<Node>("getNodeById") { - @Nonnull + @NotNull @Override public Node perform() throws RepositoryException { NodeDelegate nd = sd.getNodeByIdentifier(id); @@ -330,13 +330,13 @@ public class SessionImpl implements Jack } @Override - @Nonnull + @NotNull public Node getNodeByUUID(String uuid) throws RepositoryException { return getNodeById(checkNotNull(uuid)); } @Override - @Nonnull + @NotNull public Node getNodeByIdentifier(String id) throws RepositoryException { return getNodeById(checkNotNull(id)); } @@ -481,7 +481,7 @@ public class SessionImpl implements Jack } @Override - @Nonnull + @NotNull public ContentHandler getImportContentHandler(String parentAbsPath, int uuidBehavior) throws RepositoryException { return new ImportHandler(checkNotNull(parentAbsPath), sessionContext, @@ -600,7 +600,7 @@ public class SessionImpl implements Jack } } - @Override @Nonnull + @Override @NotNull public String[] getLockTokens() { try { return getWorkspace().getLockManager().getLockTokens(); @@ -625,7 +625,7 @@ public class SessionImpl implements Jack final String oakPath = getOakPathOrThrow(checkNotNull(absPath)); checkNotNull(actions); return sd.perform(new ReadOperation<Boolean>("hasPermission") { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { return sessionContext.getAccessManager().hasPermissions(oakPath, actions); @@ -713,7 +713,7 @@ public class SessionImpl implements Jack } @Override - @Nonnull + @NotNull public AccessControlManager getAccessControlManager() throws RepositoryException { return sessionContext.getAccessControlManager(); } @@ -722,7 +722,7 @@ public class SessionImpl implements Jack * @see javax.jcr.Session#getRetentionManager() */ @Override - @Nonnull + @NotNull public RetentionManager getRetentionManager() throws RepositoryException { throw new UnsupportedRepositoryOperationException("Retention Management is not supported."); } @@ -761,13 +761,13 @@ public class SessionImpl implements Jack } @Override - @Nonnull + @NotNull public PrincipalManager getPrincipalManager() throws RepositoryException { return sessionContext.getPrincipalManager(); } @Override - @Nonnull + @NotNull public UserManager getUserManager() throws RepositoryException { return sessionContext.getUserManager(); } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java Wed Nov 7 14:10:06 2018 @@ -24,13 +24,13 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.NamespaceException; import javax.jcr.Session; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.namepath.impl.LocalNameMapper; import org.apache.jackrabbit.util.XMLChar; +import org.jetbrains.annotations.NotNull; import com.google.common.collect.Maps; @@ -42,7 +42,7 @@ import com.google.common.collect.Maps; */ public class SessionNamespaces extends LocalNameMapper { - public SessionNamespaces(@Nonnull Root root) { + public SessionNamespaces(@NotNull Root root) { super(root, Maps.<String, String>newHashMap()); } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java Wed Nov 7 14:10:06 2018 @@ -23,7 +23,6 @@ import static org.apache.jackrabbit.oak. import java.io.IOException; import java.io.InputStream; -import javax.annotation.Nonnull; import javax.jcr.InvalidSerializedDataException; import javax.jcr.NamespaceRegistry; import javax.jcr.PathNotFoundException; @@ -52,6 +51,7 @@ import org.apache.jackrabbit.oak.jcr.xml import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry; import org.apache.jackrabbit.oak.plugins.nodetype.write.ReadWriteNodeTypeManager; +import org.jetbrains.annotations.NotNull; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -85,19 +85,19 @@ public class WorkspaceImpl implements Ja return sessionDelegate.getRoot().getTree(NODE_TYPES_PATH); } - @Nonnull + @NotNull @Override protected Root getWriteRoot() { return sessionDelegate.getContentSession().getLatestRoot(); } @Override - @Nonnull + @NotNull protected ValueFactory getValueFactory() { return sessionContext.getValueFactory(); } - @Nonnull + @NotNull @Override protected NamePathMapper getNamePathMapper() { return sessionContext; @@ -107,7 +107,7 @@ public class WorkspaceImpl implements Ja //----------------------------------------------------------< Workspace >--- @Override - @Nonnull + @NotNull public Session getSession() { return sessionContext.getSession(); } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java Wed Nov 7 14:10:06 2018 @@ -18,10 +18,11 @@ */ package org.apache.jackrabbit.oak.jcr.session.operation; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + /** * A {@code SessionOperation} provides an execution context for executing session scoped operations. * @see org.apache.jackrabbit.oak.jcr.delegate.SessionDelegate#perform(SessionOperation) @@ -30,12 +31,12 @@ public abstract class SessionOperation<T private final String name; private final boolean update; - protected SessionOperation(@Nonnull String name, boolean update) { + protected SessionOperation(@NotNull String name, boolean update) { this.name = name; this.update = update; } - protected SessionOperation(@Nonnull String name) { + protected SessionOperation(@NotNull String name) { this(name, false); } @@ -64,7 +65,7 @@ public abstract class SessionOperation<T public void checkPreconditions() throws RepositoryException { } - @Nonnull + @NotNull public T perform() throws RepositoryException { throw new UnsupportedOperationException(); } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/UserManagerOperation.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/UserManagerOperation.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/UserManagerOperation.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/UserManagerOperation.java Wed Nov 7 14:10:06 2018 @@ -19,19 +19,19 @@ package org.apache.jackrabbit.oak.jcr.session.operation; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import org.apache.jackrabbit.oak.jcr.delegate.SessionDelegate; +import org.jetbrains.annotations.NotNull; public abstract class UserManagerOperation<T> extends SessionOperation<T> { private final SessionDelegate delegate; - protected UserManagerOperation(@Nonnull SessionDelegate delegate, @Nonnull String name) { + protected UserManagerOperation(@NotNull SessionDelegate delegate, @NotNull String name) { this(delegate, name, false); } - protected UserManagerOperation(@Nonnull SessionDelegate delegate, @Nonnull String name, boolean update) { + protected UserManagerOperation(@NotNull SessionDelegate delegate, @NotNull String name, boolean update) { super(name, update); this.delegate = delegate; } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java Wed Nov 7 14:10:06 2018 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.jcr.version; -import javax.annotation.Nonnull; import javax.jcr.InvalidItemStateException; import javax.jcr.RepositoryException; import javax.jcr.UnsupportedRepositoryOperationException; @@ -36,6 +35,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.util.ISO8601; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -55,7 +55,7 @@ public class ReadWriteVersionManager ext private final Clock clock = Clock.ACCURATE; - public ReadWriteVersionManager(@Nonnull SessionDelegate sessionDelegate) { + public ReadWriteVersionManager(@NotNull SessionDelegate sessionDelegate) { this.sessionDelegate = sessionDelegate; this.versionStorage = new VersionStorage(sessionDelegate.getRoot()); } @@ -73,19 +73,19 @@ public class ReadWriteVersionManager ext } @Override - @Nonnull + @NotNull protected Tree getVersionStorage() { return versionStorage.getTree(); } @Override - @Nonnull + @NotNull protected Root getWorkspaceRoot() { return sessionDelegate.getRoot(); } @Override - @Nonnull + @NotNull protected ReadOnlyNodeTypeManager getNodeTypeManager() { return ReadOnlyNodeTypeManager.getInstance( sessionDelegate.getRoot(), NamePathMapper.DEFAULT); @@ -105,8 +105,8 @@ public class ReadWriteVersionManager ext * @throws RepositoryException if an error occurs while checking the * node type of the tree. */ - @Nonnull - public Tree checkin(@Nonnull Tree versionable) + @NotNull + public Tree checkin(@NotNull Tree versionable) throws RepositoryException, InvalidItemStateException, UnsupportedRepositoryOperationException { if (sessionDelegate.hasPendingChanges()) { @@ -156,8 +156,8 @@ public class ReadWriteVersionManager ext * @throws IllegalArgumentException if the {@code versionablePath} is * not absolute. */ - public void checkout(@Nonnull Root workspaceRoot, - @Nonnull String versionablePath) + public void checkout(@NotNull Root workspaceRoot, + @NotNull String versionablePath) throws UnsupportedRepositoryOperationException, InvalidItemStateException, RepositoryException { checkState(!workspaceRoot.hasPendingChanges()); @@ -180,10 +180,10 @@ public class ReadWriteVersionManager ext } } - public void addVersionLabel(@Nonnull VersionStorage versionStorage, - @Nonnull String versionHistoryOakRelPath, - @Nonnull String versionIdentifier, - @Nonnull String oakVersionLabel, + public void addVersionLabel(@NotNull VersionStorage versionStorage, + @NotNull String versionHistoryOakRelPath, + @NotNull String versionIdentifier, + @NotNull String oakVersionLabel, boolean moveLabel) throws RepositoryException { Tree versionHistory = TreeUtil.getTree(checkNotNull(versionStorage.getTree()), checkNotNull(versionHistoryOakRelPath)); @@ -207,9 +207,9 @@ public class ReadWriteVersionManager ext } } - public void removeVersionLabel(@Nonnull VersionStorage versionStorage, - @Nonnull String versionHistoryOakRelPath, - @Nonnull String oakVersionLabel) + public void removeVersionLabel(@NotNull VersionStorage versionStorage, + @NotNull String versionHistoryOakRelPath, + @NotNull String oakVersionLabel) throws RepositoryException { Tree versionHistory = TreeUtil.getTree(checkNotNull(versionStorage.getTree()), checkNotNull(versionHistoryOakRelPath)); @@ -228,9 +228,9 @@ public class ReadWriteVersionManager ext } } - public void removeVersion(@Nonnull VersionStorage versionStorage, - @Nonnull String versionHistoryOakRelPath, - @Nonnull String oakVersionName) + public void removeVersion(@NotNull VersionStorage versionStorage, + @NotNull String versionHistoryOakRelPath, + @NotNull String oakVersionName) throws RepositoryException { Tree versionHistory = TreeUtil.getTree(versionStorage.getTree(), versionHistoryOakRelPath); if (versionHistory == null || !versionHistory.exists()) { @@ -253,8 +253,8 @@ public class ReadWriteVersionManager ext // TODO: more methods that modify versions //------------------------------------------------------------< private >--- - @Nonnull - private Tree getExistingBaseVersion(@Nonnull Tree versionableTree) throws RepositoryException { + @NotNull + private Tree getExistingBaseVersion(@NotNull Tree versionableTree) throws RepositoryException { Tree baseVersion = getBaseVersion(versionableTree); if (baseVersion == null) { throw new IllegalStateException("Base version does not exist for " + versionableTree.getPath()); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java Wed Nov 7 14:10:06 2018 @@ -23,7 +23,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.AccessDeniedException; import javax.jcr.NodeIterator; import javax.jcr.ReferentialIntegrityException; @@ -43,6 +42,7 @@ import org.apache.jackrabbit.oak.jcr.del import org.apache.jackrabbit.oak.jcr.session.NodeImpl; import org.apache.jackrabbit.oak.jcr.session.SessionContext; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; +import org.jetbrains.annotations.NotNull; /** * {@code VersionHistoryImpl}... @@ -62,7 +62,7 @@ public class VersionHistoryImpl extends @Override public String getVersionableIdentifier() throws RepositoryException { return perform(new SessionOperation<String>("getVersionableIdentifier") { - @Nonnull + @NotNull @Override public String perform() throws RepositoryException { return dlg.getVersionableIdentifier(); @@ -73,7 +73,7 @@ public class VersionHistoryImpl extends @Override public Version getRootVersion() throws RepositoryException { return perform(new SessionOperation<Version>("getRootVersion") { - @Nonnull + @NotNull @Override public Version perform() throws RepositoryException { return new VersionImpl(dlg.getRootVersion(), sessionContext); @@ -84,7 +84,7 @@ public class VersionHistoryImpl extends @Override public VersionIterator getAllLinearVersions() throws RepositoryException { return perform(new SessionOperation<VersionIterator>("getAllLinearVersions") { - @Nonnull + @NotNull @Override public VersionIterator perform() throws RepositoryException { Iterator<Version> versions = transform(dlg.getAllLinearVersions(), @@ -102,7 +102,7 @@ public class VersionHistoryImpl extends @Override public VersionIterator getAllVersions() throws RepositoryException { return perform(new SessionOperation<VersionIterator>("getAllVersions") { - @Nonnull + @NotNull @Override public VersionIterator perform() throws RepositoryException { Iterator<Version> versions = transform(dlg.getAllVersions(), @@ -131,7 +131,7 @@ public class VersionHistoryImpl extends public Version getVersion(final String versionName) throws VersionException, RepositoryException { return perform(new SessionOperation<Version>("getVersion") { - @Nonnull + @NotNull @Override public Version perform() throws RepositoryException { return new VersionImpl(dlg.getVersion(versionName), sessionContext); @@ -143,7 +143,7 @@ public class VersionHistoryImpl extends public Version getVersionByLabel(final String label) throws VersionException, RepositoryException { return perform(new SessionOperation<Version>("getVersionByLabel") { - @Nonnull + @NotNull @Override public Version perform() throws RepositoryException { String oakLabel = sessionContext.getOakName(label); @@ -195,7 +195,7 @@ public class VersionHistoryImpl extends @Override public String[] getVersionLabels() throws RepositoryException { return perform(new SessionOperation<String[]>("getVersionLabels") { - @Nonnull + @NotNull @Override public String[] perform() throws RepositoryException { List<String> labels = new ArrayList<String>(); @@ -215,7 +215,7 @@ public class VersionHistoryImpl extends "VersionHistory"); } return perform(new SessionOperation<String[]>("getVersionLabels") { - @Nonnull + @NotNull @Override public String[] perform() throws RepositoryException { List<String> labels = new ArrayList<String>(); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java Wed Nov 7 14:10:06 2018 @@ -23,7 +23,6 @@ import java.util.Calendar; import java.util.Iterator; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.InvalidItemStateException; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -43,6 +42,7 @@ import org.apache.jackrabbit.oak.jcr.del import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.version.VersionConstants; +import org.jetbrains.annotations.NotNull; public class VersionImpl extends NodeImpl<VersionDelegate> implements Version { @@ -53,7 +53,7 @@ public class VersionImpl extends NodeImp @Override public VersionHistory getContainingHistory() throws RepositoryException { return perform(new SessionOperation<VersionHistory>("getContainingHistory") { - @Nonnull + @NotNull @Override public VersionHistory perform() throws RepositoryException { return new VersionHistoryImpl( @@ -66,7 +66,7 @@ public class VersionImpl extends NodeImp @Override public Calendar getCreated() throws RepositoryException { return sessionDelegate.perform(new SessionOperation<Calendar>("getCreated") { - @Nonnull + @NotNull @Override public Calendar perform() throws RepositoryException { PropertyDelegate dlg = getPropertyOrThrow(JcrConstants.JCR_CREATED); @@ -120,7 +120,7 @@ public class VersionImpl extends NodeImp @Override public Version[] getPredecessors() throws RepositoryException { return perform(new SessionOperation<Version[]>("getPredecessors") { - @Nonnull + @NotNull @Override public Version[] perform() throws RepositoryException { List<Version> predecessors = new ArrayList<Version>(); @@ -135,7 +135,7 @@ public class VersionImpl extends NodeImp @Override public Version[] getSuccessors() throws RepositoryException { return perform(new SessionOperation<Version[]>("getSuccessors") { - @Nonnull + @NotNull @Override public Version[] perform() throws RepositoryException { PropertyDelegate p = getPropertyOrThrow(VersionConstants.JCR_SUCCESSORS); @@ -153,7 +153,7 @@ public class VersionImpl extends NodeImp @Override public Node getFrozenNode() throws RepositoryException { return perform(new SessionOperation<Node>("getFrozenNode") { - @Nonnull + @NotNull @Override public Node perform() throws RepositoryException { NodeDelegate frozenNode = dlg.getChild(VersionConstants.JCR_FROZENNODE); @@ -169,13 +169,13 @@ public class VersionImpl extends NodeImp //------------------------------< internal >-------------------------------- - @Nonnull + @NotNull private VersionManagerDelegate getVersionManagerDelegate() { return VersionManagerDelegate.create(sessionContext.getSessionDelegate()); } - @Nonnull - private PropertyDelegate getPropertyOrThrow(@Nonnull String name) + @NotNull + private PropertyDelegate getPropertyOrThrow(@NotNull String name) throws RepositoryException { PropertyDelegate p = dlg.getPropertyOrNull(checkNotNull(name)); if (p == null) { Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java Wed Nov 7 14:10:06 2018 @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.InvalidItemStateException; import javax.jcr.ItemExistsException; import javax.jcr.Node; @@ -53,6 +52,7 @@ import org.apache.jackrabbit.oak.jcr.loc import org.apache.jackrabbit.oak.jcr.session.SessionContext; import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation; import org.apache.jackrabbit.oak.plugins.nodetype.write.ReadWriteNodeTypeManager; +import org.jetbrains.annotations.NotNull; public class VersionManagerImpl implements VersionManager { @@ -252,7 +252,7 @@ public class VersionManagerImpl implemen public boolean isCheckedOut(final String absPath) throws RepositoryException { final SessionDelegate sessionDelegate = sessionContext.getSessionDelegate(); return sessionDelegate.perform(new SessionOperation<Boolean>("isCheckoutOut") { - @Nonnull + @NotNull @Override public Boolean perform() throws RepositoryException { String oakPath = getOakPathOrThrowNotFound(absPath); @@ -283,7 +283,7 @@ public class VersionManagerImpl implemen throws RepositoryException { final SessionDelegate sessionDelegate = sessionContext.getSessionDelegate(); return sessionDelegate.perform(new SessionOperation<VersionHistory>("getVersionHistory") { - @Nonnull + @NotNull @Override public VersionHistory perform() throws RepositoryException { return new VersionHistoryImpl( @@ -296,7 +296,7 @@ public class VersionManagerImpl implemen public Version getBaseVersion(final String absPath) throws RepositoryException { final SessionDelegate sessionDelegate = sessionContext.getSessionDelegate(); return sessionDelegate.perform(new SessionOperation<Version>("getBaseVersion") { - @Nonnull + @NotNull @Override public Version perform() throws RepositoryException { String oakPath = getOakPathOrThrowNotFound(absPath); @@ -360,7 +360,7 @@ public class VersionManagerImpl implemen public Version checkin(final String absPath) throws RepositoryException { final SessionDelegate sessionDelegate = sessionContext.getSessionDelegate(); return sessionDelegate.perform(new SessionOperation<Version>("checkin", true) { - @Nonnull + @NotNull @Override public Version perform() throws RepositoryException { String oakPath = getOakPathOrThrowNotFound(absPath); @@ -408,9 +408,9 @@ public class VersionManagerImpl implemen * @return the parent for the given <code>absPath</code>. * @throws PathNotFoundException if the node does not exist. */ - @Nonnull - private NodeDelegate ensureParentExists(@Nonnull SessionDelegate sessionDelegate, - @Nonnull String absPath) + @NotNull + private NodeDelegate ensureParentExists(@NotNull SessionDelegate sessionDelegate, + @NotNull String absPath) throws PathNotFoundException { String oakParentPath = getOakPathOrThrowNotFound( PathUtils.getParentPath(checkNotNull(absPath))); @@ -431,8 +431,8 @@ public class VersionManagerImpl implemen * sub-graphs. * @return existing nodes in this workspace. */ - private List<NodeDelegate> getExisting(@Nonnull Version version, - @Nonnull Set<String> versionablePaths) + private List<NodeDelegate> getExisting(@NotNull Version version, + @NotNull Set<String> versionablePaths) throws RepositoryException { // collect uuids final List<String> uuids = new ArrayList<String>(); @@ -505,9 +505,9 @@ public class VersionManagerImpl implemen * mix:versionable. * @throws RepositoryException if some other error occurs. */ - @Nonnull + @NotNull private VersionHistoryDelegate internalGetVersionHistory( - @Nonnull String absPathVersionable) + @NotNull String absPathVersionable) throws RepositoryException, UnsupportedRepositoryOperationException { SessionDelegate sessionDelegate = sessionContext.getSessionDelegate(); String oakPath = getOakPathOrThrowNotFound(checkNotNull(absPathVersionable)); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java Wed Nov 7 14:10:06 2018 @@ -16,11 +16,10 @@ */ package org.apache.jackrabbit.oak.jcr.version; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkNotNull; @@ -34,7 +33,7 @@ public class VersionStorage { private final Root root; - public VersionStorage(@Nonnull Root versionStorageRoot) { + public VersionStorage(@NotNull Root versionStorageRoot) { this.root = versionStorageRoot; } @@ -66,7 +65,7 @@ public class VersionStorage { * @param workspaceRoot the root of the workspace. * @return the version storage tree. */ - private static Tree getVersionStorageTree(@Nonnull Root workspaceRoot) { + private static Tree getVersionStorageTree(@NotNull Root workspaceRoot) { // TODO: this assumes the version store is in the same workspace. return checkNotNull(workspaceRoot).getTree(VERSION_STORAGE_PATH); } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java Wed Nov 7 14:10:06 2018 @@ -24,9 +24,6 @@ import java.util.Set; import java.util.Stack; import java.util.UUID; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.ImportUUIDBehavior; import javax.jcr.ItemExistsException; import javax.jcr.PathNotFoundException; @@ -68,6 +65,8 @@ import org.apache.jackrabbit.oak.spi.xml import org.apache.jackrabbit.oak.spi.xml.ProtectedNodeImporter; import org.apache.jackrabbit.oak.spi.xml.ProtectedPropertyImporter; import org.apache.jackrabbit.oak.spi.xml.ReferenceChangeTracker; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -172,7 +171,7 @@ public class ImporterImpl implements Imp } } - private Tree createTree(@Nonnull Tree parent, @Nonnull NodeInfo nInfo, @CheckForNull String uuid) throws RepositoryException { + private Tree createTree(@NotNull Tree parent, @NotNull NodeInfo nInfo, @Nullable String uuid) throws RepositoryException { String ntName = nInfo.getPrimaryTypeName(); Tree child = TreeUtil.addChild( parent, nInfo.getName(), ntName, ntTypesRoot, userID); @@ -262,8 +261,8 @@ public class ImporterImpl implements Imp return tree; } - private void importProperties(@Nonnull Tree tree, - @Nonnull List<PropInfo> propInfos, + private void importProperties(@NotNull Tree tree, + @NotNull List<PropInfo> propInfos, boolean ignoreRegular) throws RepositoryException { // process properties for (PropInfo pi : propInfos) { @@ -594,7 +593,7 @@ public class ImporterImpl implements Imp */ private final Set<String> importedUUIDs; - private IdResolver(@Nonnull Root root, @Nonnull ContentSession contentSession) { + private IdResolver(@NotNull Root root, @NotNull ContentSession contentSession) { currentStateIdManager = new IdentifierManager(root); baseStateIdManager = new IdentifierManager(contentSession.getLatestRoot()); @@ -606,8 +605,8 @@ public class ImporterImpl implements Imp } - @CheckForNull - private Tree getConflictingTree(@Nonnull String id) { + @Nullable + private Tree getConflictingTree(@NotNull String id) { //1. First check from base state that tree corresponding to //this id exist Tree conflicting = baseStateIdManager.getTree(id); @@ -627,7 +626,7 @@ public class ImporterImpl implements Imp return conflicting; } - private void rememberImportedUUIDs(@CheckForNull Tree tree) { + private void rememberImportedUUIDs(@Nullable Tree tree) { if (tree == null || importedUUIDs == null) { return; } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java Wed Nov 7 14:10:06 2018 @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Stack; -import javax.annotation.Nonnull; import javax.jcr.InvalidSerializedDataException; import javax.jcr.NamespaceRegistry; import javax.jcr.PropertyType; @@ -32,6 +31,7 @@ import org.apache.jackrabbit.oak.spi.nam import org.apache.jackrabbit.oak.spi.xml.Importer; import org.apache.jackrabbit.oak.spi.xml.NodeInfo; import org.apache.jackrabbit.oak.spi.xml.PropInfo; +import org.jetbrains.annotations.NotNull; import org.xml.sax.Attributes; import org.xml.sax.SAXException; @@ -288,7 +288,7 @@ class SysViewImportHandler extends Targe } } - private boolean isSystemProperty(@Nonnull String localName) { + private boolean isSystemProperty(@NotNull String localName) { return currentPropName != null && currentPropName.getNamespaceUri().equals(NamespaceRegistry.NAMESPACE_JCR) && currentPropName.getLocalName().equals(localName); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java Wed Nov 7 14:10:06 2018 @@ -30,7 +30,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicLong; -import javax.annotation.Nonnull; import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -42,6 +41,7 @@ import org.apache.jackrabbit.oak.NodeSto import org.apache.jackrabbit.oak.commons.FixturesHelper; import org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture; import org.apache.jackrabbit.oak.fixture.NodeStoreFixture; +import org.jetbrains.annotations.NotNull; import org.junit.BeforeClass; import org.junit.Test; @@ -92,9 +92,9 @@ public class AtomicCounterIT extends Abs } } - private ListenableFutureTask<Void> updateCounter(@Nonnull final String counterPath, + private ListenableFutureTask<Void> updateCounter(@NotNull final String counterPath, final long delta, - @Nonnull final AtomicLong expected) { + @NotNull final AtomicLong expected) { checkNotNull(counterPath); checkNotNull(expected); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterTest.java Wed Nov 7 14:10:06 2018 @@ -24,12 +24,12 @@ import static org.junit.Assert.assertEqu import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import javax.annotation.Nonnull; import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; import org.apache.jackrabbit.oak.fixture.NodeStoreFixture; +import org.jetbrains.annotations.NotNull; import org.junit.Test; public class AtomicCounterTest extends AbstractRepositoryTest { @@ -82,7 +82,7 @@ public class AtomicCounterTest extends A } } - private static void assertCounter(@Nonnull final Node counter, final long expectedCount) + private static void assertCounter(@NotNull final Node counter, final long expectedCount) throws RepositoryException { checkNotNull(counter); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java Wed Nov 7 14:10:06 2018 @@ -24,8 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Credentials; import javax.jcr.Repository; import javax.jcr.Session; @@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider; import org.apache.jackrabbit.oak.spi.state.Clusterable; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; import org.slf4j.Logger; @@ -79,7 +79,7 @@ public abstract class DocumentClusterIT mk.dispose(); // closes connection as well } - protected void dispose(@Nonnull Repository repo) { + protected void dispose(@NotNull Repository repo) { AbstractRepositoryTest.dispose(checkNotNull(repo)); } @@ -101,7 +101,7 @@ public abstract class DocumentClusterIT * @param log may be null. If valid Logger it will be logged * @throws Exception */ - static void raiseExceptions(@Nonnull final Map<String, Exception> exceptions, + static void raiseExceptions(@NotNull final Map<String, Exception> exceptions, @Nullable final Logger log) throws Exception { if (exceptions != null) { for (Map.Entry<String, Exception> entry : exceptions.entrySet()) { @@ -120,7 +120,7 @@ public abstract class DocumentClusterIT * * @param mks the list of {@link DocumentMK} composing the cluster. Cannot be null. */ - static void alignCluster(@Nonnull final List<DocumentMK> mks) { + static void alignCluster(@NotNull final List<DocumentMK> mks) { // in a first round let all MKs run their background update for (DocumentMK mk : mks) { mk.getNodeStore().runBackgroundOperations(); @@ -144,9 +144,9 @@ public abstract class DocumentClusterIT * @param repos list of {@link Repository} created on each {@code mks} * @throws Exception */ - void setUpCluster(@Nonnull final Class<?> clazz, - @Nonnull final List<DocumentMK> mks, - @Nonnull final List<Repository> repos) throws Exception { + void setUpCluster(@NotNull final Class<?> clazz, + @NotNull final List<DocumentMK> mks, + @NotNull final List<Repository> repos) throws Exception { setUpCluster(clazz, mks, repos, NOT_PROVIDED); } @@ -161,21 +161,21 @@ public abstract class DocumentClusterIT * manual and sync with {@link #alignCluster(List)}. * @throws Exception */ - void setUpCluster(@Nonnull final Class<?> clazz, - @Nonnull final List<DocumentMK> mks, - @Nonnull final List<Repository> repos, + void setUpCluster(@NotNull final Class<?> clazz, + @NotNull final List<DocumentMK> mks, + @NotNull final List<Repository> repos, final int asyncDelay) throws Exception { for (int i = 0; i < NUM_CLUSTER_NODES; i++) { initRepository(clazz, repos, mks, i + 1, asyncDelay); } } - static MongoConnection createConnection(@Nonnull final Class<?> clazz) throws Exception { + static MongoConnection createConnection(@NotNull final Class<?> clazz) throws Exception { return OakMongoNSRepositoryStub.createConnection( checkNotNull(clazz).getSimpleName()); } - static void dropDB(@Nonnull final Class<?> clazz) throws Exception { + static void dropDB(@NotNull final Class<?> clazz) throws Exception { MongoConnection con = createConnection(checkNotNull(clazz)); try { con.getDB().dropDatabase(); @@ -194,9 +194,9 @@ public abstract class DocumentClusterIT * @param asyncDelay the async delay to set. For default use {@link #NOT_PROVIDED} * @throws Exception */ - protected void initRepository(@Nonnull final Class<?> clazz, - @Nonnull final List<Repository> repos, - @Nonnull final List<DocumentMK> mks, + protected void initRepository(@NotNull final Class<?> clazz, + @NotNull final List<Repository> repos, + @NotNull final List<DocumentMK> mks, final int clusterId, final int asyncDelay) throws Exception { DocumentMK.Builder builder = new DocumentMK.Builder(); @@ -226,7 +226,7 @@ public abstract class DocumentClusterIT checkNotNull(mks).add(mk); } - protected Jcr getJcr(@Nonnull NodeStore store) { + protected Jcr getJcr(@NotNull NodeStore store) { Jcr j = new Jcr(checkNotNull(store)); if (store instanceof Clusterable) { j.with((Clusterable) store); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeDefinitionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeDefinitionTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeDefinitionTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeDefinitionTest.java Wed Nov 7 14:10:06 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.jcr.no import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.ItemVisitor; import javax.jcr.Node; import javax.jcr.NodeIterator; @@ -30,6 +29,7 @@ import javax.jcr.util.TraversingItemVisi import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.test.AbstractJCRTest; +import org.jetbrains.annotations.NotNull; public class NodeTypeDefinitionTest extends AbstractJCRTest { @@ -97,9 +97,9 @@ public class NodeTypeDefinitionTest exte } } - private static int getIndex(@Nonnull Node node) throws RepositoryException { + private static int getIndex(@NotNull Node node) throws RepositoryException { String name = node.getName(); int i = name.lastIndexOf('['); return (i == -1) ? 1 : Integer.valueOf(name.substring(i+1, name.lastIndexOf(']'))); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/AbstractRandomizedTest.java Wed Nov 7 14:10:06 2018 @@ -21,7 +21,6 @@ import java.security.Principal; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -34,6 +33,7 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.oak.jcr.Jcr; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; @@ -91,11 +91,11 @@ public abstract class AbstractRandomized oakRepository = dispose(oakRepository); } - protected Principal getTestPrincipal(@Nonnull JackrabbitSession session) throws RepositoryException { + protected Principal getTestPrincipal(@NotNull JackrabbitSession session) throws RepositoryException { return session.getUserManager().getAuthorizable(userId).getPrincipal(); } - protected Principal getPrincipal(@Nonnull JackrabbitSession session, int index) throws RepositoryException { + protected Principal getPrincipal(@NotNull JackrabbitSession session, int index) throws RepositoryException { return session.getPrincipalManager().getPrincipal(ids[index]); } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java Wed Nov 7 14:10:06 2018 @@ -21,9 +21,6 @@ import java.util.Collections; import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Credentials; import javax.jcr.Node; import javax.jcr.PathNotFoundException; @@ -47,6 +44,8 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils; import org.apache.jackrabbit.test.NotExecutableException; import org.apache.jackrabbit.test.api.security.AbstractAccessControlTest; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; @@ -173,7 +172,7 @@ public abstract class AbstractEvaluation } } - protected static String generateId(@Nonnull String hint) { + protected static String generateId(@NotNull String hint) { return hint + UUID.randomUUID(); } @@ -205,16 +204,16 @@ public abstract class AbstractEvaluation return Collections.singletonMap("rep:glob", testSession.getValueFactory().createValue(value)); } - protected void assertHasRepoPrivilege(@Nonnull String privName, boolean isAllow) throws Exception { + protected void assertHasRepoPrivilege(@NotNull String privName, boolean isAllow) throws Exception { Privilege[] privs = privilegesFromName(privName.toString()); assertEquals(isAllow, testAcMgr.hasPrivileges(null, privs)); } - protected void assertHasPrivilege(@Nonnull String path, @Nonnull String privName, boolean isAllow) throws Exception { + protected void assertHasPrivilege(@NotNull String path, @NotNull String privName, boolean isAllow) throws Exception { assertHasPrivileges(path, privilegesFromName(privName), isAllow); } - protected void assertHasPrivileges(@Nonnull String path, @Nonnull Privilege[] privileges, boolean isAllow) throws Exception { + protected void assertHasPrivileges(@NotNull String path, @NotNull Privilege[] privileges, boolean isAllow) throws Exception { if (testSession.nodeExists(path)) { assertEquals(isAllow, testAcMgr.hasPrivileges(path, privileges)); } else { @@ -232,7 +231,7 @@ public abstract class AbstractEvaluation assertArrayEquals(privilegesFromName(Privilege.JCR_READ), privs); } - protected JackrabbitAccessControlList modify(@Nullable String path, @Nonnull String privilege, boolean isAllow) throws Exception { + protected JackrabbitAccessControlList modify(@Nullable String path, @NotNull String privilege, boolean isAllow) throws Exception { return modify(path, testUser.getPrincipal(), privilegesFromName(privilege), isAllow, EMPTY_RESTRICTIONS); } @@ -258,13 +257,13 @@ public abstract class AbstractEvaluation } protected JackrabbitAccessControlList allow(@Nullable String nPath, - @Nonnull Privilege[] privileges) + @NotNull Privilege[] privileges) throws Exception { return modify(nPath, testUser.getPrincipal(), privileges, true, EMPTY_RESTRICTIONS); } protected JackrabbitAccessControlList allow(@Nullable String nPath, - @Nonnull Privilege[] privileges, + @NotNull Privilege[] privileges, Map<String, Value> restrictions) throws Exception { return modify(nPath, testUser.getPrincipal(), privileges, true, restrictions); @@ -331,7 +330,7 @@ public abstract class AbstractEvaluation superuser.save(); } - @CheckForNull + @Nullable private AccessControlList getList(@Nullable String path) throws RepositoryException { if (path == null || superuser.nodeExists(path)) { for (AccessControlPolicy policy : acMgr.getPolicies(path)) { @@ -343,4 +342,4 @@ public abstract class AbstractEvaluation return null; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java Wed Nov 7 14:10:06 2018 @@ -22,7 +22,6 @@ import java.io.InputStream; import java.security.Principal; import java.util.Arrays; import java.util.List; -import javax.annotation.Nullable; import javax.jcr.ImportUUIDBehavior; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -38,6 +37,7 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.api.security.JackrabbitAccessControlList; import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.test.AbstractJCRTest; +import org.jetbrains.annotations.Nullable; public class AccessControlImporterTest extends AbstractJCRTest { Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NamespaceManagementTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NamespaceManagementTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NamespaceManagementTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NamespaceManagementTest.java Wed Nov 7 14:10:06 2018 @@ -18,13 +18,13 @@ package org.apache.jackrabbit.oak.jcr.se import java.util.Arrays; import java.util.List; -import javax.annotation.Nonnull; import javax.jcr.AccessDeniedException; import javax.jcr.RepositoryException; import javax.jcr.Workspace; import javax.jcr.security.AccessControlPolicy; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; +import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -55,7 +55,7 @@ public class NamespaceManagementTest ext } } - @Nonnull + @NotNull private String getNewNamespacePrefix(Workspace wsp) throws RepositoryException { String prefix = "prefix"; List<String> pfcs = Arrays.asList(wsp.getNamespaceRegistry().getPrefixes()); @@ -66,7 +66,7 @@ public class NamespaceManagementTest ext return prefix; } - @Nonnull + @NotNull private String getNewNamespaceURI(Workspace wsp) throws RepositoryException { String uri = "http://jackrabbit.apache.org/uri";; List<String> uris = Arrays.asList(wsp.getNamespaceRegistry().getURIs()); @@ -129,4 +129,4 @@ public class NamespaceManagementTest ext } } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java Wed Nov 7 14:10:06 2018 @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; import javax.jcr.ImportUUIDBehavior; import javax.jcr.Node; import javax.jcr.Repository; @@ -46,6 +45,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter; import org.apache.jackrabbit.test.NotExecutableException; +import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Before; @@ -139,7 +139,7 @@ public abstract class AbstractImportTest } } - @CheckForNull + @Nullable protected ConfigurationParameters getConfigurationParameters() { String importBehavior = getImportBehavior(); if (importBehavior != null) { Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsBestEffortTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsBestEffortTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsBestEffortTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsBestEffortTest.java Wed Nov 7 14:10:06 2018 @@ -33,9 +33,9 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider; import org.apache.jackrabbit.oak.spi.xml.ImportBehavior; import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter; +import org.jetbrains.annotations.NotNull; import org.junit.Test; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import java.util.HashMap; import java.util.List; @@ -130,14 +130,14 @@ public class GroupImportWithActionsBestE Set<String> failedIds = Sets.newHashSet(); @Override - public void onMemberAdded(@Nonnull Group group, @Nonnull Authorizable member, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onMemberAdded(@NotNull Group group, @NotNull Authorizable member, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { this.group = group; this.memberIds.add(member.getID()); onMemberAddedCalled = true; } @Override - public void onMembersAdded(@Nonnull Group group, @Nonnull Iterable<String> memberIds, @Nonnull Iterable<String> failedIds, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onMembersAdded(@NotNull Group group, @NotNull Iterable<String> memberIds, @NotNull Iterable<String> failedIds, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { this.group = group; this.memberIds.addAll(ImmutableSet.copyOf(memberIds)); this.failedIds.addAll(ImmutableSet.copyOf(failedIds)); @@ -145,7 +145,7 @@ public class GroupImportWithActionsBestE } @Override - public void onMembersAddedContentId(@Nonnull Group group, @Nonnull Iterable<String> memberContentIds, @Nonnull Iterable<String> failedIds, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onMembersAddedContentId(@NotNull Group group, @NotNull Iterable<String> memberContentIds, @NotNull Iterable<String> failedIds, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { this.group = group; this.memberContentIds.addAll(ImmutableSet.copyOf(memberContentIds)); this.failedIds.addAll(ImmutableSet.copyOf(failedIds)); @@ -161,9 +161,9 @@ public class GroupImportWithActionsBestE actions.add(action); } - @Nonnull + @NotNull @Override - public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) { + public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) { return actions; } } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportWithActionsTest.java Wed Nov 7 14:10:06 2018 @@ -33,9 +33,9 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider; import org.apache.jackrabbit.oak.spi.xml.ImportBehavior; import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter; +import org.jetbrains.annotations.NotNull; import org.junit.Test; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import java.util.HashMap; import java.util.List; @@ -129,14 +129,14 @@ public class GroupImportWithActionsTest Set<String> memberIds = Sets.newHashSet(); @Override - public void onMembersAdded(@Nonnull Group group, @Nonnull Iterable<String> memberIds, @Nonnull Iterable<String> failedIds, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onMembersAdded(@NotNull Group group, @NotNull Iterable<String> memberIds, @NotNull Iterable<String> failedIds, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { this.group = group; this.memberIds.addAll(ImmutableSet.copyOf(memberIds)); onMembersAddedCalled = true; } @Override - public void onMemberAdded(@Nonnull Group group, @Nonnull Authorizable member, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onMemberAdded(@NotNull Group group, @NotNull Authorizable member, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { memberIds.add(member.getID()); onMemberAddedCalled = true; } @@ -155,9 +155,9 @@ public class GroupImportWithActionsTest actions.add(action); } - @Nonnull + @NotNull @Override - public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) { + public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) { return actions; } } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/PrincipalLookupTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/PrincipalLookupTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/PrincipalLookupTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/PrincipalLookupTest.java Wed Nov 7 14:10:06 2018 @@ -17,16 +17,16 @@ package org.apache.jackrabbit.oak.jcr.security.user; import java.security.Principal; -import javax.annotation.Nonnull; import javax.jcr.Session; import org.apache.jackrabbit.api.JackrabbitSession; import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.jackrabbit.test.NotExecutableException; +import org.jetbrains.annotations.NotNull; public class PrincipalLookupTest extends AbstractUserTest { - private static PrincipalManager getPrincipalManager(@Nonnull Session session) throws Exception { + private static PrincipalManager getPrincipalManager(@NotNull Session session) throws Exception { if (!(session instanceof JackrabbitSession)) { throw new NotExecutableException("JackrabbitSession expected"); } @@ -53,4 +53,4 @@ public class PrincipalLookupTest extends } } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java Wed Nov 7 14:10:06 2018 @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.jcr.security.user; import java.util.HashMap; -import javax.annotation.CheckForNull; import javax.jcr.Node; import javax.jcr.Property; import javax.jcr.Session; @@ -27,6 +26,7 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.Nullable; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -51,7 +51,7 @@ public class UserImportPwExpiryTest exte return null; } - @CheckForNull + @Nullable protected ConfigurationParameters getConfigurationParameters() { HashMap<String, Object> userParams = new HashMap<String, Object>() {{ put(UserConstants.PARAM_PASSWORD_MAX_AGE, 10); Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java Wed Nov 7 14:10:06 2018 @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.security.AccessControlEntry; import javax.jcr.security.AccessControlList; @@ -41,6 +40,7 @@ import org.apache.jackrabbit.oak.spi.sec 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.xml.ImportBehavior; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -238,9 +238,9 @@ public class UserImportWithActionsTest e private void addAction(AuthorizableAction action) { actions.add(action); } - @Nonnull + @NotNull @Override - public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) { + public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) { return actions; } } Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvIgnoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvIgnoreTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvIgnoreTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/OpvIgnoreTest.java Wed Nov 7 14:10:06 2018 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.jcr.version; -import javax.annotation.Nonnull; import javax.jcr.Node; import javax.jcr.Property; import javax.jcr.PropertyType; @@ -38,6 +37,7 @@ import org.apache.jackrabbit.oak.spi.nod import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.test.AbstractJCRTest; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -59,7 +59,7 @@ public class OpvIgnoreTest extends Abstr versionManager = superuser.getWorkspace().getVersionManager(); } - private void addIgnoredChild(@Nonnull Node node) throws Exception { + private void addIgnoredChild(@NotNull Node node) throws Exception { AccessControlManager acMgr = superuser.getAccessControlManager(); JackrabbitAccessControlList acl = AccessControlUtils.getAccessControlList(acMgr, node.getPath()); acl.addAccessControlEntry(EveryonePrincipal.getInstance(), AccessControlUtils.privilegesFromNames(acMgr, Privilege.JCR_READ)); @@ -243,4 +243,4 @@ public class OpvIgnoreTest extends Abstr return def; } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java?rev=1846023&r1=1846022&r2=1846023&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java (original) +++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java Wed Nov 7 14:10:06 2018 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.jcr.version; -import javax.annotation.Nullable; import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.Property; @@ -30,6 +29,7 @@ import javax.jcr.version.VersionManager; import com.google.common.base.Function; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.test.AbstractJCRTest; +import org.jetbrains.annotations.Nullable; import java.util.Set; @@ -334,4 +334,4 @@ public class VersionableTest extends Abs })); } -} \ No newline at end of file +}
