Author: reschke
Date: Wed Jul 18 14:41:56 2018
New Revision: 1836179
URL: http://svn.apache.org/viewvc?rev=1836179&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations
instead - oak-exercise
Modified:
jackrabbit/oak/trunk/oak-exercise/pom.xml
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Editor.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedAuthorizationConfiguration.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedPermissionProvider.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Reader.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/readonly/ReadOnlyAuthorizationConfiguration.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Role.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAccessControlManager.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesTreePermission.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Utils.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/restriction/CustomRestrictionProvider.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalConfiguration.java
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/ExerciseUtility.java
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L4_CustomAccessControlManagementTest.java
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L5_CustomPermissionEvaluationTest.java
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L3_BuiltInPrivilegesTest.java
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java
Modified: jackrabbit/oak/trunk/oak-exercise/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/pom.xml?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-exercise/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-exercise/pom.xml Wed Jul 18 14:41:56 2018
@@ -125,10 +125,10 @@
<version>${jackrabbit.version}</version>
</dependency>
- <!-- Findbugs annotations -->
+ <!-- Nullability annotations -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<!-- OSGi -->
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
Wed Jul 18 14:41:56 2018
@@ -22,8 +22,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
import javax.jcr.SimpleCredentials;
import javax.security.auth.login.LoginException;
@@ -46,6 +44,8 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser;
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,14 +98,14 @@ public class CustomExternalIdentityProvi
log.info("modified IDP: " + getName());
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return "CustomExternalIdentityProvider";
}
@Override
- public ExternalIdentity getIdentity(@Nonnull ExternalIdentityRef ref)
throws ExternalIdentityException {
+ public ExternalIdentity getIdentity(@NotNull ExternalIdentityRef ref)
throws ExternalIdentityException {
if (getName().equals(ref.getProviderName())) {
String id = ref.getId();
ExternalIdentity ei = getUser(id);
@@ -119,23 +119,23 @@ public class CustomExternalIdentityProvi
}
@Override
- public ExternalUser getUser(@Nonnull final String userId) throws
ExternalIdentityException {
+ public ExternalUser getUser(@NotNull final String userId) throws
ExternalIdentityException {
if (userGroupMap.containsKey(userId)) {
return new ExternalUser() {
- @Nonnull
+ @NotNull
@Override
public ExternalIdentityRef getExternalId() {
return new ExternalIdentityRef(userId, getName());
}
- @Nonnull
+ @NotNull
@Override
public String getId() {
return userId;
}
- @Nonnull
+ @NotNull
@Override
public String getPrincipalName() {
return "p_" + getExternalId().getString();
@@ -146,7 +146,7 @@ public class CustomExternalIdentityProvi
return null;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<ExternalIdentityRef> getDeclaredGroups()
throws ExternalIdentityException {
Set<String> groupIds = userGroupMap.get(userId);
@@ -163,7 +163,7 @@ public class CustomExternalIdentityProvi
}
}
- @Nonnull
+ @NotNull
@Override
public Map<String, ?> getProperties() {
return ImmutableMap.of();
@@ -175,7 +175,7 @@ public class CustomExternalIdentityProvi
}
@Override
- public ExternalUser authenticate(@Nonnull Credentials credentials) throws
ExternalIdentityException, LoginException {
+ public ExternalUser authenticate(@NotNull Credentials credentials) throws
ExternalIdentityException, LoginException {
if (credentials instanceof SimpleCredentials) {
String userId = ((SimpleCredentials) credentials).getUserID();
return getUser(userId);
@@ -185,10 +185,10 @@ public class CustomExternalIdentityProvi
}
@Override
- public ExternalGroup getGroup(@Nonnull final String name) throws
ExternalIdentityException {
+ public ExternalGroup getGroup(@NotNull final String name) throws
ExternalIdentityException {
if (groupIds.contains(name)) {
return new ExternalGroup() {
- @Nonnull
+ @NotNull
@Override
public Iterable<ExternalIdentityRef> getDeclaredMembers()
throws ExternalIdentityException {
Set<ExternalIdentityRef> members = new
HashSet<ExternalIdentityRef>();
@@ -200,19 +200,19 @@ public class CustomExternalIdentityProvi
return members;
}
- @Nonnull
+ @NotNull
@Override
public ExternalIdentityRef getExternalId() {
return new ExternalIdentityRef(name, getName());
}
- @Nonnull
+ @NotNull
@Override
public String getId() {
return name;
}
- @Nonnull
+ @NotNull
@Override
public String getPrincipalName() {
return "p_" + getExternalId().getString();
@@ -223,13 +223,13 @@ public class CustomExternalIdentityProvi
return null;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<ExternalIdentityRef> getDeclaredGroups()
throws ExternalIdentityException {
return ImmutableSet.of();
}
- @Nonnull
+ @NotNull
@Override
public Map<String, ?> getProperties() {
return ImmutableMap.of();
@@ -240,15 +240,15 @@ public class CustomExternalIdentityProvi
}
}
- @Nonnull
+ @NotNull
@Override
public Iterator<ExternalUser> listUsers() throws ExternalIdentityException
{
throw new UnsupportedOperationException("listUsers");
}
- @Nonnull
+ @NotNull
@Override
public Iterator<ExternalGroup> listGroups() throws
ExternalIdentityException {
throw new UnsupportedOperationException("listGroups");
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Editor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Editor.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Editor.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Editor.java
Wed Jul 18 14:41:56 2018
@@ -16,11 +16,11 @@
*/
package
org.apache.jackrabbit.oak.exercise.security.authorization.models.predefined;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
public class Editor extends Reader {
- public Editor(@Nonnull String name) {
+ public Editor(@NotNull String name) {
super(name);
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedAuthorizationConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedAuthorizationConfiguration.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedAuthorizationConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedAuthorizationConfiguration.java
Wed Jul 18 14:41:56 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.exerci
import java.security.Principal;
import java.util.Collections;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
@@ -42,6 +41,7 @@ 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.restriction.RestrictionProvider;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.NotNull;
import static
org.apache.jackrabbit.oak.spi.security.RegistrationConstants.OAK_SECURITY_NAME;
@@ -61,9 +61,9 @@ public final class PredefinedAuthorizati
private static final long READ_PERMISSIONS = Permissions.READ |
Permissions.READ_ACCESS_CONTROL;
private static final Set<String> READ_PRIVILEGE_NAMES =
ImmutableSet.of(PrivilegeConstants.JCR_READ,
PrivilegeConstants.JCR_READ_ACCESS_CONTROL, PrivilegeConstants.REP_READ_NODES,
PrivilegeConstants.REP_READ_PROPERTIES);
- @Nonnull
+ @NotNull
@Override
- public AccessControlManager getAccessControlManager(@Nonnull Root root,
@Nonnull NamePathMapper namePathMapper) {
+ public AccessControlManager getAccessControlManager(@NotNull Root root,
@NotNull NamePathMapper namePathMapper) {
return new AbstractAccessControlManager(root, namePathMapper,
getSecurityProvider()) {
@Override
@@ -108,21 +108,21 @@ public final class PredefinedAuthorizati
};
}
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return RestrictionProvider.EMPTY;
}
- @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 new PredefinedPermissionProvider(principals);
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return AuthorizationConfiguration.NAME;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedPermissionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedPermissionProvider.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedPermissionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/PredefinedPermissionProvider.java
Wed Jul 18 14:41:56 2018
@@ -18,15 +18,14 @@ package org.apache.jackrabbit.oak.exerci
import java.security.Principal;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.RepositoryPermission;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* EXERCISE: complete PermissionProvider implementation
@@ -35,7 +34,7 @@ class PredefinedPermissionProvider imple
private final Set<Principal> principals;
- PredefinedPermissionProvider(@Nonnull Set<Principal> principals) {
+ PredefinedPermissionProvider(@NotNull Set<Principal> principals) {
this.principals = principals;
}
@@ -45,7 +44,7 @@ class PredefinedPermissionProvider imple
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
// EXERCISE: complete PermissionProvider implementation
@@ -53,34 +52,34 @@ class PredefinedPermissionProvider imple
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String...
privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull String...
privilegeNames) {
// EXERCISE: complete PermissionProvider implementation
return false;
}
- @Nonnull
+ @NotNull
@Override
public RepositoryPermission getRepositoryPermission() {
// EXERCISE: complete PermissionProvider implementation
return RepositoryPermission.EMPTY;
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull
TreePermission parentPermission) {
+ public TreePermission getTreePermission(@NotNull Tree tree, @NotNull
TreePermission parentPermission) {
// EXERCISE: complete PermissionProvider implementation
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) {
// EXERCISE: complete PermissionProvider implementation
return false;
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull String
jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String
jcrActions) {
// EXERCISE: complete PermissionProvider implementation
return false;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Reader.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Reader.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Reader.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/predefined/Reader.java
Wed Jul 18 14:41:56 2018
@@ -18,8 +18,7 @@ package org.apache.jackrabbit.oak.exerci
import java.security.Principal;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,7 +26,7 @@ public class Reader implements Principal
private final String name;
- public Reader(@Nonnull String name) {
+ public Reader(@NotNull String name) {
this.name = name;
}
@@ -35,4 +34,4 @@ public class Reader implements Principal
public String getName() {
return name;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/readonly/ReadOnlyAuthorizationConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/readonly/ReadOnlyAuthorizationConfiguration.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/readonly/ReadOnlyAuthorizationConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/readonly/ReadOnlyAuthorizationConfiguration.java
Wed Jul 18 14:41:56 2018
@@ -20,8 +20,6 @@ import java.security.Principal;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
@@ -68,6 +66,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.oak.spi.xml.ProtectedItemImporter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static
org.apache.jackrabbit.oak.spi.security.RegistrationConstants.OAK_SECURITY_NAME;
@@ -169,9 +169,9 @@ public final class ReadOnlyAuthorization
private static final long READ_PERMISSIONS = Permissions.READ |
Permissions.READ_ACCESS_CONTROL;
private static final Set<String> READ_PRIVILEGE_NAMES =
ImmutableSet.of(PrivilegeConstants.JCR_READ,
PrivilegeConstants.JCR_READ_ACCESS_CONTROL, PrivilegeConstants.REP_READ_NODES,
PrivilegeConstants.REP_READ_PROPERTIES);
- @Nonnull
+ @NotNull
@Override
- public AccessControlManager getAccessControlManager(@Nonnull Root root,
@Nonnull NamePathMapper namePathMapper) {
+ public AccessControlManager getAccessControlManager(@NotNull Root root,
@NotNull NamePathMapper namePathMapper) {
return new AbstractAccessControlManager(root, namePathMapper,
getSecurityProvider()) {
@Override
@@ -216,21 +216,21 @@ public final class ReadOnlyAuthorization
};
}
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return RestrictionProvider.EMPTY;
}
- @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) {
if (principals.contains(SystemPrincipal.INSTANCE)) {
return EmptyPermissionProvider.getInstance();
} else {
return new AggregatedPermissionProvider() {
- @Nonnull
+ @NotNull
@Override
public PrivilegeBits supportedPrivileges(@Nullable Tree tree,
@Nullable PrivilegeBits privilegeBits) {
return (privilegeBits != null) ? privilegeBits : new
PrivilegeBitsProvider(root).getBits(PrivilegeConstants.JCR_ALL);
@@ -242,23 +242,23 @@ public final class ReadOnlyAuthorization
}
@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;
}
@Override
- public boolean isGranted(@Nonnull TreeLocation location, long
permissions) {
+ public boolean isGranted(@NotNull TreeLocation location, long
permissions) {
return onlyReadPermissions(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 new ReadOnlyPermissions();
}
@@ -266,39 +266,39 @@ public final class ReadOnlyAuthorization
public void refresh() {
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
return READ_PRIVILEGE_NAMES;
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull
String... privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull
String... privilegeNames) {
Set<String> privs = Sets.newHashSet(privilegeNames);
privs.removeAll(READ_PRIVILEGE_NAMES);
return privs.isEmpty();
}
- @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 ReadOnlyPermissions.INSTANCE;
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable
PropertyState property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable
PropertyState property, long permissions) {
return onlyReadPermissions(permissions);
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull
String jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull
String jcrActions) {
return
onlyReadPermissions(Permissions.getPermissions(jcrActions,
TreeLocation.create(root, oakPath), false));
}
};
@@ -309,55 +309,55 @@ public final class ReadOnlyAuthorization
return Permissions.diff(permissions, READ_PERMISSIONS) ==
Permissions.NO_PERMISSION;
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return AuthorizationConfiguration.NAME;
}
- @Nonnull
+ @NotNull
@Override
public ConfigurationParameters getParameters() {
return ConfigurationParameters.EMPTY;
}
- @Nonnull
+ @NotNull
@Override
public WorkspaceInitializer getWorkspaceInitializer() {
return WorkspaceInitializer.DEFAULT;
}
- @Nonnull
+ @NotNull
@Override
public RepositoryInitializer getRepositoryInitializer() {
return RepositoryInitializer.DEFAULT;
}
- @Nonnull
+ @NotNull
@Override
- public List<? extends CommitHook> getCommitHooks(@Nonnull String
workspaceName) {
+ public List<? extends CommitHook> getCommitHooks(@NotNull String
workspaceName) {
return ImmutableList.of();
}
- @Nonnull
+ @NotNull
@Override
- public List<? extends ValidatorProvider> getValidators(@Nonnull String
workspaceName, @Nonnull Set<Principal> principals, @Nonnull MoveTracker
moveTracker) {
+ public List<? extends ValidatorProvider> getValidators(@NotNull String
workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker
moveTracker) {
return ImmutableList.of();
}
- @Nonnull
+ @NotNull
@Override
public List<ThreeWayConflictHandler> getConflictHandlers() {
return ImmutableList.of();
}
- @Nonnull
+ @NotNull
@Override
public List<ProtectedItemImporter> getProtectedItemImporters() {
return ImmutableList.of();
}
- @Nonnull
+ @NotNull
@Override
public Context getContext() {
return Context.DEFAULT;
@@ -367,9 +367,9 @@ public final class ReadOnlyAuthorization
private static final TreePermission INSTANCE = new
ReadOnlyPermissions();
- @Nonnull
+ @NotNull
@Override
- public TreePermission getChildPermission(@Nonnull String childName,
@Nonnull NodeState childState) {
+ public TreePermission getChildPermission(@NotNull String childName,
@NotNull NodeState childState) {
return this;
}
@@ -379,7 +379,7 @@ public final class ReadOnlyAuthorization
}
@Override
- public boolean canRead(@Nonnull PropertyState property) {
+ public boolean canRead(@NotNull PropertyState property) {
return true;
}
@@ -399,7 +399,7 @@ public final class ReadOnlyAuthorization
}
@Override
- public boolean isGranted(long permissions, @Nonnull PropertyState
property) {
+ public boolean isGranted(long permissions, @NotNull PropertyState
property) {
return onlyReadPermissions(permissions);
}
}
@@ -413,4 +413,4 @@ public final class ReadOnlyAuthorization
return "Read-only Policy defined by
'ReadOnlyAuthorizationConfiguration'";
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Role.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Role.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Role.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Role.java
Wed Jul 18 14:41:56 2018
@@ -17,11 +17,10 @@
package
org.apache.jackrabbit.oak.exercise.security.authorization.models.simplifiedroles;
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableSet;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.NotNull;
final class Role {
static final Role NONE = new Role(Permissions.NO_PERMISSION);
@@ -41,7 +40,7 @@ final class Role {
this.privilegeNames = ImmutableSet.copyOf(privilegeNames);
}
- private Role(@Nonnull Role base, long permissions, String...
privilegeNames) {
+ private Role(@NotNull Role base, long permissions, String...
privilegeNames) {
this.permissions = base.permissions|permissions;
this.privilegeNames =
ImmutableSet.<String>builder().addAll(base.privilegeNames).add(privilegeNames).build();
}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAccessControlManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAccessControlManager.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAccessControlManager.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAccessControlManager.java
Wed Jul 18 14:41:56 2018
@@ -16,8 +16,6 @@
*/
package
org.apache.jackrabbit.oak.exercise.security.authorization.models.simplifiedroles;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.AccessDeniedException;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -34,12 +32,14 @@ import org.apache.jackrabbit.commons.ite
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import
org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.PolicyOwner;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
class ThreeRolesAccessControlManager implements PolicyOwner,
AccessControlManager {
private final String supportedPath;
- ThreeRolesAccessControlManager(@Nonnull Root root, @Nonnull String
supportedPath, @Nonnull SecurityProvider securityProvider) {
+ ThreeRolesAccessControlManager(@NotNull Root root, @NotNull String
supportedPath, @NotNull SecurityProvider securityProvider) {
this.supportedPath = supportedPath;
// EXERCISE
}
@@ -102,10 +102,10 @@ class ThreeRolesAccessControlManager imp
}
@Override
- public boolean defines(@Nullable String absPath, @Nonnull
AccessControlPolicy accessControlPolicy) {
+ public boolean defines(@Nullable String absPath, @NotNull
AccessControlPolicy accessControlPolicy) {
if (Utils.isSupportedPath(supportedPath, absPath)) {
// EXERCISE
}
return false;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesAuthorizationConfiguration.java
Wed Jul 18 14:41:56 2018
@@ -21,7 +21,6 @@ import java.security.Principal;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlManager;
@@ -63,6 +62,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,21 +103,21 @@ public class ThreeRolesAuthorizationConf
supportedPath = null;
}
- @Nonnull
+ @NotNull
@Override
- public AccessControlManager getAccessControlManager(@Nonnull Root root,
@Nonnull NamePathMapper namePathMapper) {
+ public AccessControlManager getAccessControlManager(@NotNull Root root,
@NotNull NamePathMapper namePathMapper) {
return new ThreeRolesAccessControlManager(root, supportedPath,
getSecurityProvider());
}
- @Nonnull
+ @NotNull
@Override
public RestrictionProvider getRestrictionProvider() {
return RestrictionProvider.EMPTY;
}
- @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) {
if (supportedPath == null) {
return EmptyPermissionProvider.getInstance();
} else {
@@ -125,13 +125,13 @@ public class ThreeRolesAuthorizationConf
}
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return AuthorizationConfiguration.NAME;
}
- @Nonnull
+ @NotNull
@Override
public RepositoryInitializer getRepositoryInitializer() {
String cnd = "<rep='internal'>\n" +
@@ -162,9 +162,9 @@ public class ThreeRolesAuthorizationConf
};
}
- @Nonnull
+ @NotNull
@Override
- public List<? extends ValidatorProvider> getValidators(@Nonnull String
workspaceName, @Nonnull Set<Principal> principals, @Nonnull MoveTracker
moveTracker) {
+ public List<? extends ValidatorProvider> getValidators(@NotNull String
workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker
moveTracker) {
return ImmutableList.of(new ValidatorProvider() {
@Override
protected Validator getRootValidator(NodeState before, NodeState
after, CommitInfo info) {
@@ -181,14 +181,14 @@ public class ThreeRolesAuthorizationConf
});
}
- @Nonnull
+ @NotNull
@Override
public List<ProtectedItemImporter> getProtectedItemImporters() {
// EXERCISE
return ImmutableList.of();
}
- @Nonnull
+ @NotNull
@Override
public Context getContext() {
/**
@@ -198,36 +198,36 @@ public class ThreeRolesAuthorizationConf
*/
return new Context() {
@Override
- public boolean definesProperty(@Nonnull Tree parent, @Nonnull
PropertyState property) {
+ public boolean definesProperty(@NotNull Tree parent, @NotNull
PropertyState property) {
return definesTree(parent) &&
NAMES.contains(property.getName());
}
@Override
- public boolean definesContextRoot(@Nonnull Tree tree) {
+ public boolean definesContextRoot(@NotNull Tree tree) {
return definesTree(tree);
}
@Override
- public boolean definesTree(@Nonnull Tree tree) {
+ public boolean definesTree(@NotNull Tree tree) {
return REP_3_ROLES_POLICY.equals(tree.getName());
}
@Override
- public boolean definesLocation(@Nonnull TreeLocation location) {
+ public boolean definesLocation(@NotNull TreeLocation location) {
String name = location.getName();
return NAMES.contains(name);
}
@Override
- public boolean definesInternal(@Nonnull Tree tree) {
+ public boolean definesInternal(@NotNull Tree tree) {
return false;
}
};
}
@Override
- public void setParameters(@Nonnull ConfigurationParameters config) {
+ public void setParameters(@NotNull ConfigurationParameters config) {
super.setParameters(config);
supportedPath = config.getConfigValue("supportedPath", null);
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java
Wed Jul 18 14:41:56 2018
@@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.exerci
import java.security.Principal;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -40,6 +37,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.util.Text;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
class ThreeRolesPermissionProvider implements AggregatedPermissionProvider,
ThreeRolesConstants {
@@ -58,9 +57,9 @@ class ThreeRolesPermissionProvider imple
private Root readOnlyRoot;
- ThreeRolesPermissionProvider(@Nonnull Root root, Set<Principal> principals,
- @Nonnull String supportedPath, @Nonnull
Context ctx,
- @Nonnull RootProvider rootProvider) {
+ ThreeRolesPermissionProvider(@NotNull Root root, Set<Principal> principals,
+ @NotNull String supportedPath, @NotNull
Context ctx,
+ @NotNull RootProvider rootProvider) {
this.root = root;
this.principalNames =
ImmutableSet.copyOf(Iterables.transform(principals, (Function<Principal,
String>) Principal::getName));
this.supportedPath = supportedPath;
@@ -70,7 +69,7 @@ class ThreeRolesPermissionProvider imple
this.readOnlyRoot = rootProvider.createReadOnlyRoot(root);
}
- @Nonnull
+ @NotNull
@Override
public PrivilegeBits supportedPrivileges(@Nullable Tree tree, @Nullable
PrivilegeBits privilegeBits) {
if (tree == null) {
@@ -108,7 +107,7 @@ class ThreeRolesPermissionProvider imple
}
@Override
- public long supportedPermissions(@Nonnull TreeLocation location, long
permissions) {
+ public long supportedPermissions(@NotNull TreeLocation location, long
permissions) {
long supported = permissions & SUPPORTED_PERMISSIONS;
if (supported != Permissions.NO_PERMISSION &&
Utils.isSupportedPath(supportedPath, location.getPath())) {
return supported;
@@ -118,7 +117,7 @@ class ThreeRolesPermissionProvider imple
}
@Override
- public long supportedPermissions(@Nonnull TreePermission treePermission,
@Nullable PropertyState property, long permissions) {
+ public long supportedPermissions(@NotNull TreePermission treePermission,
@Nullable PropertyState property, long permissions) {
long supported = permissions & SUPPORTED_PERMISSIONS;
if (supported != Permissions.NO_PERMISSION && (treePermission
instanceof ThreeRolesTreePermission)) {
return supported;
@@ -128,7 +127,7 @@ class ThreeRolesPermissionProvider imple
}
@Override
- public boolean isGranted(@Nonnull TreeLocation location, long permissions)
{
+ public boolean isGranted(@NotNull TreeLocation location, long permissions)
{
if (Utils.isSupportedPath(supportedPath, location.getPath())) {
TreePermission tp = getTreePermission(location);
@@ -139,9 +138,9 @@ class ThreeRolesPermissionProvider imple
}
}
- @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) {
// EXERCISE : currently this implementation ignores TreeType ->
complete implementation
return getTreePermission(tree, parentPermission);
}
@@ -152,7 +151,7 @@ class ThreeRolesPermissionProvider imple
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
if (tree != null) {
@@ -166,19 +165,19 @@ class ThreeRolesPermissionProvider imple
}
@Override
- public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String...
privilegeNames) {
+ public boolean hasPrivileges(@Nullable Tree tree, @NotNull String...
privilegeNames) {
return
getPrivileges(tree).containsAll(ImmutableSet.copyOf(privilegeNames));
}
- @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) {
if (parentPermission instanceof ThreeRolesTreePermission) {
// nested policies are not supported => within a given tree defined
// by a ThreeRolePolicy all items share the same permission setup.
@@ -201,7 +200,7 @@ class ThreeRolesPermissionProvider imple
}
@Override
- public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState
property, long permissions) {
+ public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState
property, long permissions) {
if (Utils.isSupportedPath(supportedPath, tree.getPath())) {
TreePermission tp = getTreePermission(tree);
return (property == null) ? tp.isGranted(permissions) :
tp.isGranted(permissions, property);
@@ -211,7 +210,7 @@ class ThreeRolesPermissionProvider imple
}
@Override
- public boolean isGranted(@Nonnull String oakPath, @Nonnull String
jcrActions) {
+ public boolean isGranted(@NotNull String oakPath, @NotNull String
jcrActions) {
TreeLocation tl = TreeLocation.create(readOnlyRoot, oakPath);
long permissions = Permissions.getPermissions(jcrActions, tl,
ctx.definesLocation(tl));
@@ -220,11 +219,11 @@ class ThreeRolesPermissionProvider imple
//--------------------------------------------------------------------------
- private boolean isAncestor(@Nonnull String path) {
+ private boolean isAncestor(@NotNull String path) {
return Text.isDescendant(path, supportedPath);
}
- private Role getRole(@Nonnull Tree tree) {
+ private Role getRole(@NotNull Tree tree) {
Tree policy = tree.getChild(REP_3_ROLES_POLICY);
if (policy.exists()) {
if (containsAny(policy, REP_OWNERS)) {
@@ -238,7 +237,7 @@ class ThreeRolesPermissionProvider imple
return Role.NONE;
}
- private boolean containsAny(@Nonnull Tree policyTree, @Nonnull String
propName) {
+ private boolean containsAny(@NotNull Tree policyTree, @NotNull String
propName) {
Iterable<String> names = TreeUtil.getStrings(policyTree, propName);
if (names != null) {
for (String principalName : names) {
@@ -250,7 +249,7 @@ class ThreeRolesPermissionProvider imple
return false;
}
- private Tree getReadOnlyTree(@Nonnull Tree tree) {
+ private Tree getReadOnlyTree(@NotNull Tree tree) {
if (tree instanceof ReadOnly) {
return tree;
} else {
@@ -258,7 +257,7 @@ class ThreeRolesPermissionProvider imple
}
}
- private TreePermission getTreePermission(@Nonnull Tree readOnlyTree) {
+ private TreePermission getTreePermission(@NotNull Tree readOnlyTree) {
Tree t = readOnlyTree;
while (Utils.isSupportedPath(supportedPath, t.getPath())) {
if (t.hasChild(REP_3_ROLES_POLICY)) {
@@ -269,7 +268,7 @@ class ThreeRolesPermissionProvider imple
return TreePermission.EMPTY;
}
- private TreePermission getTreePermission(@Nonnull TreeLocation location) {
+ private TreePermission getTreePermission(@NotNull TreeLocation location) {
TreeLocation l = location;
while (Utils.isSupportedPath(supportedPath, l.getPath())) {
Tree tree = location.getTree();
@@ -280,4 +279,4 @@ class ThreeRolesPermissionProvider imple
}
return TreePermission.EMPTY;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesTreePermission.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesTreePermission.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesTreePermission.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesTreePermission.java
Wed Jul 18 14:41:56 2018
@@ -16,31 +16,30 @@
*/
package
org.apache.jackrabbit.oak.exercise.security.authorization.models.simplifiedroles;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
class ThreeRolesTreePermission implements TreePermission, ThreeRolesConstants {
private final Role role;
private final boolean isAcContent;
- ThreeRolesTreePermission(@Nonnull Role role, boolean isAcContent) {
+ ThreeRolesTreePermission(@NotNull Role role, boolean isAcContent) {
this.role = role;
this.isAcContent = isAcContent;
}
- @Nonnull
+ @NotNull
Role getRole() {
return role;
}
- @Nonnull
+ @NotNull
@Override
- public TreePermission getChildPermission(@Nonnull String childName,
@Nonnull NodeState childState) {
+ public TreePermission getChildPermission(@NotNull String childName,
@NotNull NodeState childState) {
if (isAcContent) {
return this;
} else {
@@ -59,7 +58,7 @@ class ThreeRolesTreePermission implement
}
@Override
- public boolean canRead(@Nonnull PropertyState property) {
+ public boolean canRead(@NotNull PropertyState property) {
return canRead();
}
@@ -79,7 +78,7 @@ class ThreeRolesTreePermission implement
}
@Override
- public boolean isGranted(long permissions, @Nonnull PropertyState
property) {
+ public boolean isGranted(long permissions, @NotNull PropertyState
property) {
return isGranted(permissions);
}
}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Utils.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Utils.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/Utils.java
Wed Jul 18 14:41:56 2018
@@ -16,16 +16,15 @@
*/
package
org.apache.jackrabbit.oak.exercise.security.authorization.models.simplifiedroles;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
final class Utils {
private Utils() {}
- static boolean isSupportedPath(@Nonnull String configuredPath, @Nonnull
String path) {
+ static boolean isSupportedPath(@NotNull String configuredPath, @NotNull
String path) {
return Text.isDescendantOrEqual(configuredPath, path);
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/restriction/CustomRestrictionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/restriction/CustomRestrictionProvider.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/restriction/CustomRestrictionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/restriction/CustomRestrictionProvider.java
Wed Jul 18 14:41:56 2018
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.exerci
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
@@ -34,6 +32,8 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionDefinition;
import
org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern;
import
org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* EXERCISE: complete the implementation
@@ -42,30 +42,30 @@ import org.apache.jackrabbit.oak.spi.sec
@Service({RestrictionProvider.class})
public class CustomRestrictionProvider implements RestrictionProvider {
- @Nonnull
+ @NotNull
@Override
public Set<RestrictionDefinition> getSupportedRestrictions(@Nullable
String oakPath) {
// EXERCISE
return null;
}
- @Nonnull
+ @NotNull
@Override
- public Restriction createRestriction(@Nullable String oakPath, @Nonnull
String oakName, @Nonnull Value value) throws RepositoryException {
+ public Restriction createRestriction(@Nullable String oakPath, @NotNull
String oakName, @NotNull Value value) throws RepositoryException {
// EXERCISE
return null;
}
- @Nonnull
+ @NotNull
@Override
- public Restriction createRestriction(@Nullable String oakPath, @Nonnull
String oakName, @Nonnull Value... values) throws RepositoryException {
+ public Restriction createRestriction(@Nullable String oakPath, @NotNull
String oakName, @NotNull Value... values) throws RepositoryException {
// EXERCISE
return null;
}
- @Nonnull
+ @NotNull
@Override
- public Set<Restriction> readRestrictions(@Nullable String oakPath,
@Nonnull Tree aceTree) {
+ public Set<Restriction> readRestrictions(@Nullable String oakPath,
@NotNull Tree aceTree) {
// EXERCISE
return null;
}
@@ -77,21 +77,21 @@ public class CustomRestrictionProvider i
}
@Override
- public void validateRestrictions(@Nullable String oakPath, @Nonnull Tree
aceTree) throws RepositoryException {
+ public void validateRestrictions(@Nullable String oakPath, @NotNull Tree
aceTree) throws RepositoryException {
// EXERCISE
}
- @Nonnull
+ @NotNull
@Override
- public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull
Tree tree) {
+ public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull
Tree tree) {
// EXERCISE
return null;
}
- @Nonnull
+ @NotNull
@Override
- public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull
Set<Restriction> restrictions) {
+ public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull
Set<Restriction> restrictions) {
// EXERCISE
return null;
}
@@ -110,4 +110,4 @@ public class CustomRestrictionProvider i
@Deactivate
private void deactivate(Map<String, Object> properties) {
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalConfiguration.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalConfiguration.java
Wed Jul 18 14:41:56 2018
@@ -17,8 +17,6 @@
package org.apache.jackrabbit.oak.exercise.security.principal;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -35,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalManagerImpl;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,21 +50,21 @@ public class CustomPrincipalConfiguratio
@Property(name = "knownPrincipals", value = {}, cardinality = 100)
private String[] knownPrincipals = new String[0];
- @Nonnull
+ @NotNull
@Override
public PrincipalManager getPrincipalManager(Root root, NamePathMapper
namePathMapper) {
log.info("CustomPrincipalConfiguration.getPrincipalManager");
return new PrincipalManagerImpl(getPrincipalProvider(root,
namePathMapper));
}
- @Nonnull
+ @NotNull
@Override
public PrincipalProvider getPrincipalProvider(Root root, NamePathMapper
namePathMapper) {
log.info("CustomPrincipalConfiguration.getPrincipalProvider");
return new CustomPrincipalProvider(knownPrincipals);
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return PrincipalConfiguration.NAME;
@@ -93,8 +92,8 @@ public class CustomPrincipalConfiguratio
}
@Override
- public void setParameters(@Nonnull ConfigurationParameters config) {
+ public void setParameters(@NotNull ConfigurationParameters config) {
super.setParameters(config);
knownPrincipals = config.getConfigValue("knownPrincipals", new
String[0]);
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
Wed Jul 18 14:41:56 2018
@@ -20,11 +20,10 @@ import java.security.Principal;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Custom principal provider that only knows of a predefined set of principals
@@ -41,7 +40,7 @@ class CustomPrincipalProvider implements
}
@Override
- public Principal getPrincipal(@Nonnull String principalName) {
+ public Principal getPrincipal(@NotNull String principalName) {
// EXERCISE: complete
if (knownPrincipalNames.contains(principalName)) {
return () -> principalName;
@@ -50,33 +49,33 @@ class CustomPrincipalProvider implements
}
}
- @Nonnull
+ @NotNull
@Override
- public Set<Principal> getMembershipPrincipals(@Nonnull Principal
principal) {
+ public Set<Principal> getMembershipPrincipals(@NotNull Principal
principal) {
// EXERCISE : expose the group membership of your known Principals
// EXERCISE : add every other principal into one of your
known-principal-groups to establish dynamic group membership
return Collections.EMPTY_SET;
}
- @Nonnull
+ @NotNull
@Override
- public Set<? extends Principal> getPrincipals(@Nonnull String userID) {
+ public Set<? extends Principal> getPrincipals(@NotNull String userID) {
// EXERCISE : expose the principal-sets of your known principals
// EXERCISE : add every other principal into one of your
known-principal-groups to establish dynamic group membership
return Collections.EMPTY_SET;
}
- @Nonnull
+ @NotNull
@Override
public Iterator<? extends Principal> findPrincipals(@Nullable String
nameHint, int searchType) {
// EXERCISE
return Collections.emptyIterator();
}
- @Nonnull
+ @NotNull
@Override
public Iterator<? extends Principal> findPrincipals(int searchType) {
// EXERCISE
return Collections.emptyIterator();
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/ExerciseUtility.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/ExerciseUtility.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/ExerciseUtility.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/ExerciseUtility.java
Wed Jul 18 14:41:56 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.exerci
import java.security.Principal;
import java.util.UUID;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.SimpleCredentials;
@@ -26,6 +25,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
+import org.jetbrains.annotations.NotNull;
public final class ExerciseUtility {
@@ -37,24 +37,24 @@ public final class ExerciseUtility {
private ExerciseUtility() {}
- public static String getTestId(@Nonnull String hint) {
+ public static String getTestId(@NotNull String hint) {
return hint + UUID.randomUUID().toString();
}
- public static Principal getTestPrincipal(@Nonnull String hint) {
+ public static Principal getTestPrincipal(@NotNull String hint) {
String name = hint + UUID.randomUUID().toString();
return new PrincipalImpl(name);
}
- public static User createTestUser(@Nonnull UserManager userMgr) throws
RepositoryException {
+ public static User createTestUser(@NotNull UserManager userMgr) throws
RepositoryException {
return userMgr.createUser(getTestId(TEST_USER_HINT), TEST_PW,
getTestPrincipal(TEST_PRINCIPAL_HINT), null);
}
- public static Group createTestGroup(@Nonnull UserManager userMgr) throws
RepositoryException {
+ public static Group createTestGroup(@NotNull UserManager userMgr) throws
RepositoryException {
return userMgr.createGroup(getTestId(TEST_GROUP_HINT),
getTestPrincipal(TEST_GROUP_PRINCIPAL_HINT), null);
}
- public static SimpleCredentials getTestCredentials(@Nonnull String userID)
{
+ public static SimpleCredentials getTestCredentials(@NotNull String userID)
{
return new SimpleCredentials(userID, TEST_PW.toCharArray());
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L4_CustomAccessControlManagementTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L4_CustomAccessControlManagementTest.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L4_CustomAccessControlManagementTest.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L4_CustomAccessControlManagementTest.java
Wed Jul 18 14:41:56 2018
@@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.security.Principal;
import java.util.Map;
-import javax.annotation.Nonnull;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.Node;
import javax.jcr.Repository;
@@ -62,6 +61,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration;
import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
import org.apache.jackrabbit.oak.spi.xml.ProtectedNodeImporter;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static junit.framework.TestCase.assertEquals;
@@ -271,7 +271,7 @@ public class L4_CustomAccessControlManag
*/
}
- private AccessControlManager getAcManager(@Nonnull Root root) {
+ private AccessControlManager getAcManager(@NotNull Root root) {
return
getConfig(AuthorizationConfiguration.class).getAccessControlManager(root,
NamePathMapper.DEFAULT);
}
@@ -522,4 +522,4 @@ public class L4_CustomAccessControlManag
adminSession.logout();
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L5_CustomPermissionEvaluationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L5_CustomPermissionEvaluationTest.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L5_CustomPermissionEvaluationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L5_CustomPermissionEvaluationTest.java
Wed Jul 18 14:41:56 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.exerci
import java.security.Principal;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.GuestCredentials;
import javax.jcr.Session;
import javax.jcr.security.Privilege;
@@ -55,6 +54,7 @@ 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.util.Text;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -207,7 +207,7 @@ public class L5_CustomPermissionEvaluati
}
- private PermissionProvider getPermissionProvider(@Nonnull Set<Principal>
principals) {
+ private PermissionProvider getPermissionProvider(@NotNull Set<Principal>
principals) {
return
getConfig(AuthorizationConfiguration.class).getPermissionProvider(root,
adminSession.getWorkspaceName(), principals);
}
@@ -358,4 +358,4 @@ public class L5_CustomPermissionEvaluati
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java
Wed Jul 18 14:41:56 2018
@@ -17,8 +17,6 @@
package org.apache.jackrabbit.oak.exercise.security.authorization.permission;
import java.security.Principal;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.security.AccessControlManager;
import org.apache.jackrabbit.JcrConstants;
@@ -33,6 +31,8 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
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 com.google.common.base.Preconditions.checkNotNull;
@@ -180,11 +180,11 @@ public class L1_IntroductionTest extends
* @param privilegeNames The privilege names.
* @throws Exception If an error occurs.
*/
- private void setupPermission(@Nonnull Root root,
+ private void setupPermission(@NotNull Root root,
@Nullable String path,
- @Nonnull Principal principal,
+ @NotNull Principal principal,
boolean isAllow,
- @Nonnull String... privilegeNames) throws
Exception {
+ @NotNull String... privilegeNames) throws
Exception {
AccessControlManager acMgr = getAccessControlManager(root);
JackrabbitAccessControlList acl =
checkNotNull(AccessControlUtils.getAccessControlList(acMgr, path));
acl.addEntry(principal, AccessControlUtils.privilegesFromNames(acMgr,
privilegeNames), isAllow);
@@ -256,4 +256,4 @@ public class L1_IntroductionTest extends
root.refresh();
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L3_BuiltInPrivilegesTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L3_BuiltInPrivilegesTest.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L3_BuiltInPrivilegesTest.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L3_BuiltInPrivilegesTest.java
Wed Jul 18 14:41:56 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.exerci
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
@@ -37,6 +36,7 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -185,4 +185,4 @@ public class L3_BuiltInPrivilegesTest ex
}
root.commit();
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java?rev=1836179&r1=1836178&r2=1836179&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java
Wed Jul 18 14:41:56 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.exerci
import java.security.Principal;
import java.util.Set;
import java.util.UUID;
-import javax.annotation.Nullable;
import javax.jcr.security.Privilege;
import com.google.common.base.Function;
@@ -30,6 +29,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -161,4 +161,4 @@ public class L4_CustomPrivilegeTest exte
// EXERCISE: cleanup the changes.
}
}
-}
\ No newline at end of file
+}
