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 14:29:25 UTC
svn commit: r1846033 [2/5] - in /jackrabbit/oak/branches/1.8: ./
oak-security-spi/
oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/
oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/
oak-security-spi/src/main/j...
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java Wed Nov 7 14:29:24 2018
@@ -24,8 +24,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.Subject;
@@ -52,6 +50,8 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -225,7 +225,7 @@ public abstract class AbstractLoginModul
/**
* @return A set of supported credential classes.
*/
- @Nonnull
+ @NotNull
protected abstract Set<Class> getSupportedCredentials();
/**
@@ -239,7 +239,7 @@ public abstract class AbstractLoginModul
*
* @return Valid (supported) credentials or {@code null}.
*/
- @CheckForNull
+ @Nullable
protected Credentials getCredentials() {
Set<Class> supported = getSupportedCredentials();
if (callbackHandler != null) {
@@ -284,7 +284,7 @@ public abstract class AbstractLoginModul
* @return The credentials passed to this login module with the shared state.
* @see #SHARED_KEY_CREDENTIALS
*/
- @CheckForNull
+ @Nullable
protected Credentials getSharedCredentials() {
Credentials shared = null;
if (sharedState.containsKey(SHARED_KEY_CREDENTIALS)) {
@@ -303,7 +303,7 @@ public abstract class AbstractLoginModul
* @return The login name passed to this login module with the shared state.
* @see #SHARED_KEY_LOGIN_NAME
*/
- @CheckForNull
+ @Nullable
protected String getSharedLoginName() {
if (sharedState.containsKey(SHARED_KEY_LOGIN_NAME)) {
return sharedState.get(SHARED_KEY_LOGIN_NAME).toString();
@@ -316,7 +316,7 @@ public abstract class AbstractLoginModul
* @return The pre authenticated login or {@code null}
* @see #SHARED_KEY_PRE_AUTH_LOGIN
*/
- @CheckForNull
+ @Nullable
protected PreAuthenticatedLogin getSharedPreAuthLogin() {
Object login = sharedState.get(SHARED_KEY_PRE_AUTH_LOGIN);
if (login instanceof PreAuthenticatedLogin) {
@@ -335,7 +335,7 @@ public abstract class AbstractLoginModul
* @return The {@code SecurityProvider} associated with this
* {@code LoginModule} or {@code null}.
*/
- @CheckForNull
+ @Nullable
protected SecurityProvider getSecurityProvider() {
if (securityProvider == null && callbackHandler != null) {
RepositoryCallback rcb = new RepositoryCallback();
@@ -358,7 +358,7 @@ public abstract class AbstractLoginModul
* @return The {@code Whiteboard} associated with this
* {@code LoginModule} or {@code null}.
*/
- @CheckForNull
+ @Nullable
protected Whiteboard getWhiteboard() {
if (whiteboard == null && callbackHandler != null) {
WhiteboardCallback cb = new WhiteboardCallback();
@@ -381,7 +381,7 @@ public abstract class AbstractLoginModul
* @return The {@code Root} associated with this {@code LoginModule} or
* {@code null}.
*/
- @CheckForNull
+ @Nullable
protected Root getRoot() {
if (root == null && callbackHandler != null) {
try {
@@ -414,7 +414,7 @@ public abstract class AbstractLoginModul
*
* @return A instance of {@code UserManager} or {@code null}.
*/
- @CheckForNull
+ @Nullable
protected UserManager getUserManager() {
UserManager userManager = null;
SecurityProvider sp = getSecurityProvider();
@@ -444,7 +444,7 @@ public abstract class AbstractLoginModul
*
* @return A instance of {@code PrincipalProvider} or {@code null}.
*/
- @CheckForNull
+ @Nullable
protected PrincipalProvider getPrincipalProvider() {
PrincipalProvider principalProvider = null;
SecurityProvider sp = getSecurityProvider();
@@ -474,8 +474,8 @@ public abstract class AbstractLoginModul
* @return The set of principals associated with the given {@code userId}.
* @see #getPrincipalProvider()
*/
- @Nonnull
- protected Set<? extends Principal> getPrincipals(@Nonnull String userId) {
+ @NotNull
+ protected Set<? extends Principal> getPrincipals(@NotNull String userId) {
PrincipalProvider principalProvider = getPrincipalProvider();
if (principalProvider == null) {
log.debug("Cannot retrieve principals. No principal provider configured.");
@@ -485,8 +485,8 @@ public abstract class AbstractLoginModul
}
}
- @Nonnull
- protected Set<? extends Principal> getPrincipals(@Nonnull Principal userPrincipal) {
+ @NotNull
+ protected Set<? extends Principal> getPrincipals(@NotNull Principal userPrincipal) {
PrincipalProvider principalProvider = getPrincipalProvider();
if (principalProvider == null) {
log.debug("Cannot retrieve principals. No principal provider configured.");
@@ -499,7 +499,7 @@ public abstract class AbstractLoginModul
}
}
- protected static void setAuthInfo(@Nonnull AuthInfo authInfo, @Nonnull Subject subject) {
+ protected static void setAuthInfo(@NotNull AuthInfo authInfo, @NotNull Subject subject) {
Set<AuthInfo> ais = subject.getPublicCredentials(AuthInfo.class);
if (!ais.isEmpty()) {
subject.getPublicCredentials().removeAll(ais);
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java Wed Nov 7 14:29:24 2018
@@ -21,13 +21,13 @@ import java.util.Collections;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.SimpleCredentials;
import javax.security.auth.Subject;
import com.google.common.base.Objects;
import org.apache.jackrabbit.oak.api.AuthInfo;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Default implementation of the AuthInfo interface.
@@ -45,7 +45,7 @@ public final class AuthInfoImpl implemen
this.principals = (principals == null) ? Collections.<Principal>emptySet() : Collections.unmodifiableSet(principals);
}
- public static AuthInfo createFromSubject(@Nonnull Subject subject) {
+ public static AuthInfo createFromSubject(@NotNull Subject subject) {
Set<AuthInfo> infoSet = subject.getPublicCredentials(AuthInfo.class);
if (infoSet.isEmpty()) {
Set<SimpleCredentials> scs = subject.getPublicCredentials(SimpleCredentials.class);
@@ -70,7 +70,7 @@ public final class AuthInfoImpl implemen
return userID;
}
- @Nonnull
+ @NotNull
@Override
public String[] getAttributeNames() {
return attributes.keySet().toArray(new String[attributes.size()]);
@@ -81,9 +81,9 @@ public final class AuthInfoImpl implemen
return attributes.get(attributeName);
}
- @Nonnull
+ @NotNull
@Override
public Set<Principal> getPrincipals() {
return principals;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java Wed Nov 7 14:29:24 2018
@@ -17,11 +17,10 @@
package org.apache.jackrabbit.oak.spi.security.authentication;
import java.security.Principal;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
import javax.security.auth.login.LoginException;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -63,7 +62,7 @@ public interface Authentication {
*
* @return a user identifier or {@code null}
*/
- @CheckForNull
+ @Nullable
String getUserId();
/**
@@ -75,6 +74,6 @@ public interface Authentication {
*
* @return a valid {@code Principal} or {@code null}
*/
- @CheckForNull
+ @Nullable
Principal getUserPrincipal();
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java Wed Nov 7 14:29:24 2018
@@ -16,10 +16,9 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
+import org.jetbrains.annotations.NotNull;
/**
* Interface for the authentication setup.
@@ -33,6 +32,6 @@ public interface AuthenticationConfigura
String PARAM_CONFIG_SPI_NAME = "org.apache.jackrabbit.oak.authentication.configSpiName";
- @Nonnull
+ @NotNull
LoginContextProvider getLoginContextProvider(ContentRepository contentRepository);
}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContextProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContextProvider.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContextProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContextProvider.java Wed Nov 7 14:29:24 2018
@@ -16,10 +16,11 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import javax.security.auth.login.LoginException;
+import org.jetbrains.annotations.NotNull;
+
/**
* Configurable provider taking care of building login contexts for
* the desired authentication mechanism.
@@ -41,6 +42,6 @@ public interface LoginContextProvider {
* @return a new login context
* @throws LoginException If an error occurs while creating a new context.
*/
- @Nonnull
+ @NotNull
LoginContext getLoginContext(Credentials credentials, String workspaceName) throws LoginException;
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfiguration.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfiguration.java Wed Nov 7 14:29:24 2018
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import javax.security.auth.Subject;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
+import org.jetbrains.annotations.NotNull;
/**
* This implementation of the authentication configuration provides login
@@ -30,11 +30,11 @@ import org.apache.jackrabbit.oak.spi.sec
*/
public class OpenAuthenticationConfiguration extends SecurityConfiguration.Default implements AuthenticationConfiguration {
- @Nonnull
+ @NotNull
@Override
public LoginContextProvider getLoginContextProvider(ContentRepository contentRepository) {
return new LoginContextProvider() {
- @Nonnull
+ @NotNull
@Override
public LoginContext getLoginContext(final Credentials credentials, String workspaceName) {
return new LoginContext() {
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/CredentialsCallback.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/CredentialsCallback.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/CredentialsCallback.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/CredentialsCallback.java Wed Nov 7 14:29:24 2018
@@ -16,10 +16,11 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.callback;
-import javax.annotation.CheckForNull;
import javax.jcr.Credentials;
import javax.security.auth.callback.Callback;
+import org.jetbrains.annotations.Nullable;
+
/**
* Callback implementation to retrieve {@code Credentials}.
*/
@@ -33,7 +34,7 @@ public class CredentialsCallback impleme
*
* @return The {@link Credentials} to be used for authentication or {@code null}.
*/
- @CheckForNull
+ @Nullable
public Credentials getCredentials() {
return credentials;
}
@@ -48,4 +49,4 @@ public class CredentialsCallback impleme
public void setCredentials(Credentials credentials) {
this.credentials = credentials;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java Wed Nov 7 14:29:24 2018
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.callback;
-import javax.annotation.CheckForNull;
import javax.security.auth.callback.Callback;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
+import org.jetbrains.annotations.Nullable;
/**
* Callback implementation used to access the repository. It allows to set and
@@ -34,7 +34,7 @@ public class RepositoryCallback implemen
private SecurityProvider securityProvider;
private String workspaceName;
- @CheckForNull
+ @Nullable
public String getWorkspaceName() {
return workspaceName;
}
@@ -43,7 +43,7 @@ public class RepositoryCallback implemen
this.workspaceName = workspaceName;
}
- @CheckForNull
+ @Nullable
public ContentRepository getContentRepository() {
return contentRepository;
}
@@ -52,7 +52,7 @@ public class RepositoryCallback implemen
this.contentRepository = contentRepository;
}
- @CheckForNull
+ @Nullable
public SecurityProvider getSecurityProvider() {
return securityProvider;
}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java Wed Nov 7 14:29:24 2018
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.callback;
-import javax.annotation.CheckForNull;
import javax.security.auth.callback.Callback;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
+import org.jetbrains.annotations.Nullable;
/**
* Callback implementation to set and get the {@link SecurityProvider}.
@@ -28,7 +28,7 @@ public class SecurityProviderCallback im
private SecurityProvider securityProvider;
- @CheckForNull
+ @Nullable
public SecurityProvider getSecurityProvider() {
return securityProvider;
}
@@ -36,4 +36,4 @@ public class SecurityProviderCallback im
public void setSecurityProvider(SecurityProvider securityProvider) {
this.securityProvider = securityProvider;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/package-info.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/package-info.java Wed Nov 7 14:29:24 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.0")
+@Version("1.0.1")
package org.apache.jackrabbit.oak.spi.security.authentication.callback;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java Wed Nov 7 14:29:24 2018
@@ -19,17 +19,17 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
public abstract class AbstractCredentials implements Credentials {
protected final Map<String,Object> attributes = new HashMap();
protected final String userId;
- public AbstractCredentials(@Nonnull String userId) {
+ public AbstractCredentials(@NotNull String userId) {
this.userId = userId;
}
@@ -38,7 +38,7 @@ public abstract class AbstractCredential
*
* @return the userId.
*/
- @Nonnull
+ @NotNull
public String getUserId() {
return userId;
}
@@ -52,7 +52,7 @@ public abstract class AbstractCredential
* @param value
* the {@code Object} to be stored
*/
- public void setAttribute(@Nonnull String name, @Nullable Object value) {
+ public void setAttribute(@NotNull String name, @Nullable Object value) {
// name cannot be null
if (name == null) {
throw new IllegalArgumentException("name cannot be null");
@@ -78,8 +78,8 @@ public abstract class AbstractCredential
* @return an <code>Object</code> containing the value of the attribute, or
* <code>null</code> if the attribute does not exist
*/
- @CheckForNull
- public Object getAttribute(@Nonnull String name) {
+ @Nullable
+ public Object getAttribute(@NotNull String name) {
synchronized (attributes) {
return (attributes.get(name));
}
@@ -92,7 +92,7 @@ public abstract class AbstractCredential
* a <code>String</code> specifying the name of the attribute to
* remove
*/
- public void removeAttribute(@Nonnull String name) {
+ public void removeAttribute(@NotNull String name) {
synchronized (attributes) {
attributes.remove(name);
}
@@ -101,7 +101,7 @@ public abstract class AbstractCredential
/**
* @return an immutable map containing the attributes available to this credentials instance
*/
- @Nonnull
+ @NotNull
public Map<String,Object> getAttributes() {
return Collections.unmodifiableMap(attributes);
}
@@ -111,7 +111,7 @@ public abstract class AbstractCredential
*
* @param attributes The attributes to be stored
*/
- public void setAttributes(@Nonnull Map<String,Object> attributes) {
+ public void setAttributes(@NotNull Map<String,Object> attributes) {
synchronized (attributes) {
this.attributes.putAll(attributes);
}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java Wed Nov 7 14:29:24 2018
@@ -21,8 +21,6 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import com.google.common.collect.ImmutableMap;
@@ -30,6 +28,9 @@ import com.google.common.collect.Immutab
import static com.google.common.collect.Sets.newHashSet;
import static com.google.common.collect.Maps.newHashMap;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* Composite implementation of the
* {@link org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport}
@@ -37,19 +38,19 @@ import static com.google.common.collect.
*/
public final class CompositeCredentialsSupport implements CredentialsSupport {
- @Nonnull
+ @NotNull
private final Supplier<Collection<CredentialsSupport>> credentialSupplier;
- private CompositeCredentialsSupport(@Nonnull Supplier<Collection<CredentialsSupport>> credentialSupplier) {
+ private CompositeCredentialsSupport(@NotNull Supplier<Collection<CredentialsSupport>> credentialSupplier) {
this.credentialSupplier = credentialSupplier;
}
- public static CredentialsSupport newInstance(@Nonnull Supplier<Collection<CredentialsSupport>> credentialSupplier) {
+ public static CredentialsSupport newInstance(@NotNull Supplier<Collection<CredentialsSupport>> credentialSupplier) {
return new CompositeCredentialsSupport(credentialSupplier);
}
@Override
- @Nonnull
+ @NotNull
public Set<Class> getCredentialClasses() {
Collection<CredentialsSupport> all = this.credentialSupplier.get();
if (all.isEmpty()) {
@@ -66,8 +67,8 @@ public final class CompositeCredentialsS
}
@Override
- @CheckForNull
- public String getUserId(@Nonnull Credentials credentials) {
+ @Nullable
+ public String getUserId(@NotNull Credentials credentials) {
Collection<CredentialsSupport> all = this.credentialSupplier.get();
for (CredentialsSupport c : all) {
String userId = c.getUserId(credentials);
@@ -79,8 +80,8 @@ public final class CompositeCredentialsS
}
@Override
- @Nonnull
- public Map<String, ?> getAttributes(@Nonnull Credentials credentials) {
+ @NotNull
+ public Map<String, ?> getAttributes(@NotNull Credentials credentials) {
Collection<CredentialsSupport> all = this.credentialSupplier.get();
if (all.isEmpty()) {
return ImmutableMap.of();
@@ -96,7 +97,7 @@ public final class CompositeCredentialsS
}
@Override
- public boolean setAttributes(@Nonnull Credentials credentials, @Nonnull Map<String, ?> attributes) {
+ public boolean setAttributes(@NotNull Credentials credentials, @NotNull Map<String, ?> attributes) {
boolean set = false;
Collection<CredentialsSupport> all = this.credentialSupplier.get();
for (CredentialsSupport c : all) {
@@ -104,4 +105,4 @@ public final class CompositeCredentialsS
}
return set;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.java Wed Nov 7 14:29:24 2018
@@ -18,10 +18,11 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* Simple helper interface that allows to easily plug support for additional or
* custom {@link Credentials} implementations during authentication.
@@ -37,7 +38,7 @@ public interface CredentialsSupport {
*
* @return the supported {@link Credentials credentials} classes.
*/
- @Nonnull
+ @NotNull
Set<Class> getCredentialClasses();
/**
@@ -48,8 +49,8 @@ public interface CredentialsSupport {
* @param credentials The credentials as passed to the repository login.
* @return The user id present in the given {@code Credentials} or {@code null}.
*/
- @CheckForNull
- String getUserId(@Nonnull Credentials credentials);
+ @Nullable
+ String getUserId(@NotNull Credentials credentials);
/**
* Obtains the attributes as present with the specified {@code Credentials}.
@@ -59,8 +60,8 @@ public interface CredentialsSupport {
* @param credentials The credentials as passed to the repository login.
* @return The credential attributes or an empty {@code Map}.
*/
- @Nonnull
- Map<String, ?> getAttributes(@Nonnull Credentials credentials);
+ @NotNull
+ Map<String, ?> getAttributes(@NotNull Credentials credentials);
/**
* Writes the attributes to the specified {@code Credentials}.
@@ -71,5 +72,5 @@ public interface CredentialsSupport {
* @param attributes The attributes to be written to the given credentials.
* @return {@code true}, if the attributes were set; {@code false} otherwise.
*/
- boolean setAttributes(@Nonnull Credentials credentials, @Nonnull Map<String, ?> attributes);
-}
\ No newline at end of file
+ boolean setAttributes(@NotNull Credentials credentials, @NotNull Map<String, ?> attributes);
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupport.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupport.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupport.java Wed Nov 7 14:29:24 2018
@@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.spi.se
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.SimpleCredentials;
@@ -28,6 +25,9 @@ import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* Implementation of the
* {@link org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport}
@@ -44,14 +44,14 @@ public final class SimpleCredentialsSupp
}
@Override
- @Nonnull
+ @NotNull
public ImmutableSet<Class> getCredentialClasses() {
return ImmutableSet.<Class>of(SimpleCredentials.class);
}
@Override
- @CheckForNull
- public String getUserId(@Nonnull Credentials credentials) {
+ @Nullable
+ public String getUserId(@NotNull Credentials credentials) {
if (credentials instanceof SimpleCredentials) {
return ((SimpleCredentials) credentials).getUserID();
} else {
@@ -60,8 +60,8 @@ public final class SimpleCredentialsSupp
}
@Override
- @Nonnull
- public Map<String, ?> getAttributes(@Nonnull Credentials credentials) {
+ @NotNull
+ public Map<String, ?> getAttributes(@NotNull Credentials credentials) {
if (credentials instanceof SimpleCredentials) {
final SimpleCredentials sc = (SimpleCredentials) credentials;
return Maps.asMap(ImmutableSet.copyOf(sc.getAttributeNames()), new Function<String, Object>() {
@@ -77,7 +77,7 @@ public final class SimpleCredentialsSupp
}
@Override
- public boolean setAttributes(@Nonnull Credentials credentials, @Nonnull Map<String, ?> attributes) {
+ public boolean setAttributes(@NotNull Credentials credentials, @NotNull Map<String, ?> attributes) {
if (credentials instanceof SimpleCredentials) {
SimpleCredentials sc = (SimpleCredentials) credentials;
for (Map.Entry<String, ?> entry : attributes.entrySet()) {
@@ -88,4 +88,4 @@ public final class SimpleCredentialsSupp
return false;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java Wed Nov 7 14:29:24 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("2.1.0")
+@Version("2.1.1")
package org.apache.jackrabbit.oak.spi.security.authentication.credentials;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java Wed Nov 7 14:29:24 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.2.0")
+@Version("1.2.1")
package org.apache.jackrabbit.oak.spi.security.authentication;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java Wed Nov 7 14:29:24 2018
@@ -17,13 +17,12 @@
package org.apache.jackrabbit.oak.spi.security.authentication.token;
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
+import org.jetbrains.annotations.NotNull;
/**
* {@link TokenConfiguration} that combines different token provider implementations.
@@ -34,11 +33,11 @@ public class CompositeTokenConfiguration
super(TokenConfiguration.NAME);
}
- public CompositeTokenConfiguration(@Nonnull SecurityProvider securityProvider) {
+ public CompositeTokenConfiguration(@NotNull SecurityProvider securityProvider) {
super(TokenConfiguration.NAME, securityProvider);
}
- @Nonnull
+ @NotNull
@Override
public TokenProvider getTokenProvider(final Root root) {
List<TokenProvider> providers = Lists.transform(getConfigurations(), new Function<TokenConfiguration, TokenProvider>() {
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProvider.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProvider.java Wed Nov 7 14:29:24 2018
@@ -19,11 +19,12 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import com.google.common.collect.ImmutableList;
+import org.jetbrains.annotations.NotNull;
+
/**
* Aggregates a collection of {@link TokenProvider}s into a single
* provider.
@@ -32,17 +33,17 @@ public final class CompositeTokenProvide
private final List<TokenProvider> providers;
- private CompositeTokenProvider(@Nonnull List<? extends TokenProvider> providers) {
+ private CompositeTokenProvider(@NotNull List<? extends TokenProvider> providers) {
this.providers = ImmutableList.copyOf(providers);
}
- @Nonnull
- public static TokenProvider newInstance(@Nonnull TokenProvider... providers) {
+ @NotNull
+ public static TokenProvider newInstance(@NotNull TokenProvider... providers) {
return newInstance(Arrays.<TokenProvider>asList(providers));
}
- @Nonnull
- public static TokenProvider newInstance(@Nonnull List<? extends TokenProvider> providers) {
+ @NotNull
+ public static TokenProvider newInstance(@NotNull List<? extends TokenProvider> providers) {
switch (providers.size()) {
case 0: return NULL_PROVIDER;
case 1: return providers.iterator().next();
@@ -51,7 +52,7 @@ public final class CompositeTokenProvide
}
@Override
- public boolean doCreateToken(@Nonnull Credentials credentials) {
+ public boolean doCreateToken(@NotNull Credentials credentials) {
for (TokenProvider tp : providers) {
if (tp.doCreateToken(credentials)) {
return true;
@@ -61,7 +62,7 @@ public final class CompositeTokenProvide
}
@Override
- public TokenInfo createToken(@Nonnull Credentials credentials) {
+ public TokenInfo createToken(@NotNull Credentials credentials) {
for (TokenProvider tp : providers) {
TokenInfo info = tp.createToken(credentials);
if (info != null) {
@@ -72,7 +73,7 @@ public final class CompositeTokenProvide
}
@Override
- public TokenInfo createToken(@Nonnull String userId, @Nonnull Map<String, ?> attributes) {
+ public TokenInfo createToken(@NotNull String userId, @NotNull Map<String, ?> attributes) {
for (TokenProvider tp : providers) {
TokenInfo info = tp.createToken(userId, attributes);
if (info != null) {
@@ -83,7 +84,7 @@ public final class CompositeTokenProvide
}
@Override
- public TokenInfo getTokenInfo(@Nonnull String token) {
+ public TokenInfo getTokenInfo(@NotNull String token) {
for (TokenProvider tp : providers) {
TokenInfo info = tp.getTokenInfo(token);
if (info != null) {
@@ -95,23 +96,23 @@ public final class CompositeTokenProvide
private static final TokenProvider NULL_PROVIDER = new TokenProvider() {
@Override
- public boolean doCreateToken(@Nonnull Credentials credentials) {
+ public boolean doCreateToken(@NotNull Credentials credentials) {
return false;
}
@Override
- public TokenInfo createToken(@Nonnull Credentials credentials) {
+ public TokenInfo createToken(@NotNull Credentials credentials) {
return null;
}
@Override
- public TokenInfo createToken(@Nonnull String userId, @Nonnull Map<String, ?> attributes) {
+ public TokenInfo createToken(@NotNull String userId, @NotNull Map<String, ?> attributes) {
return null;
}
@Override
- public TokenInfo getTokenInfo(@Nonnull String token) {
+ public TokenInfo getTokenInfo(@NotNull String token) {
return null;
}
};
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java Wed Nov 7 14:29:24 2018
@@ -16,10 +16,9 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.token;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
+import org.jetbrains.annotations.NotNull;
/**
* Configuration for token management.
@@ -34,6 +33,6 @@ public interface TokenConfiguration exte
* @param root The target root.
* @return A new instance of {@link org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider}.
*/
- @Nonnull
+ @NotNull
TokenProvider getTokenProvider(Root root);
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java Wed Nov 7 14:29:24 2018
@@ -17,9 +17,8 @@
package org.apache.jackrabbit.oak.spi.security.authentication.token;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.api.security.authentication.token.TokenCredentials;
+import org.jetbrains.annotations.NotNull;
/**
* The {@code TokenInfo} provides data associated with a login token and
@@ -33,7 +32,7 @@ public interface TokenInfo {
*
* @return the ID of the user.
*/
- @Nonnull
+ @NotNull
String getUserId();
/**
@@ -41,7 +40,7 @@ public interface TokenInfo {
*
* @return the login token.
*/
- @Nonnull
+ @NotNull
String getToken();
/**
@@ -81,14 +80,14 @@ public interface TokenInfo {
* validated against the information stored in this instance; {@code false}
* otherwise.
*/
- boolean matches(@Nonnull TokenCredentials tokenCredentials);
+ boolean matches(@NotNull TokenCredentials tokenCredentials);
/**
* Returns the private attributes stored with this info object.
*
* @return the private attributes stored with this info object.
*/
- @Nonnull
+ @NotNull
Map<String, String> getPrivateAttributes();
/**
@@ -96,6 +95,6 @@ public interface TokenInfo {
*
* @return the public attributes stored with this info object.
*/
- @Nonnull
+ @NotNull
Map<String, String> getPublicAttributes();
}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java Wed Nov 7 14:29:24 2018
@@ -17,10 +17,11 @@
package org.apache.jackrabbit.oak.spi.security.authentication.token;
import java.util.Map;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.Credentials;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* Interface to manage create and manage login tokens.
*/
@@ -54,7 +55,7 @@ public interface TokenProvider {
* @param credentials The current credentials.
* @return {@code true} if a new login token needs to be created, {@code false} otherwise.
*/
- boolean doCreateToken(@Nonnull Credentials credentials);
+ boolean doCreateToken(@NotNull Credentials credentials);
/**
* Issues a new login token for the user with the specified credentials
@@ -64,8 +65,8 @@ public interface TokenProvider {
* @return The {@code TokenInfo} associated with the new login token or
* {@code null} if no token has been created.
*/
- @CheckForNull
- TokenInfo createToken(@Nonnull Credentials credentials);
+ @Nullable
+ TokenInfo createToken(@NotNull Credentials credentials);
/**
* Issues a new login token for the user with the given {@code userId}
@@ -77,8 +78,8 @@ public interface TokenProvider {
* @return The {@code TokenInfo} associated with the new login token or
* {@code null} if no token has been created.
*/
- @CheckForNull
- TokenInfo createToken(@Nonnull String userId, @Nonnull Map<String,?> attributes);
+ @Nullable
+ TokenInfo createToken(@NotNull String userId, @NotNull Map<String,?> attributes);
/**
* Retrieves the {@code TokenInfo} associated with the specified login token
@@ -88,6 +89,6 @@ public interface TokenProvider {
* @return the {@code TokenInfo} associated with the specified login token
* or {@code null}.
*/
- @CheckForNull
- TokenInfo getTokenInfo(@Nonnull String token);
+ @Nullable
+ TokenInfo getTokenInfo(@NotNull String token);
}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/package-info.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/package-info.java Wed Nov 7 14:29:24 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.5.0")
+@Version("1.5.1")
package org.apache.jackrabbit.oak.spi.security.authentication.token;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/AuthorizationConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/AuthorizationConfiguration.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/AuthorizationConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/AuthorizationConfiguration.java Wed Nov 7 14:29:24 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlManager;
import org.apache.jackrabbit.oak.api.Root;
@@ -26,6 +25,7 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
+import org.jetbrains.annotations.NotNull;
/**
* Configuration for access control management and permission evaluation.
@@ -34,15 +34,15 @@ public interface AuthorizationConfigurat
String NAME = "org.apache.jackrabbit.oak.authorization";
- @Nonnull
- AccessControlManager getAccessControlManager(@Nonnull Root root,
- @Nonnull NamePathMapper namePathMapper);
+ @NotNull
+ AccessControlManager getAccessControlManager(@NotNull Root root,
+ @NotNull NamePathMapper namePathMapper);
- @Nonnull
+ @NotNull
RestrictionProvider getRestrictionProvider();
- @Nonnull
- PermissionProvider getPermissionProvider(@Nonnull Root root,
- @Nonnull String workspaceName,
- @Nonnull Set<Principal> principals);
+ @NotNull
+ PermissionProvider getPermissionProvider(@NotNull Root root,
+ @NotNull String workspaceName,
+ @NotNull Set<Principal> principals);
}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/OpenAuthorizationConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/OpenAuthorizationConfiguration.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/OpenAuthorizationConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/OpenAuthorizationConfiguration.java Wed Nov 7 14:29:24 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlManager;
import org.apache.jackrabbit.oak.api.Root;
@@ -27,6 +26,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authorization.permission.OpenPermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
+import org.jetbrains.annotations.NotNull;
/**
* This class implements an {@link AuthorizationConfiguration} which grants
@@ -35,21 +35,21 @@ import org.apache.jackrabbit.oak.spi.sec
public class OpenAuthorizationConfiguration extends SecurityConfiguration.Default
implements AuthorizationConfiguration {
- @Nonnull
+ @NotNull
@Override
- public AccessControlManager getAccessControlManager(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper) {
+ public AccessControlManager getAccessControlManager(@NotNull Root root, @NotNull NamePathMapper namePathMapper) {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
throw new UnsupportedOperationException();
}
- @Nonnull
+ @NotNull
@Override
- public PermissionProvider getPermissionProvider(@Nonnull Root root, @Nonnull String workspaceName, @Nonnull Set<Principal> principals) {
+ public PermissionProvider getPermissionProvider(@NotNull Root root, @NotNull String workspaceName, @NotNull Set<Principal> principals) {
return OpenPermissionProvider.getInstance();
}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java Wed Nov 7 14:29:24 2018
@@ -20,8 +20,6 @@ import java.security.Principal;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.ValueFormatException;
@@ -36,6 +34,8 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Default implementation of the {@code JackrabbitAccessControlEntry} interface.
@@ -66,18 +66,18 @@ public abstract class ACE implements Jac
}
//--------------------------------------------------------------------------
- @Nonnull
+ @NotNull
public PrivilegeBits getPrivilegeBits() {
return privilegeBits;
}
- @Nonnull
+ @NotNull
public Set<Restriction> getRestrictions() {
return restrictions;
}
//-------------------------------------------------< AccessControlEntry >---
- @Nonnull
+ @NotNull
@Override
public Principal getPrincipal() {
return principal;
@@ -89,7 +89,7 @@ public abstract class ACE implements Jac
return isAllow;
}
- @Nonnull
+ @NotNull
@Override
public String[] getRestrictionNames() throws RepositoryException {
return Collections2.transform(restrictions, new Function<Restriction, String>() {
@@ -100,7 +100,7 @@ public abstract class ACE implements Jac
}).toArray(new String[restrictions.size()]);
}
- @CheckForNull
+ @Nullable
@Override
public Value getRestriction(String restrictionName) throws RepositoryException {
for (Restriction restriction : restrictions) {
@@ -120,7 +120,7 @@ public abstract class ACE implements Jac
return null;
}
- @CheckForNull
+ @Nullable
@Override
public Value[] getRestrictions(String restrictionName) throws RepositoryException {
for (Restriction restriction : restrictions) {
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java Wed Nov 7 14:29:24 2018
@@ -21,9 +21,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -37,6 +34,8 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionDefinition;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Abstract base implementation of the {@code JackrabbitAccessControlList}
@@ -48,30 +47,30 @@ public abstract class AbstractAccessCont
private final NamePathMapper namePathMapper;
public AbstractAccessControlList(@Nullable String oakPath,
- @Nonnull NamePathMapper namePathMapper) {
+ @NotNull NamePathMapper namePathMapper) {
this.oakPath = oakPath;
this.namePathMapper = namePathMapper;
}
//------------------------------------------< AbstractAccessControlList >---
- @CheckForNull
+ @Nullable
public String getOakPath() {
return oakPath;
}
- @Nonnull
+ @NotNull
public NamePathMapper getNamePathMapper() {
return namePathMapper;
}
- @Nonnull
+ @NotNull
public abstract List<? extends JackrabbitAccessControlEntry> getEntries();
- @Nonnull
+ @NotNull
public abstract RestrictionProvider getRestrictionProvider();
//--------------------------------------< JackrabbitAccessControlPolicy >---
- @CheckForNull
+ @Nullable
@Override
public String getPath() {
return (oakPath == null) ? null : namePathMapper.getJcrPath(oakPath);
@@ -102,7 +101,7 @@ public abstract class AbstractAccessCont
return getEntries().size();
}
- @Nonnull
+ @NotNull
@Override
public String[] getRestrictionNames() throws RepositoryException {
Collection<RestrictionDefinition> supported = getRestrictionProvider().getSupportedRestrictions(getOakPath());
@@ -149,4 +148,4 @@ public abstract class AbstractAccessCont
public boolean addEntry(Principal principal, Privilege[] privileges, boolean isAllow, Map<String, Value> restrictions) throws RepositoryException {
return addEntry(principal, privileges, isAllow, restrictions, null);
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java Wed Nov 7 14:29:24 2018
@@ -20,9 +20,6 @@ import java.security.Principal;
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.AccessDeniedException;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -40,6 +37,8 @@ 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.permission.Permissions;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,9 +59,9 @@ public abstract class AbstractAccessCont
private PermissionProvider permissionProvider;
- protected AbstractAccessControlManager(@Nonnull Root root,
- @Nonnull NamePathMapper namePathMapper,
- @Nonnull SecurityProvider securityProvider) {
+ protected AbstractAccessControlManager(@NotNull Root root,
+ @NotNull NamePathMapper namePathMapper,
+ @NotNull SecurityProvider securityProvider) {
this.root = root;
this.workspaceName = root.getContentSession().getWorkspaceName();
this.namePathMapper = namePathMapper;
@@ -72,16 +71,16 @@ public abstract class AbstractAccessCont
}
//-----------------------------------------------< AccessControlManager >---
- @Nonnull
+ @NotNull
@Override
public Privilege[] getSupportedPrivileges(@Nullable String absPath) throws RepositoryException {
getTree(getOakPath(absPath), Permissions.NO_PERMISSION, false);
return privilegeManager.getRegisteredPrivileges();
}
- @Nonnull
+ @NotNull
@Override
- public Privilege privilegeFromName(@Nonnull String privilegeName) throws RepositoryException {
+ public Privilege privilegeFromName(@NotNull String privilegeName) throws RepositoryException {
return privilegeManager.getPrivilege(privilegeName);
}
@@ -90,7 +89,7 @@ public abstract class AbstractAccessCont
return hasPrivileges(absPath, privileges, getPermissionProvider(), Permissions.NO_PERMISSION, false);
}
- @Nonnull
+ @NotNull
@Override
public Privilege[] getPrivileges(@Nullable String absPath) throws RepositoryException {
return getPrivileges(absPath, getPermissionProvider(), Permissions.NO_PERMISSION);
@@ -98,7 +97,7 @@ public abstract class AbstractAccessCont
//-------------------------------------< JackrabbitAccessControlManager >---
@Override
- public boolean hasPrivileges(@Nullable String absPath, @Nonnull Set<Principal> principals, @Nullable Privilege[] privileges) throws RepositoryException {
+ public boolean hasPrivileges(@Nullable String absPath, @NotNull Set<Principal> principals, @Nullable Privilege[] privileges) throws RepositoryException {
if (getPrincipals().equals(principals)) {
return hasPrivileges(absPath, privileges);
} else {
@@ -108,7 +107,7 @@ public abstract class AbstractAccessCont
}
@Override
- public Privilege[] getPrivileges(@Nullable String absPath, @Nonnull Set<Principal> principals) throws RepositoryException {
+ public Privilege[] getPrivileges(@Nullable String absPath, @NotNull Set<Principal> principals) throws RepositoryException {
if (getPrincipals().equals(principals)) {
return getPrivileges(absPath);
} else {
@@ -118,32 +117,32 @@ public abstract class AbstractAccessCont
}
//----------------------------------------------------------< protected >---
- @Nonnull
+ @NotNull
protected AuthorizationConfiguration getConfig() {
return config;
}
- @Nonnull
+ @NotNull
protected Root getRoot() {
return root;
}
- @Nonnull
+ @NotNull
protected Root getLatestRoot() {
return root.getContentSession().getLatestRoot();
}
- @Nonnull
+ @NotNull
protected NamePathMapper getNamePathMapper() {
return namePathMapper;
}
- @Nonnull
+ @NotNull
protected PrivilegeManager getPrivilegeManager() {
return privilegeManager;
}
- @CheckForNull
+ @Nullable
protected String getOakPath(@Nullable String jcrPath) throws RepositoryException {
if (jcrPath == null) {
return null;
@@ -156,7 +155,7 @@ public abstract class AbstractAccessCont
}
}
- @Nonnull
+ @NotNull
protected Tree getTree(@Nullable String oakPath, long permissions, boolean checkAcContent) throws RepositoryException {
Tree tree = (oakPath == null) ? root.getTree("/") : root.getTree(oakPath);
if (!tree.exists()) {
@@ -173,7 +172,7 @@ public abstract class AbstractAccessCont
return tree;
}
- @Nonnull
+ @NotNull
protected PermissionProvider getPermissionProvider() {
if (permissionProvider == null) {
permissionProvider = config.getPermissionProvider(root, workspaceName, getPrincipals());
@@ -184,7 +183,7 @@ public abstract class AbstractAccessCont
}
//------------------------------------------------------------< private >---
- @Nonnull
+ @NotNull
private Set<Principal> getPrincipals() {
return root.getContentSession().getAuthInfo().getPrincipals();
}
@@ -201,9 +200,9 @@ public abstract class AbstractAccessCont
}
}
- @Nonnull
+ @NotNull
private Privilege[] getPrivileges(@Nullable String absPath,
- @Nonnull PermissionProvider provider,
+ @NotNull PermissionProvider provider,
long permissions) throws RepositoryException {
Tree tree;
if (absPath == null) {
@@ -227,7 +226,7 @@ public abstract class AbstractAccessCont
}
private boolean hasPrivileges(@Nullable String absPath, @Nullable Privilege[] privileges,
- @Nonnull PermissionProvider provider, long permissions,
+ @NotNull PermissionProvider provider, long permissions,
boolean checkAcContent) throws RepositoryException {
Tree tree;
if (absPath == null) {
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACL.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACL.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACL.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACL.java Wed Nov 7 14:29:24 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Value;
import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlException;
@@ -31,6 +29,8 @@ import com.google.common.collect.Immutab
import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* An implementation of the {@code JackrabbitAccessControlList} interface that only
@@ -52,9 +52,9 @@ public class ImmutableACL extends Abstra
* @param namePathMapper The {@link NamePathMapper} used for conversion.
*/
public ImmutableACL(@Nullable String oakPath,
- @Nonnull List<? extends JackrabbitAccessControlEntry> entries,
- @Nonnull RestrictionProvider restrictionProvider,
- @Nonnull NamePathMapper namePathMapper) {
+ @NotNull List<? extends JackrabbitAccessControlEntry> entries,
+ @NotNull RestrictionProvider restrictionProvider,
+ @NotNull NamePathMapper namePathMapper) {
super(oakPath, namePathMapper);
this.entries = ImmutableList.copyOf(entries);
this.restrictionProvider = restrictionProvider;
@@ -86,13 +86,13 @@ public class ImmutableACL extends Abstra
}
//------------------------------------------< AbstractAccessControlList >---
- @Nonnull
+ @NotNull
@Override
public List<JackrabbitAccessControlEntry> getEntries() {
return entries;
}
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return restrictionProvider;
@@ -119,4 +119,4 @@ public class ImmutableACL extends Abstra
}
return false;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PolicyOwner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PolicyOwner.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PolicyOwner.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PolicyOwner.java Wed Nov 7 14:29:24 2018
@@ -16,10 +16,11 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.security.AccessControlPolicy;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* Interface to improve pluggability of the {@link javax.jcr.security.AccessControlManager},
* namely the interaction of multiple managers within a
@@ -44,5 +45,5 @@ public interface PolicyOwner {
* @return {@code true} If the {@code AccessControlManager} implementing this
* interface can handle the specified {@code accessControlPolicy} at the given {@code path}.
*/
- boolean defines(@Nullable String absPath, @Nonnull AccessControlPolicy accessControlPolicy);
-}
\ No newline at end of file
+ boolean defines(@Nullable String absPath, @NotNull AccessControlPolicy accessControlPolicy);
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/package-info.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/package-info.java Wed Nov 7 14:29:24 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.5.0")
+@Version("1.5.1")
package org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/package-info.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/package-info.java Wed Nov 7 14:29:24 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.1.0")
+@Version("1.1.1")
package org.apache.jackrabbit.oak.spi.security.authorization;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/AggregatedPermissionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/AggregatedPermissionProvider.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/AggregatedPermissionProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/AggregatedPermissionProvider.java Wed Nov 7 14:29:24 2018
@@ -16,14 +16,13 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.permission;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.TreeLocation;
import org.apache.jackrabbit.oak.plugins.tree.TreeType;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Extension of the {@link PermissionProvider} interface that allows it to be
@@ -53,7 +52,7 @@ public interface AggregatedPermissionPro
* that are supported and evaluated by the implementation at the given {@code tree}
* represented as {@code PrivilegeBits}.
*/
- @Nonnull
+ @NotNull
PrivilegeBits supportedPrivileges(@Nullable Tree tree, @Nullable PrivilegeBits privilegeBits);
/**
@@ -91,7 +90,7 @@ public interface AggregatedPermissionPro
* @return The subset of the given {@code permissions} that are supported and
* evaluated by the implementation for the given location.
*/
- long supportedPermissions(@Nonnull TreeLocation location, long permissions);
+ long supportedPermissions(@NotNull TreeLocation location, long permissions);
/**
* Allows to determined the set or subset of permissions evaluated by the
@@ -109,7 +108,7 @@ public interface AggregatedPermissionPro
* @return The subset of the given {@code permissions} that are supported and
* evaluated by the implementation for the given tree permissions.
*/
- long supportedPermissions(@Nonnull TreePermission treePermission, @Nullable PropertyState property, long permissions);
+ long supportedPermissions(@NotNull TreePermission treePermission, @Nullable PropertyState property, long permissions);
/**
* Test if the specified permissions are granted for the set of {@code Principal}s
@@ -122,7 +121,7 @@ public interface AggregatedPermissionPro
* @return {@code true} if the specified permissions are granted for the existing
* or non-existing item identified by the given location.
*/
- boolean isGranted(@Nonnull TreeLocation location, long permissions);
+ boolean isGranted(@NotNull TreeLocation location, long permissions);
/**
* Return the {@code TreePermission} for the set of {@code Principal}s associated
@@ -134,7 +133,7 @@ public interface AggregatedPermissionPro
* obtained before for the parent tree.
* @return The {@code TreePermission} object for the specified {@code tree}.
*/
- @Nonnull
- TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreeType type, @Nonnull TreePermission parentPermission);
+ @NotNull
+ TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreeType type, @NotNull TreePermission parentPermission);
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProvider.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProvider.java Wed Nov 7 14:29:24 2018
@@ -18,11 +18,10 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.Collections;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Permission provider implementation that does not grant any permissions.
@@ -43,36 +42,36 @@ public final class EmptyPermissionProvid
// nothing to do
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
return Collections.emptySet();
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String... privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull String... privilegeNames) {
return false;
}
- @Nonnull
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
return RepositoryPermission.EMPTY;
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreePermission parentPermission) {
return TreePermission.EMPTY;
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property, long permissions) {
return false;
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String jcrActions) {
return false;
}
}
Modified: jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProvider.java?rev=1846033&r1=1846032&r2=1846033&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProvider.java Wed Nov 7 14:29:24 2018
@@ -18,12 +18,11 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.Collections;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Permission provider implementation that grants full access everywhere.
@@ -44,36 +43,36 @@ public final class OpenPermissionProvide
// nothing to do
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
return Collections.singleton(PrivilegeConstants.JCR_ALL);
}
@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 RepositoryPermission.ALL;
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull TreePermission parentPermission) {
return TreePermission.ALL;
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState property, long permissions) {
return true;
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String jcrActions) {
return true;
}
}