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 [12/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/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java Wed Nov 7 13:57:55 2018
@@ -26,8 +26,7 @@ import static org.mockito.Mockito.when;
import java.util.Set;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
public class AndImplTest {
@@ -72,8 +71,8 @@ public class AndImplTest {
* @param clazz the class you want Mockito to generate for you.
* @return a Mockito instance of the provided ConstraintImpl
*/
- private static ConstraintImpl mockConstraint(@Nonnull String toString,
- @Nonnull Class<? extends ConstraintImpl> clazz) {
+ private static ConstraintImpl mockConstraint(@NotNull String toString,
+ @NotNull Class<? extends ConstraintImpl> clazz) {
ConstraintImpl c = mock(checkNotNull(clazz));
when(c.toString()).thenReturn(checkNotNull(toString));
return c;
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/IndexSelectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/IndexSelectionTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/IndexSelectionTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/IndexSelectionTest.java Wed Nov 7 13:57:55 2018
@@ -22,8 +22,6 @@ package org.apache.jackrabbit.oak.query.
import java.util.List;
import java.util.UUID;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.Oak;
@@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -99,7 +98,7 @@ public class IndexSelectionTest extends
private static class TestIndexProvider implements QueryIndexProvider {
TestIndex index = new TestIndex();
- @Nonnull
+ @NotNull
@Override
public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) {
return ImmutableList.<QueryIndex>of(index);
@@ -134,4 +133,4 @@ public class IndexSelectionTest extends
return "test-index";
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java Wed Nov 7 13:57:55 2018
@@ -24,9 +24,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentRepository;
@@ -35,6 +32,8 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Ignore;
import org.junit.Test;
@@ -439,8 +438,8 @@ public class TraversingIndexQueryTest ex
* @param value
* @return
*/
- private static Tree addNtUnstructuredChild(@Nonnull final Tree parent,
- @Nonnull final String name,
+ private static Tree addNtUnstructuredChild(@NotNull final Tree parent,
+ @NotNull final String name,
@Nullable final String propertyName,
@Nullable final Long value) {
checkNotNull(parent);
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/CustomQueryIndexProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/CustomQueryIndexProviderTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/CustomQueryIndexProviderTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/CustomQueryIndexProviderTest.java Wed Nov 7 13:57:55 2018
@@ -22,9 +22,6 @@ package org.apache.jackrabbit.oak.securi
import java.util.Collections;
import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -42,6 +39,8 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -69,16 +68,16 @@ public class CustomQueryIndexProviderTes
private class UUIDIndexReplacementInitializer implements RepositoryInitializer {
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
builder.child("oak:index").child("uuid").setProperty("type", TEST_INDEX);
}
}
private static class TestIndexEditor implements IndexEditorProvider {
- @CheckForNull
+ @Nullable
@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 {
if (TEST_INDEX.equals(type)) {
PropertyIndexEditorProvider piep = new PropertyIndexEditorProvider();
@@ -89,7 +88,7 @@ public class CustomQueryIndexProviderTes
}
private static class TestQueryProvider implements QueryIndexProvider {
- @Nonnull
+ @NotNull
@Override
public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) {
return Collections.singletonList(new TestQueryIndex());
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImplTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImplTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImplTest.java Wed Nov 7 13:57:55 2018
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authentication;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import javax.jcr.SimpleCredentials;
import javax.security.auth.callback.Callback;
@@ -30,6 +29,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authentication.callback.WhiteboardCallback;
import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
@@ -51,7 +51,7 @@ public class CallbackHandlerImplTest ext
callbackHandler = create(simpleCreds);
}
- private CallbackHandlerImpl create(@Nonnull Credentials creds) {
+ private CallbackHandlerImpl create(@NotNull Credentials creds) {
return new CallbackHandlerImpl(creds, root.getContentSession().getWorkspaceName(), getContentRepository(), getSecurityProvider(), whiteboard);
}
@@ -118,4 +118,4 @@ public class CallbackHandlerImplTest ext
callbackHandler.handle(new Callback[] {new Callback() {}});
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/AbstractTokenTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/AbstractTokenTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/AbstractTokenTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/AbstractTokenTest.java Wed Nov 7 13:57:55 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authentication.token;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.AccessDeniedException;
import org.apache.jackrabbit.JcrConstants;
@@ -28,6 +26,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConstants;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenInfo;
import org.apache.jackrabbit.oak.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
/**
@@ -60,17 +60,17 @@ public abstract class AbstractTokenTest
return ConfigurationParameters.EMPTY;
}
- @CheckForNull
- Tree getTokenTree(@Nonnull TokenInfo info) {
+ @Nullable
+ Tree getTokenTree(@NotNull TokenInfo info) {
String token = info.getToken();
int pos = token.indexOf('_');
String nodeId = (pos == -1) ? token : token.substring(0, pos);
return new IdentifierManager(root).getTree(nodeId);
}
- @Nonnull
- Tree createTokenTree(@Nonnull TokenInfo base, @Nonnull NodeUtil parent,
- @Nonnull String ntName) throws AccessDeniedException {
+ @NotNull
+ Tree createTokenTree(@NotNull TokenInfo base, @NotNull NodeUtil parent,
+ @NotNull String ntName) throws AccessDeniedException {
Tree tokenTree = getTokenTree(base);
Tree tree = parent.addChild("token", ntName).getTree();
tree.setProperty(tokenTree.getProperty(JcrConstants.JCR_UUID));
@@ -78,4 +78,4 @@ public abstract class AbstractTokenTest
tree.setProperty(tokenTree.getProperty(TOKEN_ATTRIBUTE_EXPIRY));
return tree;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestCredentialsSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestCredentialsSupport.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestCredentialsSupport.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestCredentialsSupport.java Wed Nov 7 13:57:55 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.securi
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import com.google.common.collect.ImmutableMap;
@@ -29,6 +27,8 @@ import com.google.common.collect.Maps;
import org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Dummy implementation of {@link CredentialsSupport} that only supports
@@ -43,19 +43,19 @@ public class TestCredentialsSupport impl
this.uid = null;
}
- TestCredentialsSupport(@Nonnull String uid) {
+ TestCredentialsSupport(@NotNull String uid) {
this.uid = uid;
}
- @Nonnull
+ @NotNull
@Override
public Set<Class> getCredentialClasses() {
return ImmutableSet.<Class>of(Creds.class);
}
- @CheckForNull
+ @Nullable
@Override
- public String getUserId(@Nonnull Credentials credentials) {
+ public String getUserId(@NotNull Credentials credentials) {
if (credentials instanceof Creds) {
return uid;
} else {
@@ -63,9 +63,9 @@ public class TestCredentialsSupport impl
}
}
- @Nonnull
+ @NotNull
@Override
- public Map<String, ?> getAttributes(@Nonnull Credentials credentials) {
+ public Map<String, ?> getAttributes(@NotNull Credentials credentials) {
if (credentials instanceof Creds) {
return ((Creds) credentials).attributes;
} else {
@@ -74,7 +74,7 @@ public class TestCredentialsSupport impl
}
@Override
- public boolean setAttributes(@Nonnull Credentials credentials, @Nonnull Map<String, ?> attributes) {
+ public boolean setAttributes(@NotNull Credentials credentials, @NotNull Map<String, ?> attributes) {
if (credentials instanceof Creds) {
((Creds) credentials).attributes.putAll(attributes);
return true;
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestLoginModule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestLoginModule.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestLoginModule.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestLoginModule.java Wed Nov 7 13:57:55 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
@@ -28,6 +27,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authentication.AuthInfoImpl;
import org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
+import org.jetbrains.annotations.NotNull;
public class TestLoginModule extends AbstractLoginModule {
@@ -42,7 +42,7 @@ public class TestLoginModule extends Abs
credentialsSupport = (CredentialsSupport) options.get("credsSupport");
}
- @Nonnull
+ @NotNull
@Override
protected Set<Class> getSupportedCredentials() {
return new TestCredentialsSupport().getCredentialClasses();
@@ -71,4 +71,4 @@ public class TestLoginModule extends Abs
return false;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java Wed Nov 7 13:57:55 2018
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import javax.jcr.GuestCredentials;
import javax.jcr.SimpleCredentials;
@@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConstants;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenInfo;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
@@ -147,7 +147,7 @@ public class TokenAuthenticationTest ext
assertNull(tp.getTokenInfo(info.getToken()));
}
- private void waitUntilExpired(@Nonnull TokenInfo info) {
+ private void waitUntilExpired(@NotNull TokenInfo info) {
long now = System.currentTimeMillis();
while (!info.isExpired(now)) {
now = waitForSystemTimeIncrement(now);
@@ -177,4 +177,4 @@ public class TokenAuthenticationTest ext
assertTrue(authentication.authenticate(new TokenCredentials(info.getToken())));
assertEquals(getTestUser().getPrincipal(), authentication.getUserPrincipal());
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java Wed Nov 7 13:57:55 2018
@@ -18,14 +18,13 @@ package org.apache.jackrabbit.oak.securi
import static org.junit.Assert.assertEquals;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConstants;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenInfo;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
public class TokenCleanupTest extends AbstractTokenTest {
@@ -69,7 +68,7 @@ public class TokenCleanupTest extends Ab
return tkn;
}
- private void waitUntilExpired(@Nonnull TokenInfo info) {
+ private void waitUntilExpired(@NotNull TokenInfo info) {
long now = System.currentTimeMillis();
while (!info.isExpired(now)) {
now = waitForSystemTimeIncrement(now);
@@ -97,4 +96,4 @@ public class TokenCleanupTest extends Ab
}
assertTokenNodes(10);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModuleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModuleTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModuleTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModuleTest.java Wed Nov 7 13:57:55 2018
@@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.securi
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
import javax.jcr.GuestCredentials;
import javax.jcr.SimpleCredentials;
@@ -44,6 +41,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConfiguration;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenInfo;
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -210,25 +209,25 @@ public class TokenLoginModuleTest extend
TokenProvider tp = new TokenProvider() {
@Override
- public boolean doCreateToken(@Nonnull Credentials credentials) {
+ public boolean doCreateToken(@NotNull Credentials credentials) {
return true;
}
- @CheckForNull
+ @Nullable
@Override
- public TokenInfo createToken(@Nonnull Credentials credentials) {
+ public TokenInfo createToken(@NotNull Credentials credentials) {
return null;
}
- @CheckForNull
+ @Nullable
@Override
- public TokenInfo createToken(@Nonnull String userId, @Nonnull Map<String, ?> attributes) {
+ public TokenInfo createToken(@NotNull String userId, @NotNull Map<String, ?> attributes) {
return null;
}
- @CheckForNull
+ @Nullable
@Override
- public TokenInfo getTokenInfo(@Nonnull String token) {
+ public TokenInfo getTokenInfo(@NotNull String token) {
return null;
}
};
@@ -273,7 +272,7 @@ public class TokenLoginModuleTest extend
private final Class<? extends Exception> e;
- private ThrowingCallbackHandler(@Nonnull Class<? extends Exception> e) {
+ private ThrowingCallbackHandler(@NotNull Class<? extends Exception> e) {
this.e = e;
}
@@ -286,4 +285,4 @@ public class TokenLoginModuleTest extend
}
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImplTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImplTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImplTest.java Wed Nov 7 13:57:55 2018
@@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.securi
import java.io.IOException;
import java.security.Principal;
import java.util.Arrays;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
import javax.jcr.GuestCredentials;
import javax.jcr.RepositoryException;
@@ -55,6 +52,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import org.mockito.Mockito;
@@ -348,22 +347,22 @@ public class LoginModuleImplTest extends
LoginModuleImpl loginModule = new LoginModuleImpl();
UserAuthenticationFactory factory = new UserAuthenticationFactory() {
- @CheckForNull
+ @Nullable
@Override
- public Authentication getAuthentication(@Nonnull UserConfiguration configuration, @Nonnull Root root, @Nullable String userId) {
+ public Authentication getAuthentication(@NotNull UserConfiguration configuration, @NotNull Root root, @Nullable String userId) {
return new Authentication() {
@Override
public boolean authenticate(@Nullable Credentials credentials) throws LoginException {
return true;
}
- @CheckForNull
+ @Nullable
@Override
public String getUserId() {
return null;
}
- @CheckForNull
+ @Nullable
@Override
public Principal getUserPrincipal() {
return null;
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContextTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContextTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContextTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContextTest.java Wed Nov 7 13:57:55 2018
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.securi
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
@@ -42,6 +40,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -186,17 +186,17 @@ public class AuthorizationContextTest ex
private final TreeType type;
private final TreeType parentType;
- private TypeTest(@Nonnull String path, TreeType type) {
+ private TypeTest(@NotNull String path, TreeType type) {
this(path, type, TreeType.DEFAULT);
}
- private TypeTest(@Nonnull String path, TreeType type, TreeType parentType) {
+ private TypeTest(@NotNull String path, TreeType type, TreeType parentType) {
this.path = path;
this.type = type;
this.parentType = parentType;
}
- private static List<TypeTest> createTests(@Nonnull Root root) throws Exception {
+ private static List<TypeTest> createTests(@NotNull Root root) throws Exception {
List<TypeTest> tests = new ArrayList();
tests.add(new TypeTest(NodeTypeConstants.NODE_TYPES_PATH + "/rep:AccessControllable/rep:namedChildNodeDefinitions/rep:policy", TreeType.DEFAULT));
tests.add(new TypeTest(NodeTypeConstants.NODE_TYPES_PATH + "/rep:AccessControllable/rep:namedChildNodeDefinitions/rep:policy/rep:Policy", TreeType.DEFAULT));
@@ -229,4 +229,4 @@ public class AuthorizationContextTest ex
return tests;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java Wed Nov 7 13:57:55 2018
@@ -26,8 +26,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -63,6 +61,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static java.util.Collections.singletonMap;
@@ -880,16 +880,16 @@ public class ACLTest extends AbstractAcc
super(Collections.singletonMap(name, new RestrictionDefinitionImpl(name, type, isMandatory)));
}
- @Nonnull
+ @NotNull
@Override
- public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) {
+ public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
- public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) {
+ public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) {
throw new UnsupportedOperationException();
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AbstractAccessControlTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AbstractAccessControlTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AbstractAccessControlTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AbstractAccessControlTest.java Wed Nov 7 13:57:55 2018
@@ -21,8 +21,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.AccessControlPolicy;
@@ -44,6 +42,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
public abstract class AbstractAccessControlTest extends AbstractSecurityTest implements PrivilegeConstants {
@@ -127,7 +127,7 @@ public abstract class AbstractAccessCont
throw new UnsupportedOperationException();
}
- private ACE createEntry(@Nonnull Principal principal, @Nonnull Privilege[] privileges, boolean isAllow, @Nullable Set<Restriction> restrictions)
+ private ACE createEntry(@NotNull Principal principal, @NotNull Privilege[] privileges, boolean isAllow, @Nullable Set<Restriction> restrictions)
throws RepositoryException {
ACL acl = createEmptyACL();
return acl.createACE(principal, getBitsProvider().getBits(privileges, getNamePathMapper()), isAllow, restrictions);
@@ -137,23 +137,23 @@ public abstract class AbstractAccessCont
return createACL(TEST_PATH, Collections.<ACE>emptyList(), getNamePathMapper(), getRestrictionProvider());
}
- ACL createACL(@Nonnull List<ACE> entries) {
+ ACL createACL(@NotNull List<ACE> entries) {
return createACL(TEST_PATH, entries, namePathMapper, getRestrictionProvider());
}
ACL createACL(@Nullable String jcrPath,
- @Nonnull List<ACE> entries,
- @Nonnull NamePathMapper namePathMapper) {
+ @NotNull List<ACE> entries,
+ @NotNull NamePathMapper namePathMapper) {
return createACL(jcrPath, entries, namePathMapper, getRestrictionProvider());
}
ACL createACL(@Nullable String jcrPath,
- @Nonnull List<ACE> entries,
- @Nonnull NamePathMapper namePathMapper,
- final @Nonnull RestrictionProvider restrictionProvider) {
+ @NotNull List<ACE> entries,
+ @NotNull NamePathMapper namePathMapper,
+ final @NotNull RestrictionProvider restrictionProvider) {
String path = (jcrPath == null) ? null : namePathMapper.getOakPath(jcrPath);
return new ACL(path, entries, namePathMapper) {
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return restrictionProvider;
@@ -181,4 +181,4 @@ public abstract class AbstractAccessCont
}
};
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporterBaseTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporterBaseTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporterBaseTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporterBaseTest.java Wed Nov 7 13:57:55 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nonnull;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -52,6 +51,7 @@ import org.apache.jackrabbit.oak.spi.xml
import org.apache.jackrabbit.oak.spi.xml.ReferenceChangeTracker;
import org.apache.jackrabbit.oak.spi.xml.TextValue;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import org.mockito.Mockito;
@@ -135,7 +135,7 @@ public abstract class AccessControlImpor
return importer.init(mockJackrabbitSession(), root, getNamePathMapper(), isWorkspaceImport(), ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING, new ReferenceChangeTracker(), getSecurityProvider());
}
- TextValue createTextValue(@Nonnull String val) {
+ TextValue createTextValue(@NotNull String val) {
return new TextValue() {
@Override
public String getString() {
@@ -155,7 +155,7 @@ public abstract class AccessControlImpor
};
}
- List<TextValue> createTextValues(@Nonnull String... values) {
+ List<TextValue> createTextValues(@NotNull String... values) {
List<TextValue> l = new ArrayList();
for (String v : values) {
l.add(createTextValue(v));
@@ -445,7 +445,7 @@ public abstract class AccessControlImpor
assertImport(aclTree, principalName);
}
- private static void assertImport(@Nonnull Tree aclTree, @Nonnull String principalName) {
+ private static void assertImport(@NotNull Tree aclTree, @NotNull String principalName) {
assertTrue(aclTree.getChildren().iterator().hasNext());
Tree aceTree = aclTree.getChildren().iterator().next();
@@ -461,4 +461,4 @@ public abstract class AccessControlImpor
assertEquals(Lists.newArrayList(NodeTypeConstants.NT_OAK_RESOURCE, NodeTypeConstants.NT_OAK_RESOURCE), restrTree.getProperty(REP_NT_NAMES).getValue(Type.NAMES));
assertEquals(Lists.newArrayList("itemName"), restrTree.getProperty(REP_ITEM_NAMES).getValue(Type.NAMES));
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java Wed Nov 7 13:57:55 2018
@@ -26,8 +26,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.AccessDeniedException;
import javax.jcr.NamespaceRegistry;
import javax.jcr.PathNotFoundException;
@@ -83,6 +81,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.util.NodeUtil;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -171,7 +171,7 @@ public class AccessControlManagerImplTes
nsRegistry.registerNamespace(prefix, uri);
}
- private AccessControlManagerImpl createAccessControlManager(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper) {
+ private AccessControlManagerImpl createAccessControlManager(@NotNull Root root, @NotNull NamePathMapper namePathMapper) {
return new AccessControlManagerImpl(root, namePathMapper, getSecurityProvider());
}
@@ -248,7 +248,7 @@ public class AccessControlManagerImplTes
return getBitsProvider().getBits(privileges, getNamePathMapper());
}
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return rp;
@@ -256,7 +256,7 @@ public class AccessControlManagerImplTes
};
}
- @Nonnull
+ @NotNull
private ACL setupPolicy(@Nullable String path, @Nullable Privilege... privileges) throws RepositoryException {
Privilege[] privs = (privileges == null || privileges.length == 0) ? testPrivileges : privileges;
ACL policy = getApplicablePolicy(path);
@@ -269,7 +269,7 @@ public class AccessControlManagerImplTes
return policy;
}
- private Map<String, Value> getGlobRestriction(@Nonnull String value) {
+ private Map<String, Value> getGlobRestriction(@NotNull String value) {
return ImmutableMap.of(REP_GLOB, valueFactory.createValue(value));
}
@@ -2377,18 +2377,18 @@ public class AccessControlManagerImplTes
private final RestrictionProvider restrictionProvider;
public TestACL(@Nullable String jcrPath,
- @Nonnull RestrictionProvider restrictionProvider,
- @Nonnull NamePathMapper namePathMapper,
- @Nonnull List<JackrabbitAccessControlEntry> entries) {
+ @NotNull RestrictionProvider restrictionProvider,
+ @NotNull NamePathMapper namePathMapper,
+ @NotNull List<JackrabbitAccessControlEntry> entries) {
super((jcrPath == null) ? null : namePathMapper.getOakPath(jcrPath), namePathMapper);
this.entries.addAll(entries);
this.restrictionProvider = restrictionProvider;
}
public TestACL(@Nullable String jcrPath,
- @Nonnull RestrictionProvider restrictionProvider,
- @Nonnull NamePathMapper namePathMapper,
- @Nonnull JackrabbitAccessControlEntry... entry) {
+ @NotNull RestrictionProvider restrictionProvider,
+ @NotNull NamePathMapper namePathMapper,
+ @NotNull JackrabbitAccessControlEntry... entry) {
this(jcrPath, restrictionProvider, namePathMapper, Lists.newArrayList(entry));
}
@@ -2423,13 +2423,13 @@ public class AccessControlManagerImplTes
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
public List<JackrabbitAccessControlEntry> getEntries() {
return entries;
}
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return restrictionProvider;
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PrincipalACLTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PrincipalACLTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PrincipalACLTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PrincipalACLTest.java Wed Nov 7 13:57:55 2018
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.security.authorization.accesscontrol;
import java.security.Principal;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.security.AccessControlEntry;
@@ -27,6 +26,7 @@ import javax.jcr.security.AccessControlP
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
@@ -52,8 +52,8 @@ public class PrincipalACLTest extends Ab
principalAcl = getPrincipalAcl(acMgr, testPrincipal);
}
- @Nonnull
- private static ACL getPrincipalAcl(@Nonnull JackrabbitAccessControlManager acMgr, @Nonnull Principal testPrincipal) throws RepositoryException {
+ @NotNull
+ private static ACL getPrincipalAcl(@NotNull JackrabbitAccessControlManager acMgr, @NotNull Principal testPrincipal) throws RepositoryException {
for (AccessControlPolicy acp : acMgr.getPolicies(testPrincipal)) {
if (acp instanceof ACL) {
return (ACL) acp;
@@ -88,4 +88,4 @@ public class PrincipalACLTest extends Ab
public void testHashCode() {
assertEquals(0, principalAcl.hashCode());
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractAggrProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractAggrProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractAggrProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractAggrProvider.java Wed Nov 7 13:57:55 2018
@@ -16,9 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authorization.composite;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
@@ -29,6 +26,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
abstract class AbstractAggrProvider implements AggregatedPermissionProvider {
@@ -49,7 +48,7 @@ abstract class AbstractAggrProvider impl
//---------------------------------------< AggregatedPermissionProvider >---
- @Nonnull
+ @NotNull
@Override
public PrivilegeBits supportedPrivileges(@Nullable Tree tree, @Nullable PrivilegeBits privilegeBits) {
return (privilegeBits == null) ? pbp.getBits(PrivilegeConstants.JCR_ALL) : privilegeBits;
@@ -61,18 +60,18 @@ abstract class AbstractAggrProvider impl
}
@Override
- public long supportedPermissions(@Nonnull TreeLocation location, long permissions) {
+ public long supportedPermissions(@NotNull TreeLocation location, long permissions) {
return permissions;
}
@Override
- public long supportedPermissions(@Nonnull TreePermission treePermission, @Nullable PropertyState property, long permissions) {
+ public long supportedPermissions(@NotNull TreePermission treePermission, @Nullable PropertyState property, long permissions) {
return permissions;
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreeType type, @Nonnull TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreeType type, @NotNull TreePermission parentPermission) {
return getTreePermission(tree, parentPermission);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java Wed Nov 7 13:57:55 2018
@@ -20,8 +20,6 @@ import java.security.Principal;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Session;
import javax.jcr.security.AccessControlManager;
@@ -52,6 +50,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -196,34 +196,34 @@ public abstract class AbstractCompositeP
}
}
- private static void allow(@Nonnull AccessControlManager acMgr,
- @Nonnull Principal principal,
+ private static void allow(@NotNull AccessControlManager acMgr,
+ @NotNull Principal principal,
@Nullable String path,
- @Nonnull String... privilegeNames) throws Exception {
+ @NotNull String... privilegeNames) throws Exception {
JackrabbitAccessControlList acl = AccessControlUtils.getAccessControlList(acMgr, path);
acl.addEntry(principal, AccessControlUtils.privilegesFromNames(acMgr, privilegeNames), true);
acMgr.setPolicy(acl.getPath(), acl);
}
- private static void deny(@Nonnull AccessControlManager acMgr,
- @Nonnull Principal principal,
+ private static void deny(@NotNull AccessControlManager acMgr,
+ @NotNull Principal principal,
@Nullable String path,
- @Nonnull String... privilegeNames) throws Exception {
+ @NotNull String... privilegeNames) throws Exception {
JackrabbitAccessControlList acl = AccessControlUtils.getAccessControlList(acMgr, path);
acl.addEntry(principal, AccessControlUtils.privilegesFromNames(acMgr, privilegeNames), false);
acMgr.setPolicy(acl.getPath(), acl);
}
- @Nonnull
- static String getActionString(@Nonnull String... actions) {
+ @NotNull
+ static String getActionString(@NotNull String... actions) {
return Text.implode(actions, ",");
}
- static void assertCompositeTreePermission(@Nonnull TreePermission tp) {
+ static void assertCompositeTreePermission(@NotNull TreePermission tp) {
assertTrue(tp.getClass()+ "", tp instanceof CompositeTreePermission);
}
- static void assertCompositeTreePermission(boolean expected, @Nonnull TreePermission tp) {
+ static void assertCompositeTreePermission(boolean expected, @NotNull TreePermission tp) {
assertEquals(expected, tp instanceof CompositeTreePermission);
}
@@ -233,9 +233,9 @@ public abstract class AbstractCompositeP
return false;
}
- List<AggregatedPermissionProvider> getAggregatedProviders(@Nonnull String workspaceName,
- @Nonnull AuthorizationConfiguration config,
- @Nonnull Set<Principal> principals) {
+ List<AggregatedPermissionProvider> getAggregatedProviders(@NotNull String workspaceName,
+ @NotNull AuthorizationConfiguration config,
+ @NotNull Set<Principal> principals) {
ImmutableList<AggregatedPermissionProvider> l = ImmutableList.of(
(AggregatedPermissionProvider) config.getPermissionProvider(root, workspaceName, principals),
getTestPermissionProvider());
@@ -625,4 +625,4 @@ public abstract class AbstractCompositeP
assertFalse(rp.isGranted(Permissions.ALL));
assertFalse(rp.isGranted(Permissions.NO_PERMISSION));
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java Wed Nov 7 13:57:55 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.securi
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
@@ -38,6 +37,7 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.PolicyOwner;
import org.apache.jackrabbit.oak.util.NodeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -277,7 +277,7 @@ public class CompositeAccessControlManag
//----------------------------------------------------< PolicyOwner >---
@Override
- public boolean defines(String absPath, @Nonnull AccessControlPolicy accessControlPolicy) {
+ public boolean defines(String absPath, @NotNull AccessControlPolicy accessControlPolicy) {
return TEST_PATH.equals(absPath) && accessControlPolicy == TestPolicy.INSTANCE;
}
}
@@ -321,4 +321,4 @@ public class CompositeAccessControlManag
return new Privilege[0];
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java Wed Nov 7 13:57:55 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import java.util.Collections;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlManager;
@@ -32,6 +31,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.CompositeRestrictionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -154,7 +154,7 @@ public class CompositeAuthorizationConfi
CompositeAuthorizationConfiguration cc = getCompositeConfiguration(
createAuthorizationConfigurationImpl(),
new OpenAuthorizationConfiguration() {
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return RestrictionProvider.EMPTY;
@@ -169,7 +169,7 @@ public class CompositeAuthorizationConfi
@Test
public void testOnlyEmptyRestrictionProvider() {
AuthorizationConfiguration ac = new OpenAuthorizationConfiguration() {
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return RestrictionProvider.EMPTY;
@@ -181,4 +181,4 @@ public class CompositeAuthorizationConfi
assertFalse(rp instanceof CompositeRestrictionProvider);
assertSame(RestrictionProvider.EMPTY, rp);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderAllTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderAllTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderAllTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderAllTest.java Wed Nov 7 13:57:55 2018
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.securi
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Session;
import com.google.common.collect.ImmutableMap;
@@ -40,6 +38,8 @@ import org.apache.jackrabbit.oak.spi.sec
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.security.principal.EveryonePrincipal;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -480,49 +480,49 @@ public class CompositeProviderAllTest ex
private static final PermissionProvider BASE = OpenPermissionProvider.getInstance();
- private OpenAggregateProvider(@Nonnull Root root) {
+ private OpenAggregateProvider(@NotNull Root root) {
super(root);
}
//-----------------------------------< AggregatedPermissionProvider >---
@Override
- public boolean isGranted(@Nonnull TreeLocation location, long permissions) {
+ public boolean isGranted(@NotNull TreeLocation location, long permissions) {
return true;
}
//---------------------------------------------< PermissionProvider >---
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
return BASE.getPrivileges(tree);
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String... privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull String... privilegeNames) {
return BASE.hasPrivileges(tree, privilegeNames);
}
- @Nonnull
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
return BASE.getRepositoryPermission();
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreePermission parentPermission) {
return BASE.getTreePermission(tree, parentPermission);
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property, long permissions) {
return BASE.isGranted(tree, property, permissions);
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String jcrActions) {
return BASE.isGranted(oakPath, jcrActions);
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCoverageTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCoverageTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCoverageTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCoverageTest.java Wed Nov 7 13:57:55 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Session;
import com.google.common.collect.ImmutableList;
@@ -42,6 +40,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -80,7 +80,7 @@ public class CompositeProviderCoverageTe
}
@Override
- List<AggregatedPermissionProvider> getAggregatedProviders(@Nonnull String workspaceName, @Nonnull AuthorizationConfiguration config, @Nonnull Set<Principal> principals) {
+ List<AggregatedPermissionProvider> getAggregatedProviders(@NotNull String workspaceName, @NotNull AuthorizationConfiguration config, @NotNull Set<Principal> principals) {
return ImmutableList.of(getTestPermissionProvider());
}
@@ -384,7 +384,7 @@ public class CompositeProviderCoverageTe
super(root);
}
- @Nonnull
+ @NotNull
@Override
public PrivilegeBits supportedPrivileges(@Nullable Tree tree, @Nullable PrivilegeBits privilegeBits) {
PrivilegeBits supported = PrivilegeBits.getInstance(
@@ -407,32 +407,32 @@ public class CompositeProviderCoverageTe
}
@Override
- public long supportedPermissions(@Nonnull TreeLocation location, long permissions) {
+ public long supportedPermissions(@NotNull TreeLocation location, long permissions) {
return permissions & Permissions.READ_NODE;
}
@Override
- public long supportedPermissions(@Nonnull TreePermission treePermission, @Nullable PropertyState property, long permissions) {
+ public long supportedPermissions(@NotNull TreePermission treePermission, @Nullable PropertyState property, long permissions) {
return permissions & Permissions.READ_NODE;
}
@Override
- public boolean isGranted(@Nonnull TreeLocation location, long permissions) {
+ public boolean isGranted(@NotNull TreeLocation location, long permissions) {
return permissions == Permissions.READ_NODE;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
return (tree == null) ? ImmutableSet.of(JCR_NAMESPACE_MANAGEMENT) : ImmutableSet.of(REP_READ_NODES);
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String... privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull String... privilegeNames) {
return true;
}
- @Nonnull
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
return new RepositoryPermission() {
@@ -443,27 +443,27 @@ public class CompositeProviderCoverageTe
};
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreePermission parentPermission) {
return new LimitedTreePermission();
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property, long permissions) {
return permissions == Permissions.READ_NODE;
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String jcrActions) {
return true;
}
}
private static final class LimitedTreePermission implements TreePermission {
- @Nonnull
+ @NotNull
@Override
- public TreePermission getChildPermission(@Nonnull String childName, @Nonnull NodeState childState) {
+ public TreePermission getChildPermission(@NotNull String childName, @NotNull NodeState childState) {
return this;
}
@@ -473,7 +473,7 @@ public class CompositeProviderCoverageTe
}
@Override
- public boolean canRead(@Nonnull PropertyState property) {
+ public boolean canRead(@NotNull PropertyState property) {
return false;
}
@@ -493,8 +493,8 @@ public class CompositeProviderCoverageTe
}
@Override
- public boolean isGranted(long permissions, @Nonnull PropertyState property) {
+ public boolean isGranted(long permissions, @NotNull PropertyState property) {
return false;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java Wed Nov 7 13:57:55 2018
@@ -26,9 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -45,6 +42,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
import org.junit.Test;
@@ -243,7 +242,7 @@ public class CompositeProviderCustomMixT
private final Set<String> granted;
private final Map<String, Long> grantMap;
- private CustomProvider(@Nonnull Root root, Set<String> supported, Set<String> granted,
+ private CustomProvider(@NotNull Root root, Set<String> supported, Set<String> granted,
Map<String, Long> grantMap) {
this.pbp = new PrivilegeBitsProvider(root);
@@ -260,7 +259,7 @@ public class CompositeProviderCustomMixT
return suppBits;
}
- @Nonnull
+ @NotNull
@Override
public PrivilegeBits supportedPrivileges(@Nullable Tree tree, @Nullable PrivilegeBits privilegeBits) {
return toBits(supported, pbp).retain(privilegeBits);
@@ -294,7 +293,7 @@ public class CompositeProviderCustomMixT
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property, long permissions) {
long myperms = mapToPermissions(granted, grantMap);
return Permissions.includes(myperms, permissions);
}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderEmptyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderEmptyTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderEmptyTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderEmptyTest.java Wed Nov 7 13:57:55 2018
@@ -17,8 +17,6 @@
package org.apache.jackrabbit.oak.security.authorization.composite;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Session;
import org.apache.jackrabbit.JcrConstants;
@@ -34,6 +32,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.RepositoryPermission;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import com.google.common.collect.ImmutableSet;
@@ -272,48 +272,48 @@ public class CompositeProviderEmptyTest
private static final PermissionProvider BASE = EmptyPermissionProvider.getInstance();
- public EmptyAggregatedProvider(@Nonnull Root root) {
+ public EmptyAggregatedProvider(@NotNull Root root) {
super(root);
}
//---------------------------------------------< PermissionProvider >---
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
return BASE.getPrivileges(tree);
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String... privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull String... privilegeNames) {
return BASE.hasPrivileges(tree, privilegeNames);
}
- @Nonnull
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
return BASE.getRepositoryPermission();
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreePermission parentPermission) {
return BASE.getTreePermission(tree, parentPermission);
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property, long permissions) {
return BASE.isGranted(tree, property, permissions);
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String jcrActions) {
return BASE.isGranted(oakPath, jcrActions);
}
//-----------------------------------< AggregatedPermissionProvider >---
@Override
- public boolean isGranted(@Nonnull TreeLocation location, long permissions) {
+ public boolean isGranted(@NotNull TreeLocation location, long permissions) {
return false;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermissionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermissionTest.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermissionTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermissionTest.java Wed Nov 7 13:57:55 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.securi
import java.lang.reflect.Field;
import java.util.Arrays;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
@@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authorization.permission.AggregatedPermissionProvider;
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.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -77,7 +76,7 @@ public class CompositeTreePermissionTest
.getTreePermission(rootTree, TreePermission.EMPTY);
}
- private static void assertCompositeTreePermission(boolean expected, @Nonnull TreePermission tp) {
+ private static void assertCompositeTreePermission(boolean expected, @NotNull TreePermission tp) {
assertEquals(expected, tp instanceof CompositeTreePermission);
}
@@ -149,4 +148,4 @@ public class CompositeTreePermissionTest
TreePermission rootTp = createRootTreePermission(new NoScopeProvider(root));
assertSame(TreePermission.NO_RECOURSE, rootTp);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/FullScopeProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/FullScopeProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/FullScopeProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/FullScopeProvider.java Wed Nov 7 13:57:55 2018
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.securi
import java.util.Arrays;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Session;
import com.google.common.collect.ImmutableSet;
@@ -34,6 +32,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Test implementation of the {@code AggregatedPermissionProvider} with following
@@ -53,13 +53,13 @@ import org.apache.jackrabbit.oak.spi.sta
*/
class FullScopeProvider extends AbstractAggrProvider implements PrivilegeConstants {
- FullScopeProvider(@Nonnull Root root) {
+ FullScopeProvider(@NotNull Root root) {
super(root);
}
//-------------------------------------------------< PermissionProvider >---
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
if (tree == null) {
@@ -70,7 +70,7 @@ class FullScopeProvider extends Abstract
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String... privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull String... privilegeNames) {
if (tree == null) {
return Arrays.equals(new String[]{JCR_NAMESPACE_MANAGEMENT}, privilegeNames);
} else {
@@ -78,7 +78,7 @@ class FullScopeProvider extends Abstract
}
}
- @Nonnull
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
return new RepositoryPermission() {
@@ -89,19 +89,19 @@ class FullScopeProvider extends Abstract
};
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreePermission parentPermission) {
return new TestTreePermission(tree.getPath());
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property, long permissions) {
return property == null && permissions == Permissions.READ_NODE;
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String jcrActions) {
Tree tree = root.getTree(oakPath);
return tree.exists() && Session.ACTION_READ.equals(jcrActions);
}
@@ -109,7 +109,7 @@ class FullScopeProvider extends Abstract
//---------------------------------------< AggregatedPermissionProvider >---
@Override
- public boolean isGranted(@Nonnull TreeLocation location, long permissions) {
+ public boolean isGranted(@NotNull TreeLocation location, long permissions) {
return permissions == Permissions.READ_NODE;
}
@@ -119,13 +119,13 @@ class FullScopeProvider extends Abstract
private final String path;
- private TestTreePermission(@Nonnull String path) {
+ private TestTreePermission(@NotNull String path) {
this.path = path;
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getChildPermission(@Nonnull String childName, @Nonnull NodeState childState) {
+ public TreePermission getChildPermission(@NotNull String childName, @NotNull NodeState childState) {
return new TestTreePermission(PathUtils.concat(path, childName));
}
@@ -135,7 +135,7 @@ class FullScopeProvider extends Abstract
}
@Override
- public boolean canRead(@Nonnull PropertyState property) {
+ public boolean canRead(@NotNull PropertyState property) {
return false;
}
@@ -155,8 +155,8 @@ class FullScopeProvider extends Abstract
}
@Override
- public boolean isGranted(long permissions, @Nonnull PropertyState property) {
+ public boolean isGranted(long permissions, @NotNull PropertyState property) {
return false;
}
}
-}
\ No newline at end of file
+}