Author: reschke
Date: Wed Jul 18 14:58:59 2018
New Revision: 1836190
URL: http://svn.apache.org/viewvc?rev=1836190&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations
instead - oak-security-spi
Modified:
jackrabbit/oak/trunk/oak-security-spi/pom.xml
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeContext.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocation.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeAware.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationBase.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/OpenSecurityProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/LoginContextProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/OpenAuthenticationConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/CredentialsCallback.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/RepositoryCallback.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/SecurityProviderCallback.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/callback/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CredentialsSupport.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupport.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenInfo.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/TokenProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/AuthorizationConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/OpenAuthorizationConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACL.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/PolicyOwner.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/AggregatedPermissionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/EmptyPermissionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/OpenPermissionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/TreePermission.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePattern.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/Restriction.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinition.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImpl.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionPattern.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalWrapper.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinition.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeDefinition.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeUtil.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableNodeName.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableType.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserAuthenticationFactory.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AbstractAuthorizableAction.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AbstractGroupAction.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AuthorizableActionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipAction.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeAction.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/NodeInfo.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedItemImporter.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedNodeImporter.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedPropertyImporter.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeContextTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePatternTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/PropInfoTest.java
Modified: jackrabbit/oak/trunk/oak-security-spi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/pom.xml?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-security-spi/pom.xml Wed Jul 18 14:58:59 2018
@@ -154,10 +154,10 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <!-- Findbugs annotations -->
+ <!-- Nullability annotations -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<!-- Test Dependencies -->
@@ -174,4 +174,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootProvider.java
Wed Jul 18 14:58:59 2018
@@ -16,24 +16,23 @@
*/
package org.apache.jackrabbit.oak.plugins.tree;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface RootProvider {
- @Nonnull
- Root createReadOnlyRoot(@Nonnull NodeState rootState);
+ @NotNull
+ Root createReadOnlyRoot(@NotNull NodeState rootState);
- @Nonnull
- Root createReadOnlyRoot(@Nonnull Root root);
+ @NotNull
+ Root createReadOnlyRoot(@NotNull Root root);
- @Nonnull
- Root createSystemRoot(@Nonnull NodeStore store, @Nullable CommitHook
commitHook);
-}
\ No newline at end of file
+ @NotNull
+ Root createSystemRoot(@NotNull NodeStore store, @Nullable CommitHook
commitHook);
+}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeContext.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeContext.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeContext.java
Wed Jul 18 14:58:59 2018
@@ -16,10 +16,9 @@
*/
package org.apache.jackrabbit.oak.plugins.tree;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
+import org.jetbrains.annotations.NotNull;
/**
* {@code TreeContext} represents item related information in relation to a
@@ -38,7 +37,7 @@ public interface TreeContext {
* @return {@code true} if the specified property state is related to or
* defined by the security module.
*/
- boolean definesProperty(@Nonnull Tree parent, @Nonnull PropertyState
property);
+ boolean definesProperty(@NotNull Tree parent, @NotNull PropertyState
property);
/**
* Reveals if the specified {@code Tree} is the root of a subtree defined
by
@@ -51,7 +50,7 @@ public interface TreeContext {
* @return {@code true} if the specified tree is the root of a subtree of
items
* that are defined by the security module.
*/
- boolean definesContextRoot(@Nonnull Tree tree);
+ boolean definesContextRoot(@NotNull Tree tree);
/**
* Reveals if the specified {@code Tree} is defined by the
@@ -61,7 +60,7 @@ public interface TreeContext {
* @return {@code true} if the specified tree is related to or defined by
the
* security module.
*/
- boolean definesTree(@Nonnull Tree tree);
+ boolean definesTree(@NotNull Tree tree);
/**
* Reveals if the specified {@code TreeLocation} is defined by the
@@ -71,7 +70,7 @@ public interface TreeContext {
* @return {@code true} if the specified tree location is related to or
* defined by the security module.
*/
- boolean definesLocation(@Nonnull TreeLocation location);
+ boolean definesLocation(@NotNull TreeLocation location);
/**
* Reveals if the specified {@code Tree} defines repository internal
information,
@@ -82,5 +81,5 @@ public interface TreeContext {
* @see org.apache.jackrabbit.oak.spi.state.NodeStateUtils#isHidden(String)
* @see
org.apache.jackrabbit.oak.spi.state.NodeStateUtils#isHiddenPath(String)
*/
- boolean definesInternal(@Nonnull Tree tree);
-}
\ No newline at end of file
+ boolean definesInternal(@NotNull Tree tree);
+}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocation.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocation.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocation.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocation.java
Wed Jul 18 14:58:59 2018
@@ -18,13 +18,12 @@
*/
package org.apache.jackrabbit.oak.plugins.tree;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
@@ -47,7 +46,7 @@ public abstract class TreeLocation {
/**
* Create a new {@code TreeLocation} instance for a {@code tree}
*/
- public static TreeLocation create(@Nonnull Tree tree) {
+ public static TreeLocation create(@NotNull Tree tree) {
return new NodeLocation(tree);
}
@@ -75,7 +74,7 @@ public abstract class TreeLocation {
* Navigate to the parent or an invalid location for the root of the
hierarchy.
* @return a {@code TreeLocation} for the parent of this location.
*/
- @Nonnull
+ @NotNull
public abstract TreeLocation getParent();
/**
@@ -91,14 +90,14 @@ public abstract class TreeLocation {
* The name of this location
* @return name
*/
- @Nonnull
+ @NotNull
public abstract String getName();
/**
* The path of this location
* @return path
*/
- @Nonnull
+ @NotNull
public abstract String getPath();
/**
@@ -113,7 +112,7 @@ public abstract class TreeLocation {
* @param name name of the child
* @return this default implementation return a non existing location
*/
- @Nonnull
+ @NotNull
public TreeLocation getChild(String name) {
return new NullLocation(this, name);
}
@@ -122,7 +121,7 @@ public abstract class TreeLocation {
* Get the underlying {@link org.apache.jackrabbit.oak.api.Tree} for this
{@code TreeLocation}.
* @return this default implementation return {@code null}.
*/
- @CheckForNull
+ @Nullable
public Tree getTree() {
return null;
}
@@ -131,7 +130,7 @@ public abstract class TreeLocation {
* Get the underlying {@link org.apache.jackrabbit.oak.api.PropertyState}
for this {@code TreeLocation}.
* @return this default implementation return {@code null}.
*/
- @CheckForNull
+ @Nullable
public PropertyState getProperty() {
return null;
}
@@ -152,7 +151,7 @@ public abstract class TreeLocation {
this.tree = tree;
}
- @Nonnull
+ @NotNull
@Override
public TreeLocation getParent() {
return tree.isRoot()
@@ -160,7 +159,7 @@ public abstract class TreeLocation {
: new NodeLocation(tree.getParent());
}
- @Nonnull
+ @NotNull
@Override
public TreeLocation getChild(String name) {
if (tree.hasProperty(name)) {
@@ -175,7 +174,7 @@ public abstract class TreeLocation {
return tree.exists();
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return tree.getName();
@@ -186,7 +185,7 @@ public abstract class TreeLocation {
return exists() ? tree : null;
}
- @Nonnull
+ @NotNull
@Override
public String getPath() {
return tree.getPath();
@@ -211,7 +210,7 @@ public abstract class TreeLocation {
this.name = name;
}
- @Nonnull
+ @NotNull
@Override
public TreeLocation getParent() {
return new NodeLocation(parent);
@@ -222,7 +221,7 @@ public abstract class TreeLocation {
return parent.hasProperty(name);
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return name;
@@ -233,7 +232,7 @@ public abstract class TreeLocation {
return parent.getProperty(name);
}
- @Nonnull
+ @NotNull
@Override
public String getPath() {
return PathUtils.concat(parent.getPath(), name);
@@ -266,7 +265,7 @@ public abstract class TreeLocation {
this.name = "";
}
- @Nonnull
+ @NotNull
@Override
public TreeLocation getParent() {
return parent;
@@ -280,13 +279,13 @@ public abstract class TreeLocation {
return false;
}
- @Nonnull
+ @NotNull
@Override
public String getName() {
return name;
}
- @Nonnull
+ @NotNull
@Override
public String getPath() {
return parent == this ? "" : PathUtils.concat(parent.getPath(),
name);
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeProvider.java
Wed Jul 18 14:58:59 2018
@@ -16,21 +16,20 @@
*/
package org.apache.jackrabbit.oak.plugins.tree;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface TreeProvider {
- @Nonnull
- Tree createReadOnlyTree(@Nonnull NodeState rootState);
+ @NotNull
+ Tree createReadOnlyTree(@NotNull NodeState rootState);
- @Nonnull
- Tree createReadOnlyTree(@Nonnull Tree readOnlyParent, @Nonnull String
childName, @Nonnull NodeState childState);
+ @NotNull
+ Tree createReadOnlyTree(@NotNull Tree readOnlyParent, @NotNull String
childName, @NotNull NodeState childState);
- @Nonnull
- NodeState asNodeState(@Nonnull Tree readOnlyTree);
-}
\ No newline at end of file
+ @NotNull
+ NodeState asNodeState(@NotNull Tree readOnlyTree);
+}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeAware.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeAware.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeAware.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeAware.java
Wed Jul 18 14:58:59 2018
@@ -16,13 +16,13 @@
*/
package org.apache.jackrabbit.oak.plugins.tree;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
public interface TreeTypeAware {
- @CheckForNull
+ @Nullable
TreeType getType();
- void setType(@Nonnull TreeType type);
-}
\ No newline at end of file
+ void setType(@NotNull TreeType type);
+}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java
Wed Jul 18 14:58:59 2018
@@ -16,22 +16,21 @@
*/
package org.apache.jackrabbit.oak.plugins.tree;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
+import org.jetbrains.annotations.NotNull;
public final class TreeTypeProvider {
private final TreeContext ctx;
- public TreeTypeProvider(@Nonnull TreeContext authorizationContext) {
+ public TreeTypeProvider(@NotNull TreeContext authorizationContext) {
this.ctx = authorizationContext;
}
- public TreeType getType(@Nonnull Tree tree) {
+ public TreeType getType(@NotNull Tree tree) {
if (tree.isRoot()) {
return TreeType.DEFAULT;
} else {
@@ -49,7 +48,7 @@ public final class TreeTypeProvider {
}
}
- public TreeType getType(@Nonnull Tree tree, @Nonnull TreeType parentType) {
+ public TreeType getType(@NotNull Tree tree, @NotNull TreeType parentType) {
if (tree.isRoot()) {
return TreeType.DEFAULT;
}
@@ -67,7 +66,7 @@ public final class TreeTypeProvider {
return type;
}
- private TreeType internalGetType(@Nonnull Tree tree) {
+ private TreeType internalGetType(@NotNull Tree tree) {
Tree t = tree;
while (!t.isRoot()) {
TreeType type = internalGetType(t.getName(), t);
@@ -80,7 +79,7 @@ public final class TreeTypeProvider {
return TreeType.DEFAULT;
}
- private TreeType internalGetType(@Nonnull Tree tree, @Nonnull TreeType
parentType) {
+ private TreeType internalGetType(@NotNull Tree tree, @NotNull TreeType
parentType) {
TreeType type;
switch (parentType) {
case HIDDEN:
@@ -101,7 +100,7 @@ public final class TreeTypeProvider {
return type;
}
- private TreeType internalGetType(@Nonnull String name, @Nonnull Tree tree)
{
+ private TreeType internalGetType(@NotNull String name, @NotNull Tree tree)
{
TreeType type;
if (NodeStateUtils.isHidden(name)) {
type = TreeType.HIDDEN;
@@ -116,4 +115,4 @@ public final class TreeTypeProvider {
}
return type;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
Wed Jul 18 14:58:59 2018
@@ -20,9 +20,6 @@ import java.util.Calendar;
import java.util.List;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.AccessDeniedException;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.ConstraintViolationException;
@@ -42,6 +39,8 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.util.ISO8601;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.collect.Iterables.contains;
import static com.google.common.collect.Lists.newArrayList;
@@ -83,13 +82,13 @@ public final class TreeUtil {
private TreeUtil() {
}
- @CheckForNull
- public static String getPrimaryTypeName(@Nonnull Tree tree) {
+ @Nullable
+ public static String getPrimaryTypeName(@NotNull Tree tree) {
return getStringInternal(tree, JcrConstants.JCR_PRIMARYTYPE,
Type.NAME);
}
- @CheckForNull
- public static Iterable<String> getStrings(@Nonnull Tree tree, @Nonnull
String propertyName) {
+ @Nullable
+ public static Iterable<String> getStrings(@NotNull Tree tree, @NotNull
String propertyName) {
PropertyState property = tree.getProperty(propertyName);
if (property == null) {
return null;
@@ -98,21 +97,21 @@ public final class TreeUtil {
}
}
- @CheckForNull
- public static String getString(@Nonnull Tree tree, @Nonnull String
propertyName) {
+ @Nullable
+ public static String getString(@NotNull Tree tree, @NotNull String
propertyName) {
return getStringInternal(tree, propertyName, Type.STRING);
}
- @CheckForNull
- public static String getString(@Nonnull Tree tree, @Nonnull String name,
@Nullable String defaultValue) {
+ @Nullable
+ public static String getString(@NotNull Tree tree, @NotNull String name,
@Nullable String defaultValue) {
String str = getString(tree, name);
return (str != null) ? str : defaultValue;
}
- @CheckForNull
- private static String getStringInternal(@Nonnull Tree tree,
- @Nonnull String propertyName,
- @Nonnull Type<String> type) {
+ @Nullable
+ private static String getStringInternal(@NotNull Tree tree,
+ @NotNull String propertyName,
+ @NotNull Type<String> type) {
PropertyState property = tree.getProperty(propertyName);
if (property != null && !property.isArray()) {
return property.getValue(type);
@@ -133,13 +132,13 @@ public final class TreeUtil {
* name. This utility returns {@code false} if the property does
not exist
* or is an multivalued property.
*/
- public static boolean getBoolean(@Nonnull Tree tree, @Nonnull String
propertyName) {
+ public static boolean getBoolean(@NotNull Tree tree, @NotNull String
propertyName) {
PropertyState property = tree.getProperty(propertyName);
return property != null && !property.isArray() &&
property.getValue(BOOLEAN);
}
- @CheckForNull
- public static String getName(@Nonnull Tree tree, @Nonnull String name) {
+ @Nullable
+ public static String getName(@NotNull Tree tree, @NotNull String name) {
PropertyState property = tree.getProperty(name);
if (property != null && property.getType() == NAME) {
return property.getValue(NAME);
@@ -148,8 +147,8 @@ public final class TreeUtil {
}
}
- @Nonnull
- public static Iterable<String> getNames(@Nonnull Tree tree, @Nonnull
String name) {
+ @NotNull
+ public static Iterable<String> getNames(@NotNull Tree tree, @NotNull
String name) {
PropertyState property = tree.getProperty(name);
if (property != null && property.getType() == NAMES) {
return property.getValue(NAMES);
@@ -158,7 +157,7 @@ public final class TreeUtil {
}
}
- public static long getLong(@Nonnull Tree tree, @Nonnull String name, long
defaultValue) {
+ public static long getLong(@NotNull Tree tree, @NotNull String name, long
defaultValue) {
PropertyState property = tree.getProperty(name);
if (property != null && !property.isArray()) {
return property.getValue(LONG);
@@ -176,8 +175,8 @@ public final class TreeUtil {
* @param path path from the start tree
* @return tree located at {@code path} from {@code start} or {@code null}
*/
- @CheckForNull
- public static Tree getTree(@Nonnull Tree tree, @Nonnull String path) {
+ @Nullable
+ public static Tree getTree(@NotNull Tree tree, @NotNull String path) {
for (String element : PathUtils.elements(path)) {
if (PathUtils.denotesParent(element)) {
if (tree.isRoot()) {
@@ -193,9 +192,9 @@ public final class TreeUtil {
}
public static Tree addChild(
- @Nonnull Tree parent, @Nonnull String name,
- @CheckForNull String typeName, @Nonnull Tree typeRoot,
- @CheckForNull String userID) throws RepositoryException {
+ @NotNull Tree parent, @NotNull String name,
+ @Nullable String typeName, @NotNull Tree typeRoot,
+ @Nullable String userID) throws RepositoryException {
if (typeName == null) {
typeName = getDefaultChildType(typeRoot, parent, name);
if (typeName == null) {
@@ -242,8 +241,8 @@ public final class TreeUtil {
* @return The new child tree with the specified name and primary type.
* @throws AccessDeniedException If the child does not exist after
creation.
*/
- @Nonnull
- public static Tree addChild(@Nonnull Tree tree, @Nonnull String childName,
@Nonnull String primaryTypeName) throws AccessDeniedException {
+ @NotNull
+ public static Tree addChild(@NotNull Tree tree, @NotNull String childName,
@NotNull String primaryTypeName) throws AccessDeniedException {
Tree child = tree.addChild(childName);
if (!child.exists()) {
throw new AccessDeniedException();
@@ -262,13 +261,13 @@ public final class TreeUtil {
* @return The new child node with the specified name and primary type.
* @throws AccessDeniedException If the child does not exist after
creation.
*/
- @Nonnull
- public static Tree getOrAddChild(@Nonnull Tree tree, @Nonnull String
childName, @Nonnull String primaryTypeName) throws AccessDeniedException {
+ @NotNull
+ public static Tree getOrAddChild(@NotNull Tree tree, @NotNull String
childName, @NotNull String primaryTypeName) throws AccessDeniedException {
Tree child = tree.getChild(childName);
return (child.exists()) ? child : addChild(tree, childName,
primaryTypeName);
}
- public static void addMixin(@Nonnull Tree tree, @Nonnull String mixinName,
@Nonnull Tree typeRoot, @CheckForNull String userID) throws RepositoryException
{
+ public static void addMixin(@NotNull Tree tree, @NotNull String mixinName,
@NotNull Tree typeRoot, @Nullable String userID) throws RepositoryException {
Tree type = typeRoot.getChild(mixinName);
if (!type.exists()) {
throw new NoSuchNodeTypeException(
@@ -302,7 +301,7 @@ public final class TreeUtil {
autoCreateItems(tree, type, typeRoot, userID);
}
- public static void autoCreateItems(@Nonnull Tree tree, @Nonnull Tree type,
@Nonnull Tree typeRoot, @CheckForNull String userID)
+ public static void autoCreateItems(@NotNull Tree tree, @NotNull Tree type,
@NotNull Tree typeRoot, @Nullable String userID)
throws RepositoryException {
// TODO: use a separate rep:autoCreatePropertyDefinitions
Tree properties = type.getChild(REP_NAMED_PROPERTY_DEFINITIONS);
@@ -352,9 +351,9 @@ public final class TreeUtil {
}
}
- public static PropertyState autoCreateProperty(@Nonnull String name,
- @Nonnull Tree definition,
- @CheckForNull String
userID) {
+ public static PropertyState autoCreateProperty(@NotNull String name,
+ @NotNull Tree definition,
+ @Nullable String userID) {
if (JCR_UUID.equals(name)) {
String uuid = UUIDUtils.generateUUID();
return PropertyStates.createProperty(name, uuid, STRING);
@@ -494,7 +493,7 @@ public final class TreeUtil {
* @return {@code true} if the specified tree is an immutable read-only
tree.
* @see org.apache.jackrabbit.oak.plugins.tree.ReadOnly
*/
- public static boolean isReadOnlyTree(@Nonnull Tree tree) {
+ public static boolean isReadOnlyTree(@NotNull Tree tree) {
return tree instanceof ReadOnly;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Wed Jul 18 14:58:59 2018
@@ -24,10 +24,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -48,6 +44,8 @@ import org.apache.jackrabbit.oak.spi.lif
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.lifecycle.WorkspaceInitializer;
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
import org.osgi.framework.Constants;
@@ -86,30 +84,30 @@ public abstract class CompositeConfigura
private T defaultConfig;
- public CompositeConfiguration(@Nonnull String name) {
+ public CompositeConfiguration(@NotNull String name) {
this.name = name;
}
- public CompositeConfiguration(@Nonnull String name, @Nonnull
SecurityProvider securityProvider) {
+ public CompositeConfiguration(@NotNull String name, @NotNull
SecurityProvider securityProvider) {
this.name = name;
this.securityProvider = securityProvider;
}
- @CheckForNull
+ @Nullable
public T getDefaultConfig() {
return defaultConfig;
}
- public void setDefaultConfig(@Nonnull T defaultConfig) {
+ public void setDefaultConfig(@NotNull T defaultConfig) {
this.defaultConfig = defaultConfig;
ctx.defaultCtx = defaultConfig.getContext();
}
- public void addConfiguration(@Nonnull T configuration) {
+ public void addConfiguration(@NotNull T configuration) {
addConfiguration(configuration, ConfigurationParameters.EMPTY);
}
- public void addConfiguration(@Nonnull T configuration, @Nonnull
ConfigurationParameters params) {
+ public void addConfiguration(@NotNull T configuration, @NotNull
ConfigurationParameters params) {
int ranking =
configuration.getParameters().getConfigValue(PARAM_RANKING, NO_RANKING);
if (ranking == NO_RANKING) {
ranking = params.getConfigValue(Constants.SERVICE_RANKING,
NO_RANKING);
@@ -132,13 +130,13 @@ public abstract class CompositeConfigura
ctx.add(configuration);
}
- public void removeConfiguration(@Nonnull T configuration) {
+ public void removeConfiguration(@NotNull T configuration) {
configurations.remove(configuration);
rankings.remove(configuration);
ctx.refresh(configurations);
}
- @Nonnull
+ @NotNull
public List<T> getConfigurations() {
if (configurations.isEmpty() && defaultConfig != null) {
return ImmutableList.of(defaultConfig);
@@ -147,11 +145,11 @@ public abstract class CompositeConfigura
}
}
- public void setSecurityProvider(@Nonnull SecurityProvider
securityProvider) {
+ public void setSecurityProvider(@NotNull SecurityProvider
securityProvider) {
this.securityProvider = securityProvider;
}
- @Nonnull
+ @NotNull
protected SecurityProvider getSecurityProvider() {
if (securityProvider == null) {
throw new IllegalStateException("SecurityProvider missing =>
CompositeConfiguration is not ready.");
@@ -159,11 +157,11 @@ public abstract class CompositeConfigura
return securityProvider;
}
- public void setRootProvider(@Nonnull RootProvider rootProvider) {
+ public void setRootProvider(@NotNull RootProvider rootProvider) {
this.rootProvider = rootProvider;
}
- @Nonnull
+ @NotNull
protected RootProvider getRootProvider() {
if (rootProvider == null) {
throw new IllegalStateException("RootProvider missing.");
@@ -171,11 +169,11 @@ public abstract class CompositeConfigura
return rootProvider;
}
- public void setTreeProvider(@Nonnull TreeProvider treeProvider) {
+ public void setTreeProvider(@NotNull TreeProvider treeProvider) {
this.treeProvider = treeProvider;
}
- @Nonnull
+ @NotNull
protected TreeProvider getTreeProvider() {
if (treeProvider == null) {
throw new IllegalStateException("TreeProvider missing.");
@@ -184,13 +182,13 @@ public abstract class CompositeConfigura
}
//----------------------------------------------< SecurityConfiguration
>---
- @Nonnull
+ @NotNull
@Override
public String getName() {
return name;
}
- @Nonnull
+ @NotNull
@Override
public ConfigurationParameters getParameters() {
List<T> configs = getConfigurations();
@@ -201,7 +199,7 @@ public abstract class CompositeConfigura
return ConfigurationParameters.of(params);
}
- @Nonnull
+ @NotNull
@Override
public WorkspaceInitializer getWorkspaceInitializer() {
return new
CompositeWorkspaceInitializer(Lists.transform(getConfigurations(), new
Function<T, WorkspaceInitializer>() {
@@ -212,7 +210,7 @@ public abstract class CompositeConfigura
}));
}
- @Nonnull
+ @NotNull
@Override
public RepositoryInitializer getRepositoryInitializer() {
return new CompositeInitializer(Lists.transform(getConfigurations(),
new Function<T, RepositoryInitializer>() {
@@ -223,9 +221,9 @@ public abstract class CompositeConfigura
}));
}
- @Nonnull
+ @NotNull
@Override
- public List<? extends CommitHook> getCommitHooks(@Nonnull final String
workspaceName) {
+ public List<? extends CommitHook> getCommitHooks(@NotNull final String
workspaceName) {
Iterable<CommitHook> t =
Iterables.concat(Lists.transform(getConfigurations(), new Function<T, List<?
extends CommitHook>>() {
@Override
public List<? extends CommitHook> apply(T securityConfiguration) {
@@ -235,20 +233,20 @@ public abstract class CompositeConfigura
return ImmutableList.copyOf(t);
}
- @Nonnull
+ @NotNull
@Override
- public List<? extends ValidatorProvider> getValidators(@Nonnull final
String workspaceName, @Nonnull final Set<Principal> principals, @Nonnull final
MoveTracker moveTracker) {
+ public List<? extends ValidatorProvider> getValidators(@NotNull final
String workspaceName, @NotNull final Set<Principal> principals, @NotNull final
MoveTracker moveTracker) {
Iterable<ValidatorProvider> t =
Iterables.concat(Lists.transform(getConfigurations(), securityConfiguration ->
securityConfiguration.getValidators(workspaceName, principals, moveTracker)));
return ImmutableList.copyOf(t);
}
- @Nonnull
+ @NotNull
@Override
public List<ThreeWayConflictHandler> getConflictHandlers() {
return
ImmutableList.copyOf(Iterables.concat(Lists.transform(getConfigurations(),
securityConfiguration -> securityConfiguration.getConflictHandlers())));
}
- @Nonnull
+ @NotNull
@Override
public List<ProtectedItemImporter> getProtectedItemImporters() {
Iterable<ProtectedItemImporter> t =
Iterables.concat(Lists.transform(getConfigurations(), new Function<T, List<?
extends ProtectedItemImporter>>() {
@@ -260,7 +258,7 @@ public abstract class CompositeConfigura
return ImmutableList.copyOf(t);
}
- @Nonnull
+ @NotNull
@Override
public Context getContext() {
return ctx;
@@ -270,7 +268,7 @@ public abstract class CompositeConfigura
private Map<SecurityConfiguration, Integer> m = new
ConcurrentHashMap();
- private int get(@Nonnull SecurityConfiguration configuration) {
+ private int get(@NotNull SecurityConfiguration configuration) {
Integer ranking = m.get(configuration);
if (ranking == null) {
return NO_RANKING;
@@ -279,25 +277,25 @@ public abstract class CompositeConfigura
}
}
- private void set(@Nonnull SecurityConfiguration configuration, int
ranking) {
+ private void set(@NotNull SecurityConfiguration configuration, int
ranking) {
if (ranking != NO_RANKING) {
m.put(configuration, ranking);
}
}
- private void remove(@Nonnull SecurityConfiguration configuration) {
+ private void remove(@NotNull SecurityConfiguration configuration) {
m.remove(configuration);
}
}
private static final class CompositeContext implements Context {
- @Nonnull
+ @NotNull
private Context defaultCtx = DEFAULT;
@Nullable
private Context[] delegatees = null;
- private void refresh(@Nonnull List<? extends SecurityConfiguration>
configurations) {
+ private void refresh(@NotNull List<? extends SecurityConfiguration>
configurations) {
Set<Context> s =
Sets.newLinkedHashSetWithExpectedSize(configurations.size());
for (Context c : Iterables.transform(configurations,
ContextFunction.INSTANCE)) {
if (DEFAULT != c) {
@@ -307,7 +305,7 @@ public abstract class CompositeConfigura
delegatees = (s.isEmpty()) ? null : s.toArray(new
Context[s.size()]);
}
- private void add(@Nonnull SecurityConfiguration configuration) {
+ private void add(@NotNull SecurityConfiguration configuration) {
Context c = configuration.getContext();
if (DEFAULT != c) {
if (delegatees == null) {
@@ -324,7 +322,7 @@ public abstract class CompositeConfigura
}
@Override
- public boolean definesProperty(@Nonnull Tree parent, @Nonnull
PropertyState property) {
+ public boolean definesProperty(@NotNull Tree parent, @NotNull
PropertyState property) {
if (delegatees == null) {
return defaultCtx.definesProperty(parent, property);
}
@@ -337,7 +335,7 @@ public abstract class CompositeConfigura
}
@Override
- public boolean definesContextRoot(@Nonnull Tree tree) {
+ public boolean definesContextRoot(@NotNull Tree tree) {
if (delegatees == null) {
return defaultCtx.definesContextRoot(tree);
}
@@ -350,7 +348,7 @@ public abstract class CompositeConfigura
}
@Override
- public boolean definesTree(@Nonnull Tree tree) {
+ public boolean definesTree(@NotNull Tree tree) {
if (delegatees == null) {
return defaultCtx.definesTree(tree);
}
@@ -363,7 +361,7 @@ public abstract class CompositeConfigura
}
@Override
- public boolean definesLocation(@Nonnull TreeLocation location) {
+ public boolean definesLocation(@NotNull TreeLocation location) {
if (delegatees == null) {
return defaultCtx.definesLocation(location);
}
@@ -376,7 +374,7 @@ public abstract class CompositeConfigura
}
@Override
- public boolean definesInternal(@Nonnull Tree tree) {
+ public boolean definesInternal(@NotNull Tree tree) {
if (delegatees == null) {
return defaultCtx.definesInternal(tree);
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationBase.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationBase.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationBase.java
Wed Jul 18 14:58:59 2018
@@ -16,10 +16,9 @@
*/
package org.apache.jackrabbit.oak.spi.security;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.tree.RootProvider;
import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
+import org.jetbrains.annotations.NotNull;
/**
* Abstract base implementation for the various security configurations.
@@ -43,12 +42,12 @@ public abstract class ConfigurationBase
/**
* non-osgi constructor
*/
- public ConfigurationBase(@Nonnull SecurityProvider securityProvider,
@Nonnull ConfigurationParameters config) {
+ public ConfigurationBase(@NotNull SecurityProvider securityProvider,
@NotNull ConfigurationParameters config) {
this.securityProvider = securityProvider;
this.config = config;
}
- @Nonnull
+ @NotNull
public SecurityProvider getSecurityProvider() {
if (securityProvider == null) {
throw new IllegalStateException();
@@ -56,19 +55,19 @@ public abstract class ConfigurationBase
return securityProvider;
}
- public void setSecurityProvider(@Nonnull SecurityProvider
securityProvider) {
+ public void setSecurityProvider(@NotNull SecurityProvider
securityProvider) {
this.securityProvider = securityProvider;
}
- public void setParameters(@Nonnull ConfigurationParameters config) {
+ public void setParameters(@NotNull ConfigurationParameters config) {
this.config = config;
}
- public void setRootProvider(@Nonnull RootProvider rootProvider) {
+ public void setRootProvider(@NotNull RootProvider rootProvider) {
this.rootProvider = rootProvider;
}
- @Nonnull
+ @NotNull
public RootProvider getRootProvider() {
if (rootProvider == null) {
throw new IllegalStateException("RootProvider missing.");
@@ -76,11 +75,11 @@ public abstract class ConfigurationBase
return rootProvider;
}
- public void setTreeProvider(@Nonnull TreeProvider treeProvider) {
+ public void setTreeProvider(@NotNull TreeProvider treeProvider) {
this.treeProvider = treeProvider;
}
- @Nonnull
+ @NotNull
public TreeProvider getTreeProvider() {
if (treeProvider == null) {
throw new IllegalStateException("TreeProvider missing.");
@@ -89,7 +88,7 @@ public abstract class ConfigurationBase
}
//----------------------------------------------< SecurityConfiguration
>---
- @Nonnull
+ @NotNull
@Override
public ConfigurationParameters getParameters() {
return config;
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
Wed Jul 18 14:58:59 2018
@@ -26,13 +26,11 @@ import java.util.Properties;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +68,7 @@ public final class ConfigurationParamete
* Note: the constructor is private to avoid creation of empty maps.
* @param options the source options.
*/
- private ConfigurationParameters(@Nonnull Map<String, ?> options) {
+ private ConfigurationParameters(@NotNull Map<String, ?> options) {
this.options = Collections.unmodifiableMap(options);
}
@@ -81,8 +79,8 @@ public final class ConfigurationParamete
* @param params source parameters to merge
* @return merged configuration parameters or {@link #EMPTY} if all source
params were empty.
*/
- @Nonnull
- public static ConfigurationParameters of(@Nonnull
ConfigurationParameters... params) {
+ @NotNull
+ public static ConfigurationParameters of(@NotNull
ConfigurationParameters... params) {
Map<String, Object> m = new HashMap<String, Object>();
for (ConfigurationParameters cp : params) {
if (cp != null) {
@@ -97,8 +95,8 @@ public final class ConfigurationParamete
* @param properties source properties
* @return configuration parameters or {@link #EMPTY} if the source
properties were empty.
*/
- @Nonnull
- public static ConfigurationParameters of(@Nonnull Properties properties) {
+ @NotNull
+ public static ConfigurationParameters of(@NotNull Properties properties) {
if (properties.isEmpty()) {
return EMPTY;
}
@@ -115,8 +113,8 @@ public final class ConfigurationParamete
* @param properties source properties
* @return configuration parameters or {@link #EMPTY} if the source
properties were empty.
*/
- @Nonnull
- public static ConfigurationParameters of(@Nonnull Dictionary<String,
Object> properties) {
+ @NotNull
+ public static ConfigurationParameters of(@NotNull Dictionary<String,
Object> properties) {
if (properties.isEmpty()) {
return EMPTY;
}
@@ -133,8 +131,8 @@ public final class ConfigurationParamete
* @param map source map
* @return configuration parameters or {@link #EMPTY} if the source map
was empty.
*/
- @Nonnull
- public static ConfigurationParameters of(@Nonnull Map<?, ?> map) {
+ @NotNull
+ public static ConfigurationParameters of(@NotNull Map<?, ?> map) {
if (map.isEmpty()) {
return EMPTY;
}
@@ -156,8 +154,8 @@ public final class ConfigurationParamete
* @param value The value
* @return a new instance of configuration parameters.
*/
- @Nonnull
- public static ConfigurationParameters of(@Nonnull String key, @Nonnull
Object value) {
+ @NotNull
+ public static ConfigurationParameters of(@NotNull String key, @NotNull
Object value) {
return new ConfigurationParameters(ImmutableMap.of(key, value));
}
@@ -171,9 +169,9 @@ public final class ConfigurationParamete
* @param value2 The value of the second pair.
* @return a new instance of configuration parameters.
*/
- @Nonnull
- public static ConfigurationParameters of(@Nonnull String key1, @Nonnull
Object value1,
- @Nonnull String key2, @Nonnull
Object value2) {
+ @NotNull
+ public static ConfigurationParameters of(@NotNull String key1, @NotNull
Object value1,
+ @NotNull String key2, @NotNull
Object value2) {
return new ConfigurationParameters(ImmutableMap.of(key1, value1, key2,
value2));
}
@@ -185,7 +183,7 @@ public final class ConfigurationParamete
* @return {@code true} if this instance contains a configuration entry
with
* the specified key irrespective of the defined value; {@code false}
otherwise.
*/
- public boolean contains(@Nonnull String key) {
+ public boolean contains(@NotNull String key) {
return options.containsKey(key);
}
@@ -211,8 +209,8 @@ public final class ConfigurationParamete
* @param targetClass The target class
* @return The original or converted configuration value or {@code null}.
*/
- @CheckForNull
- public <T> T getConfigValue(@Nonnull String key, @Nullable T defaultValue,
+ @Nullable
+ public <T> T getConfigValue(@NotNull String key, @Nullable T defaultValue,
@Nullable Class<T> targetClass) {
if (options.containsKey(key)) {
return convert(options.get(key), defaultValue, targetClass);
@@ -237,8 +235,8 @@ public final class ConfigurationParamete
* or to use for conversion.
* @return The original or converted configuration value or {@code null}.
*/
- @Nonnull
- public <T> T getConfigValue(@Nonnull String key, @Nonnull T defaultValue) {
+ @NotNull
+ public <T> T getConfigValue(@NotNull String key, @NotNull T defaultValue) {
Object property = options.get(key);
if (property == null) {
return defaultValue;
@@ -372,7 +370,7 @@ public final class ConfigurationParamete
* {@inheritDoc}
*/
@Override
- public void putAll(@Nonnull Map<? extends String, ?> m) {
+ public void putAll(@NotNull Map<? extends String, ?> m) {
// we rely on the immutability of the delegated map to throw the
correct exceptions.
options.putAll(m);
}
@@ -389,7 +387,7 @@ public final class ConfigurationParamete
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
public Set<String> keySet() {
return options.keySet();
@@ -398,7 +396,7 @@ public final class ConfigurationParamete
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
public Collection<Object> values() {
return options.values();
@@ -407,7 +405,7 @@ public final class ConfigurationParamete
/**
* {@inheritDoc}
*/
- @Nonnull
+ @NotNull
@Override
public Set<Entry<String,Object>> entrySet() {
return options.entrySet();
@@ -471,7 +469,7 @@ public final class ConfigurationParamete
* @param str the string to parse
* @return the new Milliseconds object or null.
*/
- @CheckForNull
+ @Nullable
public static Milliseconds of(@Nullable String str) {
if (str == null) {
return null;
@@ -500,8 +498,8 @@ public final class ConfigurationParamete
return current < 0 ? null : new Milliseconds(current + 1);
}
- @Nonnull
- public static Milliseconds of(@Nullable String str, @Nonnull
Milliseconds defaultValue) {
+ @NotNull
+ public static Milliseconds of(@Nullable String str, @NotNull
Milliseconds defaultValue) {
if (str == null) {
return defaultValue;
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/Context.java
Wed Jul 18 14:58:59 2018
@@ -16,12 +16,11 @@
*/
package org.apache.jackrabbit.oak.spi.security;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.TreeContext;
import org.apache.jackrabbit.oak.plugins.tree.TreeLocation;
+import org.jetbrains.annotations.NotNull;
/**
* {@code Context} represents item related information in relation to a
@@ -40,28 +39,28 @@ public interface Context extends TreeCon
class Default implements Context {
@Override
- public boolean definesProperty(@Nonnull Tree parent, @Nonnull
PropertyState property) {
+ public boolean definesProperty(@NotNull Tree parent, @NotNull
PropertyState property) {
return false;
}
@Override
- public boolean definesContextRoot(@Nonnull Tree tree) {
+ public boolean definesContextRoot(@NotNull Tree tree) {
return false;
}
@Override
- public boolean definesTree(@Nonnull Tree tree) {
+ public boolean definesTree(@NotNull Tree tree) {
return false;
}
@Override
- public boolean definesLocation(@Nonnull TreeLocation location) {
+ public boolean definesLocation(@NotNull TreeLocation location) {
return false;
}
@Override
- public boolean definesInternal(@Nonnull Tree tree) {
+ public boolean definesInternal(@NotNull Tree tree) {
return false;
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/OpenSecurityProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/OpenSecurityProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/OpenSecurityProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/OpenSecurityProvider.java
Wed Jul 18 14:58:59 2018
@@ -16,14 +16,13 @@
*/
package org.apache.jackrabbit.oak.spi.security;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.ImmutableList;
import
org.apache.jackrabbit.oak.spi.security.authentication.AuthenticationConfiguration;
import
org.apache.jackrabbit.oak.spi.security.authentication.OpenAuthenticationConfiguration;
import
org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
import
org.apache.jackrabbit.oak.spi.security.authorization.OpenAuthorizationConfiguration;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Rudimentary {@code SecurityProvider} implementation that allow every subject
@@ -36,21 +35,21 @@ import org.apache.jackrabbit.oak.spi.sec
*/
public class OpenSecurityProvider implements SecurityProvider {
- @Nonnull
+ @NotNull
@Override
public ConfigurationParameters getParameters(@Nullable String name) {
return ConfigurationParameters.EMPTY;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends SecurityConfiguration> getConfigurations() {
return ImmutableList.of(new OpenAuthenticationConfiguration(), new
OpenAuthorizationConfiguration());
}
- @Nonnull
+ @NotNull
@Override
- public <T> T getConfiguration(@Nonnull Class<T> configClass) {
+ public <T> T getConfiguration(@NotNull Class<T> configClass) {
if (AuthenticationConfiguration.class == configClass) {
return (T) new OpenAuthenticationConfiguration();
} else if (AuthorizationConfiguration.class == configClass) {
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityConfiguration.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityConfiguration.java
Wed Jul 18 14:58:59 2018
@@ -21,8 +21,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.MoveTracker;
@@ -43,7 +42,7 @@ public interface SecurityConfiguration {
*
* @return The name of this configuration.
*/
- @Nonnull
+ @NotNull
String getName();
/**
@@ -53,7 +52,7 @@ public interface SecurityConfiguration {
*
* @return The configuration parameters.
*/
- @Nonnull
+ @NotNull
ConfigurationParameters getParameters();
/**
@@ -63,7 +62,7 @@ public interface SecurityConfiguration {
*
* @return An instance of {@code WorkspaceInitializer}.
*/
- @Nonnull
+ @NotNull
WorkspaceInitializer getWorkspaceInitializer();
/**
@@ -73,7 +72,7 @@ public interface SecurityConfiguration {
*
* @return An instance of {@code RepositoryInitializer}.
*/
- @Nonnull
+ @NotNull
RepositoryInitializer getRepositoryInitializer();
/**
@@ -83,8 +82,8 @@ public interface SecurityConfiguration {
* @param workspaceName The name of the workspace.
* @return A list of commit hooks.
*/
- @Nonnull
- List<? extends CommitHook> getCommitHooks(@Nonnull String workspaceName);
+ @NotNull
+ List<? extends CommitHook> getCommitHooks(@NotNull String workspaceName);
/**
* Returns the list of validators that need to be executed for the
specified
@@ -96,29 +95,29 @@ public interface SecurityConfiguration {
* @param moveTracker The move tracker associated with the commit.
* @return A list of validators.
*/
- @Nonnull
- List<? extends ValidatorProvider> getValidators(@Nonnull String
workspaceName,
- @Nonnull Set<Principal>
principals,
- @Nonnull MoveTracker
moveTracker);
+ @NotNull
+ List<? extends ValidatorProvider> getValidators(@NotNull String
workspaceName,
+ @NotNull Set<Principal>
principals,
+ @NotNull MoveTracker
moveTracker);
/**
* Returns the list of conflict handlers available for this security
configuration.
*
* @return A list of {@link
org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler}.
*/
- @Nonnull
+ @NotNull
List<ThreeWayConflictHandler> getConflictHandlers();
/**
* @return The list of protected item importers defined by this
configuration.
*/
- @Nonnull
+ @NotNull
List<ProtectedItemImporter> getProtectedItemImporters();
/**
* @return The context defined by this configuration.
*/
- @Nonnull
+ @NotNull
Context getContext();
/**
@@ -127,56 +126,56 @@ public interface SecurityConfiguration {
*/
class Default implements SecurityConfiguration {
- @Nonnull
+ @NotNull
@Override
public String getName() {
return "org.apache.jackrabbit.oak";
}
- @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 Collections.emptyList();
}
- @Nonnull
+ @NotNull
@Override
public List<? extends ValidatorProvider> getValidators(
- @Nonnull String workspaceName, @Nonnull Set<Principal>
principals, @Nonnull MoveTracker moveTracker) {
+ @NotNull String workspaceName, @NotNull Set<Principal>
principals, @NotNull MoveTracker moveTracker) {
return Collections.emptyList();
}
- @Nonnull
+ @NotNull
@Override
public List<ThreeWayConflictHandler> getConflictHandlers() {
return Collections.emptyList();
}
- @Nonnull
+ @NotNull
@Override
public List<ProtectedItemImporter> getProtectedItemImporters() {
return Collections.emptyList();
}
- @Nonnull
+ @NotNull
@Override
public Context getContext() {
return Context.DEFAULT;
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/SecurityProvider.java
Wed Jul 18 14:58:59 2018
@@ -16,9 +16,8 @@
*/
package org.apache.jackrabbit.oak.spi.security;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -43,7 +42,7 @@ public interface SecurityProvider {
* identified by the specified name. If the specified name is {@code null}
* the global config parameters will be returned.
*/
- @Nonnull
+ @NotNull
ConfigurationParameters getParameters(@Nullable String name);
/**
@@ -51,7 +50,7 @@ public interface SecurityProvider {
*
* @return the available {@link
org.apache.jackrabbit.oak.spi.security.SecurityConfiguration}s.
*/
- @Nonnull
+ @NotNull
Iterable<? extends SecurityConfiguration> getConfigurations();
/**
@@ -61,6 +60,6 @@ public interface SecurityProvider {
* @param <T>
* @return The desired security configuration.
*/
- @Nonnull
- <T> T getConfiguration(@Nonnull Class<T> configClass);
+ @NotNull
+ <T> T getConfiguration(@NotNull Class<T> configClass);
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
Wed Jul 18 14:58:59 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/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java
Wed Jul 18 14:58:59 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/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java?rev=1836190&r1=1836189&r2=1836190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/Authentication.java
Wed Jul 18 14:58:59 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
+}
