You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/07/18 14:37:11 UTC

svn commit: r1836177 [1/14] - in /jackrabbit/oak/trunk/oak-core: ./ src/main/java/org/apache/jackrabbit/oak/ src/main/java/org/apache/jackrabbit/oak/core/ src/main/java/org/apache/jackrabbit/oak/management/ src/main/java/org/apache/jackrabbit/oak/namep...

Author: reschke
Date: Wed Jul 18 14:37:06 2018
New Revision: 1836177

URL: http://svn.apache.org/viewvc?rev=1836177&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-core

Modified:
    jackrabbit/oak/trunk/oak-core/pom.xml
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakInitializer.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SystemRoot.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/NamePathMapperImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/DefaultThreeWayConflictHandler.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/JcrLastModifiedConflictHandler.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/COWNodeStore.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfo.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfoService.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/CompositeIndexEditorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Cursors.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexEditorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfo.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoService.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardIndexEditorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexPlan.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndexProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditorOld.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterEditorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/ExtractedText.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/PreExtractedTextProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/ProgressTrackingEditor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedIndex.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexEditorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexEditorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/ValuePatternUtil.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindexMBean.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategy.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/AbstractDecoratedNodeState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/LoggingReporter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/PeriodicReporter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/Reporter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/report/ReportingNodeState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractTypeDefinition.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NameConstraint.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NumericConstraint.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/PathConstraint.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventHandler.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/Filter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteredHandler.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringAwareObserver.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringDispatcher.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringObserver.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserver.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/EventFilter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PermissionProviderFactory.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Selectors.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/RootFactory.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/TreeFactory.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/HiddenTree.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTree.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/NodeBuilderTree.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/RootProviderService.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeProviderService.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ValueConverter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElement.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ConstraintImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/CommitMarker.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthentication.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenValidatorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/ProviderCtx.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidator.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidatorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/Util.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfiguration.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermission.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/AllPermissions.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/ChildOrderDiff.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissions.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/EntryPredicate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/MoveAwarePermissionValidator.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NoPermissions.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCache.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStore.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreValidatorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionUtil.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidatorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntries.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermission.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/NodeTypePattern.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/WhiteboardRestrictionProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContext.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableProperties.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CredentialsImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/PasswordHistory.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RandomAuthorizableNodeName.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserPrincipalImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationFactoryImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserContext.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidatorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/Utils.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/GroupImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/QueryUtil.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeName.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactory.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/MutableRootTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TestPermissionProvider.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/commit/JcrLastModifiedConflictHandlerTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/MountsNodeCounterTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/counter/NodeCounterIndexTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiPropertyOrTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultipleIndicesTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/RelativePathTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/report/AssertingPeriodicReporter.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/ChangeCollectorProviderTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserverTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTreeTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/SQL2OptimiseQueryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/TraversalAvoidanceTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/IndexSelectionTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/CustomQueryIndexProviderTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/AbstractTokenTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestCredentialsSupport.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestLoginModule.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenAuthenticationTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModuleTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContextTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AbstractAccessControlTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporterBaseTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PrincipalACLTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractAggrProvider.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/AbstractCompositeProviderTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderAllTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCoverageTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderEmptyTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermissionTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/FullScopeProvider.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/LimitedScopeProvider.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/NoScopeProvider.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/AbstractOakCoreTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/ChildOrderPropertyTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/VersionStorageTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/AbstractPermissionRandomTestIT.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountPermissionProviderRandomTestIT.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/MountUtils.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCacheTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHookTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/RepoPolicyTreePermissionTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermissionTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CustomRestrictionProviderTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/TestProvider.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializerTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderHelper.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalConfigurationImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/JcrAllTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeContextTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractAddMembersByIdTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProviderTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/IntermediatePathTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipWriterTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordHistoryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/SystemUserImplTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterBaseTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderWithCacheTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UtilsTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/GroupActionTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/action/PasswordValidationActionTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathConditionVisitorTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/XPathQueryBuilderTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProviderTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeNameTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardUserAuthenticationFactoryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtil.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtilTest.java

Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Jul 18 14:37:06 2018
@@ -226,10 +226,10 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- Findbugs annotations -->
+    <!-- Nullability annotations -->
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
     </dependency>
 
     <!-- Test Dependencies -->

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java Wed Jul 18 14:37:06 2018
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak;
 
 import java.io.IOException;
 import java.io.InputStream;
-import javax.annotation.Nonnull;
-
 import static org.apache.jackrabbit.oak.api.Type.NAME;
 import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
 import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
@@ -50,6 +48,7 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * {@code InitialContent} implements a {@link RepositoryInitializer} the creates
@@ -73,7 +72,7 @@ public class InitialContent implements R
     private boolean prePopulateVS = false;
 
     @Override
