Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java Wed Nov 7 13:57:55 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.security.internal; import java.util.List; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.plugins.tree.RootProvider; import org.apache.jackrabbit.oak.plugins.tree.TreeProvider; import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration; @@ -26,18 +24,19 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; +import org.jetbrains.annotations.NotNull; final class ConfigurationInitializer { private ConfigurationInitializer() {} - @Nonnull - static <T extends SecurityConfiguration> T initializeConfiguration(@Nonnull T configuration, @Nonnull SecurityProvider securityProvider, @Nonnull RootProvider rootProvider, @Nonnull TreeProvider treeProvider) { + @NotNull + static <T extends SecurityConfiguration> T initializeConfiguration(@NotNull T configuration, @NotNull SecurityProvider securityProvider, @NotNull RootProvider rootProvider, @NotNull TreeProvider treeProvider) { return initializeConfiguration(configuration, securityProvider, ConfigurationParameters.EMPTY, rootProvider, treeProvider); } - @Nonnull - static <T extends SecurityConfiguration> T initializeConfiguration(@Nonnull T configuration, @Nonnull SecurityProvider securityProvider, @Nonnull ConfigurationParameters parameters, @Nonnull RootProvider rootProvider, @Nonnull TreeProvider treeProvider) { + @NotNull + static <T extends SecurityConfiguration> T initializeConfiguration(@NotNull T configuration, @NotNull SecurityProvider securityProvider, @NotNull ConfigurationParameters parameters, @NotNull RootProvider rootProvider, @NotNull TreeProvider treeProvider) { if (configuration instanceof ConfigurationBase) { ConfigurationBase base = (ConfigurationBase) configuration; base.setSecurityProvider(securityProvider); @@ -48,10 +47,10 @@ final class ConfigurationInitializer { return configuration; } - static void initializeConfigurations(@Nonnull CompositeConfiguration configuration, @Nonnull SecurityProvider securityProvider, - @Nonnull ConfigurationParameters parameters, - @Nonnull RootProvider rootProvider, - @Nonnull TreeProvider treeProvider) { + static void initializeConfigurations(@NotNull CompositeConfiguration configuration, @NotNull SecurityProvider securityProvider, + @NotNull ConfigurationParameters parameters, + @NotNull RootProvider rootProvider, + @NotNull TreeProvider treeProvider) { configuration.setSecurityProvider(securityProvider); configuration.setRootProvider(rootProvider); configuration.setTreeProvider(treeProvider); @@ -61,4 +60,4 @@ final class ConfigurationInitializer { initializeConfiguration(config, securityProvider, parameters, rootProvider, treeProvider); } } -} \ No newline at end of file +}
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProvider.java Wed Nov 7 13:57:55 2018 @@ -27,9 +27,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardAware; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.collect.Sets.newHashSet; @@ -49,7 +48,7 @@ class InternalSecurityProvider implement private Whiteboard whiteboard; - @Nonnull + @NotNull @Override public ConfigurationParameters getParameters(@Nullable String name) { SecurityConfiguration securityConfiguration = getSecurityConfigurationByName(name); @@ -89,7 +88,7 @@ class InternalSecurityProvider implement return null; } - @Nonnull + @NotNull @Override public Iterable<? extends SecurityConfiguration> getConfigurations() { return newHashSet( @@ -102,10 +101,10 @@ class InternalSecurityProvider implement ); } - @Nonnull + @NotNull @Override @SuppressWarnings("unchecked") - public <T> T getConfiguration(@Nonnull Class<T> configurationClass) { + public <T> T getConfiguration(@NotNull Class<T> configurationClass) { if (configurationClass == AuthenticationConfiguration.class) { return (T) authenticationConfiguration; } @@ -134,7 +133,7 @@ class InternalSecurityProvider implement } @Override - public void setWhiteboard(@Nonnull Whiteboard whiteboard) { + public void setWhiteboard(@NotNull Whiteboard whiteboard) { this.whiteboard = whiteboard; } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java Wed Nov 7 13:57:55 2018 @@ -20,8 +20,6 @@ import java.util.Dictionary; import java.util.Hashtable; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.commons.PropertiesUtil; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.tree.RootProvider; @@ -50,6 +48,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider; +import org.jetbrains.annotations.NotNull; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; @@ -290,7 +289,7 @@ public class SecurityProviderRegistratio unbindConfiguration(tokenConfiguration, configuration, properties); } - private void bindConfiguration(@Nonnull CompositeConfiguration composite, @Nonnull SecurityConfiguration configuration, Map<String, Object> properties) { + private void bindConfiguration(@NotNull CompositeConfiguration composite, @NotNull SecurityConfiguration configuration, Map<String, Object> properties) { synchronized (this) { composite.addConfiguration(configuration, ConfigurationParameters.of(properties)); addCandidate(properties); @@ -298,7 +297,7 @@ public class SecurityProviderRegistratio maybeRegister(); } - private void unbindConfiguration(@Nonnull CompositeConfiguration composite, @Nonnull SecurityConfiguration configuration, Map<String, Object> properties) { + private void unbindConfiguration(@NotNull CompositeConfiguration composite, @NotNull SecurityConfiguration configuration, Map<String, Object> properties) { synchronized (this) { composite.removeConfiguration(configuration); removeCandidate(properties); @@ -513,7 +512,7 @@ public class SecurityProviderRegistratio log.info("SecurityProvider instance unregistered"); } - private SecurityProvider createSecurityProvider(@Nonnull BundleContext context) { + private SecurityProvider createSecurityProvider(@NotNull BundleContext context) { InternalSecurityProvider securityProvider = new InternalSecurityProvider(); // Static, mandatory references Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java Wed Nov 7 13:57:55 2018 @@ -20,8 +20,6 @@ import static org.apache.jackrabbit.oak. import java.util.Map; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.namepath.NamePathMapper; @@ -33,6 +31,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.principal.PrincipalManagerImpl; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; +import org.jetbrains.annotations.NotNull; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -61,14 +60,14 @@ public class PrincipalConfigurationImpl //---------------------------------------------< PrincipalConfiguration >--- - @Nonnull + @NotNull @Override public PrincipalManager getPrincipalManager(Root root, NamePathMapper namePathMapper) { PrincipalProvider principalProvider = getPrincipalProvider(root, namePathMapper); return new PrincipalManagerImpl(principalProvider); } - @Nonnull + @NotNull @Override public PrincipalProvider getPrincipalProvider(Root root, NamePathMapper namePathMapper) { UserConfiguration uc = getSecurityProvider().getConfiguration(UserConfiguration.class); @@ -83,7 +82,7 @@ public class PrincipalConfigurationImpl } //----------------------------------------------< SecurityConfiguration >--- - @Nonnull + @NotNull @Override public String getName() { return NAME; Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java Wed Nov 7 13:57:55 2018 @@ -22,8 +22,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import com.google.common.base.Function; @@ -43,6 +41,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,15 +57,15 @@ class PrincipalProviderImpl implements P private final UserManager userManager; - PrincipalProviderImpl(@Nonnull Root root, - @Nonnull UserConfiguration userConfiguration, - @Nonnull NamePathMapper namePathMapper) { + PrincipalProviderImpl(@NotNull Root root, + @NotNull UserConfiguration userConfiguration, + @NotNull NamePathMapper namePathMapper) { this.userManager = userConfiguration.getUserManager(root, namePathMapper); } //--------------------------------------------------< PrincipalProvider >--- @Override - public Principal getPrincipal(@Nonnull String principalName) { + public Principal getPrincipal(@NotNull String principalName) { Authorizable authorizable = getAuthorizable(new PrincipalImpl(principalName)); if (authorizable != null) { try { @@ -79,9 +79,9 @@ class PrincipalProviderImpl implements P return (EveryonePrincipal.NAME.equals(principalName)) ? EveryonePrincipal.getInstance() : null; } - @Nonnull + @NotNull @Override - public Set<Group> getGroupMembership(@Nonnull Principal principal) { + public Set<Group> getGroupMembership(@NotNull Principal principal) { Authorizable authorizable = getAuthorizable(principal); if (authorizable == null) { return Collections.emptySet(); @@ -90,9 +90,9 @@ class PrincipalProviderImpl implements P } } - @Nonnull + @NotNull @Override - public Set<? extends Principal> getPrincipals(@Nonnull String userID) { + public Set<? extends Principal> getPrincipals(@NotNull String userID) { Set<Principal> principals = new HashSet<Principal>(); try { Authorizable authorizable = userManager.getAuthorizable(userID); @@ -106,7 +106,7 @@ class PrincipalProviderImpl implements P return principals; } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(@Nullable final String nameHint, final int searchType) { @@ -128,7 +128,7 @@ class PrincipalProviderImpl implements P } } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(int searchType) { return findPrincipals(null, searchType); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java Wed Nov 7 13:57:55 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.security.privilege; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; @@ -31,6 +29,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; /** * JcrAllCommitHook is responsible for updating the jcr:all privilege definition @@ -38,7 +37,7 @@ import org.apache.jackrabbit.util.Text; */ class JcrAllCommitHook implements PostValidationHook, PrivilegeConstants { - @Nonnull + @NotNull @Override public NodeState processCommit( NodeState before, NodeState after, CommitInfo info) Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java Wed Nov 7 13:57:55 2018 @@ -21,8 +21,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.api.security.authorization.PrivilegeManager; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.namepath.NamePathMapper; @@ -35,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.Context; import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration; +import org.jetbrains.annotations.NotNull; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; @@ -45,7 +44,7 @@ import org.osgi.service.component.annota public class PrivilegeConfigurationImpl extends ConfigurationBase implements PrivilegeConfiguration { //---------------------------------------------< PrivilegeConfiguration >--- - @Nonnull + @NotNull @Override public PrivilegeManager getPrivilegeManager(Root root, NamePathMapper namePathMapper) { return new PrivilegeManagerImpl(root, namePathMapper); @@ -58,31 +57,31 @@ public class PrivilegeConfigurationImpl } //----------------------------------------------< SecurityConfiguration >--- - @Nonnull + @NotNull @Override public String getName() { return NAME; } - @Nonnull + @NotNull @Override public RepositoryInitializer getRepositoryInitializer() { return new PrivilegeInitializer(getRootProvider()); } - @Nonnull + @NotNull @Override - public List<? extends CommitHook> getCommitHooks(@Nonnull String workspaceName) { + public List<? extends CommitHook> getCommitHooks(@NotNull String workspaceName) { return Collections.singletonList(new JcrAllCommitHook()); } - @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 Collections.singletonList(new PrivilegeValidatorProvider(getRootProvider())); } - @Nonnull + @NotNull @Override public Context getContext() { return PrivilegeContext.getInstance(); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContext.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContext.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContext.java Wed Nov 7 13:57:55 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.security.privilege; -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.TreeLocation; @@ -25,6 +23,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; final class PrivilegeContext implements Context, PrivilegeConstants { @@ -39,27 +38,27 @@ final class PrivilegeContext implements //------------------------------------------------------------< Context >--- @Override - public boolean definesProperty(@Nonnull Tree parent, @Nonnull PropertyState property) { + public boolean definesProperty(@NotNull Tree parent, @NotNull PropertyState property) { return PRIVILEGE_PROPERTY_NAMES.contains(property.getName()) && definesTree(parent); } @Override - public boolean definesContextRoot(@Nonnull Tree tree) { + public boolean definesContextRoot(@NotNull Tree tree) { return REP_PRIVILEGES.equals(tree.getName()) && NT_REP_PRIVILEGES.equals(TreeUtil.getPrimaryTypeName(tree)); } @Override - public boolean definesTree(@Nonnull Tree tree) { + public boolean definesTree(@NotNull Tree tree) { return PRIVILEGE_NODETYPE_NAMES.contains(TreeUtil.getPrimaryTypeName(tree)); } @Override - public boolean definesLocation(@Nonnull TreeLocation location) { + public boolean definesLocation(@NotNull TreeLocation location) { return Text.isDescendantOrEqual(PRIVILEGES_PATH, location.getPath()); } @Override - public boolean definesInternal(@Nonnull Tree tree) { + public boolean definesInternal(@NotNull Tree tree) { return false; } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java Wed Nov 7 13:57:55 2018 @@ -19,15 +19,14 @@ package org.apache.jackrabbit.oak.securi import java.util.HashMap; import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeDefinition; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeUtil; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Reads privilege definitions from the repository content without applying @@ -37,7 +36,7 @@ class PrivilegeDefinitionReader implemen private final Tree privilegesTree; - PrivilegeDefinitionReader(@Nonnull Root root) { + PrivilegeDefinitionReader(@NotNull Root root) { this.privilegesTree = root.getTree(PRIVILEGES_PATH); } @@ -46,7 +45,7 @@ class PrivilegeDefinitionReader implemen * * @return All privilege definitions stored in the content. */ - @Nonnull + @NotNull Map<String, PrivilegeDefinition> readDefinitions() { Map<String, PrivilegeDefinition> definitions = new HashMap(); for (Tree child : privilegesTree.getChildren()) { @@ -65,8 +64,8 @@ class PrivilegeDefinitionReader implemen * @return The privilege definition with the specified name or {@code null} * if the name doesn't refer to a registered privilege. */ - @CheckForNull - PrivilegeDefinition readDefinition(@Nonnull String privilegeName) { + @Nullable + PrivilegeDefinition readDefinition(@NotNull String privilegeName) { if (!privilegesTree.exists() || !privilegesTree.hasChild(privilegeName)) { return null; } else { @@ -75,7 +74,7 @@ class PrivilegeDefinitionReader implemen } } - private static boolean isPrivilegeDefinition(@Nonnull Tree tree) { + private static boolean isPrivilegeDefinition(@NotNull Tree tree) { return NT_REP_PRIVILEGE.equals(TreeUtil.getPrimaryTypeName(tree)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java Wed Nov 7 13:57:55 2018 @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeDefinition; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; import static java.util.Arrays.asList; @@ -79,12 +79,12 @@ class PrivilegeDefinitionWriter implemen } //-------------------------------------------------------------------------- - @Nonnull + @NotNull private PrivilegeBits getNext() { return next; } - @Nonnull + @NotNull private PrivilegeBits next() { PrivilegeBits bits = next; next = bits.nextBits(); @@ -160,4 +160,4 @@ class PrivilegeDefinitionWriter implemen definitions.put(JCR_ALL, all); return definitions.values(); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java Wed Nov 7 13:57:55 2018 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.security.privilege; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import org.apache.jackrabbit.JcrConstants; @@ -31,6 +30,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,12 +48,12 @@ class PrivilegeInitializer implements Re private final RootProvider rootProvider; - PrivilegeInitializer(@Nonnull RootProvider rootProvider) { + PrivilegeInitializer(@NotNull RootProvider rootProvider) { this.rootProvider = rootProvider; } @Override - public void initialize(@Nonnull NodeBuilder builder) { + public void initialize(@NotNull NodeBuilder builder) { NodeBuilder system = builder.child(JcrConstants.JCR_SYSTEM); system.setProperty(JcrConstants.JCR_PRIMARYTYPE, NodeTypeConstants.NT_REP_SYSTEM, Type.NAME); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java Wed Nov 7 13:57:55 2018 @@ -21,8 +21,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.InvalidItemStateException; import javax.jcr.RepositoryException; import javax.jcr.security.AccessControlException; @@ -33,6 +31,8 @@ import org.apache.jackrabbit.oak.api.Roo import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeDefinition; import org.apache.jackrabbit.oak.spi.security.privilege.ImmutablePrivilegeDefinition; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -91,13 +91,13 @@ class PrivilegeManagerImpl implements Pr } //------------------------------------------------------------< private >--- - @Nonnull + @NotNull private Root getWriteRoot() { return root.getContentSession().getLatestRoot(); } - @Nonnull - private Set<String> getOakNames(@CheckForNull String[] jcrNames) throws RepositoryException { + @NotNull + private Set<String> getOakNames(@Nullable String[] jcrNames) throws RepositoryException { Set<String> oakNames; if (jcrNames == null || jcrNames.length == 0) { oakNames = Collections.emptySet(); @@ -111,8 +111,8 @@ class PrivilegeManagerImpl implements Pr return oakNames; } - @Nonnull - private String getOakName(@CheckForNull String jcrName) throws RepositoryException { + @NotNull + private String getOakName(@Nullable String jcrName) throws RepositoryException { if (jcrName == null) { throw new AccessControlException("Invalid privilege name 'null'"); } @@ -123,23 +123,23 @@ class PrivilegeManagerImpl implements Pr return oakName; } - @Nonnull - private Privilege getPrivilege(@Nonnull PrivilegeDefinition definition) { + @NotNull + private Privilege getPrivilege(@NotNull PrivilegeDefinition definition) { return new PrivilegeImpl(definition); } - @Nonnull + @NotNull private PrivilegeDefinition[] getPrivilegeDefinitions() { Map<String, PrivilegeDefinition> definitions = getReader().readDefinitions(); return definitions.values().toArray(new PrivilegeDefinition[definitions.size()]); } - @CheckForNull - private PrivilegeDefinition getPrivilegeDefinition(@Nonnull String oakName) { + @Nullable + private PrivilegeDefinition getPrivilegeDefinition(@NotNull String oakName) { return getReader().readDefinition(oakName); } - @Nonnull + @NotNull private PrivilegeDefinitionReader getReader() { return new PrivilegeDefinitionReader(root); } @@ -153,7 +153,7 @@ class PrivilegeManagerImpl implements Pr private final PrivilegeDefinition definition; - private PrivilegeImpl(@Nonnull PrivilegeDefinition definition) { + private PrivilegeImpl(@NotNull PrivilegeDefinition definition) { this.definition = definition; } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java Wed Nov 7 13:57:55 2018 @@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Root; @@ -37,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; import static org.apache.jackrabbit.oak.api.CommitFailedException.CONSTRAINT; @@ -131,7 +130,7 @@ class PrivilegeValidator extends Default } } - @Nonnull + @NotNull private Tree getPrivilegesTree(Root root) throws CommitFailedException { Tree privilegesTree = root.getTree(PRIVILEGES_PATH); if (!privilegesTree.exists()) { @@ -254,7 +253,7 @@ class PrivilegeValidator extends Default return aggregateNames; } - private static boolean isPrivilegeDefinition(@Nonnull NodeState state) { + private static boolean isPrivilegeDefinition(@NotNull NodeState state) { return NT_REP_PRIVILEGE.equals(NodeStateUtils.getPrimaryTypeName(state)); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorProvider.java Wed Nov 7 13:57:55 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.security.privilege; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.plugins.tree.RootProvider; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; @@ -25,6 +23,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.Validator; import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.REP_PRIVILEGES; @@ -38,11 +37,11 @@ class PrivilegeValidatorProvider extends private final RootProvider rootProvider; - PrivilegeValidatorProvider(@Nonnull RootProvider rootProvider) { + PrivilegeValidatorProvider(@NotNull RootProvider rootProvider) { this.rootProvider = rootProvider; } - @Nonnull + @NotNull @Override public Validator getRootValidator( NodeState before, NodeState after, CommitInfo info) { @@ -53,4 +52,4 @@ class PrivilegeValidatorProvider extends private Root createRoot(NodeState nodeState) { return rootProvider.createReadOnlyRoot(nodeState); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java Wed Nov 7 13:57:55 2018 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.securi import java.security.Principal; import java.util.Enumeration; import java.util.Iterator; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import com.google.common.base.Function; @@ -30,6 +29,7 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,11 +40,11 @@ abstract class AbstractGroupPrincipal ex private static final Logger log = LoggerFactory.getLogger(AbstractGroupPrincipal.class); - AbstractGroupPrincipal(@Nonnull String principalName, @Nonnull Tree groupTree, @Nonnull NamePathMapper namePathMapper) { + AbstractGroupPrincipal(@NotNull String principalName, @NotNull Tree groupTree, @NotNull NamePathMapper namePathMapper) { super(principalName, groupTree, namePathMapper); } - AbstractGroupPrincipal(@Nonnull String principalName, @Nonnull String groupPath, @Nonnull NamePathMapper namePathMapper) { + AbstractGroupPrincipal(@NotNull String principalName, @NotNull String groupPath, @NotNull NamePathMapper namePathMapper) { super(principalName, groupPath, namePathMapper); } @@ -52,9 +52,9 @@ abstract class AbstractGroupPrincipal ex abstract boolean isEveryone() throws RepositoryException; - abstract boolean isMember(@Nonnull Authorizable authorizable) throws RepositoryException; + abstract boolean isMember(@NotNull Authorizable authorizable) throws RepositoryException; - @Nonnull + @NotNull abstract Iterator<Authorizable> getMembers() throws RepositoryException; //--------------------------------------------------------------< Group >--- Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java Wed Nov 7 13:57:55 2018 @@ -16,9 +16,6 @@ */ package org.apache.jackrabbit.oak.security.user; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.commons.UUIDUtils; @@ -27,6 +24,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.commons.UUIDUtils.generateUUID; @@ -43,7 +42,7 @@ abstract class AuthorizableBaseProvider private final boolean usercaseMappedProfile; - AuthorizableBaseProvider(@Nonnull Root root, @Nonnull ConfigurationParameters config) { + AuthorizableBaseProvider(@NotNull Root root, @NotNull ConfigurationParameters config) { this.root = checkNotNull(root); this.config = checkNotNull(config); @@ -51,13 +50,13 @@ abstract class AuthorizableBaseProvider usercaseMappedProfile = config.getConfigValue(PARAM_ENABLE_RFC7613_USERCASE_MAPPED_PROFILE, DEFAULT_ENABLE_RFC7613_USERCASE_MAPPED_PROFILE); } - @CheckForNull - Tree getByID(@Nonnull String authorizableId, @Nonnull AuthorizableType authorizableType) { + @Nullable + Tree getByID(@NotNull String authorizableId, @NotNull AuthorizableType authorizableType) { return getByContentID(getContentID(authorizableId), authorizableType); } - @CheckForNull - Tree getByContentID(@Nonnull String contentId, @Nonnull AuthorizableType authorizableType) { + @Nullable + Tree getByContentID(@NotNull String contentId, @NotNull AuthorizableType authorizableType) { Tree tree = identifierManager.getTree(contentId); if (UserUtil.isType(tree, authorizableType)) { return tree; @@ -66,8 +65,8 @@ abstract class AuthorizableBaseProvider } } - @CheckForNull - Tree getByPath(@Nonnull String authorizableOakPath, @Nonnull AuthorizableType type) { + @Nullable + Tree getByPath(@NotNull String authorizableOakPath, @NotNull AuthorizableType type) { Tree tree = root.getTree(authorizableOakPath); if (UserUtil.isType(tree, type)) { return tree; @@ -76,17 +75,17 @@ abstract class AuthorizableBaseProvider } } - @Nonnull - String getContentID(@Nonnull Tree authorizableTree) { + @NotNull + String getContentID(@NotNull Tree authorizableTree) { return getIdentifier(authorizableTree); } - @Nonnull - String getContentID(@Nonnull String authorizableId) { + @NotNull + String getContentID(@NotNull String authorizableId) { String s = authorizableId.toLowerCase(); if (usercaseMappedProfile) { s = java.text.Normalizer.normalize(s, java.text.Normalizer.Form.NFKC); } return UUIDUtils.generateUUID(s); } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java Wed Nov 7 13:57:55 2018 @@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.util.Collections; import java.util.Iterator; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -33,6 +32,7 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,8 +56,8 @@ abstract class AuthorizableImpl implemen private AuthorizableProperties properties; private int hashCode; - AuthorizableImpl(@Nonnull String id, @Nonnull Tree tree, - @Nonnull UserManagerImpl userManager) throws RepositoryException { + AuthorizableImpl(@NotNull String id, @NotNull Tree tree, + @NotNull UserManagerImpl userManager) throws RepositoryException { checkValidTree(tree); this.id = id; @@ -65,7 +65,7 @@ abstract class AuthorizableImpl implemen this.userManager = userManager; } - abstract void checkValidTree(@Nonnull Tree tree) throws RepositoryException; + abstract void checkValidTree(@NotNull Tree tree) throws RepositoryException; static boolean isValidAuthorizableImpl(Authorizable authorizable) { return authorizable instanceof AuthorizableImpl; @@ -172,7 +172,7 @@ abstract class AuthorizableImpl implemen } //-------------------------------------------------------------------------- - @Nonnull + @NotNull Tree getTree() { if (tree.exists()) { return tree; @@ -181,7 +181,7 @@ abstract class AuthorizableImpl implemen } } - @Nonnull + @NotNull String getPrincipalName() throws RepositoryException { if (principalName == null) { PropertyState pNameProp = tree.getProperty(REP_PRINCIPAL_NAME); @@ -199,7 +199,7 @@ abstract class AuthorizableImpl implemen /** * @return The user manager associated with this authorizable. */ - @Nonnull + @NotNull UserManagerImpl getUserManager() { return userManager; } @@ -207,7 +207,7 @@ abstract class AuthorizableImpl implemen /** * @return The membership provider associated with this authorizable */ - @Nonnull + @NotNull MembershipProvider getMembershipProvider() { return userManager.getMembershipProvider(); } @@ -245,7 +245,7 @@ abstract class AuthorizableImpl implemen * @return Iterator of groups this authorizable is (declared) member of. * @throws RepositoryException If an error occurs. */ - @Nonnull + @NotNull private Iterator<Group> getMembership(boolean includeInherited) throws RepositoryException { if (isEveryone()) { return Collections.<Group>emptySet().iterator(); @@ -266,4 +266,4 @@ abstract class AuthorizableImpl implemen return RangeIteratorAdapter.EMPTY; } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableProperties.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableProperties.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableProperties.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableProperties.java Wed Nov 7 13:57:55 2018 @@ -17,12 +17,12 @@ package org.apache.jackrabbit.oak.security.user; import java.util.Iterator; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.Value; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + /** * Internal interface covering those methods of {link Authorizable} that deal * with reading and writing custom properties defined with user and groups. @@ -39,8 +39,8 @@ interface AuthorizableProperties { * @return An iterator of property names available at the given {@code relPath}. * @throws RepositoryException If an error occurs. */ - @Nonnull - Iterator<String> getNames(@Nonnull String relPath) throws RepositoryException; + @NotNull + Iterator<String> getNames(@NotNull String relPath) throws RepositoryException; /** * Returns {@code true} if there is a custom authorizable property at the @@ -53,7 +53,7 @@ interface AuthorizableProperties { * @return {@code true} if a valid property exists; {@code false} otherwise. * @throws RepositoryException If an error occurs. */ - boolean hasProperty(@Nonnull String relPath) throws RepositoryException; + boolean hasProperty(@NotNull String relPath) throws RepositoryException; /** * Returns the values of the property identified by the specified @@ -67,8 +67,8 @@ interface AuthorizableProperties { * property exposed by this interface. * @throws RepositoryException If an error occurs. */ - @CheckForNull - Value[] getProperty(@Nonnull String relPath) throws RepositoryException; + @Nullable + Value[] getProperty(@NotNull String relPath) throws RepositoryException; /** * Creates or modifies the property at the specified {@code relPath}. If @@ -83,7 +83,7 @@ interface AuthorizableProperties { * that represents protected content that cannot be modified using this API. * @see #setProperty(String, javax.jcr.Value[]) */ - void setProperty(@Nonnull String relPath, @Nullable Value value) throws RepositoryException; + void setProperty(@NotNull String relPath, @Nullable Value value) throws RepositoryException; /** * Creates or modifies the property at the specified {@code relPath}. If @@ -98,7 +98,7 @@ interface AuthorizableProperties { * that represents protected content that cannot be modified using this API. * @see #setProperty(String, javax.jcr.Value) */ - void setProperty(@Nonnull String relPath, @Nullable Value[] values) throws RepositoryException; + void setProperty(@NotNull String relPath, @Nullable Value[] values) throws RepositoryException; /** * Removes the property identified by the given {@code relPath} and returns @@ -112,6 +112,6 @@ interface AuthorizableProperties { * that cannot be altered using this API because it is not associated with * this authorizable or is otherwise considered protected. */ - boolean removeProperty(@Nonnull String relPath) throws RepositoryException; + boolean removeProperty(@NotNull String relPath) throws RepositoryException; -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java Wed Nov 7 13:57:55 2018 @@ -21,9 +21,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.nodetype.ConstraintViolationException; @@ -40,6 +37,8 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,15 +55,15 @@ class AuthorizablePropertiesImpl impleme private final AuthorizableImpl authorizable; private final NamePathMapper namePathMapper; - AuthorizablePropertiesImpl(@Nonnull AuthorizableImpl authorizable, @Nonnull NamePathMapper namePathMapper) { + AuthorizablePropertiesImpl(@NotNull AuthorizableImpl authorizable, @NotNull NamePathMapper namePathMapper) { this.authorizable = authorizable; this.namePathMapper = namePathMapper; } //---------------------------------------------< AuthorizableProperties >--- - @Nonnull + @NotNull @Override - public Iterator<String> getNames(@Nonnull String relPath) throws RepositoryException { + public Iterator<String> getNames(@NotNull String relPath) throws RepositoryException { String oakPath = getOakPath(relPath); Tree tree = getTree(); TreeLocation location = getLocation(tree, oakPath); @@ -87,7 +86,7 @@ class AuthorizablePropertiesImpl impleme * @see org.apache.jackrabbit.api.security.user.Authorizable#hasProperty(String) */ @Override - public boolean hasProperty(@Nonnull String relPath) throws RepositoryException { + public boolean hasProperty(@NotNull String relPath) throws RepositoryException { String oakPath = getOakPath(relPath); return isAuthorizableProperty(getTree(), getLocation(getTree(), oakPath), true); } @@ -96,7 +95,7 @@ class AuthorizablePropertiesImpl impleme * @see org.apache.jackrabbit.api.security.user.Authorizable#getProperty(String) */ @Override - public Value[] getProperty(@Nonnull String relPath) throws RepositoryException { + public Value[] getProperty(@NotNull String relPath) throws RepositoryException { String oakPath = getOakPath(relPath); Tree tree = getTree(); Value[] values = null; @@ -116,7 +115,7 @@ class AuthorizablePropertiesImpl impleme * @see org.apache.jackrabbit.api.security.user.Authorizable#setProperty(String, javax.jcr.Value) */ @Override - public void setProperty(@Nonnull String relPath, @Nullable Value value) throws RepositoryException { + public void setProperty(@NotNull String relPath, @Nullable Value value) throws RepositoryException { if (value == null) { removeProperty(relPath); } else { @@ -136,7 +135,7 @@ class AuthorizablePropertiesImpl impleme * @see org.apache.jackrabbit.api.security.user.Authorizable#setProperty(String, javax.jcr.Value[]) */ @Override - public void setProperty(@Nonnull String relPath, @Nullable Value[] values) throws RepositoryException { + public void setProperty(@NotNull String relPath, @Nullable Value[] values) throws RepositoryException { if (values == null) { removeProperty(relPath); } else { @@ -157,7 +156,7 @@ class AuthorizablePropertiesImpl impleme * @see org.apache.jackrabbit.api.security.user.Authorizable#removeProperty(String) */ @Override - public boolean removeProperty(@Nonnull String relPath) throws RepositoryException { + public boolean removeProperty(@NotNull String relPath) throws RepositoryException { String oakPath = getOakPath(relPath); Tree node = getTree(); TreeLocation propertyLocation = getLocation(node, oakPath); @@ -175,7 +174,7 @@ class AuthorizablePropertiesImpl impleme } //------------------------------------------------------------< private >--- - @Nonnull + @NotNull private Tree getTree() { return authorizable.getTree(); } @@ -195,7 +194,7 @@ class AuthorizablePropertiesImpl impleme * {@code false} otherwise. * @throws RepositoryException If an error occurs. */ - private boolean isAuthorizableProperty(@Nonnull Tree authorizableTree, @Nonnull TreeLocation propertyLocation, boolean verifyAncestor) throws RepositoryException { + private boolean isAuthorizableProperty(@NotNull Tree authorizableTree, @NotNull TreeLocation propertyLocation, boolean verifyAncestor) throws RepositoryException { return getAuthorizableProperty(authorizableTree, propertyLocation, verifyAncestor) != null; } @@ -215,8 +214,8 @@ class AuthorizablePropertiesImpl impleme * node type or one of it's sub-node types. * @throws RepositoryException If an error occurs. */ - @CheckForNull - private PropertyState getAuthorizableProperty(@Nonnull Tree authorizableTree, @Nonnull TreeLocation propertyLocation, boolean verifyAncestor) throws RepositoryException { + @Nullable + private PropertyState getAuthorizableProperty(@NotNull Tree authorizableTree, @NotNull TreeLocation propertyLocation, boolean verifyAncestor) throws RepositoryException { PropertyState property = propertyLocation.getProperty(); if (property == null) { return null; @@ -243,7 +242,7 @@ class AuthorizablePropertiesImpl impleme return property; } - private void checkProtectedProperty(@Nonnull Tree parent, @Nonnull PropertyState property) throws RepositoryException { + private void checkProtectedProperty(@NotNull Tree parent, @NotNull PropertyState property) throws RepositoryException { ReadOnlyNodeTypeManager nodeTypeManager = authorizable.getUserManager().getNodeTypeManager(); PropertyDefinition def = nodeTypeManager.getDefinition(parent, property, false); if (def.isProtected()) { @@ -262,8 +261,8 @@ class AuthorizablePropertiesImpl impleme * @throws RepositoryException If an error occurs or if {@code relPath} refers * to a node that is outside of the scope of this authorizable. */ - @Nonnull - private Tree getOrCreateTargetTree(@CheckForNull String relPath) throws RepositoryException { + @NotNull + private Tree getOrCreateTargetTree(@Nullable String relPath) throws RepositoryException { Tree targetTree; Tree userTree = getTree(); if (relPath != null) { @@ -281,8 +280,8 @@ class AuthorizablePropertiesImpl impleme return targetTree; } - @Nonnull - private static TreeLocation getLocation(@Nonnull Tree tree, @Nonnull String relativePath) { + @NotNull + private static TreeLocation getLocation(@NotNull Tree tree, @NotNull String relativePath) { TreeLocation loc = TreeLocation.create(tree); for (String element : Text.explode(relativePath, '/', false)) { if (PathUtils.denotesParent(element)) { @@ -294,8 +293,8 @@ class AuthorizablePropertiesImpl impleme return loc; } - @Nonnull - private String getOakPath(@CheckForNull String relPath) throws RepositoryException { + @NotNull + private String getOakPath(@Nullable String relPath) throws RepositoryException { if (relPath == null || relPath.isEmpty() || relPath.charAt(0) == '/') { throw new RepositoryException("Relative path expected. Found " + relPath); } @@ -306,7 +305,7 @@ class AuthorizablePropertiesImpl impleme return oakPath; } - private static void checkScope(@Nonnull String userPath, @Nonnull String targetPath, @Nonnull String relPath) throws RepositoryException { + private static void checkScope(@NotNull String userPath, @NotNull String targetPath, @NotNull String relPath) throws RepositoryException { if (!Text.isDescendantOrEqual(userPath, targetPath)) { throw new RepositoryException("Relative path " + relPath + " outside of scope of " + userPath); } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProvider.java Wed Nov 7 13:57:55 2018 @@ -20,10 +20,6 @@ import java.security.Principal; import java.util.Collections; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; @@ -36,6 +32,8 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.VisibleValidator; import org.apache.jackrabbit.oak.spi.security.principal.SystemPrincipal; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; @@ -49,13 +47,13 @@ class CacheValidatorProvider extends Val private final boolean isSystem; private final TreeProvider treeProvider; - CacheValidatorProvider(@Nonnull Set<Principal> principals, @Nonnull TreeProvider treeProvider) { + CacheValidatorProvider(@NotNull Set<Principal> principals, @NotNull TreeProvider treeProvider) { super(); isSystem = principals.contains(SystemPrincipal.INSTANCE); this.treeProvider = treeProvider; } - @CheckForNull + @Nullable @Override protected Validator getRootValidator(NodeState before, NodeState after, CommitInfo info) { TypePredicate cachePredicate = new TypePredicate(after, NT_REP_CACHE); @@ -75,14 +73,14 @@ class CacheValidatorProvider extends Val private static final CommitMarker INSTANCE = new CommitMarker(); - private static boolean isValidCommitInfo(@Nonnull CommitInfo commitInfo) { + private static boolean isValidCommitInfo(@NotNull CommitInfo commitInfo) { return CommitMarker.INSTANCE == commitInfo.getInfo().get(CommitMarker.KEY); } private CommitMarker() {} } - private static CommitFailedException constraintViolation(int code, @Nonnull String message) { + private static CommitFailedException constraintViolation(int code, @NotNull String message) { return new CommitFailedException(CommitFailedException.CONSTRAINT, code, message); } @@ -97,7 +95,7 @@ class CacheValidatorProvider extends Val private final boolean isCache; - private CacheValidator(@Nullable Tree parentBefore, @Nonnull Tree parentAfter, TypePredicate cachePredicate, boolean isValidCommitInfo) { + private CacheValidator(@Nullable Tree parentBefore, @NotNull Tree parentAfter, TypePredicate cachePredicate, boolean isValidCommitInfo) { this.parentBefore = parentBefore; this.parentAfter = parentAfter; @@ -142,7 +140,7 @@ class CacheValidatorProvider extends Val return new VisibleValidator(new CacheValidator(null, tree, cachePredicate, isValidCommitInfo), true, true); } - private boolean isCache(@CheckForNull Tree tree) { + private boolean isCache(@Nullable Tree tree) { return tree != null && (REP_CACHE.equals(tree.getName()) || cachePredicate.apply(tree)); } @@ -152,4 +150,4 @@ class CacheValidatorProvider extends Val } } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CredentialsImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CredentialsImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CredentialsImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CredentialsImpl.java Wed Nov 7 13:57:55 2018 @@ -16,11 +16,11 @@ */ package org.apache.jackrabbit.oak.security.user; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Credentials; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + /** * Credentials implementation to cover * {@link org.apache.jackrabbit.api.security.user.User#getCredentials()} @@ -30,18 +30,18 @@ class CredentialsImpl implements Credent private final String userId; private final String pwHash; - CredentialsImpl(@Nonnull String userId, @Nullable String pwHash) { + CredentialsImpl(@NotNull String userId, @Nullable String pwHash) { this.userId = userId; this.pwHash = pwHash; } - @Nonnull + @NotNull public String getUserId() { return userId; } - @CheckForNull + @Nullable public String getPasswordHash() { return pwHash; } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java Wed Nov 7 13:57:55 2018 @@ -20,8 +20,6 @@ import java.security.Principal; import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.nodetype.ConstraintViolationException; @@ -38,6 +36,8 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil; import org.apache.jackrabbit.oak.spi.xml.ImportBehavior; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +54,7 @@ class GroupImpl extends AuthorizableImpl //---------------------------------------------------< AuthorizableImpl >--- @Override - void checkValidTree(@Nonnull Tree tree) throws RepositoryException { + void checkValidTree(@NotNull Tree tree) throws RepositoryException { if (!UserUtil.isType(tree, AuthorizableType.GROUP)) { throw new IllegalArgumentException("Invalid group node: node type rep:Group expected."); } @@ -127,7 +127,7 @@ class GroupImpl extends AuthorizableImpl } @Override - public Set<String> addMembers(@Nonnull String... memberIds) throws RepositoryException { + public Set<String> addMembers(@NotNull String... memberIds) throws RepositoryException { return updateMembers(false, memberIds); } @@ -153,7 +153,7 @@ class GroupImpl extends AuthorizableImpl } @Override - public Set<String> removeMembers(@Nonnull String... memberIds) throws RepositoryException { + public Set<String> removeMembers(@NotNull String... memberIds) throws RepositoryException { return updateMembers(true, memberIds); } @@ -244,7 +244,7 @@ class GroupImpl extends AuthorizableImpl * authorizable. * @throws javax.jcr.RepositoryException If another error occurs. */ - private Set<String> updateMembers(boolean isRemove, @Nonnull String... memberIds) throws RepositoryException { + private Set<String> updateMembers(boolean isRemove, @NotNull String... memberIds) throws RepositoryException { Set<String> failedIds = Sets.newHashSet(memberIds); int importBehavior = UserUtil.getImportBehavior(getUserManager().getConfig()); @@ -312,7 +312,7 @@ class GroupImpl extends AuthorizableImpl return failedIds; } - private boolean isCyclicMembership(@Nonnull Group member) throws RepositoryException { + private boolean isCyclicMembership(@NotNull Group member) throws RepositoryException { return member.isMember(this); } @@ -336,14 +336,14 @@ class GroupImpl extends AuthorizableImpl } @Override - boolean isMember(@Nonnull Authorizable authorizable) throws RepositoryException { + boolean isMember(@NotNull Authorizable authorizable) throws RepositoryException { return GroupImpl.this.isMember(authorizable); } - @Nonnull + @NotNull @Override Iterator<Authorizable> getMembers() throws RepositoryException { return GroupImpl.this.getMembers(); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java Wed Nov 7 13:57:55 2018 @@ -20,8 +20,6 @@ import java.security.Principal; import java.security.acl.Group; import java.util.HashSet; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.RepositoryException; import javax.security.auth.Subject; @@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalIteratorAdapter; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +52,7 @@ class ImpersonationImpl implements Imper private final UserImpl user; private final PrincipalManager principalManager; - ImpersonationImpl(@Nonnull UserImpl user) throws RepositoryException { + ImpersonationImpl(@NotNull UserImpl user) throws RepositoryException { this.user = user; this.principalManager = user.getUserManager().getPrincipalManager(); } @@ -62,7 +62,7 @@ class ImpersonationImpl implements Imper /** * @see org.apache.jackrabbit.api.security.user.Impersonation#getImpersonators() */ - @Nonnull + @NotNull @Override public PrincipalIterator getImpersonators() throws RepositoryException { Set<String> impersonators = getImpersonatorNames(); @@ -87,7 +87,7 @@ class ImpersonationImpl implements Imper * @see org.apache.jackrabbit.api.security.user.Impersonation#grantImpersonation(Principal) */ @Override - public boolean grantImpersonation(@Nonnull Principal principal) throws RepositoryException { + public boolean grantImpersonation(@NotNull Principal principal) throws RepositoryException { if (!isValidPrincipal(principal)) { return false; } @@ -113,7 +113,7 @@ class ImpersonationImpl implements Imper * @see Impersonation#revokeImpersonation(java.security.Principal) */ @Override - public boolean revokeImpersonation(@Nonnull Principal principal) throws RepositoryException { + public boolean revokeImpersonation(@NotNull Principal principal) throws RepositoryException { String pName = principal.getName(); Tree userTree = user.getTree(); @@ -130,7 +130,7 @@ class ImpersonationImpl implements Imper * @see Impersonation#allows(javax.security.auth.Subject) */ @Override - public boolean allows(@CheckForNull Subject subject) throws RepositoryException { + public boolean allows(@Nullable Subject subject) throws RepositoryException { if (subject == null) { return false; } @@ -154,13 +154,13 @@ class ImpersonationImpl implements Imper } //------------------------------------------------------------< private >--- - @Nonnull + @NotNull private Set<String> getImpersonatorNames() { return getImpersonatorNames(user.getTree()); } - @Nonnull - private Set<String> getImpersonatorNames(@Nonnull Tree userTree) { + @NotNull + private Set<String> getImpersonatorNames(@NotNull Tree userTree) { Set<String> princNames = new HashSet<String>(); PropertyState impersonators = userTree.getProperty(REP_IMPERSONATORS); if (impersonators != null) { @@ -171,7 +171,7 @@ class ImpersonationImpl implements Imper return princNames; } - private void updateImpersonatorNames(@Nonnull Tree userTree, @Nonnull Set<String> principalNames) { + private void updateImpersonatorNames(@NotNull Tree userTree, @NotNull Set<String> principalNames) { if (principalNames == null || principalNames.isEmpty()) { userTree.removeProperty(REP_IMPERSONATORS); } else { @@ -179,7 +179,7 @@ class ImpersonationImpl implements Imper } } - private boolean isAdmin(@Nonnull Principal principal) { + private boolean isAdmin(@NotNull Principal principal) { if (principal instanceof AdminPrincipal) { return true; } else if (principal instanceof Group) { @@ -195,7 +195,7 @@ class ImpersonationImpl implements Imper } } - private boolean isValidPrincipal(@Nonnull Principal principal) { + private boolean isValidPrincipal(@NotNull Principal principal) { Principal p = null; // shortcut for TreeBasedPrincipal if (principal instanceof TreeBasedPrincipal) {
