Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java Wed Jul 18 14:58:59 2018 @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.NamespaceRegistry; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; @@ -40,17 +38,19 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public abstract class AbstractRestrictionProvider implements RestrictionProvider, AccessControlConstants { private Map<String, RestrictionDefinition> supported; - public AbstractRestrictionProvider(@Nonnull Map<String, ? extends RestrictionDefinition> definitions) { + public AbstractRestrictionProvider(@NotNull Map<String, ? extends RestrictionDefinition> definitions) { this.supported = ImmutableMap.copyOf(definitions); } //------------------------------------------------< RestrictionProvider >--- - @Nonnull + @NotNull @Override public Set<RestrictionDefinition> getSupportedRestrictions(String oakPath) { if (isUnsupportedPath(oakPath)) { @@ -60,9 +60,9 @@ public abstract class AbstractRestrictio } } - @Nonnull + @NotNull @Override - public Restriction createRestriction(String oakPath, @Nonnull String oakName, @Nonnull Value value) throws RepositoryException { + public Restriction createRestriction(String oakPath, @NotNull String oakName, @NotNull Value value) throws RepositoryException { RestrictionDefinition definition = getDefinition(oakPath, oakName); Type<?> requiredType = definition.getRequiredType(); int tag = requiredType.tag(); @@ -78,9 +78,9 @@ public abstract class AbstractRestrictio return createRestriction(propertyState, definition); } - @Nonnull + @NotNull @Override - public Restriction createRestriction(String oakPath, @Nonnull String oakName, @Nonnull Value... values) throws RepositoryException { + public Restriction createRestriction(String oakPath, @NotNull String oakName, @NotNull Value... values) throws RepositoryException { RestrictionDefinition definition = getDefinition(oakPath, oakName); Type<?> requiredType = definition.getRequiredType(); for (Value v : values) { @@ -101,9 +101,9 @@ public abstract class AbstractRestrictio return createRestriction(propertyState, definition); } - @Nonnull + @NotNull @Override - public Set<Restriction> readRestrictions(String oakPath, @Nonnull Tree aceTree) { + public Set<Restriction> readRestrictions(String oakPath, @NotNull Tree aceTree) { if (isUnsupportedPath(oakPath)) { return Collections.emptySet(); } else { @@ -134,7 +134,7 @@ public abstract class AbstractRestrictio } @Override - public void validateRestrictions(String oakPath, @Nonnull Tree aceTree) throws AccessControlException { + public void validateRestrictions(String oakPath, @NotNull Tree aceTree) throws AccessControlException { Map<String, PropertyState> restrictionProperties = getRestrictionProperties(aceTree); if (isUnsupportedPath(oakPath)) { if (!restrictionProperties.isEmpty()) { @@ -182,8 +182,8 @@ public abstract class AbstractRestrictio * @param aceTree The ACE tree for which the restrictions are being read. * @return The tree storing the restriction information. */ - @Nonnull - protected Tree getRestrictionsTree(@Nonnull Tree aceTree) { + @NotNull + protected Tree getRestrictionsTree(@NotNull Tree aceTree) { Tree restrictions = aceTree.getChild(REP_RESTRICTIONS); if (!restrictions.exists()) { // no rep:restrictions tree -> read from aceTree for backwards compatibility @@ -193,8 +193,8 @@ public abstract class AbstractRestrictio } //------------------------------------------------------------< private >--- - @Nonnull - private RestrictionDefinition getDefinition(@Nullable String oakPath, @Nonnull String oakName) throws AccessControlException { + @NotNull + private RestrictionDefinition getDefinition(@Nullable String oakPath, @NotNull String oakName) throws AccessControlException { if (isUnsupportedPath(oakPath)) { throw new AccessControlException("Unsupported restriction at " + oakPath); } @@ -205,12 +205,12 @@ public abstract class AbstractRestrictio return definition; } - @Nonnull + @NotNull private Restriction createRestriction(PropertyState propertyState, RestrictionDefinition definition) { return new RestrictionImpl(propertyState, definition); } - @Nonnull + @NotNull private Map<String, PropertyState> getRestrictionProperties(Tree aceTree) { Tree rTree = getRestrictionsTree(aceTree); Map<String, PropertyState> restrictionProperties = new HashMap<String, PropertyState>();
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePattern.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePattern.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePattern.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositePattern.java Wed Jul 18 14:58:59 2018 @@ -17,11 +17,10 @@ package org.apache.jackrabbit.oak.spi.security.authorization.restriction; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Aggregates of a list of {@link RestrictionPattern}s into a single pattern. @@ -33,11 +32,11 @@ public final class CompositePattern impl private final List<RestrictionPattern> patterns; - public CompositePattern(@Nonnull List<RestrictionPattern> patterns) { + public CompositePattern(@NotNull List<RestrictionPattern> patterns) { this.patterns = patterns; } - public static RestrictionPattern create(@Nonnull List<RestrictionPattern> patterns) { + public static RestrictionPattern create(@NotNull List<RestrictionPattern> patterns) { switch (patterns.size()) { case 0 : return RestrictionPattern.EMPTY; case 1 : return patterns.get(0); @@ -46,7 +45,7 @@ public final class CompositePattern impl } @Override - public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { for (RestrictionPattern pattern : patterns) { if (!pattern.matches(tree, property)) { return false; @@ -56,7 +55,7 @@ public final class CompositePattern impl } @Override - public boolean matches(@Nonnull String path) { + public boolean matches(@NotNull String path) { for (RestrictionPattern pattern : patterns) { if (!pattern.matches(path)) { return false; @@ -74,4 +73,4 @@ public final class CompositePattern impl } return true; } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java Wed Jul 18 14:58:59 2018 @@ -25,8 +25,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.security.AccessControlException; @@ -34,6 +32,8 @@ import javax.jcr.security.AccessControlE import com.google.common.collect.Sets; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Aggregates of a collection of {@link RestrictionProvider} implementations @@ -43,15 +43,15 @@ public final class CompositeRestrictionP private final RestrictionProvider[] providers; - private CompositeRestrictionProvider(@Nonnull Collection<? extends RestrictionProvider> providers) { + private CompositeRestrictionProvider(@NotNull Collection<? extends RestrictionProvider> providers) { this.providers = providers.toArray(new RestrictionProvider[providers.size()]); } - public static RestrictionProvider newInstance(@Nonnull RestrictionProvider... providers) { + public static RestrictionProvider newInstance(@NotNull RestrictionProvider... providers) { return newInstance(Arrays.asList(providers)); } - public static RestrictionProvider newInstance(@Nonnull Collection<? extends RestrictionProvider> providers) { + public static RestrictionProvider newInstance(@NotNull Collection<? extends RestrictionProvider> providers) { switch (providers.size()) { case 0: return EMPTY; case 1: return providers.iterator().next(); @@ -59,7 +59,7 @@ public final class CompositeRestrictionP } } - @Nonnull + @NotNull @Override public Set<RestrictionDefinition> getSupportedRestrictions(@Nullable String oakPath) { Set<RestrictionDefinition> defs = Sets.newHashSet(); @@ -69,21 +69,21 @@ public final class CompositeRestrictionP return defs; } - @Nonnull + @NotNull @Override - public Restriction createRestriction(@Nullable String oakPath, @Nonnull String oakName, @Nonnull Value value) throws RepositoryException { + public Restriction createRestriction(@Nullable String oakPath, @NotNull String oakName, @NotNull Value value) throws RepositoryException { return getProvider(oakPath, oakName).createRestriction(oakPath, oakName, value); } - @Nonnull + @NotNull @Override - public Restriction createRestriction(@Nullable String oakPath, @Nonnull String oakName, @Nonnull Value... values) throws RepositoryException { + public Restriction createRestriction(@Nullable String oakPath, @NotNull String oakName, @NotNull Value... values) throws RepositoryException { return getProvider(oakPath, oakName).createRestriction(oakPath, oakName, values); } - @Nonnull + @NotNull @Override - public Set<Restriction> readRestrictions(@Nullable String oakPath, @Nonnull Tree aceTree) { + public Set<Restriction> readRestrictions(@Nullable String oakPath, @NotNull Tree aceTree) { Set<Restriction> restrictions = Sets.newHashSet(); for (RestrictionProvider rp : providers) { restrictions.addAll(rp.readRestrictions(oakPath, aceTree)); @@ -100,7 +100,7 @@ public final class CompositeRestrictionP } @Override - public void validateRestrictions(@Nullable String oakPath, @Nonnull Tree aceTree) throws RepositoryException { + public void validateRestrictions(@Nullable String oakPath, @NotNull Tree aceTree) throws RepositoryException { Map<String,RestrictionDefinition> supported = getSupported(oakPath); Set<String> rNames = new HashSet<String>(); for (Restriction r : readRestrictions(oakPath, aceTree)) { @@ -124,15 +124,15 @@ public final class CompositeRestrictionP } } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { return getPattern(oakPath, readRestrictions(oakPath, tree)); } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { List<RestrictionPattern> patterns = new ArrayList<RestrictionPattern>(); for (RestrictionProvider rp : providers) { RestrictionPattern pattern = rp.getPattern(oakPath, restrictions); @@ -144,7 +144,7 @@ public final class CompositeRestrictionP } //------------------------------------------------------------< private >--- - private RestrictionProvider getProvider(@Nullable String oakPath, @Nonnull String oakName) throws AccessControlException { + private RestrictionProvider getProvider(@Nullable String oakPath, @NotNull String oakName) throws AccessControlException { for (RestrictionProvider rp : providers) { for (RestrictionDefinition def : rp.getSupportedRestrictions(oakPath)) { if (def.getName().equals(oakName)) { @@ -176,4 +176,4 @@ public final class CompositeRestrictionP private static String getName(Restriction restriction) { return restriction.getDefinition().getName(); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/Restriction.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/Restriction.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/Restriction.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/Restriction.java Wed Jul 18 14:58:59 2018 @@ -16,9 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.security.authorization.restriction; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; +import org.jetbrains.annotations.NotNull; /** * A {@code Restriction} object represents a "live" restriction object that @@ -34,7 +33,7 @@ public interface Restriction { * * @return the restriction definition that applies to this restriction. */ - @Nonnull + @NotNull RestrictionDefinition getDefinition(); /** @@ -42,6 +41,6 @@ public interface Restriction { * * @return An {@code PropertyState}. */ - @Nonnull + @NotNull PropertyState getProperty(); } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinition.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinition.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinition.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinition.java Wed Jul 18 14:58:59 2018 @@ -16,9 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.security.authorization.restriction; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Type; +import org.jetbrains.annotations.NotNull; /** * The {@code RestrictionDefinition} interface provides methods for @@ -44,7 +43,7 @@ public interface RestrictionDefinition { * * @return The oak name. */ - @Nonnull + @NotNull String getName(); /** @@ -52,7 +51,7 @@ public interface RestrictionDefinition { * * @return The required type which must be a valid {@link javax.jcr.PropertyType}. */ - @Nonnull + @NotNull Type<?> getRequiredType(); /** Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java Wed Jul 18 14:58:59 2018 @@ -16,11 +16,11 @@ */ package org.apache.jackrabbit.oak.spi.security.authorization.restriction; -import javax.annotation.Nonnull; import javax.jcr.PropertyType; import com.google.common.base.Objects; import org.apache.jackrabbit.oak.api.Type; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkNotNull; @@ -42,7 +42,7 @@ public class RestrictionDefinitionImpl i * is allowed. * @param isMandatory A boolean indicating if the restriction is mandatory. */ - public RestrictionDefinitionImpl(@Nonnull String name, Type<?> type, boolean isMandatory) { + public RestrictionDefinitionImpl(@NotNull String name, Type<?> type, boolean isMandatory) { this.name = checkNotNull(name); if (type.tag() == PropertyType.UNDEFINED) { throw new IllegalArgumentException("'undefined' is not a valid required definition type."); @@ -52,13 +52,13 @@ public class RestrictionDefinitionImpl i } //----------------------------------------------< RestrictionDefinition >--- - @Nonnull + @NotNull @Override public String getName() { return name; } - @Nonnull + @NotNull @Override public Type<?> getRequiredType() { return type; Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImpl.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImpl.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImpl.java Wed Jul 18 14:58:59 2018 @@ -16,11 +16,10 @@ */ package org.apache.jackrabbit.oak.spi.security.authorization.restriction; -import javax.annotation.Nonnull; - import com.google.common.base.Objects; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; +import org.jetbrains.annotations.NotNull; /** * {@code RestrictionImpl} @@ -32,24 +31,24 @@ public class RestrictionImpl implements private int hashCode = 0; - public RestrictionImpl(@Nonnull PropertyState property, @Nonnull RestrictionDefinition def) { + public RestrictionImpl(@NotNull PropertyState property, @NotNull RestrictionDefinition def) { this.definition = def; this.property = property; } - public RestrictionImpl(@Nonnull PropertyState property, boolean isMandatory) { + public RestrictionImpl(@NotNull PropertyState property, boolean isMandatory) { this.definition = new RestrictionDefinitionImpl(property.getName(), property.getType(), isMandatory); this.property = property; } //--------------------------------------------------------< Restriction >--- - @Nonnull + @NotNull @Override public RestrictionDefinition getDefinition() { return definition; } - @Nonnull + @NotNull @Override public PropertyState getProperty() { return property; Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionPattern.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionPattern.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionPattern.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionPattern.java Wed Jul 18 14:58:59 2018 @@ -16,11 +16,10 @@ */ package org.apache.jackrabbit.oak.spi.security.authorization.restriction; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Interface used to verify if a given {@code restriction} applies to a given @@ -38,7 +37,7 @@ public interface RestrictionPattern { * @return {@code true} if the underlying restriction matches the specified * tree or property state; {@code false} otherwise. */ - boolean matches(@Nonnull Tree tree, @Nullable PropertyState property); + boolean matches(@NotNull Tree tree, @Nullable PropertyState property); /** * Returns {@code true} if the underlying restriction matches the specified @@ -48,7 +47,7 @@ public interface RestrictionPattern { * @return {@code true} if the underlying restriction matches the specified * path; {@code false} otherwise. */ - boolean matches(@Nonnull String path); + boolean matches(@NotNull String path); /** * Returns {@code true} if the underlying restriction matches for repository @@ -66,12 +65,12 @@ public interface RestrictionPattern { */ RestrictionPattern EMPTY = new RestrictionPattern() { @Override - public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) { + public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) { return true; } @Override - public boolean matches(@Nonnull String path) { + public boolean matches(@NotNull String path) { return true; } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionProvider.java Wed Jul 18 14:58:59 2018 @@ -18,13 +18,13 @@ package org.apache.jackrabbit.oak.spi.se import java.util.Collections; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.security.AccessControlException; import org.apache.jackrabbit.oak.api.Tree; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Interface to manage the supported restrictions present with a given access @@ -43,7 +43,7 @@ public interface RestrictionProvider { * policies should be returned. * @return The set of supported restrictions at the given path. */ - @Nonnull + @NotNull Set<RestrictionDefinition> getSupportedRestrictions(@Nullable String oakPath); /** @@ -58,10 +58,10 @@ public interface RestrictionProvider { * exists for the specified parameters. * @throws RepositoryException If another error occurs. */ - @Nonnull + @NotNull Restriction createRestriction(@Nullable String oakPath, - @Nonnull String oakName, - @Nonnull Value value) throws AccessControlException, RepositoryException; + @NotNull String oakName, + @NotNull Value value) throws AccessControlException, RepositoryException; /** * Creates a new multi valued restriction for the specified parameters. @@ -75,10 +75,10 @@ public interface RestrictionProvider { * exists for the specified parameters. * @throws RepositoryException If another error occurs. */ - @Nonnull + @NotNull Restriction createRestriction(@Nullable String oakPath, - @Nonnull String oakName, - @Nonnull Value... values) throws AccessControlException, RepositoryException; + @NotNull String oakName, + @NotNull Value... values) throws AccessControlException, RepositoryException; /** * Read the valid restrictions stored in the specified ACE tree. @@ -90,8 +90,8 @@ public interface RestrictionProvider { * @return The valid restrictions stored with the specified tree or an * empty set. */ - @Nonnull - Set<Restriction> readRestrictions(@Nullable String oakPath, @Nonnull Tree aceTree); + @NotNull + Set<Restriction> readRestrictions(@Nullable String oakPath, @NotNull Tree aceTree); /** * Writes the given restrictions to the specified ACE tree. Note, that this @@ -118,7 +118,7 @@ public interface RestrictionProvider { * @throws AccessControlException If any invalid restrictions are detected. * @throws RepositoryException If another error occurs. */ - void validateRestrictions(@Nullable String oakPath, @Nonnull Tree aceTree) throws AccessControlException, RepositoryException; + void validateRestrictions(@Nullable String oakPath, @NotNull Tree aceTree) throws AccessControlException, RepositoryException; /** * Creates the {@link RestrictionPattern} for the restriction information @@ -130,8 +130,8 @@ public interface RestrictionProvider { * @return A new {@link RestrictionPattern} representing the restriction * information present with the given tree. */ - @Nonnull - RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree); + @NotNull + RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree); /** * Creates the {@link RestrictionPattern} for the specified restrictions. @@ -144,8 +144,8 @@ public interface RestrictionProvider { * @return A new {@link RestrictionPattern} representing those restrictions * of the specified set that are supported by this implementation. */ - @Nonnull - RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions); + @NotNull + RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions); /** * Empty restriction provider implementation that doesn't support any @@ -153,27 +153,27 @@ public interface RestrictionProvider { */ RestrictionProvider EMPTY = new RestrictionProvider() { - @Nonnull + @NotNull @Override public Set<RestrictionDefinition> getSupportedRestrictions(@Nullable String oakPath) { return Collections.emptySet(); } - @Nonnull + @NotNull @Override - public Restriction createRestriction(@Nullable String oakPath, @Nonnull String oakName, @Nonnull Value value) throws AccessControlException, RepositoryException { + public Restriction createRestriction(@Nullable String oakPath, @NotNull String oakName, @NotNull Value value) throws AccessControlException, RepositoryException { throw new AccessControlException("This implementation doesn't support any restrictions"); } - @Nonnull + @NotNull @Override - public Restriction createRestriction(@Nullable String oakPath, @Nonnull String oakName, @Nonnull Value... values) throws AccessControlException, RepositoryException { + public Restriction createRestriction(@Nullable String oakPath, @NotNull String oakName, @NotNull Value... values) throws AccessControlException, RepositoryException { throw new AccessControlException("This implementation doesn't support any restrictions"); } - @Nonnull + @NotNull @Override - public Set<Restriction> readRestrictions(@Nullable String oakPath, @Nonnull Tree aceTree) { + public Set<Restriction> readRestrictions(@Nullable String oakPath, @NotNull Tree aceTree) { return Collections.emptySet(); } @@ -183,19 +183,19 @@ public interface RestrictionProvider { } @Override - public void validateRestrictions(@Nullable String oakPath, @Nonnull Tree aceTree) { + public void validateRestrictions(@Nullable String oakPath, @NotNull Tree aceTree) { // nothing to do } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Tree tree) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Tree tree) { return RestrictionPattern.EMPTY; } - @Nonnull + @NotNull @Override - public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) { + public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { return RestrictionPattern.EMPTY; } }; Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/package-info.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/package-info.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/package-info.java Wed Jul 18 14:58:59 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("1.1") +@Version("1.1.1") package org.apache.jackrabbit.oak.spi.security.authorization.restriction; import org.osgi.annotation.versioning.Version; Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/package-info.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/package-info.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/package-info.java Wed Jul 18 14:58:59 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("2.2.0") +@Version("2.2.1") package org.apache.jackrabbit.oak.spi.security; import org.osgi.annotation.versioning.Version; Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfiguration.java Wed Jul 18 14:58:59 2018 @@ -18,13 +18,12 @@ package org.apache.jackrabbit.oak.spi.se import java.util.ArrayList; import java.util.List; -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; import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; +import org.jetbrains.annotations.NotNull; /** * {@link PrincipalConfiguration} that combines different principal provider @@ -36,17 +35,17 @@ public class CompositePrincipalConfigura super(PrincipalConfiguration.NAME); } - public CompositePrincipalConfiguration(@Nonnull SecurityProvider securityProvider) { + public CompositePrincipalConfiguration(@NotNull SecurityProvider securityProvider) { super(PrincipalConfiguration.NAME, securityProvider); } - @Nonnull + @NotNull @Override public PrincipalManager getPrincipalManager(Root root, NamePathMapper namePathMapper) { return new PrincipalManagerImpl(getPrincipalProvider(root, namePathMapper)); } - @Nonnull + @NotNull @Override public PrincipalProvider getPrincipalProvider(final Root root, final NamePathMapper namePathMapper) { List<PrincipalConfiguration> configurations = getConfigurations(); Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java Wed Jul 18 14:58:59 2018 @@ -23,13 +23,13 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.Iterators; import static com.google.common.base.Preconditions.checkNotNull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + /** * {@code PrincipalProvider} implementation that aggregates a list of principal * providers into a single. @@ -42,7 +42,7 @@ public class CompositePrincipalProvider this.providers = checkNotNull(providers); } - public static PrincipalProvider of(@Nonnull List<PrincipalProvider> providers) { + public static PrincipalProvider of(@NotNull List<PrincipalProvider> providers) { PrincipalProvider pp; switch (providers.size()) { case 0 : @@ -59,7 +59,7 @@ public class CompositePrincipalProvider //--------------------------------------------------< PrincipalProvider >--- @Override - public Principal getPrincipal(@Nonnull String principalName) { + public Principal getPrincipal(@NotNull String principalName) { Principal principal = null; for (int i = 0; i < providers.size() && principal == null; i++) { principal = providers.get(i).getPrincipal(principalName); @@ -68,15 +68,15 @@ public class CompositePrincipalProvider return principal; } - @Nonnull + @NotNull @Override - public Set<Group> getGroupMembership(@Nonnull Principal principal) { + public Set<Group> getGroupMembership(@NotNull Principal principal) { return Collections.emptySet(); } - @Nonnull + @NotNull @Override - public Set<Principal> getMembershipPrincipals(@Nonnull Principal principal) { + public Set<Principal> getMembershipPrincipals(@NotNull Principal principal) { Set<Principal> groups = new HashSet<>(); for (PrincipalProvider provider : providers) { groups.addAll(provider.getMembershipPrincipals(principal)); @@ -84,9 +84,9 @@ public class CompositePrincipalProvider return groups; } - @Nonnull + @NotNull @Override - public Set<Principal> getPrincipals(@Nonnull String userID) { + public Set<Principal> getPrincipals(@NotNull String userID) { Set<Principal> principals = new HashSet<Principal>(); for (PrincipalProvider provider : providers) { principals.addAll(provider.getPrincipals(userID)); @@ -94,7 +94,7 @@ public class CompositePrincipalProvider return principals; } - @Nonnull + @NotNull @Override public Iterator<Principal> findPrincipals(@Nullable String nameHint, int searchType) { Iterator<? extends Principal>[] iterators = new Iterator[providers.size()]; @@ -109,9 +109,9 @@ public class CompositePrincipalProvider return Iterators.concat(iterators); } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(int searchType) { return findPrincipals(null, searchType); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java Wed Jul 18 14:58:59 2018 @@ -21,8 +21,8 @@ import java.security.acl.Group; import java.util.Collections; import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Implementation of the {@code PrincipalProvider} interface that never @@ -35,37 +35,37 @@ public final class EmptyPrincipalProvide private EmptyPrincipalProvider() {} @Override - public Principal getPrincipal(@Nonnull String principalName) { + public Principal getPrincipal(@NotNull String principalName) { return null; } - @Nonnull + @NotNull @Override - public Set<Group> getGroupMembership(@Nonnull Principal principal) { + public Set<Group> getGroupMembership(@NotNull Principal principal) { return Collections.emptySet(); } - @Nonnull + @NotNull @Override - public Set<Principal> getMembershipPrincipals(@Nonnull Principal principal) { + public Set<Principal> getMembershipPrincipals(@NotNull Principal principal) { return Collections.emptySet(); } - @Nonnull + @NotNull @Override - public Set<? extends Principal> getPrincipals(@Nonnull String userID) { + public Set<? extends Principal> getPrincipals(@NotNull String userID) { return Collections.emptySet(); } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, int searchType) { return Collections.emptyIterator(); } - @Nonnull + @NotNull @Override public Iterator<? extends Principal> findPrincipals(int searchType) { return Collections.emptyIterator(); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalWrapper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalWrapper.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalWrapper.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalWrapper.java Wed Jul 18 14:58:59 2018 @@ -20,16 +20,15 @@ import java.security.Principal; import java.security.acl.Group; import java.util.Enumeration; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.api.security.principal.GroupPrincipal; +import org.jetbrains.annotations.NotNull; @Deprecated class GroupPrincipalWrapper extends PrincipalImpl implements GroupPrincipal { private final Group group; - GroupPrincipalWrapper(@Nonnull Group group) { + GroupPrincipalWrapper(@NotNull Group group) { super(group.getName()); this.group = group; } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java Wed Jul 18 14:58:59 2018 @@ -23,9 +23,8 @@ import java.util.Enumeration; import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.api.security.principal.GroupPrincipal; +import org.jetbrains.annotations.NotNull; import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; @@ -50,7 +49,7 @@ public final class GroupPrincipals { * * @return true if the principal is of type group. */ - public static boolean isGroup(@Nonnull Principal principal) { + public static boolean isGroup(@NotNull Principal principal) { return principal instanceof Group || principal instanceof GroupPrincipal; } @@ -59,7 +58,7 @@ public final class GroupPrincipals { * @param principal the principal whose membership is listed. * @return an enumeration of the group members. */ - public static Enumeration<? extends Principal> members(@Nonnull Principal principal) { + public static Enumeration<? extends Principal> members(@NotNull Principal principal) { if (principal instanceof Group) { return ((Group) principal).members(); } @@ -75,7 +74,7 @@ public final class GroupPrincipals { * @param member the principal whose membership is to be checked. * @return true if the principal is a member of this group, false otherwise. */ - public static boolean isMember(@Nonnull Principal principal, @Nonnull Principal member) { + public static boolean isMember(@NotNull Principal principal, @NotNull Principal member) { if (principal instanceof Group) { return ((Group) principal).isMember(member); } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalConfiguration.java Wed Jul 18 14:58:59 2018 @@ -16,12 +16,11 @@ */ package org.apache.jackrabbit.oak.spi.security.principal; -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; import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration; +import org.jetbrains.annotations.NotNull; /** * Configuration interface for principal management. @@ -40,7 +39,7 @@ public interface PrincipalConfiguration * @return An instance of {@link PrincipalManager}. * @see org.apache.jackrabbit.api.JackrabbitSession#getPrincipalManager() */ - @Nonnull + @NotNull PrincipalManager getPrincipalManager(Root root, NamePathMapper namePathMapper); /** @@ -68,6 +67,6 @@ public interface PrincipalConfiguration * @param namePathMapper The {@code NamePathMapper} to be used. * @return An instance of {@link PrincipalProvider}. */ - @Nonnull + @NotNull PrincipalProvider getPrincipalProvider(Root root, NamePathMapper namePathMapper); } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java Wed Jul 18 14:58:59 2018 @@ -17,12 +17,10 @@ package org.apache.jackrabbit.oak.spi.security.principal; import java.security.Principal; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.api.security.principal.PrincipalIterator; import org.apache.jackrabbit.api.security.principal.PrincipalManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Default implementation of the {@code PrincipalManager} interface. @@ -31,48 +29,48 @@ public class PrincipalManagerImpl implem private final PrincipalProvider principalProvider; - public PrincipalManagerImpl(@Nonnull PrincipalProvider principalProvider) { + public PrincipalManagerImpl(@NotNull PrincipalProvider principalProvider) { this.principalProvider = principalProvider; } //---------------------------------------------------< PrincipalManager >--- @Override - public boolean hasPrincipal(@Nonnull String principalName) { + public boolean hasPrincipal(@NotNull String principalName) { return principalProvider.getPrincipal(principalName) != null; } @Override - @CheckForNull - public Principal getPrincipal(@Nonnull String principalName) { + @Nullable + public Principal getPrincipal(@NotNull String principalName) { return principalProvider.getPrincipal(principalName); } @Override - @Nonnull + @NotNull public PrincipalIterator findPrincipals(@Nullable String simpleFilter) { return findPrincipals(simpleFilter, PrincipalManager.SEARCH_TYPE_ALL); } @Override - @Nonnull + @NotNull public PrincipalIterator findPrincipals(@Nullable String simpleFilter, int searchType) { return new PrincipalIteratorAdapter(principalProvider.findPrincipals(simpleFilter, searchType)); } @Override - @Nonnull + @NotNull public PrincipalIterator getPrincipals(int searchType) { return new PrincipalIteratorAdapter(principalProvider.findPrincipals(searchType)); } @Override - @Nonnull - public PrincipalIterator getGroupMembership(@Nonnull Principal principal) { + @NotNull + public PrincipalIterator getGroupMembership(@NotNull Principal principal) { return new PrincipalIteratorAdapter(principalProvider.getMembershipPrincipals(principal)); } @Override - @Nonnull + @NotNull public Principal getEveryone() { Principal everyone = getPrincipal(EveryonePrincipal.NAME); if (everyone == null) { @@ -80,4 +78,4 @@ public class PrincipalManagerImpl implem } return everyone; } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java Wed Jul 18 14:58:59 2018 @@ -21,10 +21,8 @@ import java.security.acl.Group; import java.util.Collections; import java.util.Iterator; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.osgi.annotation.versioning.ProviderType; /** @@ -50,8 +48,8 @@ public interface PrincipalProvider { * @param principalName the name of the principal to retrieve * @return return the requested principal or {@code null} */ - @CheckForNull - Principal getPrincipal(@Nonnull String principalName); + @Nullable + Principal getPrincipal(@NotNull String principalName); /** * Returns an iterator over all group principals for which the given @@ -68,8 +66,8 @@ public interface PrincipalProvider { * @return an iterator returning all groups the given principal is member of. * @see java.security.acl.Group#isMember(java.security.Principal) */ - @Nonnull - default Set<Group> getGroupMembership(@Nonnull Principal principal) { + @NotNull + default Set<Group> getGroupMembership(@NotNull Principal principal) { return Collections.emptySet(); } @@ -87,8 +85,8 @@ public interface PrincipalProvider { * @return an iterator returning all groups the given principal is member of. * @see org.apache.jackrabbit.api.security.principal.GroupPrincipal#isMember(java.security.Principal) */ - @Nonnull - default Set<Principal> getMembershipPrincipals(@Nonnull Principal principal) { + @NotNull + default Set<Principal> getMembershipPrincipals(@NotNull Principal principal) { return GroupPrincipals.transform(getGroupMembership(principal)); } @@ -101,8 +99,8 @@ public interface PrincipalProvider { * @return The set of principals associated with the specified {@code userID} * or an empty set if it cannot be resolved. */ - @Nonnull - Set<? extends Principal> getPrincipals(@Nonnull String userID); + @NotNull + Set<? extends Principal> getPrincipals(@NotNull String userID); /** * Find the principals that match the specified nameHint and search type. @@ -115,7 +113,7 @@ public interface PrincipalProvider { * <ul><li>{@link org.apache.jackrabbit.api.security.principal.PrincipalManager#SEARCH_TYPE_GROUP}</li></ul> * @return An iterator of principals. */ - @Nonnull + @NotNull Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, int searchType); @@ -129,6 +127,6 @@ public interface PrincipalProvider { * <ul><li>{@link org.apache.jackrabbit.api.security.principal.PrincipalManager#SEARCH_TYPE_GROUP}</li></ul> * @return An iterator of principals. */ - @Nonnull + @NotNull Iterator<? extends Principal> findPrincipals(int searchType); -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinition.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinition.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinition.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinition.java Wed Jul 18 14:58:59 2018 @@ -17,11 +17,11 @@ package org.apache.jackrabbit.oak.spi.security.privilege; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; +import org.jetbrains.annotations.NotNull; + /** * Default implementation of the {@code PrivilegeDefinition} interface. */ @@ -44,7 +44,7 @@ public final class ImmutablePrivilegeDef } //------------------------------------------------< PrivilegeDefinition >--- - @Nonnull + @NotNull @Override public String getName() { return name; @@ -55,7 +55,7 @@ public final class ImmutablePrivilegeDef return isAbstract; } - @Nonnull + @NotNull @Override public Set<String> getDeclaredAggregateNames() { return declaredAggregateNames; @@ -86,4 +86,4 @@ public final class ImmutablePrivilegeDef public String toString() { return "PrivilegeDefinition: " + name; } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java Wed Jul 18 14:58:59 2018 @@ -19,15 +19,14 @@ package org.apache.jackrabbit.oak.spi.se import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.primitives.Longs; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.base.Preconditions.checkArgument; @@ -124,8 +123,8 @@ public final class PrivilegeBits impleme * @param base The base for this mutable instance. * @return a new instance of privilege bits. */ - @Nonnull - public static PrivilegeBits getInstance(@Nonnull PrivilegeBits... base) { + @NotNull + public static PrivilegeBits getInstance(@NotNull PrivilegeBits... base) { PrivilegeBits bts = getInstance(); for (PrivilegeBits baseBits : base) { bts.add(baseBits); @@ -140,7 +139,7 @@ public final class PrivilegeBits impleme * @param property The property state storing privilege bits information. * @return an instance of {@code PrivilegeBits} */ - @Nonnull + @NotNull public static PrivilegeBits getInstance(@Nullable PropertyState property) { if (property == null) { return EMPTY; @@ -164,7 +163,7 @@ public final class PrivilegeBits impleme * @param tree A privilege definition tree or the privileges root. * @return an instance of {@code PrivilegeBits} */ - @Nonnull + @NotNull public static PrivilegeBits getInstance(@Nullable Tree tree) { if (tree == null) { return EMPTY; @@ -186,7 +185,7 @@ public final class PrivilegeBits impleme * @param bits A long value. * @return an instance of {@code PrivilegeBits} */ - @Nonnull + @NotNull private static PrivilegeBits getInstance(long bits) { if (bits == NO_PRIVILEGE) { return EMPTY; @@ -202,7 +201,7 @@ public final class PrivilegeBits impleme * @param bits A long array. * @return an instance of {@code PrivilegeBits} */ - @Nonnull + @NotNull private static PrivilegeBits getInstance(long[] bits) { return new PrivilegeBits(new UnmodifiableData(bits)); } @@ -220,8 +219,8 @@ public final class PrivilegeBits impleme * otherwise. * @return the resulting permissions. */ - public static long calculatePermissions(@Nonnull PrivilegeBits bits, - @Nonnull PrivilegeBits parentBits, + public static long calculatePermissions(@NotNull PrivilegeBits bits, + @NotNull PrivilegeBits parentBits, boolean isAllow) { long privs = bits.d.longValue(); long parentPrivs = parentBits.d.longValue(); @@ -339,7 +338,7 @@ public final class PrivilegeBits impleme * * @return an unmodifiable {@code PrivilegeBits} instance. */ - @Nonnull + @NotNull public PrivilegeBits unmodifiable() { if (d instanceof ModifiableData) { if (d.isSimple()) { @@ -355,7 +354,7 @@ public final class PrivilegeBits impleme } } - @Nonnull + @NotNull public PrivilegeBits modifiable() { if (d instanceof ModifiableData) { return this; @@ -373,7 +372,7 @@ public final class PrivilegeBits impleme * {@code otherBits} are included in this instance; {@code false} * otherwise. */ - public boolean includes(@Nonnull PrivilegeBits otherBits) { + public boolean includes(@NotNull PrivilegeBits otherBits) { return d.includes(otherBits.d); } @@ -384,8 +383,8 @@ public final class PrivilegeBits impleme * @return The updated instance. * @throws UnsupportedOperationException if this instance is immutable. */ - @Nonnull - public PrivilegeBits add(@Nonnull PrivilegeBits other) { + @NotNull + public PrivilegeBits add(@NotNull PrivilegeBits other) { if (d instanceof ModifiableData) { ((ModifiableData) d).add(other.d); return this; @@ -404,8 +403,8 @@ public final class PrivilegeBits impleme * @return The updated instance. * @throws UnsupportedOperationException if this instance is immutable. */ - @Nonnull - public PrivilegeBits diff(@Nonnull PrivilegeBits other) { + @NotNull + public PrivilegeBits diff(@NotNull PrivilegeBits other) { if (d instanceof ModifiableData) { ((ModifiableData) d).diff(other.d); return this; @@ -423,8 +422,8 @@ public final class PrivilegeBits impleme * @return The updated instance. * @throws UnsupportedOperationException if this instance is immutable. */ - @Nonnull - public PrivilegeBits addDifference(@Nonnull PrivilegeBits a, @Nonnull PrivilegeBits b) { + @NotNull + public PrivilegeBits addDifference(@NotNull PrivilegeBits a, @NotNull PrivilegeBits b) { if (d instanceof ModifiableData) { ((ModifiableData) d).addDifference(a.d, b.d); return this; @@ -441,8 +440,8 @@ public final class PrivilegeBits impleme * @return This modifiable instance of privilege bits modified such it contains * only privileges that were also contained in the {@code other} instance. */ - @Nonnull - public PrivilegeBits retain(@Nonnull PrivilegeBits other) { + @NotNull + public PrivilegeBits retain(@NotNull PrivilegeBits other) { if (d instanceof ModifiableData) { ((ModifiableData) d).retain(other.d); return this; @@ -451,7 +450,7 @@ public final class PrivilegeBits impleme } } - @Nonnull + @NotNull public PropertyState asPropertyState(String name) { return PropertyStates.createProperty(name, Longs.asList(d.longValues()), Type.LONGS); } @@ -461,7 +460,7 @@ public final class PrivilegeBits impleme * * @return an new instance of {@code PrivilegeBits} */ - @Nonnull + @NotNull public PrivilegeBits nextBits() { if (this == EMPTY) { return EMPTY; @@ -475,7 +474,7 @@ public final class PrivilegeBits impleme * * @param tree The target tree. */ - public void writeTo(@Nonnull Tree tree) { + public void writeTo(@NotNull Tree tree) { String name = (REP_PRIVILEGES.equals(tree.getName())) ? REP_NEXT : REP_BITS; tree.setProperty(asPropertyState(name)); } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java Wed Jul 18 14:58:59 2018 @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import javax.jcr.security.Privilege; @@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.api.Roo import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NameMapper; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,7 +63,7 @@ public final class PrivilegeBitsProvider * * @return The privileges root. */ - @Nonnull + @NotNull public Tree getPrivilegesTree() { return PrivilegeUtil.getPrivilegesTree(root); } @@ -73,8 +73,8 @@ public final class PrivilegeBitsProvider * @param privilegeNames the names * @return the privilege bits */ - @Nonnull - public PrivilegeBits getBits(@Nonnull String... privilegeNames) { + @NotNull + public PrivilegeBits getBits(@NotNull String... privilegeNames) { if (privilegeNames.length == 0) { return PrivilegeBits.EMPTY; } else { @@ -87,8 +87,8 @@ public final class PrivilegeBitsProvider * @param privilegeNames the names * @return the privilege bits */ - @Nonnull - public PrivilegeBits getBits(@Nonnull Iterable<String> privilegeNames) { + @NotNull + public PrivilegeBits getBits(@NotNull Iterable<String> privilegeNames) { if (Iterables.isEmpty(privilegeNames)) { return PrivilegeBits.EMPTY; } @@ -121,8 +121,8 @@ public final class PrivilegeBitsProvider * @param nameMapper the name mapper * @return the privilege bits */ - @Nonnull - public PrivilegeBits getBits(@Nonnull Privilege[] privileges, @Nonnull final NameMapper nameMapper) { + @NotNull + public PrivilegeBits getBits(@NotNull Privilege[] privileges, @NotNull final NameMapper nameMapper) { return getBits(Iterables.filter(Iterables.transform(Arrays.asList(privileges), new Function<Privilege, String>() { @Override @@ -148,7 +148,7 @@ public final class PrivilegeBitsProvider * bits. Any bits that don't have a corresponding privilege definition will * be ignored. */ - @Nonnull + @NotNull public Set<String> getPrivilegeNames(PrivilegeBits privilegeBits) { if (privilegeBits == null || privilegeBits.isEmpty()) { return Collections.emptySet(); @@ -200,8 +200,8 @@ public final class PrivilegeBitsProvider * @return The names of the non-aggregate privileges that correspond to the * given {@code privilegeNames}. */ - @Nonnull - public Iterable<String> getAggregatedPrivilegeNames(@Nonnull String... privilegeNames) { + @NotNull + public Iterable<String> getAggregatedPrivilegeNames(@NotNull String... privilegeNames) { if (privilegeNames.length == 0) { return Collections.emptySet(); } else if (privilegeNames.length == 1) { @@ -227,11 +227,11 @@ public final class PrivilegeBitsProvider } } - private Iterable<String> extractAggregatedPrivileges(@Nonnull Iterable<String> privilegeNames) { + private Iterable<String> extractAggregatedPrivileges(@NotNull Iterable<String> privilegeNames) { return FluentIterable.from(privilegeNames).transformAndConcat(new ExtractAggregatedPrivileges()); } - private Set<String> resolveBuiltInAggregation(@Nonnull String privilegeName) { + private Set<String> resolveBuiltInAggregation(@NotNull String privilegeName) { ImmutableSet.Builder<String> builder = ImmutableSet.builder(); for (String name : AGGREGATE_PRIVILEGES.get(privilegeName)) { if (!AGGREGATE_PRIVILEGES.containsKey(name)) { @@ -246,7 +246,7 @@ public final class PrivilegeBitsProvider } private final class ExtractAggregatedPrivileges implements Function<String, Iterable<String>> { - @Nonnull + @NotNull @Override public Iterable<String> apply(@Nullable String privName) { if (privName == null) { @@ -271,7 +271,7 @@ public final class PrivilegeBitsProvider } } - private void fillAggregation(@Nonnull Tree privTree, @Nonnull ImmutableSet.Builder<String> builder) { + private void fillAggregation(@NotNull Tree privTree, @NotNull ImmutableSet.Builder<String> builder) { if (!privTree.exists()) { return; } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeConfiguration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeConfiguration.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeConfiguration.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeConfiguration.java Wed Jul 18 14:58:59 2018 @@ -16,12 +16,11 @@ */ package org.apache.jackrabbit.oak.spi.security.privilege; -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; import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration; +import org.jetbrains.annotations.NotNull; /** * Interface for the privilege management configuration. @@ -37,6 +36,6 @@ public interface PrivilegeConfiguration * @param namePathMapper The name and path mapper to be used. * @return A new {@code PrivilegeManager}. */ - @Nonnull + @NotNull PrivilegeManager getPrivilegeManager(Root root, NamePathMapper namePathMapper); } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeDefinition.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeDefinition.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeDefinition.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeDefinition.java Wed Jul 18 14:58:59 2018 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.spi.security.privilege; import java.util.Set; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; /** * The {@code PrivilegeDefinition} interface defines the characteristics of @@ -30,7 +30,7 @@ public interface PrivilegeDefinition { * * @return the internal name. */ - @Nonnull + @NotNull String getName(); /** @@ -49,6 +49,6 @@ public interface PrivilegeDefinition { * * @return The internal names of the aggregated privileges or an empty array. */ - @Nonnull + @NotNull Set<String> getDeclaredAggregateNames(); -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeUtil.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeUtil.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeUtil.java Wed Jul 18 14:58:59 2018 @@ -16,13 +16,12 @@ */ package org.apache.jackrabbit.oak.spi.security.privilege; -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.api.Type; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; /** * Privilege management related utility methods. @@ -37,7 +36,7 @@ public final class PrivilegeUtil impleme * * @return The privileges root. */ - @Nonnull + @NotNull public static Tree getPrivilegesTree(Root root) { return root.getTree(PRIVILEGES_PATH); } @@ -50,8 +49,8 @@ public final class PrivilegeUtil impleme * @param definitionTree An existing tree storing a privilege definition. * @return A new instance of {@code PrivilegeDefinition}. */ - @Nonnull - public static PrivilegeDefinition readDefinition(@Nonnull Tree definitionTree) { + @NotNull + public static PrivilegeDefinition readDefinition(@NotNull Tree definitionTree) { String name = definitionTree.getName(); boolean isAbstract = TreeUtil.getBoolean(definitionTree, REP_IS_ABSTRACT); Iterable<String> declAggrNames = null; @@ -61,4 +60,4 @@ public final class PrivilegeUtil impleme } return new ImmutablePrivilegeDefinition(name, isAbstract, declAggrNames); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/package-info.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/package-info.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/package-info.java Wed Jul 18 14:58:59 2018 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@Version("1.2.0") +@Version("1.2.1") package org.apache.jackrabbit.oak.spi.security.privilege; import org.osgi.annotation.versioning.Version; Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableNodeName.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableNodeName.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableNodeName.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableNodeName.java Wed Jul 18 14:58:59 2018 @@ -16,9 +16,8 @@ */ package org.apache.jackrabbit.oak.spi.security.user; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; /** * The {@code AuthorizableNodeName} is in charge of generating a valid node @@ -41,8 +40,8 @@ public interface AuthorizableNodeName { * @param authorizableId The ID of the authorizable to be created. * @return A valid node name. */ - @Nonnull - String generateNodeName(@Nonnull String authorizableId); + @NotNull + String generateNodeName(@NotNull String authorizableId); /** * Default implementation of the {@code AuthorizableNodeName} interface @@ -53,9 +52,9 @@ public interface AuthorizableNodeName { final class Default implements AuthorizableNodeName { @Override - @Nonnull - public String generateNodeName(@Nonnull String authorizableId) { + @NotNull + public String generateNodeName(@NotNull String authorizableId) { return Text.escapeIllegalJcrChars(authorizableId); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableType.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableType.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableType.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableType.java Wed Jul 18 14:58:59 2018 @@ -18,12 +18,11 @@ */ package org.apache.jackrabbit.oak.spi.security.user; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.Group; import org.apache.jackrabbit.api.security.user.User; import org.apache.jackrabbit.api.security.user.UserManager; +import org.jetbrains.annotations.NotNull; /** * The different authorizable types. @@ -40,7 +39,7 @@ public enum AuthorizableType { this.userType = jcrUserType; } - @Nonnull + @NotNull public static AuthorizableType getType(int jcrUserType) { switch (jcrUserType) { case UserManager.SEARCH_TYPE_AUTHORIZABLE: Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserAuthenticationFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserAuthenticationFactory.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserAuthenticationFactory.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserAuthenticationFactory.java Wed Jul 18 14:58:59 2018 @@ -18,10 +18,8 @@ package org.apache.jackrabbit.oak.spi.se import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.spi.security.authentication.Authentication; - -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Provides a user management specific implementation of the @@ -43,6 +41,6 @@ public interface UserAuthenticationFacto * {@code userId} or {@code null} if this implementation cannot not handle the * specified parameters. */ - @CheckForNull - Authentication getAuthentication(@Nonnull UserConfiguration configuration, @Nonnull Root root, @Nullable String userId); + @Nullable + Authentication getAuthentication(@NotNull UserConfiguration configuration, @NotNull Root root, @Nullable String userId); } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java Wed Jul 18 14:58:59 2018 @@ -16,14 +16,13 @@ */ package org.apache.jackrabbit.oak.spi.security.user; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Configuration interface for user management. @@ -39,7 +38,7 @@ public interface UserConfiguration exten * @param namePathMapper A name path mapper used for conversion of jcr/oak names/paths. * @return a new instance of {@code UserManager} */ - @Nonnull + @NotNull UserManager getUserManager(Root root, NamePathMapper namePathMapper); /** @@ -63,5 +62,5 @@ public interface UserConfiguration exten * @see org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration */ @Nullable - PrincipalProvider getUserPrincipalProvider(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper); + PrincipalProvider getUserPrincipalProvider(@NotNull Root root, @NotNull NamePathMapper namePathMapper); } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java Wed Jul 18 14:58:59 2018 @@ -16,9 +16,10 @@ */ package org.apache.jackrabbit.oak.spi.security.user; -import javax.annotation.Nonnull; import javax.jcr.Credentials; +import org.jetbrains.annotations.NotNull; + /** * Credentials implementation that only contains a {@code userId} but no password. * It can be used for {@link org.apache.jackrabbit.api.security.user.User#getCredentials()}, @@ -28,13 +29,13 @@ public final class UserIdCredentials imp private final String userId; - public UserIdCredentials(@Nonnull String userId) { + public UserIdCredentials(@NotNull String userId) { this.userId = userId; } - @Nonnull + @NotNull public String getUserId() { return userId; } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AbstractAuthorizableAction.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AbstractAuthorizableAction.java?rev=1836190&r1=1836189&r2=1836190&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AbstractAuthorizableAction.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AbstractAuthorizableAction.java Wed Jul 18 14:58:59 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.spi.security.user.action; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.RepositoryException; import org.apache.jackrabbit.api.security.user.Authorizable; @@ -27,6 +25,8 @@ import org.apache.jackrabbit.oak.api.Roo import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Abstract implementation of the {@code AuthorizableAction} interface that @@ -48,7 +48,7 @@ public abstract class AbstractAuthorizab * Doesn't perform any action. */ @Override - public void onCreate(@Nonnull Group group, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onCreate(@NotNull Group group, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { // nothing to do } @@ -56,7 +56,7 @@ public abstract class AbstractAuthorizab * Doesn't perform any action. */ @Override - public void onCreate(@Nonnull User user, @Nullable String password, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onCreate(@NotNull User user, @Nullable String password, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { // nothing to do } @@ -64,7 +64,7 @@ public abstract class AbstractAuthorizab * Doesn't perform any action. */ @Override - public void onRemove(@Nonnull Authorizable authorizable, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onRemove(@NotNull Authorizable authorizable, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { // nothing to do } @@ -72,7 +72,7 @@ public abstract class AbstractAuthorizab * Doesn't perform any action. */ @Override - public void onPasswordChange(@Nonnull User user, @Nullable String newPassword, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException { + public void onPasswordChange(@NotNull User user, @Nullable String newPassword, @NotNull Root root, @NotNull NamePathMapper namePathMapper) throws RepositoryException { // nothing to do } }