-    public void initialize(@Nonnull NodeBuilder builder) {
+    public void initialize(@NotNull NodeBuilder builder) {
         builder.setProperty(JCR_PRIMARYTYPE, NT_REP_ROOT, Type.NAME);
 
         if (!builder.hasChildNode(JCR_SYSTEM)) {

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Wed Jul 18 14:37:06 2018
@@ -42,7 +42,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 
-import javax.annotation.Nonnull;
 import javax.jcr.NoSuchWorkspaceException;
 import javax.management.JMException;
 import javax.management.MBeanServer;
@@ -132,6 +131,7 @@ import org.apache.jackrabbit.oak.spi.whi
 import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardAware;
 import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
 import org.apache.jackrabbit.oak.spi.descriptors.AggregatingDescriptors;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -192,7 +192,7 @@ public class Oak {
             private final AtomicInteger counter = new AtomicInteger();
 
             @Override
-            public Thread newThread(@Nonnull Runnable r) {
+            public Thread newThread(@NotNull Runnable r) {
                 Thread thread = new Thread(r, createName());
                 thread.setDaemon(true);
                 return thread;
@@ -219,7 +219,7 @@ public class Oak {
             private final AtomicInteger counter = new AtomicInteger();
 
             @Override
-            public Thread newThread(@Nonnull Runnable r) {
+            public Thread newThread(@NotNull Runnable r) {
                 Thread thread = new Thread(r, createName());
                 thread.setDaemon(true);
                 thread.setPriority(Thread.MIN_PRIORITY);
@@ -377,8 +377,8 @@ public class Oak {
      * @param c
      * @return
      */
-    @Nonnull
-    public Oak with(@Nonnull Clusterable c) {
+    @NotNull
+    public Oak with(@NotNull Clusterable c) {
         this.clusterable = checkNotNull(c);
         return this;
     }
@@ -391,20 +391,20 @@ public class Oak {
      * @param defaultWorkspaceName The name of the default workspace.
      * @return this builder.
      */
-    @Nonnull
-    public Oak with(@Nonnull String defaultWorkspaceName) {
+    @NotNull
+    public Oak with(@NotNull String defaultWorkspaceName) {
         this.defaultWorkspaceName = checkNotNull(defaultWorkspaceName);
         return this;
     }
 
-    @Nonnull
-    public Oak with(@Nonnull RepositoryInitializer initializer) {
+    @NotNull
+    public Oak with(@NotNull RepositoryInitializer initializer) {
         initializers.add(checkNotNull(initializer));
         return this;
     }
 
-    @Nonnull
-    public Oak with(@Nonnull QueryLimits settings) {
+    @NotNull
+    public Oak with(@NotNull QueryLimits settings) {
         QueryEngineSettings s = new QueryEngineSettings();
         s.setFailTraversal(settings.getFailTraversal());
         s.setFullTextComparisonWithoutIndex(settings.getFullTextComparisonWithoutIndex());
@@ -421,8 +421,8 @@ public class Oak {
      * @param provider query index provider
      * @return this builder
      */
-    @Nonnull
-    public Oak with(@Nonnull QueryIndexProvider provider) {
+    @NotNull
+    public Oak with(@NotNull QueryIndexProvider provider) {
         queryIndexProviders.add(checkNotNull(provider));
         return this;
     }
@@ -434,8 +434,8 @@ public class Oak {
      * @param provider index hook provider
      * @return this builder
      */
-    @Nonnull
-    public Oak with(@Nonnull IndexEditorProvider provider) {
+    @NotNull
+    public Oak with(@NotNull IndexEditorProvider provider) {
         indexEditorProviders.add(checkNotNull(provider));
         return this;
     }
@@ -446,8 +446,8 @@ public class Oak {
      * @param hook commit hook
      * @return this builder
      */
-    @Nonnull
-    public Oak with(@Nonnull CommitHook hook) {
+    @NotNull
+    public Oak with(@NotNull CommitHook hook) {
         checkNotNull(hook);
         withEditorHook();
         commitHooks.add(hook);
@@ -476,8 +476,8 @@ public class Oak {
      * @param provider editor provider
      * @return this builder
      */
-    @Nonnull
-    public Oak with(@Nonnull EditorProvider provider) {
+    @NotNull
+    public Oak with(@NotNull EditorProvider provider) {
         editorProviders.add(checkNotNull(provider));
         return this;
     }
@@ -488,11 +488,11 @@ public class Oak {
      * @param editor editor
      * @return this builder
      */
-    @Nonnull
-    public Oak with(@Nonnull final Editor editor) {
+    @NotNull
+    public Oak with(@NotNull final Editor editor) {
         checkNotNull(editor);
         return with(new EditorProvider() {
-            @Override @Nonnull
+            @Override @NotNull
             public Editor getRootEditor(
                     NodeState before, NodeState after,
                     NodeBuilder builder, CommitInfo info) {
@@ -501,8 +501,8 @@ public class Oak {
         });
     }
 
-    @Nonnull
-    public Oak with(@Nonnull SecurityProvider securityProvider) {
+    @NotNull
+    public Oak with(@NotNull SecurityProvider securityProvider) {
         this.securityProvider = checkNotNull(securityProvider);
         if (securityProvider instanceof WhiteboardAware) {
             ((WhiteboardAware) securityProvider).setWhiteboard(whiteboard);
@@ -528,13 +528,13 @@ public class Oak {
      * @deprecated Use {@link #with(ThreeWayConflictHandler)} instead
      */
     @Deprecated
-    @Nonnull
-    public Oak with(@Nonnull ConflictHandler conflictHandler) {
+    @NotNull
+    public Oak with(@NotNull ConflictHandler conflictHandler) {
         return with(ConflictHandlers.wrap(conflictHandler));
     }
 
-    @Nonnull
-    public Oak with(@Nonnull ThreeWayConflictHandler conflictHandler) {
+    @NotNull
+    public Oak with(@NotNull ThreeWayConflictHandler conflictHandler) {
         checkNotNull(conflictHandler);
         withEditorHook();
 
@@ -552,26 +552,26 @@ public class Oak {
         return this;
     }
 
-    @Nonnull
-    public Oak with(@Nonnull ScheduledExecutorService scheduledExecutor) {
+    @NotNull
+    public Oak with(@NotNull ScheduledExecutorService scheduledExecutor) {
         this.scheduledExecutor = checkNotNull(scheduledExecutor);
         return this;
     }
 
-    @Nonnull
-    public Oak with(@Nonnull Executor executor) {
+    @NotNull
+    public Oak with(@NotNull Executor executor) {
         this.executor = checkNotNull(executor);
         return this;
     }
 
-    @Nonnull
-    public Oak with(@Nonnull MBeanServer mbeanServer) {
+    @NotNull
+    public Oak with(@NotNull MBeanServer mbeanServer) {
         this.mbeanServer = checkNotNull(mbeanServer);
         return this;
     }
 
-    @Nonnull
-    public Oak with(@Nonnull Whiteboard whiteboard) {
+    @NotNull
+    public Oak with(@NotNull Whiteboard whiteboard) {
         this.whiteboard = checkNotNull(whiteboard);
         if (securityProvider instanceof WhiteboardAware) {
             ((WhiteboardAware) securityProvider).setWhiteboard(whiteboard);
@@ -583,8 +583,8 @@ public class Oak {
         return this;
     }
 
-    @Nonnull
-    public Oak with(@Nonnull Observer observer) {
+    @NotNull
+    public Oak with(@NotNull Observer observer) {
         observers.add(checkNotNull(observer));
         return this;
     }
@@ -649,7 +649,7 @@ public class Oak {
      * <code>#shutdown</code> on the <code>executor</code> provided for this Oak instance.
      * </p>
      */
-    public Oak withAsyncIndexing(@Nonnull String name, long delayInSeconds) {
+    public Oak withAsyncIndexing(@NotNull String name, long delayInSeconds) {
         if (this.asyncTasks == null) {
             asyncTasks = new HashMap<String, Long>();
         }
@@ -658,7 +658,7 @@ public class Oak {
         return this;
     }
 
-    @Nonnull
+    @NotNull
     public Whiteboard getWhiteboard() {
         return this.whiteboard;
     }
@@ -834,7 +834,7 @@ public class Oak {
     private static class RepoStateCheckHook implements CommitHook, Closeable {
         private volatile boolean closed;
 
-        @Nonnull
+        @NotNull
         @Override
         public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) throws CommitFailedException {
             if (closed){

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakInitializer.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakInitializer.java Wed Jul 18 14:37:06 2018
@@ -20,8 +20,6 @@ package org.apache.jackrabbit.oak;
 
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-
 import com.google.common.collect.ImmutableMap;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
@@ -37,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.lif
 import org.apache.jackrabbit.oak.spi.lifecycle.WorkspaceInitializer;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
 
 public final class OakInitializer {
 
@@ -45,9 +44,9 @@ public final class OakInitializer {
     private OakInitializer() {
     }
 
-    public static void initialize(@Nonnull NodeStore store,
-                                  @Nonnull RepositoryInitializer initializer,
-                                  @Nonnull IndexEditorProvider indexEditor) {
+    public static void initialize(@NotNull NodeStore store,
+                                  @NotNull RepositoryInitializer initializer,
+                                  @NotNull IndexEditorProvider indexEditor) {
         try {
             NodeBuilder builder = store.getRoot().builder();
             initializer.initialize(builder);
@@ -57,10 +56,10 @@ public final class OakInitializer {
         }
     }
 
-    public static void initialize(@Nonnull Iterable<WorkspaceInitializer> initializer,
-                                  @Nonnull NodeStore store,
-                                  @Nonnull String workspaceName,
-                                  @Nonnull IndexEditorProvider indexEditor) {
+    public static void initialize(@NotNull Iterable<WorkspaceInitializer> initializer,
+                                  @NotNull NodeStore store,
+                                  @NotNull String workspaceName,
+                                  @NotNull IndexEditorProvider indexEditor) {
         NodeBuilder builder = store.getRoot().builder();
         for (WorkspaceInitializer wspInit : initializer) {
             wspInit.initialize(builder, workspaceName);
@@ -72,7 +71,7 @@ public final class OakInitializer {
         }
     }
 
-    private static CommitHook createHook(@Nonnull IndexEditorProvider indexEditor) {
+    private static CommitHook createHook(@NotNull IndexEditorProvider indexEditor) {
         return new CompositeHook(
                         ResetCommitAttributeHook.INSTANCE,
                         new EditorHook(new IndexUpdateProvider(indexEditor)));

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/OakVersion.java Wed Jul 18 14:37:06 2018
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Provides version information about Oak.
@@ -33,7 +33,7 @@ public final class OakVersion {
      * 
      * @return the version (or "SNAPSHOT" when unknown)
      */
-    @Nonnull
+    @NotNull
     public synchronized static String getVersion() {
         if (version == null) {
             version = org.apache.jackrabbit.oak.commons.OakVersion.getVersion(

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java Wed Jul 18 14:37:06 2018
@@ -72,8 +72,6 @@ import static javax.jcr.Repository.WRITE
 import java.io.Closeable;
 import java.io.IOException;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.jcr.Credentials;
 import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.PropertyType;
@@ -102,6 +100,8 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.apache.jackrabbit.oak.spi.descriptors.GenericDescriptors;
 import org.apache.jackrabbit.oak.OakVersion;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * {@code NodeStore}-based implementation of
@@ -129,12 +129,12 @@ public class ContentRepositoryImpl imple
      * @param indexProvider        index provider
      * @param securityProvider     The configured security provider.
      */
-    public ContentRepositoryImpl(@Nonnull NodeStore nodeStore,
-                                 @Nonnull CommitHook commitHook,
-                                 @Nonnull String defaultWorkspaceName,
+    public ContentRepositoryImpl(@NotNull NodeStore nodeStore,
+                                 @NotNull CommitHook commitHook,
+                                 @NotNull String defaultWorkspaceName,
                                  QueryEngineSettings queryEngineSettings,
                                  @Nullable QueryIndexProvider indexProvider,
-                                 @Nonnull SecurityProvider securityProvider,
+                                 @NotNull SecurityProvider securityProvider,
                                  @Nullable Descriptors baseDescriptors) {
         this.nodeStore = checkNotNull(nodeStore);
         this.commitHook = checkNotNull(commitHook);
@@ -145,7 +145,7 @@ public class ContentRepositoryImpl imple
         this.baseDescriptors = baseDescriptors;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public ContentSession login(Credentials credentials, String workspaceName)
             throws LoginException, NoSuchWorkspaceException {
@@ -166,7 +166,7 @@ public class ContentRepositoryImpl imple
                 commitHook, queryEngineSettings, indexProvider);
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Descriptors getDescriptors() {
         if (descriptors == null) {
@@ -181,7 +181,7 @@ public class ContentRepositoryImpl imple
     }
     
     @SuppressWarnings("deprecation")
-    @Nonnull
+    @NotNull
     protected GenericDescriptors createDescriptors() {
         final ValueFactory valueFactory = new SimpleValueFactory();
         final Value trueValue = valueFactory.createValue(true);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java Wed Jul 18 14:37:06 2018
@@ -21,7 +21,6 @@ import static com.google.common.base.Pre
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.annotation.Nonnull;
 import javax.security.auth.login.LoginException;
 
 import org.apache.jackrabbit.oak.api.AuthInfo;
@@ -34,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.security.authentication.AuthInfoImpl;
 import org.apache.jackrabbit.oak.spi.security.authentication.LoginContext;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,13 +64,13 @@ class ContentSessionImpl implements Cont
      */
     private boolean live = true;
 
-    public ContentSessionImpl(@Nonnull LoginContext loginContext,
-                              @Nonnull SecurityProvider securityProvider,
-                              @Nonnull String workspaceName,
-                              @Nonnull NodeStore store,
-                              @Nonnull CommitHook hook,
+    public ContentSessionImpl(@NotNull LoginContext loginContext,
+                              @NotNull SecurityProvider securityProvider,
+                              @NotNull String workspaceName,
+                              @NotNull NodeStore store,
+                              @NotNull CommitHook hook,
                               QueryEngineSettings queryEngineSettings,
-                              @Nonnull QueryIndexProvider indexProvider) {
+                              @NotNull QueryIndexProvider indexProvider) {
         this.loginContext = loginContext;
         this.securityProvider = securityProvider;
         this.workspaceName = workspaceName;
@@ -86,7 +86,7 @@ class ContentSessionImpl implements Cont
     }
 
     //-----------------------------------------------------< ContentSession >---
-    @Nonnull
+    @NotNull
     @Override
     public AuthInfo getAuthInfo() {
         checkLive();
@@ -98,7 +98,7 @@ class ContentSessionImpl implements Cont
         return workspaceName;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Root getLatestRoot() {
         checkLive();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java Wed Jul 18 14:37:06 2018
@@ -24,8 +24,6 @@ import static org.apache.jackrabbit.oak.
 import java.io.InputStream;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.api.ContentSession;
 import org.apache.jackrabbit.oak.api.QueryEngine;
@@ -38,6 +36,7 @@ import org.apache.jackrabbit.oak.query.E
 import org.apache.jackrabbit.oak.query.QueryEngineImpl;
 import org.apache.jackrabbit.oak.query.QueryEngineSettings;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Simple implementation of the Root interface that only supports simple read
@@ -49,11 +48,11 @@ public final class ImmutableRoot impleme
 
     private final ImmutableTree rootTree;
 
-    public ImmutableRoot(@Nonnull NodeState rootState) {
+    public ImmutableRoot(@NotNull NodeState rootState) {
         this(new ImmutableTree(rootState));
     }
 
-    public ImmutableRoot(@Nonnull Root root) {
+    public ImmutableRoot(@NotNull Root root) {
         if (root instanceof MutableRoot) {
             rootTree = new ImmutableTree(((MutableRoot) root).getBaseState());
         } else if (root instanceof ImmutableRoot) {
@@ -63,12 +62,12 @@ public final class ImmutableRoot impleme
         }
     }
 
-    public ImmutableRoot(@Nonnull ImmutableTree rootTree) {
+    public ImmutableRoot(@NotNull ImmutableTree rootTree) {
         checkArgument(rootTree.isRoot());
         this.rootTree = rootTree;
     }
 
-    public static ImmutableRoot getInstance(@Nonnull Root root) {
+    public static ImmutableRoot getInstance(@NotNull Root root) {
         if (root instanceof ImmutableRoot) {
             return (ImmutableRoot) root;
         } else {
@@ -78,9 +77,9 @@ public final class ImmutableRoot impleme
 
     //---------------------------------------------------------------< Root >---
 
-    @Nonnull
+    @NotNull
     @Override
-    public ImmutableTree getTree(@Nonnull String path) {
+    public ImmutableTree getTree(@NotNull String path) {
         checkArgument(PathUtils.isAbsolute(path));
         ImmutableTree child = rootTree;
         for (String name : elements(path)) {
@@ -105,7 +104,7 @@ public final class ImmutableRoot impleme
     }
 
     @Override
-    public void commit(@Nonnull Map<String, Object> info) {
+    public void commit(@NotNull Map<String, Object> info) {
         throw new UnsupportedOperationException();
     }
 
@@ -119,7 +118,7 @@ public final class ImmutableRoot impleme
         return false;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public QueryEngine getQueryEngine() {
         return new QueryEngineImpl() {
@@ -133,17 +132,17 @@ public final class ImmutableRoot impleme
         };
     }
 
-    @Override @Nonnull
-    public Blob createBlob(@Nonnull InputStream stream) {
+    @Override @NotNull
+    public Blob createBlob(@NotNull InputStream stream) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Blob getBlob(@Nonnull String reference) {
+    public Blob getBlob(@NotNull String reference) {
         return null;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public ContentSession getContentSession() {
         throw new UnsupportedOperationException();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java Wed Jul 18 14:37:06 2018
@@ -31,7 +31,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
 import javax.security.auth.Subject;
 
 import com.google.common.collect.ImmutableMap;
@@ -65,6 +64,7 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
 
 class MutableRoot implements Root {
 
@@ -177,7 +177,7 @@ class MutableRoot implements Root {
 
     //---------------------------------------------------------------< Root >---
 
-    @Nonnull
+    @NotNull
     @Override
     public ContentSession getContentSession() {
         return session;
@@ -213,9 +213,9 @@ class MutableRoot implements Root {
         return success;
     }
 
-    @Nonnull
+    @NotNull
     @Override
-    public MutableTree getTree(@Nonnull String path) {
+    public MutableTree getTree(@NotNull String path) {
         checkLive();
         return rootTree.getTree(path);
     }
@@ -242,7 +242,7 @@ class MutableRoot implements Root {
     }
 
     @Override
-    public void commit(@Nonnull Map<String, Object> info) throws CommitFailedException {
+    public void commit(@NotNull Map<String, Object> info) throws CommitFailedException {
         checkLive();
         ContentSession session = getContentSession();
         CommitInfo commitInfo = new CommitInfo(
@@ -302,7 +302,7 @@ class MutableRoot implements Root {
         return modCount > 0;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public QueryEngine getQueryEngine() {
         checkLive();
@@ -320,14 +320,14 @@ class MutableRoot implements Root {
         };
     }
 
-    @Override @Nonnull
-    public Blob createBlob(@Nonnull InputStream inputStream) throws IOException {
+    @Override @NotNull
+    public Blob createBlob(@NotNull InputStream inputStream) throws IOException {
         checkLive();
         return store.createBlob(checkNotNull(inputStream));
     }
 
     @Override
-    public Blob getBlob(@Nonnull String reference) {
+    public Blob getBlob(@NotNull String reference) {
         return store.getBlob(reference);
     }
 
@@ -339,7 +339,7 @@ class MutableRoot implements Root {
      *
      * @return base node state
      */
-    @Nonnull
+    @NotNull
     NodeState getBaseState() {
         return builder.getBaseState();
     }
@@ -356,12 +356,12 @@ class MutableRoot implements Root {
      *
      * @return root node state
      */
-    @Nonnull
+    @NotNull
     private NodeState getRootState() {
         return builder.getNodeState();
     }
 
-    @Nonnull
+    @NotNull
     private AuthorizationConfiguration getAcConfig() {
         return securityProvider.getConfiguration(AuthorizationConfiguration.class);
     }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java Wed Jul 18 14:37:06 2018
@@ -23,16 +23,14 @@ import static com.google.common.base.Pre
 import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
 import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 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.core.MutableRoot.Move;
 import org.apache.jackrabbit.oak.plugins.tree.impl.AbstractMutableTree;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 final class MutableTree extends AbstractMutableTree {
 
@@ -56,13 +54,13 @@ final class MutableTree extends Abstract
     /** Pointer into the list of pending moves */
     private Move pendingMoves;
 
-    MutableTree(@Nonnull MutableRoot root, @Nonnull NodeBuilder nodeBuilder,
-            @Nonnull Move pendingMoves) {
+    MutableTree(@NotNull MutableRoot root, @NotNull NodeBuilder nodeBuilder,
+            @NotNull Move pendingMoves) {
         this(root, pendingMoves, null, nodeBuilder, "");
     }
 
-    private MutableTree(@Nonnull MutableRoot root, @Nonnull Move pendingMoves,
-            @Nullable MutableTree parent, @Nonnull NodeBuilder nodeBuilder, @Nonnull String name) {
+    private MutableTree(@NotNull MutableRoot root, @NotNull Move pendingMoves,
+            @Nullable MutableTree parent, @NotNull NodeBuilder nodeBuilder, @NotNull String name) {
         this.root = checkNotNull(root);
         this.parent = parent;
         this.name = checkNotNull(name);
@@ -73,12 +71,12 @@ final class MutableTree extends Abstract
     //------------------------------------------------------------< AbstractMutableTree >---
 
     @Override
-    @CheckForNull
+    @Nullable
     protected AbstractMutableTree getParentOrNull() {
         return parent;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     protected NodeBuilder getNodeBuilder() {
         return nodeBuilder;
@@ -87,8 +85,8 @@ final class MutableTree extends Abstract
     //-----------------------------------------------------< AbstractTree >---
 
     @Override
-    @Nonnull
-    protected MutableTree createChild(@Nonnull String name) throws IllegalArgumentException {
+    @NotNull
+    protected MutableTree createChild(@NotNull String name) throws IllegalArgumentException {
         return new MutableTree(root, pendingMoves, this,
                 nodeBuilder.getChildNode(checkNotNull(name)), name);
     }
@@ -96,21 +94,21 @@ final class MutableTree extends Abstract
     //------------------------------------------------------------< Tree >---
 
     @Override
-    @Nonnull
+    @NotNull
     public String getName() {
         beforeRead();
         return name;
     }
 
     @Override
-    @Nonnull
+    @NotNull
     public String getPath() {
         beforeRead();
         return super.getPath();
     }
 
     @Override
-    @Nonnull
+    @NotNull
     public Status getStatus() {
         beforeRead();
         return super.getStatus();
@@ -123,13 +121,13 @@ final class MutableTree extends Abstract
     }
 
     @Override
-    public PropertyState getProperty(@Nonnull String name) {
+    public PropertyState getProperty(@NotNull String name) {
         beforeRead();
         return super.getProperty(checkNotNull(name));
     }
 
     @Override
-    public boolean hasProperty(@Nonnull String name) {
+    public boolean hasProperty(@NotNull String name) {
         beforeRead();
         return super.hasProperty(checkNotNull(name));
     }
@@ -141,28 +139,28 @@ final class MutableTree extends Abstract
     }
 
     @Override
-    @CheckForNull
-    public Status getPropertyStatus(@Nonnull String name) {
+    @Nullable
+    public Status getPropertyStatus(@NotNull String name) {
         beforeRead();
         return super.getPropertyStatus(checkNotNull(name));
     }
 
     @Override
-    @Nonnull
+    @NotNull
     public Iterable<? extends PropertyState> getProperties() {
         beforeRead();
         return super.getProperties();
     }
 
     @Override
-    @Nonnull
-    public Tree getChild(@Nonnull String name) {
+    @NotNull
+    public Tree getChild(@NotNull String name) {
         beforeRead();
         return super.getChild(checkNotNull(name));
     }
 
     @Override
-    public boolean hasChild(@Nonnull String name) {
+    public boolean hasChild(@NotNull String name) {
         beforeRead();
         return super.hasChild(checkNotNull(name));
     }
@@ -174,7 +172,7 @@ final class MutableTree extends Abstract
     }
 
     @Override
-    @Nonnull
+    @NotNull
     public Iterable<Tree> getChildren() {
         beforeRead();
         return super.getChildren();
@@ -191,8 +189,8 @@ final class MutableTree extends Abstract
     }
 
     @Override
-    @Nonnull
-    public Tree addChild(@Nonnull String name) {
+    @NotNull
+    public Tree addChild(@NotNull String name) {
         beforeWrite();
         Tree child;
         if (hasChild(name)) {
@@ -221,28 +219,28 @@ final class MutableTree extends Abstract
     }
 
     @Override
-    public void setProperty(@Nonnull PropertyState property) {
+    public void setProperty(@NotNull PropertyState property) {
         beforeWrite();
         super.setProperty(property);
         root.updated();
     }
 
     @Override
-    public <T> void setProperty(@Nonnull String name, @Nonnull T value) {
+    public <T> void setProperty(@NotNull String name, @NotNull T value) {
         beforeWrite();
         super.setProperty(name, value);
         root.updated();
     }
 
     @Override
-    public <T> void setProperty(@Nonnull String name, @Nonnull T value, @Nonnull Type<T> type) {
+    public <T> void setProperty(@NotNull String name, @NotNull T value, @NotNull Type<T> type) {
         beforeWrite();
         super.setProperty(name, value, type);
         root.updated();
     }
 
     @Override
-    public void removeProperty(@Nonnull String name) {
+    public void removeProperty(@NotNull String name) {
         beforeWrite();
         super.removeProperty(name);
         root.updated();
@@ -254,7 +252,7 @@ final class MutableTree extends Abstract
      * @param parent  parent of this tree
      * @param name  name of this tree
      */
-    void setParentAndName(@Nonnull MutableTree parent, @Nonnull String name) {
+    void setParentAndName(@NotNull MutableTree parent, @NotNull String name) {
         this.name = checkNotNull(name);
         this.parent = checkNotNull(parent);
     }
@@ -265,7 +263,7 @@ final class MutableTree extends Abstract
      * @param newParent new parent for this tree
      * @param newName   new name for this tree
      */
-    boolean moveTo(@Nonnull MutableTree newParent, @Nonnull String newName) {
+    boolean moveTo(@NotNull MutableTree newParent, @NotNull String newName) {
         name = checkNotNull(newName);
         parent = checkNotNull(newParent);
         boolean success = nodeBuilder.moveTo(newParent.nodeBuilder, newName);
@@ -281,8 +279,8 @@ final class MutableTree extends Abstract
      * @param path the path to the tree
      * @return a {@link Tree} instance for the child at {@code path}.
      */
-    @Nonnull
-    MutableTree getTree(@Nonnull String path) {
+    @NotNull
+    MutableTree getTree(@NotNull String path) {
         checkArgument(isAbsolute(checkNotNull(path)));
         beforeRead();
         MutableTree child = this;
@@ -292,7 +290,7 @@ final class MutableTree extends Abstract
         return child;
     }
 
-    @Nonnull
+    @NotNull
     String getPathInternal() {
         if (parent == null) {
             return "/";
@@ -304,7 +302,7 @@ final class MutableTree extends Abstract
     }
 
     @Override
-    protected void buildPath(@Nonnull StringBuilder sb) {
+    protected void buildPath(@NotNull StringBuilder sb) {
         if (parent != null) {
             parent.buildPath(checkNotNull(sb));
             sb.append('/').append(name);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java?rev=1836177&r1=1836176&r2=1836177&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java Wed Jul 18 14:37:06 2018
@@ -18,10 +18,6 @@ package org.apache.jackrabbit.oak.core;
 
 import java.io.IOException;
 import java.io.InputStream;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.google.common.base.Predicate;
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.api.PropertyState;
@@ -33,6 +29,8 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
@@ -95,8 +93,8 @@ class SecureNodeBuilder implements NodeB
      * @param permissionProvider The {@code PermissionProvider} used to evaluation read access.
      */
     SecureNodeBuilder(
-            @Nonnull NodeBuilder builder,
-            @Nonnull LazyValue<PermissionProvider> permissionProvider) {
+            @NotNull NodeBuilder builder,
+            @NotNull LazyValue<PermissionProvider> permissionProvider) {
         this.rootBuilder = this;
         this.parent = null;
         this.name = null;
@@ -112,12 +110,12 @@ class SecureNodeBuilder implements NodeB
         this.builder = parent.builder.getChildNode(name);
     }
 
-    @Override @Nonnull
+    @Override @NotNull
     public NodeState getBaseState() {
         return new SecureNodeState(builder.getBaseState(), getTreePermission());
     }
 
-    @Override @Nonnull
+    @Override @NotNull
     public NodeState getNodeState() {
         return new SecureNodeState(builder.getNodeState(), getTreePermission());
     }
@@ -169,11 +167,11 @@ class SecureNodeBuilder implements NodeB
 
 
     @Override
-    public boolean moveTo(@Nonnull NodeBuilder newParent, @Nonnull String newName) {
+    public boolean moveTo(@NotNull NodeBuilder newParent, @NotNull String newName) {
         return exists() && builder.moveTo(newParent, newName);
     }
 
-    @CheckForNull
+    @Nullable
     @Override
     public PropertyState getProperty(String name) {
         PropertyState property = builder.getProperty(name);
@@ -200,7 +198,7 @@ class SecureNodeBuilder implements NodeB
         }
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Iterable<? extends PropertyState> getProperties() {
         if (getTreePermission().canReadProperties() || isNew()) {
@@ -213,14 +211,14 @@ class SecureNodeBuilder implements NodeB
     }
 
     @Override
-    public boolean getBoolean(@Nonnull String name) {
+    public boolean getBoolean(@NotNull String name) {
         PropertyState property = getProperty(name);
         return isType(property, BOOLEAN)  && property.getValue(BOOLEAN);
     }
 
-    @CheckForNull
+    @Nullable
     @Override
-    public String getString(@Nonnull String name) {
+    public String getString(@NotNull String name) {
         PropertyState property = getProperty(name);
         if (isType(property, STRING)) {
             return property.getValue(STRING);
@@ -229,9 +227,9 @@ class SecureNodeBuilder implements NodeB
         }
     }
 
-    @CheckForNull
+    @Nullable
     @Override
-    public String getName(@Nonnull String name) {
+    public String getName(@NotNull String name) {
         PropertyState property = getProperty(name);
         if (isType(property, NAME)) {
             return property.getValue(NAME);
@@ -240,9 +238,9 @@ class SecureNodeBuilder implements NodeB
         }
     }
 
-    @Nonnull
+    @NotNull
     @Override
-    public Iterable<String> getNames(@Nonnull String name) {
+    public Iterable<String> getNames(@NotNull String name) {
         PropertyState property = getProperty(name);
         if (isType(property, NAMES)) {
             return property.getValue(NAMES);
@@ -251,29 +249,29 @@ class SecureNodeBuilder implements NodeB
         }
     }
 
-    @Nonnull
+    @NotNull
     @Override
-    public NodeBuilder setProperty(@Nonnull PropertyState property) {
+    public NodeBuilder setProperty(@NotNull PropertyState property) {
         builder.setProperty(property);
         return this;
     }
 
-    @Nonnull
+    @NotNull
     @Override
-    public <T> NodeBuilder setProperty(String name, @Nonnull T value) {
+    public <T> NodeBuilder setProperty(String name, @NotNull T value) {
         builder.setProperty(name, value);
         return this;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public <T> NodeBuilder setProperty(
-            String name, @Nonnull T value, Type<T> type) {
+            String name, @NotNull T value, Type<T> type) {
         builder.setProperty(name, value, type);
         return this;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public NodeBuilder removeProperty(String name) {
         if (hasProperty(name)) { // only remove properties that we can see
@@ -282,7 +280,7 @@ class SecureNodeBuilder implements NodeB
         return this;
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Iterable<String> getChildNodeNames() {
         return filter(
@@ -291,7 +289,7 @@ class SecureNodeBuilder implements NodeB
     }
 
     @Override
-    public boolean hasChildNode(@Nonnull String name) {
+    public boolean hasChildNode(@NotNull String name) {
         if (builder.hasChildNode(name)) {
             return getChildNode(name).exists();
         } else {
@@ -299,9 +297,9 @@ class SecureNodeBuilder implements NodeB
         }
     }
 
-    @Nonnull
+    @NotNull
     @Override
-    public NodeBuilder child(@Nonnull String name) {
+    public NodeBuilder child(@NotNull String name) {
         if (hasChildNode(name)) {
             return getChildNode(name);
         } else {
@@ -309,23 +307,23 @@ class SecureNodeBuilder implements NodeB
         }
     }
 
-    @Nonnull
+    @NotNull
     @Override
-    public NodeBuilder setChildNode(@Nonnull String name) {
+    public NodeBuilder setChildNode(@NotNull String name) {
         builder.setChildNode(name);
         return new SecureNodeBuilder(this, name);
     }
 
-    @Nonnull
+    @NotNull
     @Override
-    public NodeBuilder setChildNode(@Nonnull String name, @Nonnull NodeState nodeState) {
+    public NodeBuilder setChildNode(@NotNull String name, @NotNull NodeState nodeState) {
         builder.setChildNode(name, nodeState);
         return new SecureNodeBuilder(this, name);
     }
 
-    @Nonnull
+    @NotNull
     @Override
-    public NodeBuilder getChildNode(@Nonnull String name) {
+    public NodeBuilder getChildNode(@NotNull String name) {
         return new SecureNodeBuilder(this, name);
     }
 
@@ -348,7 +346,7 @@ class SecureNodeBuilder implements NodeB
      *
      * @return The permissions for this tree.
      */
-    @Nonnull
+    @NotNull
     private TreePermission getTreePermission() {
         if (treePermission == null
                 || rootPermission != rootBuilder.treePermission) {
@@ -365,7 +363,7 @@ class SecureNodeBuilder implements NodeB
         return treePermission;
     }
 
-    private static boolean isType(@CheckForNull PropertyState property, Type<?> type) {
+    private static boolean isType(@Nullable PropertyState property, Type<?> type) {
         Type<?> t = (property == null) ? null : property.getType();
         return t == type;
     }