Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java Wed Nov 7 13:57:55 2018 @@ -19,14 +19,13 @@ package org.apache.jackrabbit.oak.query; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * An instance of this class provides the context for the execution of a query, @@ -65,7 +64,7 @@ public class ExecutionContext { * * @return base state of the content tree against which the query runs. */ - @Nonnull + @NotNull public NodeState getBaseState() { return baseState; } @@ -85,7 +84,7 @@ public class ExecutionContext { * * @return root of the content tree against which the query runs. */ - @Nonnull + @NotNull public Root getRoot() { return root; } @@ -94,7 +93,7 @@ public class ExecutionContext { * @return Index provider for indexes matching the state of the content tree as * returned from {@link #getBaseState()}. */ - @Nonnull + @NotNull public QueryIndexProvider getIndexProvider() { return indexProvider; } @@ -103,7 +102,7 @@ public class ExecutionContext { return settings; } - @CheckForNull + @Nullable public PermissionProvider getPermissionProvider() { return permissionProvider; }
Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java Wed Nov 7 13:57:55 2018 @@ -16,9 +16,8 @@ package org.apache.jackrabbit.oak.query; import java.util.Iterator; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.osgi.annotation.versioning.ProviderType; import org.apache.jackrabbit.oak.api.PropertyValue; @@ -139,7 +138,7 @@ public interface Query { * @return {@code this} if no conversions are possible or a new instance of * a {@link Query}. Cannot return null. */ - @Nonnull + @NotNull Query buildAlternativeQuery(); /** Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java Wed Nov 7 13:57:55 2018 @@ -27,8 +27,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.api.QueryEngine; import org.apache.jackrabbit.oak.api.Result; @@ -38,6 +36,7 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider; import org.apache.jackrabbit.oak.query.stats.QueryStatsData.QueryExecutionStats; import org.apache.jackrabbit.oak.query.xpath.XPathToSQL2Converter; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -293,8 +292,8 @@ public abstract class QueryEngineImpl im * If there are multiple, the first one is the original, and the second the alternative. * @return the query */ - @Nonnull - private Query prepareAndSelect(@Nonnull List<Query> queries) { + @NotNull + private Query prepareAndSelect(@NotNull List<Query> queries) { Query result = null; if (checkNotNull(queries).size() == 1) { @@ -380,7 +379,7 @@ public abstract class QueryEngineImpl im * * @param querySelectionMode cannot be null */ - protected void setQuerySelectionMode(@Nonnull QuerySelectionMode querySelectionMode) { + protected void setQuerySelectionMode(@NotNull QuerySelectionMode querySelectionMode) { this.querySelectionMode = querySelectionMode; } } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java Wed Nov 7 13:57:55 2018 @@ -29,8 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.api.Result.SizePrecision; import org.apache.jackrabbit.oak.api.Tree; @@ -94,6 +92,7 @@ import org.apache.jackrabbit.oak.spi.que import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1341,7 +1340,7 @@ public class QueryImpl implements Query return result; } - private static String recomposeStatement(@Nonnull QueryImpl query) { + private static String recomposeStatement(@NotNull QueryImpl query) { checkNotNull(query); String original = query.getStatement(); String origUpper = original.toUpperCase(); @@ -1369,7 +1368,7 @@ public class QueryImpl implements Query * @param right the second subquery * @return the union query */ - private UnionQueryImpl newAlternativeUnionQuery(@Nonnull Query left, @Nonnull Query right) { + private UnionQueryImpl newAlternativeUnionQuery(@NotNull Query left, @NotNull Query right) { UnionQueryImpl u = new UnionQueryImpl( false, checkNotNull(left, "`left` cannot be null"), Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ValueConverter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ValueConverter.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ValueConverter.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ValueConverter.java Wed Nov 7 13:57:55 2018 @@ -17,9 +17,6 @@ package org.apache.jackrabbit.oak.query; import java.net.URI; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PropertyType; import org.apache.jackrabbit.oak.api.Blob; @@ -27,6 +24,8 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -88,7 +87,7 @@ public class ValueConverter { * @return the converted value * @throws IllegalArgumentException if mapping is illegal */ - public static PropertyValue convert(@Nonnull PropertyValue value, int targetType, @Nullable NamePathMapper mapper) { + public static PropertyValue convert(@NotNull PropertyValue value, int targetType, @Nullable NamePathMapper mapper) { int sourceType = value.getType().tag(); if (sourceType == targetType) { return value; @@ -191,7 +190,7 @@ public class ValueConverter { PropertyType.nameFromValue(targetType)); } - private static String getOakPath(@Nonnull String jcrPath, @CheckForNull NamePathMapper mapper) { + private static String getOakPath(@NotNull String jcrPath, @Nullable NamePathMapper mapper) { if (mapper == null) { // to simplify testing, a getNamePathMapper isn't required return jcrPath; @@ -203,4 +202,4 @@ public class ValueConverter { } return p; } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElement.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElement.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElement.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElement.java Wed Nov 7 13:57:55 2018 @@ -18,12 +18,11 @@ */ package org.apache.jackrabbit.oak.query.ast; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.query.QueryImpl; import org.apache.jackrabbit.oak.query.ValueConverter; +import org.jetbrains.annotations.NotNull; /** * The base class for all abstract syntax tree nodes. @@ -152,7 +151,7 @@ abstract class AstElement { * @return a clone of self. Default implementation in {@link AstElement} returns same reference * to {@code this}. */ - @Nonnull + @NotNull public AstElement copyOf() { return this; } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java Wed Nov 7 13:57:55 2018 @@ -17,10 +17,9 @@ import static com.google.common.base.Pre import java.util.ArrayList; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.spi.query.QueryConstants; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -190,8 +189,8 @@ public class AstElementFactory { * @param e the element to be cloned. Cannot be null. * @return same as {@link AstElement#copyOf()} */ - @Nonnull - public static AstElement copyElementAndCheckReference(@Nonnull final AstElement e) { + @NotNull + public static AstElement copyElementAndCheckReference(@NotNull final AstElement e) { AstElement clone = checkNotNull(e).copyOf(); if (clone == e && LOG.isDebugEnabled()) { Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ConstraintImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ConstraintImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ConstraintImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ConstraintImpl.java Wed Nov 7 13:57:55 2018 @@ -19,10 +19,9 @@ package org.apache.jackrabbit.oak.query. import java.util.Collections; import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; import org.apache.jackrabbit.oak.query.index.FilterImpl; +import org.jetbrains.annotations.NotNull; /** * The base class for constraints. @@ -174,7 +173,7 @@ public abstract class ConstraintImpl ext * @return the set of union constraints, if available, or an empty set if * conversion is not possible */ - @Nonnull + @NotNull public Set<ConstraintImpl> convertToUnion() { return Collections.emptySet(); } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java Wed Nov 7 13:57:55 2018 @@ -20,10 +20,9 @@ import static com.google.common.base.Pre import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.query.index.FilterImpl; +import org.jetbrains.annotations.NotNull; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; @@ -61,7 +60,7 @@ public class NotFullTextSearchImpl exten return raw.toString().trim(); } - private static boolean isKeyword(@Nonnull String term) { + private static boolean isKeyword(@NotNull String term) { return KEYWORDS.contains(checkNotNull(term).toLowerCase()); } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java Wed Nov 7 13:57:55 2018 @@ -30,8 +30,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.api.Result.SizePrecision; @@ -55,6 +53,7 @@ import org.apache.jackrabbit.oak.spi.que import org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvancedQueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndex.IndexPlan; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -200,7 +199,7 @@ public class SelectorImpl extends Source * @return all of the matching supertypes, or empty if the * {@link #matchesAllTypes} flag is set */ - @Nonnull + @NotNull public Set<String> getSupertypes() { return supertypes; } @@ -209,7 +208,7 @@ public class SelectorImpl extends Source * @return all of the matching primary subtypes, or empty if the * {@link #matchesAllTypes} flag is set */ - @Nonnull + @NotNull public Set<String> getPrimaryTypes() { return primaryTypes; } @@ -218,7 +217,7 @@ public class SelectorImpl extends Source * @return all of the matching mixin types, or empty if the * {@link #matchesAllTypes} flag is set */ - @Nonnull + @NotNull public Set<String> getMixinTypes() { return mixinTypes; } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java Wed Nov 7 13:57:55 2018 @@ -27,8 +27,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PropertyType; import javax.jcr.Session; @@ -44,6 +42,8 @@ import org.apache.jackrabbit.oak.query.a import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * A filter or lookup condition. @@ -270,7 +270,7 @@ public class FilterImpl implements Filte return matchesAllTypes; } - @Override @Nonnull + @Override @NotNull public Set<String> getSupertypes() { if (selector == null) { return Collections.emptySet(); @@ -278,7 +278,7 @@ public class FilterImpl implements Filte return selector.getSupertypes(); } - @Override @Nonnull + @Override @NotNull public Set<String> getPrimaryTypes() { if (selector == null) { return Collections.emptySet(); @@ -286,7 +286,7 @@ public class FilterImpl implements Filte return selector.getPrimaryTypes(); } - @Override @Nonnull + @Override @NotNull public Set<String> getMixinTypes() { if (selector == null) { return Collections.emptySet(); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java Wed Nov 7 13:57:55 2018 @@ -19,9 +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 javax.annotation.Nullable; - import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.tree.RootProvider; @@ -56,6 +53,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardAware; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.osgi.framework.BundleContext; import static com.google.common.base.Preconditions.checkNotNull; @@ -100,7 +99,7 @@ public class SecurityProviderImpl implem * * @param configuration security configuration */ - public SecurityProviderImpl(@Nonnull ConfigurationParameters configuration) { + public SecurityProviderImpl(@NotNull ConfigurationParameters configuration) { checkNotNull(configuration); this.configuration = configuration; @@ -115,7 +114,7 @@ public class SecurityProviderImpl implem } @Override - public void setWhiteboard(@Nonnull Whiteboard whiteboard) { + public void setWhiteboard(@NotNull Whiteboard whiteboard) { this.whiteboard = whiteboard; } @@ -124,7 +123,7 @@ public class SecurityProviderImpl implem return whiteboard; } - @Nonnull + @NotNull @Override public ConfigurationParameters getParameters(@Nullable String name) { if (name == null) { @@ -139,7 +138,7 @@ public class SecurityProviderImpl implem return params; } - @Nonnull + @NotNull @Override public Iterable<? extends SecurityConfiguration> getConfigurations() { Set<SecurityConfiguration> scs = new HashSet<SecurityConfiguration>(); @@ -153,9 +152,9 @@ public class SecurityProviderImpl implem } @SuppressWarnings("unchecked") - @Nonnull + @NotNull @Override - public <T> T getConfiguration(@Nonnull Class<T> configClass) { + public <T> T getConfiguration(@NotNull Class<T> configClass) { if (AuthenticationConfiguration.class == configClass) { return (T) authenticationConfiguration; } else if (AuthorizationConfiguration.class == configClass) { @@ -191,32 +190,32 @@ public class SecurityProviderImpl implem } @SuppressWarnings("UnusedDeclaration") - protected void bindPrincipalConfiguration(@Nonnull PrincipalConfiguration reference) { + protected void bindPrincipalConfiguration(@NotNull PrincipalConfiguration reference) { principalConfiguration.addConfiguration(initConfiguration(reference)); } @SuppressWarnings("UnusedDeclaration") - protected void unbindPrincipalConfiguration(@Nonnull PrincipalConfiguration reference) { + protected void unbindPrincipalConfiguration(@NotNull PrincipalConfiguration reference) { principalConfiguration.removeConfiguration(reference); } @SuppressWarnings("UnusedDeclaration") - protected void bindTokenConfiguration(@Nonnull TokenConfiguration reference) { + protected void bindTokenConfiguration(@NotNull TokenConfiguration reference) { tokenConfiguration.addConfiguration(initConfiguration(reference)); } @SuppressWarnings("UnusedDeclaration") - protected void unbindTokenConfiguration(@Nonnull TokenConfiguration reference) { + protected void unbindTokenConfiguration(@NotNull TokenConfiguration reference) { tokenConfiguration.removeConfiguration(reference); } @SuppressWarnings("UnusedDeclaration") - protected void bindAuthorizationConfiguration(@Nonnull AuthorizationConfiguration reference) { + protected void bindAuthorizationConfiguration(@NotNull AuthorizationConfiguration reference) { authorizationConfiguration.addConfiguration(initConfiguration(reference)); } @SuppressWarnings("UnusedDeclaration") - protected void unbindAuthorizationConfiguration(@Nonnull AuthorizationConfiguration reference) { + protected void unbindAuthorizationConfiguration(@NotNull AuthorizationConfiguration reference) { authorizationConfiguration.removeConfiguration(reference); } @@ -236,11 +235,11 @@ public class SecurityProviderImpl implem initConfiguration(privilegeConfiguration); } - private <T extends SecurityConfiguration> T initConfiguration(@Nonnull T config) { + private <T extends SecurityConfiguration> T initConfiguration(@NotNull T config) { return initConfiguration(config, ConfigurationParameters.EMPTY); } - private <T extends SecurityConfiguration> T initConfiguration(@Nonnull T config, @Nonnull ConfigurationParameters params) { + private <T extends SecurityConfiguration> T initConfiguration(@NotNull T config, @NotNull ConfigurationParameters params) { if (config instanceof ConfigurationBase) { ConfigurationBase cfg = (ConfigurationBase) config; cfg.setSecurityProvider(this); @@ -251,14 +250,14 @@ public class SecurityProviderImpl implem return config; } - private CompositeConfiguration initCompositeConfiguration(@Nonnull CompositeConfiguration composite, @Nonnull SecurityConfiguration defaultConfig) { + private CompositeConfiguration initCompositeConfiguration(@NotNull CompositeConfiguration composite, @NotNull SecurityConfiguration defaultConfig) { composite.setRootProvider(rootProvider); composite.setTreeProvider(treeProvider); composite.setDefaultConfig(initDefaultConfiguration(defaultConfig)); return composite; } - private <T extends SecurityConfiguration> T initDefaultConfiguration(@Nonnull T config) { + private <T extends SecurityConfiguration> T initDefaultConfiguration(@NotNull T config) { if (config instanceof ConfigurationBase) { ConfigurationBase cfg = (ConfigurationBase) config; cfg.setRootProvider(rootProvider); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java Wed Nov 7 13:57:55 2018 @@ -17,8 +17,6 @@ package org.apache.jackrabbit.oak.security.authentication; import java.util.Map; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.ContentRepository; import org.apache.jackrabbit.oak.spi.security.ConfigurationBase; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; @@ -28,6 +26,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.LoginContextProvider; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardAware; +import org.jetbrains.annotations.NotNull; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.metatype.annotations.AttributeDefinition; @@ -96,7 +95,7 @@ public class AuthenticationConfiguration } //----------------------------------------------< SecurityConfiguration >--- - @Nonnull + @NotNull @Override public String getName() { return NAME; @@ -127,7 +126,7 @@ public class AuthenticationConfiguration * @param contentRepository The content repository. * @return An new instance of {@link LoginContextProvider}. */ - @Nonnull + @NotNull @Override public LoginContextProvider getLoginContextProvider(ContentRepository contentRepository) { String appName = getParameters().getConfigValue(PARAM_APP_NAME, DEFAULT_APP_NAME); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java Wed Nov 7 13:57:55 2018 @@ -20,8 +20,6 @@ import java.security.AccessController; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import javax.jcr.Credentials; import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; @@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.LoginContextProvider; import org.apache.jackrabbit.oak.spi.security.authentication.PreAuthContext; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,7 +69,7 @@ class LoginContextProviderImpl implement } @Override - @Nonnull + @NotNull public LoginContext getLoginContext(Credentials credentials, String workspaceName) throws LoginException { Subject subject = getSubject(); @@ -86,7 +86,7 @@ class LoginContextProviderImpl implement } //------------------------------------------------------------< private >--- - @CheckForNull + @Nullable private static Subject getSubject() { Subject subject = null; try { @@ -97,12 +97,12 @@ class LoginContextProviderImpl implement return subject; } - @Nonnull + @NotNull private CallbackHandler getCallbackHandler(Credentials credentials, String workspaceName) { return new CallbackHandlerImpl(credentials, workspaceName, contentRepository, securityProvider, whiteboard); } - @Nonnull + @NotNull private Configuration getConfiguration() { if (configuration == null) { Configuration loginConfig = null; Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/CommitMarker.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/CommitMarker.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/CommitMarker.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/CommitMarker.java Wed Nov 7 13:57:55 2018 @@ -19,9 +19,8 @@ package org.apache.jackrabbit.oak.securi import java.util.Collections; import java.util.Map; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.commit.CommitInfo; +import org.jetbrains.annotations.NotNull; /** * Marker object to help the {@link org.apache.jackrabbit.oak.security.authentication.token.TokenValidatorProvider.TokenValidator} @@ -40,9 +39,9 @@ final class CommitMarker { return Collections.<String, Object>singletonMap(CommitMarker.KEY, CommitMarker.INSTANCE); } - static boolean isValidCommitInfo(@Nonnull CommitInfo commitInfo) { + static boolean isValidCommitInfo(@NotNull CommitInfo commitInfo) { return CommitMarker.INSTANCE == commitInfo.getInfo().get(CommitMarker.KEY); } private CommitMarker() {} -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java Wed Nov 7 13:57:55 2018 @@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.securi import java.security.Principal; import java.util.Date; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Credentials; import javax.security.auth.login.LoginException; @@ -28,6 +25,8 @@ import org.apache.jackrabbit.api.securit import org.apache.jackrabbit.oak.spi.security.authentication.Authentication; import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenInfo; import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,7 +64,7 @@ class TokenAuthentication implements Aut return false; } - @CheckForNull + @Nullable @Override public String getUserId() { if (tokenInfo == null) { @@ -74,7 +73,7 @@ class TokenAuthentication implements Aut return tokenInfo.getUserId(); } - @CheckForNull + @Nullable @Override public Principal getUserPrincipal() { if (tokenInfo == null) { @@ -88,7 +87,7 @@ class TokenAuthentication implements Aut } //-----------------------------------------------------------< internal >--- - @Nonnull + @NotNull TokenInfo getTokenInfo() { if (tokenInfo == null) { throw new IllegalStateException("Token info can only be retrieved after successful authentication."); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java Wed Nov 7 13:57:55 2018 @@ -21,8 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.security.user.util.PasswordUtil; +import org.jetbrains.annotations.NotNull; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; @@ -110,7 +109,7 @@ public class TokenConfigurationImpl exte super(); } - public TokenConfigurationImpl(@Nonnull SecurityProvider securityProvider) { + public TokenConfigurationImpl(@NotNull SecurityProvider securityProvider) { super(securityProvider, securityProvider.getParameters(NAME)); } @@ -136,15 +135,15 @@ public class TokenConfigurationImpl exte } //----------------------------------------------< SecurityConfiguration >--- - @Nonnull + @NotNull @Override public String getName() { return NAME; } - @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) { ValidatorProvider vp = new TokenValidatorProvider(getSecurityProvider().getParameters(UserConfiguration.NAME), getTreeProvider()); return ImmutableList.of(vp); } @@ -156,7 +155,7 @@ public class TokenConfigurationImpl exte * @param root The target root. * @return A new instance of {@link org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider}. */ - @Nonnull + @NotNull @Override public TokenProvider getTokenProvider(Root root) { UserConfiguration uc = getSecurityProvider().getConfiguration(UserConfiguration.class); @@ -173,4 +172,4 @@ public class TokenConfigurationImpl exte return CompositeCredentialsSupport.newInstance(() -> ImmutableSet.copyOf(credentialsSupport.values())); } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java Wed Nov 7 13:57:55 2018 @@ -22,9 +22,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Credentials; import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; @@ -40,6 +37,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConfiguration; import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenInfo; import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -194,7 +193,7 @@ public final class TokenLoginModule exte } //------------------------------------------------< AbstractLoginModule >--- - @Nonnull + @NotNull @Override protected Set<Class> getSupportedCredentials() { return Collections.<Class>singleton(TokenCredentials.class); @@ -215,7 +214,7 @@ public final class TokenLoginModule exte * Retrieve the token provider * @return the token provider or {@code null}. */ - @CheckForNull + @Nullable private TokenProvider getTokenProvider() { TokenProvider provider = null; SecurityProvider securityProvider = getSecurityProvider(); @@ -245,8 +244,8 @@ public final class TokenLoginModule exte * @param tokenInfo The tokenInfo to retrieve attributes from. * @return The {@code AuthInfo} resulting from the successful login. */ - @CheckForNull - private AuthInfo getAuthInfo(@Nullable TokenInfo tokenInfo, @Nonnull Set<? extends Principal> principals) { + @Nullable + private AuthInfo getAuthInfo(@Nullable TokenInfo tokenInfo, @NotNull Set<? extends Principal> principals) { if (tokenInfo != null) { Map<String, Object> attributes = new HashMap<String, Object>(); Map<String, String> publicAttributes = tokenInfo.getPublicAttributes(); @@ -259,7 +258,7 @@ public final class TokenLoginModule exte } } - private void updateSubject(@Nonnull TokenCredentials tc, @Nullable AuthInfo authInfo, + private void updateSubject(@NotNull TokenCredentials tc, @Nullable AuthInfo authInfo, @Nullable Set<? extends Principal> principals) { if (!subject.isReadOnly()) { subject.getPublicCredentials().add(tc); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java Wed Nov 7 13:57:55 2018 @@ -27,9 +27,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.AccessDeniedException; import javax.jcr.Credentials; import javax.jcr.RepositoryException; @@ -59,6 +56,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; import org.apache.jackrabbit.util.ISO8601; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -126,11 +125,11 @@ class TokenProviderImpl implements Token private final IdentifierManager identifierManager; private final long cleanupThreshold; - TokenProviderImpl(@Nonnull Root root, @Nonnull ConfigurationParameters options, @Nonnull UserConfiguration userConfiguration) { + TokenProviderImpl(@NotNull Root root, @NotNull ConfigurationParameters options, @NotNull UserConfiguration userConfiguration) { this(root, options, userConfiguration, SimpleCredentialsSupport.getInstance()); } - TokenProviderImpl(@Nonnull Root root, @Nonnull ConfigurationParameters options, @Nonnull UserConfiguration userConfiguration, @Nonnull CredentialsSupport credentialsSupport) { + TokenProviderImpl(@NotNull Root root, @NotNull ConfigurationParameters options, @NotNull UserConfiguration userConfiguration, @NotNull CredentialsSupport credentialsSupport) { this.root = root; this.options = options; this.credentialsSupport = credentialsSupport; @@ -155,7 +154,7 @@ class TokenProviderImpl implements Token * empty value; {@code false} otherwise. */ @Override - public boolean doCreateToken(@Nonnull Credentials credentials) { + public boolean doCreateToken(@NotNull Credentials credentials) { Credentials creds = extractCredentials(credentials); if (creds == null) { return false; @@ -175,9 +174,9 @@ class TokenProviderImpl implements Token * @return A new {@code TokenInfo} or {@code null} if the token could not * be created. */ - @CheckForNull + @Nullable @Override - public TokenInfo createToken(@Nonnull Credentials credentials) { + public TokenInfo createToken(@NotNull Credentials credentials) { Credentials creds = extractCredentials(credentials); String uid = (creds != null) ? credentialsSupport.getUserId(creds) : null; @@ -209,7 +208,7 @@ class TokenProviderImpl implements Token * be created. */ @Override - public TokenInfo createToken(@Nonnull String userId, @Nonnull Map<String, ?> attributes) { + public TokenInfo createToken(@NotNull String userId, @NotNull Map<String, ?> attributes) { String error = "Failed to create login token. {}"; User user = getUser(userId); Tree tokenParent = (user == null) ? null : getTokenParent(user); @@ -264,7 +263,7 @@ class TokenProviderImpl implements Token * associated with a valid user. */ @Override - public TokenInfo getTokenInfo(@Nonnull String token) { + public TokenInfo getTokenInfo(@NotNull String token) { int pos = token.indexOf(DELIM); String nodeId = (pos == -1) ? token : token.substring(0, pos); Tree tokenTree = identifierManager.getTree(nodeId); @@ -287,7 +286,7 @@ class TokenProviderImpl implements Token return creationTime + tokenExpiration; } - private static long getExpirationTime(@Nonnull Tree tokenTree, long defaultValue) { + private static long getExpirationTime(@NotNull Tree tokenTree, long defaultValue) { return TreeUtil.getLong(tokenTree, TOKEN_ATTRIBUTE_EXPIRY, defaultValue); } @@ -295,14 +294,14 @@ class TokenProviderImpl implements Token return expirationTime < loginTime; } - private static void setExpirationTime(@Nonnull Tree tree, long time) { + private static void setExpirationTime(@NotNull Tree tree, long time) { Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); tree.setProperty(TOKEN_ATTRIBUTE_EXPIRY, ISO8601.format(calendar), DATE); } - @CheckForNull - private Credentials extractCredentials(@Nonnull Credentials credentials) { + @Nullable + private Credentials extractCredentials(@NotNull Credentials credentials) { Credentials creds = credentials; if (credentials instanceof ImpersonationCredentials) { creds = ((ImpersonationCredentials) credentials).getBaseCredentials(); @@ -315,7 +314,7 @@ class TokenProviderImpl implements Token } } - @Nonnull + @NotNull private static String generateKey(int size) { SecureRandom random = new SecureRandom(); byte key[] = new byte[size]; @@ -329,12 +328,12 @@ class TokenProviderImpl implements Token return res.toString(); } - @Nonnull - private static String getKeyValue(@Nonnull String key, @Nonnull String userId) { + @NotNull + private static String getKeyValue(@NotNull String key, @NotNull String userId) { return key + userId; } - private static boolean isValidTokenTree(@CheckForNull Tree tokenTree) { + private static boolean isValidTokenTree(@Nullable Tree tokenTree) { if (tokenTree == null || !tokenTree.exists()) { return false; } else { @@ -343,13 +342,13 @@ class TokenProviderImpl implements Token } } - @Nonnull - private Tree getTokenTree(@Nonnull TokenInfoImpl tokenInfo) { + @NotNull + private Tree getTokenTree(@NotNull TokenInfoImpl tokenInfo) { return root.getTree(tokenInfo.tokenPath); } - @CheckForNull - private User getUser(@Nonnull Tree tokenTree) throws RepositoryException { + @Nullable + private User getUser(@NotNull Tree tokenTree) throws RepositoryException { String userPath = Text.getRelativeParent(tokenTree.getPath(), 2); Authorizable authorizable = userManager.getAuthorizableByPath(userPath); if (authorizable != null && !authorizable.isGroup() && !((User) authorizable).isDisabled()) { @@ -359,8 +358,8 @@ class TokenProviderImpl implements Token } } - @CheckForNull - private User getUser(@Nonnull String userId) { + @Nullable + private User getUser(@NotNull String userId) { try { Authorizable user = userManager.getAuthorizable(userId); if (user != null && !user.isGroup()) { @@ -375,8 +374,8 @@ class TokenProviderImpl implements Token return null; } - @CheckForNull - private Tree getTokenParent(@Nonnull User user) { + @Nullable + private Tree getTokenParent(@NotNull User user) { Tree tokenParent = null; String parentPath = null; try { @@ -418,9 +417,9 @@ class TokenProviderImpl implements Token * new token node. * */ - private TokenInfo createTokenNode(@Nonnull Tree parent, @Nonnull String tokenName, - long expTime, @Nonnull String uuid, - @Nonnull String id, Map<String, ?> attributes) + private TokenInfo createTokenNode(@NotNull Tree parent, @NotNull String tokenName, + long expTime, @NotNull String uuid, + @NotNull String id, Map<String, ?> attributes) throws AccessDeniedException, UnsupportedEncodingException, NoSuchAlgorithmException { Tree tokenNode = TreeUtil.addChild(parent, tokenName, TOKEN_NT_NAME); @@ -458,7 +457,7 @@ class TokenProviderImpl implements Token * @param token * The token info used as random data to skip cleanup. */ - private void cleanupExpired(@Nonnull String userId, @Nonnull Tree parent, long currentTime, @Nonnull String token) { + private void cleanupExpired(@NotNull String userId, @NotNull Tree parent, long currentTime, @NotNull String token) { if (cleanupThreshold > NO_TOKEN_CLEANUP && shouldRunCleanup(token)) { long start = System.currentTimeMillis(); long active = 0; @@ -496,7 +495,7 @@ class TokenProviderImpl implements Token * @param tkn * @return true if the cleanup should run */ - static boolean shouldRunCleanup(@Nonnull String token) { + static boolean shouldRunCleanup(@NotNull String token) { return token.charAt(0) < '2'; } @@ -518,7 +517,7 @@ class TokenProviderImpl implements Token private final Map<String, String> mandatoryAttributes; private final Map<String, String> publicAttributes; - private TokenInfoImpl(@Nonnull Tree tokenTree, @Nonnull String token, @Nonnull String userId, @Nullable Principal principal) { + private TokenInfoImpl(@NotNull Tree tokenTree, @NotNull String token, @NotNull String userId, @Nullable Principal principal) { this.token = token; this.tokenPath = tokenTree.getPath(); this.userId = userId; @@ -544,20 +543,20 @@ class TokenProviderImpl implements Token } } - @CheckForNull + @Nullable Principal getPrincipal() { return principal; } //------------------------------------------------------< TokenInfo >--- - @Nonnull + @NotNull @Override public String getUserId() { return userId; } - @Nonnull + @NotNull @Override public String getToken() { return token; @@ -613,7 +612,7 @@ class TokenProviderImpl implements Token } @Override - public boolean matches(@Nonnull TokenCredentials tokenCredentials) { + public boolean matches(@NotNull TokenCredentials tokenCredentials) { String tk = tokenCredentials.getToken(); int pos = tk.lastIndexOf(DELIM); if (pos > -1) { @@ -644,13 +643,13 @@ class TokenProviderImpl implements Token return true; } - @Nonnull + @NotNull @Override public Map<String, String> getPrivateAttributes() { return Collections.unmodifiableMap(mandatoryAttributes); } - @Nonnull + @NotNull @Override public Map<String, String> getPublicAttributes() { return Collections.unmodifiableMap(publicAttributes); @@ -664,7 +663,7 @@ class TokenProviderImpl implements Token * @return {@code true} if the specified {@code attributeName} * starts with or equals {@link #TOKEN_ATTRIBUTE}. */ - private boolean isMandatoryAttribute(@Nonnull String attributeName) { + private boolean isMandatoryAttribute(@NotNull String attributeName) { return attributeName.startsWith(TOKEN_ATTRIBUTE); } @@ -678,7 +677,7 @@ class TokenProviderImpl implements Token * @return {@code true} if the specified property name doesn't seem * to represent repository internal information. */ - private boolean isInfoAttribute(@Nonnull String attributeName) { + private boolean isInfoAttribute(@NotNull String attributeName) { String prefix = Text.getNamespacePrefix(attributeName); return !NamespaceConstants.RESERVED_PREFIXES.contains(prefix); } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenValidatorProvider.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenValidatorProvider.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenValidatorProvider.java Wed Nov 7 13:57:55 2018 @@ -16,10 +16,6 @@ */ package org.apache.jackrabbit.oak.security.authentication.token; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; @@ -38,6 +34,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.user.util.PasswordUtil; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.util.Text; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +49,7 @@ class TokenValidatorProvider extends Val private final TreeProvider treeProvider; - TokenValidatorProvider(@Nonnull ConfigurationParameters userConfig, @Nonnull TreeProvider treeProvider) { + TokenValidatorProvider(@NotNull ConfigurationParameters userConfig, @NotNull TreeProvider treeProvider) { userRootPath = userConfig.getConfigValue(UserConstants.PARAM_USER_PATH, UserConstants.DEFAULT_USER_PATH); this.treeProvider = treeProvider; } @@ -61,7 +59,7 @@ class TokenValidatorProvider extends Val return new TokenValidator(before, after, commitInfo); } - 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); } @@ -71,11 +69,11 @@ class TokenValidatorProvider extends Val private final Tree parentAfter; private final CommitInfo commitInfo; - TokenValidator(@Nonnull NodeState parentBefore, @Nonnull NodeState parentAfter, @Nonnull CommitInfo commitInfo) { + TokenValidator(@NotNull NodeState parentBefore, @NotNull NodeState parentAfter, @NotNull CommitInfo commitInfo) { this(treeProvider.createReadOnlyTree(parentBefore), treeProvider.createReadOnlyTree(parentAfter), commitInfo); } - private TokenValidator(@Nullable Tree parentBefore, @Nonnull Tree parentAfter, @Nonnull CommitInfo commitInfo) { + private TokenValidator(@Nullable Tree parentBefore, @NotNull Tree parentAfter, @NotNull CommitInfo commitInfo) { this.parentBefore = parentBefore; this.parentAfter = parentAfter; this.commitInfo = commitInfo; @@ -150,18 +148,18 @@ class TokenValidatorProvider extends Val } } - private void verifyHierarchy(@Nonnull String path) throws CommitFailedException { + private void verifyHierarchy(@NotNull String path) throws CommitFailedException { if (!Text.isDescendant(userRootPath, path)) { String msg = "Attempt to create a token (or it's parent) outside of configured scope " + path; throw constraintViolation(64, msg); } } - private boolean isTokenTree(@CheckForNull Tree tree) { + private boolean isTokenTree(@Nullable Tree tree) { return tree != null && TOKEN_NT_NAME.equals(TreeUtil.getPrimaryTypeName(tree)); } - private void validateTokenTree(@Nonnull Tree tokenTree) throws CommitFailedException { + private void validateTokenTree(@NotNull Tree tokenTree) throws CommitFailedException { // enforce changing being made by the TokenProvider implementation verifyCommitInfo(); @@ -183,11 +181,11 @@ class TokenValidatorProvider extends Val } } - private boolean isTokensParent(@CheckForNull Tree tree) { + private boolean isTokensParent(@Nullable Tree tree) { return tree != null && TOKENS_NODE_NAME.equals(tree.getName()); } - private void validateTokensParent(@Nonnull Tree tokensParent) throws CommitFailedException { + private void validateTokensParent(@NotNull Tree tokensParent) throws CommitFailedException { verifyHierarchy(tokensParent.getPath()); @@ -202,4 +200,4 @@ class TokenValidatorProvider extends Val } } } -} \ No newline at end of file +} Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java Wed Nov 7 13:57:55 2018 @@ -22,9 +22,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.Credentials; import javax.jcr.GuestCredentials; import javax.jcr.SimpleCredentials; @@ -46,6 +43,8 @@ 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.util.UserUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -179,7 +178,7 @@ public final class LoginModuleImpl exten } //------------------------------------------------< AbstractLoginModule >--- - @Nonnull + @NotNull @Override protected Set<Class> getSupportedCredentials() { return SUPPORTED_CREDENTIALS; @@ -195,8 +194,8 @@ public final class LoginModuleImpl exten } //-------------------------------------------------------------------------- - @CheckForNull - private String getLoginId(@CheckForNull PreAuthenticatedLogin preAuthenticatedLogin) { + @Nullable + private String getLoginId(@Nullable PreAuthenticatedLogin preAuthenticatedLogin) { if (preAuthenticatedLogin != null) { return preAuthenticatedLogin.getUserId(); } @@ -241,7 +240,7 @@ public final class LoginModuleImpl exten } } - @CheckForNull + @Nullable private Authentication getUserAuthentication(@Nullable String loginName) { SecurityProvider securityProvider = getSecurityProvider(); Root root = getRoot(); @@ -257,7 +256,7 @@ public final class LoginModuleImpl exten return null; } - private AuthInfo createAuthInfo(@Nonnull Set<? extends Principal> principals) { + private AuthInfo createAuthInfo(@NotNull Set<? extends Principal> principals) { Credentials creds; if (credentials instanceof ImpersonationCredentials) { creds = ((ImpersonationCredentials) credentials).getBaseCredentials(); Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java Wed Nov 7 13:57:55 2018 @@ -20,7 +20,6 @@ import java.security.Principal; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; import javax.jcr.security.AccessControlManager; import com.google.common.collect.ImmutableList; @@ -56,6 +55,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; import org.apache.jackrabbit.oak.spi.xml.ImportBehavior; import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter; +import org.jetbrains.annotations.NotNull; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; @@ -123,7 +123,7 @@ public class AuthorizationConfigurationI super(); } - public AuthorizationConfigurationImpl(@Nonnull SecurityProvider securityProvider) { + public AuthorizationConfigurationImpl(@NotNull SecurityProvider securityProvider) { super(securityProvider, securityProvider.getParameters(NAME)); } @@ -135,55 +135,55 @@ public class AuthorizationConfigurationI } //----------------------------------------------< SecurityConfiguration >--- - @Nonnull + @NotNull @Override public String getName() { return NAME; } - @Nonnull + @NotNull @Override public Context getContext() { return AuthorizationContext.getInstance(); } - @Nonnull + @NotNull @Override public WorkspaceInitializer getWorkspaceInitializer() { return new AuthorizationInitializer(mountInfoProvider); } - @Nonnull + @NotNull @Override - public List<? extends CommitHook> getCommitHooks(@Nonnull String workspaceName) { + public List<? extends CommitHook> getCommitHooks(@NotNull String workspaceName) { return ImmutableList.of( new VersionablePathHook(workspaceName), new PermissionHook(workspaceName, getRestrictionProvider(), mountInfoProvider, getRootProvider(), getTreeProvider())); } - @Nonnull + @NotNull @Override - public List<ValidatorProvider> getValidators(@Nonnull String workspaceName, @Nonnull Set<Principal> principals, @Nonnull MoveTracker moveTracker) { + public List<ValidatorProvider> getValidators(@NotNull String workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker moveTracker) { return ImmutableList.of( new PermissionStoreValidatorProvider(), new PermissionValidatorProvider(getSecurityProvider(), workspaceName, principals, moveTracker, getRootProvider(), getTreeProvider()), new AccessControlValidatorProvider(getSecurityProvider(), getRootProvider(), getTreeProvider())); } - @Nonnull + @NotNull @Override public List<ProtectedItemImporter> getProtectedItemImporters() { return ImmutableList.of(new AccessControlImporter()); } //-----------------------------------------< AccessControlConfiguration >--- - @Nonnull + @NotNull @Override - public AccessControlManager getAccessControlManager(@Nonnull Root root, @Nonnull NamePathMapper namePathMapper) { + public AccessControlManager getAccessControlManager(@NotNull Root root, @NotNull NamePathMapper namePathMapper) { return new AccessControlManagerImpl(root, namePathMapper, getSecurityProvider()); } - @Nonnull + @NotNull @Override public RestrictionProvider getRestrictionProvider() { RestrictionProvider restrictionProvider = getParameters().getConfigValue(AccessControlConstants.PARAM_RESTRICTION_PROVIDER, null, RestrictionProvider.class); @@ -194,10 +194,10 @@ public class AuthorizationConfigurationI return restrictionProvider; } - @Nonnull + @NotNull @Override - public PermissionProvider getPermissionProvider(@Nonnull Root root, @Nonnull String workspaceName, - @Nonnull Set<Principal> principals) { + public PermissionProvider getPermissionProvider(@NotNull Root root, @NotNull String workspaceName, + @NotNull Set<Principal> principals) { Context ctx = getSecurityProvider().getConfiguration(AuthorizationConfiguration.class).getContext(); if (mountInfoProvider.hasNonDefaultMounts()) { Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java Wed Nov 7 13:57:55 2018 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.security.authorization; -import javax.annotation.Nonnull; - import com.google.common.collect.Iterables; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; @@ -26,6 +24,7 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.plugins.tree.TreeLocation; import org.apache.jackrabbit.oak.spi.security.Context; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; final class AuthorizationContext implements Context, AccessControlConstants, PermissionConstants { @@ -44,12 +43,12 @@ final class AuthorizationContext impleme //------------------------------------------------------------< Context >--- @Override - public boolean definesProperty(@Nonnull Tree parent, @Nonnull PropertyState property) { + public boolean definesProperty(@NotNull Tree parent, @NotNull PropertyState property) { return definesTree(parent); } @Override - public boolean definesContextRoot(@Nonnull Tree tree) { + public boolean definesContextRoot(@NotNull Tree tree) { String name = tree.getName(); if (isNodeName(name)) { return NT_REP_ACL.equals(TreeUtil.getPrimaryTypeName(tree)); @@ -59,13 +58,13 @@ final class AuthorizationContext impleme } @Override - public boolean definesTree(@Nonnull Tree tree) { + public boolean definesTree(@NotNull Tree tree) { String ntName = TreeUtil.getPrimaryTypeName(tree); return ntName != null && isNtName(ntName); } @Override - public boolean definesLocation(@Nonnull TreeLocation location) { + public boolean definesLocation(@NotNull TreeLocation location) { PropertyState p = location.getProperty(); Tree tree = (p == null) ? location.getTree() : location.getParent().getTree(); if (tree != null) { @@ -76,11 +75,11 @@ final class AuthorizationContext impleme } @Override - public boolean definesInternal(@Nonnull Tree tree) { + public boolean definesInternal(@NotNull Tree tree) { return PermissionConstants.REP_PERMISSION_STORE.equals(tree.getName()); } - private static boolean isNodeName(@Nonnull String name) { + private static boolean isNodeName(@NotNull String name) { for (String n : NODE_NAMES) { if (n.equals(name)) { return true; @@ -89,7 +88,7 @@ final class AuthorizationContext impleme return false; } - private static boolean isItemName(@Nonnull String name) { + private static boolean isItemName(@NotNull String name) { if (isNodeName(name)) { return true; } @@ -101,7 +100,7 @@ final class AuthorizationContext impleme return false; } - private static boolean isNtName(@Nonnull String name) { + private static boolean isNtName(@NotNull String name) { for (String n : NT_NAMES) { if (n.equals(name)) { return true; Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java Wed Nov 7 13:57:55 2018 @@ -23,8 +23,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.AccessControlEntry; @@ -41,6 +39,8 @@ import org.apache.jackrabbit.oak.spi.sec import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionDefinition; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +51,7 @@ abstract class ACL extends AbstractAcces private final List<ACE> entries = new ArrayList<ACE>(); ACL(@Nullable String oakPath, @Nullable List<ACE> entries, - @Nonnull NamePathMapper namePathMapper) { + @NotNull NamePathMapper namePathMapper) { super(oakPath, namePathMapper); if (entries != null) { this.entries.addAll(entries); @@ -64,7 +64,7 @@ abstract class ACL extends AbstractAcces abstract PrivilegeBits getPrivilegeBits(Privilege[] privileges); //------------------------------------------< AbstractAccessControlList >--- - @Nonnull + @NotNull @Override public List<ACE> getEntries() { return entries; @@ -185,7 +185,7 @@ abstract class ACL extends AbstractAcces return (ACE) entry; } - private boolean internalAddEntry(@Nonnull ACE entry) throws RepositoryException { + private boolean internalAddEntry(@NotNull ACE entry) throws RepositoryException { final Principal principal = entry.getPrincipal(); List<ACE> subList = Lists.newArrayList(Iterables.filter(entries, new Predicate<ACE>() { @Override @@ -234,7 +234,7 @@ abstract class ACL extends AbstractAcces return true; } - private ACE createACE(@Nonnull ACE existing, @Nonnull PrivilegeBits newPrivilegeBits) throws RepositoryException { + private ACE createACE(@NotNull ACE existing, @NotNull PrivilegeBits newPrivilegeBits) throws RepositoryException { return createACE(existing.getPrincipal(), newPrivilegeBits, existing.isAllow(), existing.getRestrictions()); } } Modified: jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java?rev=1846014&r1=1846013&r2=1846014&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java (original) +++ jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java Wed Nov 7 13:57:55 2018 @@ -21,9 +21,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Session; @@ -53,6 +50,8 @@ import org.apache.jackrabbit.oak.spi.xml import org.apache.jackrabbit.oak.spi.xml.ProtectedNodeImporter; import org.apache.jackrabbit.oak.spi.xml.ReferenceChangeTracker; import org.apache.jackrabbit.oak.spi.xml.TextValue; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,9 +84,9 @@ public class AccessControlImporter imple //----------------------------------------------< ProtectedItemImporter >--- @Override - public boolean init(@Nonnull Session session, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper, + public boolean init(@NotNull Session session, @NotNull Root root, @NotNull NamePathMapper namePathMapper, boolean isWorkspaceImport, int uuidBehavior, - @Nonnull ReferenceChangeTracker referenceTracker, @Nonnull SecurityProvider securityProvider) { + @NotNull ReferenceChangeTracker referenceTracker, @NotNull SecurityProvider securityProvider) { if (initialized) { throw new IllegalStateException("Already initialized"); } @@ -122,7 +121,7 @@ public class AccessControlImporter imple //----------------------------------------------< ProtectedNodeImporter >--- @Override - public boolean start(@Nonnull Tree protectedParent) throws RepositoryException { + public boolean start(@NotNull Tree protectedParent) throws RepositoryException { checkInitialized(); // the acl node must have been added during the regular import before @@ -132,7 +131,7 @@ public class AccessControlImporter imple } @Override - public void end(@Nonnull Tree protectedParent) throws RepositoryException { + public void end(@NotNull Tree protectedParent) throws RepositoryException { if (acl != null) { acMgr.setPolicy(acl.getPath(), acl); acl = null; @@ -142,7 +141,7 @@ public class AccessControlImporter imple } @Override - public void startChildInfo(@Nonnull NodeInfo childInfo, @Nonnull List<PropInfo> propInfos) throws RepositoryException { + public void startChildInfo(@NotNull NodeInfo childInfo, @NotNull List<PropInfo> propInfos) throws RepositoryException { checkInitialized(); String ntName = childInfo.getPrimaryTypeName(); if (NT_REP_GRANT_ACE.equals(ntName) || NT_REP_DENY_ACE.equals(ntName)) { @@ -198,7 +197,7 @@ public class AccessControlImporter imple } } - @CheckForNull + @Nullable private JackrabbitAccessControlList getACL(Tree tree) throws RepositoryException { String nodeName = tree.getName(); @@ -226,7 +225,7 @@ public class AccessControlImporter imple return acList; } - @CheckForNull + @Nullable private JackrabbitAccessControlList getACL(@Nullable String path) throws RepositoryException { JackrabbitAccessControlList acList = null; for (AccessControlPolicy p : acMgr.getPolicies(path)) { @@ -304,4 +303,4 @@ public class AccessControlImporter imple } } } -} \ No newline at end of file +}
