Author: reschke
Date: Wed Nov  7 13:41:08 2018
New Revision: 1846010

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

Modified:
    jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMemberTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMembersTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddUniqueMembersTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugOakTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LucenePropertyFullTextTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberDeclaredMemberOf.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsDeclaredMember.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsMember.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberMemberOf.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMemberTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMembersTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/MimeType.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/AggregateNodeSearcher.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FacetSearcher.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FullTextSearcher.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterOrderBySearcher.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterSplitOrderBySearcher.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/NodeTypeSearcher.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/OrderBySearcher.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/PaginationEnabledSearcher.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SearchScalabilityBenchmark.java
    
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SplitOrderBySearcher.java

Modified: jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-benchmarks/pom.xml Wed Nov  7 13:41:08 2018
@@ -164,8 +164,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
 Wed Nov  7 13:41:08 2018
@@ -25,9 +25,6 @@ import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.jcr.Credentials;
 import javax.jcr.GuestCredentials;
 import javax.jcr.Repository;
@@ -43,6 +40,8 @@ import org.apache.commons.math.stat.desc
 import org.apache.jackrabbit.oak.commons.Profiler;
 import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
 import org.apache.jackrabbit.oak.spi.security.authentication.SystemSubject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -454,7 +453,7 @@ public abstract class AbstractTest<T> ex
         return new Object[0];
     }
 
-    @CheckForNull
+    @Nullable
     protected String comment(){
         return null;
     }
@@ -584,7 +583,7 @@ public abstract class AbstractTest<T> ex
         return loginSubject(SystemSubject.INSTANCE);
     }
 
-    protected Session loginSubject(@Nonnull Subject subject) {
+    protected Session loginSubject(@NotNull Subject subject) {
         try {
 
             return Subject.doAsPrivileged(subject, new 
PrivilegedExceptionAction<Session>() {

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMemberTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMemberTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMemberTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMemberTest.java
 Wed Nov  7 13:41:08 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.benchm
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nonnull;
 import javax.jcr.Session;
 
 import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -27,6 +26,7 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
 import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Test the performance of adding a configured number of members to groups. The
@@ -48,7 +48,7 @@ public class AddMemberTest extends AddMe
     }
 
     @Override
-    protected void createUsers(@Nonnull UserManager userManager) throws 
Exception {
+    protected void createUsers(@NotNull UserManager userManager) throws 
Exception {
         for (int i = 0; i <= numberOfMembers; i++) {
             String id = USER + i;
             User u = userManager.createUser(id, null, new PrincipalImpl(id), 
REL_TEST_PATH);
@@ -57,7 +57,7 @@ public class AddMemberTest extends AddMe
     }
 
     @Override
-    protected void addMembers(@Nonnull UserManager userManager, @Nonnull Group 
group, @Nonnull Session s) throws Exception {
+    protected void addMembers(@NotNull UserManager userManager, @NotNull Group 
group, @NotNull Session s) throws Exception {
         int j = 1;
         for (int i = 0; i <= numberOfMembers; i++) {
             String userPath = userPaths.get(random.nextInt(numberOfMembers));

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMembersTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMembersTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMembersTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddMembersTest.java
 Wed Nov  7 13:41:08 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.benchm
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import javax.annotation.Nonnull;
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -42,6 +41,7 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
 import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
 import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Test the performance of adding a configured number of members to groups. The
@@ -70,7 +70,7 @@ public class AddMembersTest extends Abst
 
     private final List<String> groupPaths = new ArrayList<>(GROUP_CNT);
 
-    public AddMembersTest(int numberOfMembers, int batchSize, @Nonnull String 
importBehavior) {
+    public AddMembersTest(int numberOfMembers, int batchSize, @NotNull String 
importBehavior) {
         this.numberOfMembers = numberOfMembers;
         this.batchSize = batchSize;
         this.importBehavior = importBehavior;
@@ -97,7 +97,7 @@ public class AddMembersTest extends Abst
         System.out.println("setup done");
     }
 
-    protected void createUsers(@Nonnull UserManager userManager) throws 
Exception {
+    protected void createUsers(@NotNull UserManager userManager) throws 
Exception {
         if (!ImportBehavior.NAME_BESTEFFORT.equals(importBehavior)) {
             for (int i = 0; i <= numberOfMembers; i++) {
                 String id = USER + i;
@@ -167,7 +167,7 @@ public class AddMembersTest extends Abst
         }
     }
 
-    protected void addMembers(@Nonnull UserManager userManger, @Nonnull Group 
group, @Nonnull Session s) throws Exception {
+    protected void addMembers(@NotNull UserManager userManger, @NotNull Group 
group, @NotNull Session s) throws Exception {
         for (int i = 0; i <= numberOfMembers; i++) {
             if (batchSize <= DEFAULT_BATCH_SIZE) {
                 group.addMembers(USER + i);

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddUniqueMembersTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddUniqueMembersTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddUniqueMembersTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AddUniqueMembersTest.java
 Wed Nov  7 13:41:08 2018
@@ -21,12 +21,12 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.annotation.Nonnull;
 import javax.jcr.Session;
 
 import org.apache.jackrabbit.api.security.user.Group;
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
+import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 
 /**
@@ -48,12 +48,12 @@ public class AddUniqueMembersTest extend
     }
 
     @Override
-    protected void createUsers(@Nonnull UserManager userManager) throws 
Exception {
+    protected void createUsers(@NotNull UserManager userManager) throws 
Exception {
         // no need for creating the users beforehand
     }
 
     @Override
-    protected void addMembers(@Nonnull UserManager userManger, @Nonnull Group 
group, @Nonnull Session s)
+    protected void addMembers(@NotNull UserManager userManger, @NotNull Group 
group, @NotNull Session s)
             throws Exception {
         long uid = index.getAndIncrement();
 

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
 Wed Nov  7 13:41:08 2018
@@ -33,8 +33,6 @@ import java.util.concurrent.LinkedBlocki
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 import javax.jcr.Binary;
 import javax.jcr.Node;
 import javax.jcr.Property;
@@ -57,6 +55,8 @@ import org.apache.jackrabbit.oak.jcr.Jcr
 import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
 import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
 import static org.apache.jackrabbit.JcrConstants.NT_FOLDER;
@@ -270,7 +270,7 @@ public class BundlingNodeTest extends Ab
             session.logout();
         }
 
-        @CheckForNull
+        @Nullable
         public String pickRandomPath(){
             if (assets != null){
                 return assets.get(random.nextInt(assets.size()));
@@ -303,7 +303,7 @@ public class BundlingNodeTest extends Ab
     private class BundlingConfigInitializer implements RepositoryInitializer {
 
         @Override
-        public void initialize(@Nonnull NodeBuilder builder) {
+        public void initialize(@NotNull NodeBuilder builder) {
             if (builder.hasChildNode(JCR_SYSTEM)){
                 NodeBuilder system = builder.getChildNode(JCR_SYSTEM);
 
@@ -347,7 +347,7 @@ public class BundlingNodeTest extends Ab
         INSTANCE;
 
         @Override
-        public void initialize(@Nonnull NodeBuilder builder) {
+        public void initialize(@NotNull NodeBuilder builder) {
             NodeBuilder nodetype = 
builder.getChildNode("oak:index").getChildNode("nodetype");
             if (nodetype.exists()){
                 nodetype.setProperty(DECLARING_NODE_TYPES, 
Collections.singleton("rep:Authorizable"), Type.NAMES);

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
 Wed Nov  7 13:41:08 2018
@@ -20,8 +20,6 @@ import java.security.Principal;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.jcr.Repository;
 import javax.jcr.security.AccessControlManager;
 
@@ -58,6 +56,8 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBitsProvider;
 import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
 import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -110,77 +110,77 @@ public class CompositeAuthorizationTest
 
         private final AuthorizationConfiguration defConfig;
 
-        private TmpAuthorizationConfig(@Nonnull AuthorizationConfiguration 
defConfig) {
+        private TmpAuthorizationConfig(@NotNull AuthorizationConfiguration 
defConfig) {
             this.defConfig = defConfig;
         }
 
-        @Nonnull
+        @NotNull
         @Override
-        public AccessControlManager getAccessControlManager(@Nonnull Root 
root, @Nonnull NamePathMapper namePathMapper) {
+        public AccessControlManager getAccessControlManager(@NotNull Root 
root, @NotNull NamePathMapper namePathMapper) {
             return defConfig.getAccessControlManager(root, namePathMapper);
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public RestrictionProvider getRestrictionProvider() {
             return defConfig.getRestrictionProvider();
         }
 
-        @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) {
             return new TmpPermissionProvider(root);
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public String getName() {
             return defConfig.getName();
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public ConfigurationParameters getParameters() {
             return defConfig.getParameters();
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public WorkspaceInitializer getWorkspaceInitializer() {
             return WorkspaceInitializer.DEFAULT;
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public RepositoryInitializer getRepositoryInitializer() {
             return RepositoryInitializer.DEFAULT;
         }
 
-        @Nonnull
+        @NotNull
         @Override
-        public List<? extends CommitHook> getCommitHooks(@Nonnull String 
workspaceName) {
+        public List<? extends CommitHook> getCommitHooks(@NotNull String 
workspaceName) {
             return Collections.EMPTY_LIST;
         }
 
-        @Nonnull
+        @NotNull
         @Override
-        public List<? extends ValidatorProvider> getValidators(@Nonnull String 
workspaceName, @Nonnull Set<Principal> principals, @Nonnull MoveTracker 
moveTracker) {
+        public List<? extends ValidatorProvider> getValidators(@NotNull String 
workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker 
moveTracker) {
             return Collections.EMPTY_LIST;
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public List<ThreeWayConflictHandler> getConflictHandlers() {
             return Collections.EMPTY_LIST;
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public List<ProtectedItemImporter> getProtectedItemImporters() {
             return Collections.EMPTY_LIST;
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public Context getContext() {
             return defConfig.getContext();
@@ -203,7 +203,7 @@ public class CompositeAuthorizationTest
             immutableRoot = RootFactory.createReadOnlyRoot(root);
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public Set<String> getPrivileges(@Nullable Tree tree) {
             performSomeRead(tree);
@@ -211,32 +211,32 @@ public class CompositeAuthorizationTest
         }
 
         @Override
-        public boolean hasPrivileges(@Nullable Tree tree, @Nonnull String... 
privilegeNames) {
+        public boolean hasPrivileges(@Nullable Tree tree, @NotNull String... 
privilegeNames) {
             performSomeRead(tree);
             return true;
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public RepositoryPermission getRepositoryPermission() {
             return RepositoryPermission.ALL;
         }
 
-        @Nonnull
+        @NotNull
         @Override
-        public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull 
TreePermission parentPermission) {
+        public TreePermission getTreePermission(@NotNull Tree tree, @NotNull 
TreePermission parentPermission) {
             performSomeRead(tree);
             return TreePermission.ALL;
         }
 
         @Override
-        public boolean isGranted(@Nonnull Tree tree, @Nullable PropertyState 
property, long permissions) {
+        public boolean isGranted(@NotNull Tree tree, @Nullable PropertyState 
property, long permissions) {
             performSomeRead(tree);
             return true;
         }
 
         @Override
-        public boolean isGranted(@Nonnull String oakPath, @Nonnull String 
jcrActions) {
+        public boolean isGranted(@NotNull String oakPath, @NotNull String 
jcrActions) {
             performSomeRead(immutableRoot.getTree(oakPath));
             return true;
         }
@@ -248,7 +248,7 @@ public class CompositeAuthorizationTest
 //            }
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public PrivilegeBits supportedPrivileges(@Nullable Tree tree, 
@Nullable PrivilegeBits privilegeBits) {
             return (privilegeBits != null) ? privilegeBits : new 
PrivilegeBitsProvider(immutableRoot).getBits(PrivilegeConstants.JCR_ALL);
@@ -260,24 +260,24 @@ public class CompositeAuthorizationTest
         }
 
         @Override
-        public long supportedPermissions(@Nonnull TreeLocation location, long 
permissions) {
+        public long supportedPermissions(@NotNull TreeLocation location, long 
permissions) {
             return permissions;
         }
 
         @Override
-        public long supportedPermissions(@Nonnull TreePermission 
treePermission, @Nullable PropertyState property, long permissions) {
+        public long supportedPermissions(@NotNull TreePermission 
treePermission, @Nullable PropertyState property, long permissions) {
             return permissions;
         }
 
         @Override
-        public boolean isGranted(@Nonnull TreeLocation location, long 
permissions) {
+        public boolean isGranted(@NotNull TreeLocation location, long 
permissions) {
             return true;
         }
 
-        @Nonnull
+        @NotNull
         @Override
-        public TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull 
TreeType type, @Nonnull TreePermission parentPermission) {
+        public TreePermission getTreePermission(@NotNull Tree tree, @NotNull 
TreeType type, @NotNull TreePermission parentPermission) {
             return getTreePermission(tree, parentPermission);
         }
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugOakTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugOakTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugOakTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugOakTest.java
 Wed Nov  7 13:41:08 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.benchm
 import java.security.PrivilegedAction;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nonnull;
 import javax.jcr.Credentials;
 import javax.jcr.GuestCredentials;
 import javax.jcr.Repository;
@@ -35,6 +34,7 @@ import org.apache.jackrabbit.oak.fixture
 import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
 import org.apache.jackrabbit.oak.jcr.Jcr;
 import org.apache.jackrabbit.oak.plugins.tree.TreeLocation;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Test the effect of multiple authorization configurations on the general read
@@ -48,7 +48,7 @@ public class CugOakTest extends CugTest
     private ContentSession cs;
     private Subject subject;
 
-    protected CugOakTest(boolean runAsAdmin, int itemsToRead, boolean 
singleSession, @Nonnull List<String> supportedPaths, boolean reverseOrder) {
+    protected CugOakTest(boolean runAsAdmin, int itemsToRead, boolean 
singleSession, @NotNull List<String> supportedPaths, boolean reverseOrder) {
         super(runAsAdmin, itemsToRead, singleSession, supportedPaths, 
reverseOrder);
     }
 
@@ -134,4 +134,4 @@ public class CugOakTest extends CugTest
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
 Wed Nov  7 13:41:08 2018
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.benchmark;
 
 import java.util.List;
-import javax.annotation.Nonnull;
 import javax.jcr.Repository;
 
 import org.apache.jackrabbit.oak.Oak;
@@ -31,6 +30,7 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
 import 
org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
 import 
org.apache.jackrabbit.oak.spi.security.authorization.cug.impl.CugConfiguration;
+import org.jetbrains.annotations.NotNull;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -45,7 +45,7 @@ public class CugTest extends ReadDeepTre
     private final ConfigurationParameters params;
     private final boolean reverseOrder;
 
-    protected CugTest(boolean runAsAdmin, int itemsToRead, boolean 
singleSession, @Nonnull List<String> supportedPaths, boolean reverseOrder) {
+    protected CugTest(boolean runAsAdmin, int itemsToRead, boolean 
singleSession, @NotNull List<String> supportedPaths, boolean reverseOrder) {
         super(runAsAdmin, itemsToRead, false, singleSession);
         this.params = 
ConfigurationParameters.of(AuthorizationConfiguration.NAME, 
ConfigurationParameters.of(
                     "cugSupportedPaths", supportedPaths.toArray(new 
String[supportedPaths.size()]),
@@ -81,7 +81,7 @@ public class CugTest extends ReadDeepTre
         return newTestSecurityProvider(params, reverseOrder);
     }
 
-    private static SecurityProvider newTestSecurityProvider(@Nonnull 
ConfigurationParameters params,
+    private static SecurityProvider newTestSecurityProvider(@NotNull 
ConfigurationParameters params,
             boolean reverseOrder) {
         SecurityProvider delegate = new 
SecurityProviderBuilder().with(params).build();
         CompositeAuthorizationConfiguration authorizationConfiguration = 
(CompositeAuthorizationConfiguration) delegate
@@ -96,4 +96,4 @@ public class CugTest extends ReadDeepTre
         }
         return delegate;
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
 Wed Nov  7 13:41:08 2018
@@ -22,7 +22,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.StringReader;
-import javax.annotation.Nonnull;
 import javax.jcr.Repository;
 
 import org.apache.commons.io.FileUtils;
@@ -45,6 +44,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +68,7 @@ public class FullTextSolrSearchTest exte
                 @Override
                 public Jcr customize(Oak oak) {
                     OakSolrConfigurationProvider configurationProvider = new 
OakSolrConfigurationProvider() {
-                        @Nonnull
+                        @NotNull
                         public OakSolrConfiguration getConfiguration() {
                             return new DefaultSolrConfiguration() {
                                 @Override

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
 Wed Nov  7 13:41:08 2018
@@ -34,8 +34,6 @@ import java.util.concurrent.ThreadPoolEx
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -89,6 +87,8 @@ import org.apache.jackrabbit.oak.spi.whi
 import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -441,7 +441,7 @@ public class HybridIndexTest extends Abs
     private class PropertyIndexInitializer implements RepositoryInitializer {
 
         @Override
-        public void initialize(@Nonnull NodeBuilder builder) {
+        public void initialize(@NotNull NodeBuilder builder) {
             NodeBuilder oakIndex = IndexUtils.getOrCreateOakIndex(builder);
             addPropIndexDefn(oakIndex, indexedPropName);
             for (int i = 0; i < numOfIndexes - 1; i++) {
@@ -465,7 +465,7 @@ public class HybridIndexTest extends Abs
 
     private class LuceneIndexInitializer implements RepositoryInitializer {
         @Override
-        public void initialize(@Nonnull NodeBuilder builder) {
+        public void initialize(@NotNull NodeBuilder builder) {
             NodeBuilder oakIndex = IndexUtils.getOrCreateOakIndex(builder);
 
             IndexDefinitionBuilder defnBuilder = new IndexDefinitionBuilder();
@@ -490,7 +490,7 @@ public class HybridIndexTest extends Abs
 
     private class LuceneFullTextInitializer implements RepositoryInitializer {
         @Override
-        public void initialize(@Nonnull NodeBuilder builder) {
+        public void initialize(@NotNull NodeBuilder builder) {
             NodeBuilder oakIndex = IndexUtils.getOrCreateOakIndex(builder);
 
             IndexDefinitionBuilder defnBuilder = new IndexDefinitionBuilder();
@@ -506,7 +506,7 @@ public class HybridIndexTest extends Abs
     private class NodeTypeIndexFixerInitializer implements 
RepositoryInitializer {
 
         @Override
-        public void initialize(@Nonnull NodeBuilder builder) {
+        public void initialize(@NotNull NodeBuilder builder) {
             //Due to OAK-1150 currently all nodes get indexed
             //With explicit list on those nodes would be indexed
             NodeBuilder nodetype = 
builder.getChildNode("oak:index").getChildNode("nodetype");

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LucenePropertyFullTextTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LucenePropertyFullTextTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LucenePropertyFullTextTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LucenePropertyFullTextTest.java
 Wed Nov  7 13:41:08 2018
@@ -39,7 +39,6 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import javax.annotation.Nonnull;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -64,6 +63,7 @@ import org.apache.jackrabbit.oak.spi.com
 import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
 import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -106,7 +106,7 @@ public class LucenePropertyFullTextTest
         final Session session = loginWriter();
         final String title;
         
-        public TestContext(@Nonnull final String title) {
+        public TestContext(@NotNull final String title) {
             this.title = checkNotNull(title);
         }
     }
@@ -118,13 +118,13 @@ public class LucenePropertyFullTextTest
         private String name;
         private Set<String> properties;
         
-        public LucenePropertyInitialiser(@Nonnull final String name, 
-                                         @Nonnull final Set<String> 
properties) {
+        public LucenePropertyInitialiser(@NotNull final String name, 
+                                         @NotNull final Set<String> 
properties) {
             this.name = checkNotNull(name);
             this.properties = checkNotNull(properties);
         }
                 
-        private boolean isAlreadyThere(@Nonnull final NodeBuilder root) {
+        private boolean isAlreadyThere(@NotNull final NodeBuilder root) {
             return checkNotNull(root).hasChildNode(INDEX_DEFINITIONS_NAME) &&
                 root.getChildNode(INDEX_DEFINITIONS_NAME).hasChildNode(name);
         }
@@ -269,7 +269,7 @@ public class LucenePropertyFullTextTest
         }
     }
     
-    private boolean performQuery(@Nonnull final TestContext ec) throws 
RepositoryException {
+    private boolean performQuery(@NotNull final TestContext ec) throws 
RepositoryException {
         QueryManager qm = ec.session.getWorkspace().getQueryManager();
         ValueFactory vf = ec.session.getValueFactory();
         Query q = qm.createQuery("SELECT * FROM [nt:base] WHERE [title] = 
$title", Query.JCR_SQL2);

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
 Wed Nov  7 13:41:08 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.benchm
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import javax.annotation.Nonnull;
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -44,6 +43,7 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
 import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
 import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Abstract test-base for the various membership related operations (isMember, 
isDeclaredMember, memberOf, declaredMemberOf)
@@ -173,5 +173,5 @@ abstract class MemberBaseTest extends Ab
         }
     }
 
-    protected abstract void testMembership(@Nonnull Group g, @Nonnull User 
member) throws Exception;
-}
\ No newline at end of file
+    protected abstract void testMembership(@NotNull Group g, @NotNull User 
member) throws Exception;
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberDeclaredMemberOf.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberDeclaredMemberOf.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberDeclaredMemberOf.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberDeclaredMemberOf.java
 Wed Nov  7 13:41:08 2018
@@ -16,10 +16,9 @@
  */
 package org.apache.jackrabbit.oak.benchmark;
 
-import javax.annotation.Nonnull;
-
 import org.apache.jackrabbit.api.security.user.Group;
 import org.apache.jackrabbit.api.security.user.User;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Same as {@link MemberBaseTest} but only reading the declared membership.
@@ -31,7 +30,7 @@ public class MemberDeclaredMemberOf exte
     }
 
     @Override
-    protected void testMembership(@Nonnull Group g, @Nonnull User member) 
throws Exception {
+    protected void testMembership(@NotNull Group g, @NotNull User member) 
throws Exception {
         member.declaredMemberOf();
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsDeclaredMember.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsDeclaredMember.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsDeclaredMember.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsDeclaredMember.java
 Wed Nov  7 13:41:08 2018
@@ -16,11 +16,10 @@
  */
 package org.apache.jackrabbit.oak.benchmark;
 
-import javax.annotation.Nonnull;
-
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
 import org.apache.jackrabbit.api.security.user.User;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Same as {@link MemberBaseTest} but testing {@link 
Group#isDeclaredMember(Authorizable)}.
@@ -32,7 +31,7 @@ public class MemberIsDeclaredMember exte
     }
 
     @Override
-    protected void testMembership(@Nonnull Group g, @Nonnull User member) 
throws Exception {
+    protected void testMembership(@NotNull Group g, @NotNull User member) 
throws Exception {
         g.isDeclaredMember(member);
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsMember.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsMember.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsMember.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberIsMember.java
 Wed Nov  7 13:41:08 2018
@@ -16,11 +16,10 @@
  */
 package org.apache.jackrabbit.oak.benchmark;
 
-import javax.annotation.Nonnull;
-
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
 import org.apache.jackrabbit.api.security.user.User;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Same as {@link MemberBaseTest} but testing {@link 
Group#isMember(Authorizable)}.
@@ -32,7 +31,7 @@ public class MemberIsMember extends Memb
     }
 
     @Override
-    protected void testMembership(@Nonnull Group g, @Nonnull User member) 
throws Exception {
+    protected void testMembership(@NotNull Group g, @NotNull User member) 
throws Exception {
         g.isMember(member);
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberMemberOf.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberMemberOf.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberMemberOf.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberMemberOf.java
 Wed Nov  7 13:41:08 2018
@@ -16,10 +16,9 @@
  */
 package org.apache.jackrabbit.oak.benchmark;
 
-import javax.annotation.Nonnull;
-
 import org.apache.jackrabbit.api.security.user.Group;
 import org.apache.jackrabbit.api.security.user.User;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Same as {@link MemberBaseTest} but only reading the declared membership.
@@ -31,7 +30,7 @@ public class MemberMemberOf extends Memb
     }
 
     @Override
-    protected void testMembership(@Nonnull Group g, @Nonnull User member) 
throws Exception {
+    protected void testMembership(@NotNull Group g, @NotNull User member) 
throws Exception {
         member.memberOf();
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ObservationTest.java
 Wed Nov  7 13:41:08 2018
@@ -38,7 +38,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import javax.annotation.Nullable;
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -58,6 +57,7 @@ import org.apache.jackrabbit.oak.fixture
 import org.apache.jackrabbit.oak.jcr.Jcr;
 import org.apache.jackrabbit.oak.spi.commit.BackgroundObserverMBean;
 import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
+import org.jetbrains.annotations.Nullable;
 
 public class ObservationTest extends Benchmark {
     public static final int EVENT_TYPES = NODE_ADDED | NODE_REMOVED | 
NODE_MOVED |

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMemberTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMemberTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMemberTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMemberTest.java
 Wed Nov  7 13:41:08 2018
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.benchm
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nonnull;
 import javax.jcr.Session;
 
 import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -26,6 +25,7 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Test the performance of removing members from groups. The
@@ -46,7 +46,7 @@ public class RemoveMemberTest extends Re
         userPaths = new ArrayList<String>(numberOfMembers);
     }
 
-    protected void createUsers(@Nonnull UserManager userManager) throws 
Exception {
+    protected void createUsers(@NotNull UserManager userManager) throws 
Exception {
         for (int i = 0; i <= numberOfMembers; i++) {
             String id = USER + i;
             User u = userManager.createUser(id, null, new PrincipalImpl(id), 
REL_TEST_PATH);
@@ -54,7 +54,7 @@ public class RemoveMemberTest extends Re
         }
     }
 
-    protected void removeMembers(@Nonnull UserManager userManger, @Nonnull 
Group group, @Nonnull Session s) throws Exception {
+    protected void removeMembers(@NotNull UserManager userManger, @NotNull 
Group group, @NotNull Session s) throws Exception {
         int j = 1;
         for (int i = 0; i <= numberOfMembers; i++) {
             Authorizable member = userManger.getAuthorizable(USER + 
random.nextInt(numberOfMembers));

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMembersTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMembersTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMembersTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RemoveMembersTest.java
 Wed Nov  7 13:41:08 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.benchm
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import javax.annotation.Nonnull;
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -42,6 +41,7 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
 import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
 import org.apache.jackrabbit.util.Text;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Test the performance of removing members from groups. The
@@ -100,7 +100,7 @@ public class RemoveMembersTest extends A
     }
 
 
-    protected void createUsers(@Nonnull UserManager userManager) throws 
Exception {
+    protected void createUsers(@NotNull UserManager userManager) throws 
Exception {
         // nothing to do here as we add|remove members by ID in the setup and 
the test
     }
 
@@ -166,7 +166,7 @@ public class RemoveMembersTest extends A
         }
     }
 
-    protected void removeMembers(@Nonnull UserManager userManger, @Nonnull 
Group group, @Nonnull Session s) throws Exception {
+    protected void removeMembers(@NotNull UserManager userManger, @NotNull 
Group group, @NotNull Session s) throws Exception {
         for (int i = 0; i <= numberOfMembers; i++) {
             if (batchSize <= DEFAULT_BATCH_SIZE) {
                 group.removeMembers(USER + random.nextInt(numberOfMembers));

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
 Wed Nov  7 13:41:08 2018
@@ -24,8 +24,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 import javax.jcr.Credentials;
 import javax.jcr.Repository;
 import javax.jcr.Session;
@@ -69,6 +67,8 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
 import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
 import org.apache.sling.testing.mock.osgi.context.OsgiContextImpl;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import static com.google.common.base.Preconditions.checkState;
 
@@ -108,13 +108,13 @@ abstract class AbstractExternalTest exte
 
     protected AbstractExternalTest(int numberOfUsers, int numberOfGroups,
                                    long expTime, boolean dynamicMembership,
-                                   @Nonnull List<String> autoMembership) {
+                                   @NotNull List<String> autoMembership) {
         this(numberOfUsers, numberOfGroups, expTime, dynamicMembership, 
autoMembership, 0);
     }
 
     protected AbstractExternalTest(int numberOfUsers, int numberOfGroups,
                                    long expTime, boolean dynamicMembership,
-                                   @Nonnull List<String> autoMembership,
+                                   @NotNull List<String> autoMembership,
                                    int roundtripDelay) {
 
         idp = (roundtripDelay < 0) ? new 
PrincipalResolvingProvider(numberOfUsers, numberOfGroups) : new 
TestIdentityProvider(numberOfUsers, numberOfGroups);
@@ -261,15 +261,15 @@ abstract class AbstractExternalTest exte
             this.membershipSize = membershipSize;
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public String getName() {
             return "test";
         }
 
-        @CheckForNull
+        @Nullable
         @Override
-        public ExternalIdentity getIdentity(@Nonnull ExternalIdentityRef ref) {
+        public ExternalIdentity getIdentity(@NotNull ExternalIdentityRef ref) {
             String id = ref.getId();
             long index = Long.valueOf(id.substring(1));
             if (id.charAt(0) == 'u') {
@@ -286,25 +286,25 @@ abstract class AbstractExternalTest exte
             }
         }
 
-        @CheckForNull
+        @Nullable
         @Override
-        public ExternalUser getUser(@Nonnull String userId) {
+        public ExternalUser getUser(@NotNull String userId) {
             return new TestUser(Long.valueOf(userId.substring(1)));
         }
 
-        @CheckForNull
+        @Nullable
         @Override
-        public ExternalUser authenticate(@Nonnull Credentials credentials) {
+        public ExternalUser authenticate(@NotNull Credentials credentials) {
             return getUser(((SimpleCredentials) credentials).getUserID());
         }
 
-        @CheckForNull
+        @Nullable
         @Override
-        public ExternalGroup getGroup(@Nonnull String name) {
+        public ExternalGroup getGroup(@NotNull String name) {
             return new TestGroup(Long.valueOf(name.substring(1)));
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public Iterator<ExternalUser> listUsers() {
             Set<ExternalUser> all = new HashSet<>();
@@ -314,7 +314,7 @@ abstract class AbstractExternalTest exte
             return all.iterator();
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public Iterator<ExternalGroup> listGroups() {
             Set<ExternalGroup> all = new HashSet<>();
@@ -343,9 +343,9 @@ abstract class AbstractExternalTest exte
             super(numberOfUsers, membershipSize);
         }
 
-        @Nonnull
+        @NotNull
         @Override
-        public String fromExternalIdentityRef(@Nonnull ExternalIdentityRef 
externalIdentityRef) {
+        public String fromExternalIdentityRef(@NotNull ExternalIdentityRef 
externalIdentityRef) {
             return "p_" + externalIdentityRef.getId();
         }
     }
@@ -356,25 +356,25 @@ abstract class AbstractExternalTest exte
         private final String principalName;
         private final ExternalIdentityRef id;
 
-        public TestIdentity(@Nonnull String userId) {
+        public TestIdentity(@NotNull String userId) {
             this.userId = userId;
             this.principalName = "p_"+userId;
             id = new ExternalIdentityRef(userId, idp.getName());
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public String getId() {
             return userId;
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public String getPrincipalName() {
             return principalName;
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public ExternalIdentityRef getExternalId() {
             return id;
@@ -385,13 +385,13 @@ abstract class AbstractExternalTest exte
             return null;
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public Iterable<ExternalIdentityRef> getDeclaredGroups() {
             return ((TestIdentityProvider) idp).getDeclaredGroupRefs(userId);
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public Map<String, ?> getProperties() {
             return ImmutableMap.of();
@@ -413,10 +413,10 @@ abstract class AbstractExternalTest exte
             super("g" + index);
         }
 
-        @Nonnull
+        @NotNull
         @Override
         public Iterable<ExternalIdentityRef> getDeclaredMembers() throws 
ExternalIdentityException {
             return ImmutableSet.of();
         }
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
 Wed Nov  7 13:41:08 2018
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.benchmark.authentication.external;
 
 import java.util.List;
-import javax.annotation.Nonnull;
 import javax.jcr.SimpleCredentials;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
@@ -25,6 +24,7 @@ import javax.security.auth.login.Configu
 import com.google.common.collect.ImmutableMap;
 import org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl;
 import 
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalLoginModule;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Login against the {@link ExternalLoginModule} with a randomly selected user.
@@ -37,7 +37,7 @@ import org.apache.jackrabbit.oak.spi.sec
 public class ExternalLoginTest extends AbstractExternalTest {
 
     public ExternalLoginTest(int numberOfUsers, int numberOfGroups, long 
expTime,
-                             boolean dynamicMembership, @Nonnull List<String> 
autoMembership) {
+                             boolean dynamicMembership, @NotNull List<String> 
autoMembership) {
         super(numberOfUsers, numberOfGroups, expTime, dynamicMembership, 
autoMembership);
     }
 
@@ -65,4 +65,4 @@ public class ExternalLoginTest extends A
             }
         };
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncAllExternalUsersTest.java
 Wed Nov  7 13:41:08 2018
@@ -17,13 +17,13 @@
 package org.apache.jackrabbit.oak.benchmark.authentication.external;
 
 import java.util.List;
-import javax.annotation.Nonnull;
 import javax.security.auth.login.Configuration;
 
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.authentication.ConfigurationUtil;
 import 
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx.SyncMBeanImpl;
 import 
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx.SynchronizationMBean;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Benchmark for {@link SynchronizationMBean#syncAllExternalUsers()}
@@ -33,7 +33,7 @@ public class SyncAllExternalUsersTest ex
     private SynchronizationMBean bean;
 
     public SyncAllExternalUsersTest(int numberOfUsers, int membershipSize, 
long expTime,
-                                    boolean dynamicMembership, @Nonnull 
List<String> autoMembership) {
+                                    boolean dynamicMembership, @NotNull 
List<String> autoMembership) {
         super(numberOfUsers, membershipSize, expTime, dynamicMembership, 
autoMembership);
     }
 
@@ -52,4 +52,4 @@ public class SyncAllExternalUsersTest ex
     protected void runTest() throws Exception {
         bean.syncAllExternalUsers();
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/SyncExternalUsersTest.java
 Wed Nov  7 13:41:08 2018
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.benchmark.authentication.external;
 
 import java.util.List;
-import javax.annotation.Nonnull;
 import javax.security.auth.login.Configuration;
 
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
@@ -25,6 +24,7 @@ import org.apache.jackrabbit.oak.spi.sec
 import 
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
 import 
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx.SyncMBeanImpl;
 import 
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx.SynchronizationMBean;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Benchmark for {@link SynchronizationMBean#syncExternalUsers(String[])}
@@ -35,7 +35,7 @@ public class SyncExternalUsersTest exten
     private SynchronizationMBean bean;
 
     public SyncExternalUsersTest(int numberOfUsers, int membershipSize, long 
expTime,
-                                 boolean dynamicMembership, @Nonnull 
List<String> autoMembership,
+                                 boolean dynamicMembership, @NotNull 
List<String> autoMembership,
                                  int batchSize) {
         super(numberOfUsers, membershipSize, expTime, dynamicMembership, 
autoMembership);
         this.batchSize = batchSize;
@@ -60,4 +60,4 @@ public class SyncExternalUsersTest exten
         }
         bean.syncExternalUsers(externalIds);
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/MimeType.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/MimeType.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/MimeType.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/MimeType.java
 Wed Nov  7 13:41:08 2018
@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
 
 public enum MimeType {
     APPLICATION_DVI("application/x-dvi"),
@@ -87,7 +87,7 @@ public enum MimeType {
     
     private final String value;
     
-    MimeType(@Nonnull final String value) {
+    MimeType(@NotNull final String value) {
         this.value = value;
     }
     

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
 Wed Nov  7 13:41:08 2018
@@ -25,8 +25,8 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.index.property.OrderedIndex;
 import 
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
 import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.PropertyType;

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/AggregateNodeSearcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/AggregateNodeSearcher.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/AggregateNodeSearcher.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/AggregateNodeSearcher.java
 Wed Nov  7 13:41:08 2018
@@ -22,8 +22,8 @@ package org.apache.jackrabbit.oak.scalab
 import com.google.common.collect.Lists;
 
 import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
 import javax.jcr.*;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
@@ -50,7 +50,7 @@ public class AggregateNodeSearcher exten
      * @return the query object
      * @throws RepositoryException
      */
-    protected Query getQuery(@Nonnull QueryManager qm,
+    protected Query getQuery(@NotNull QueryManager qm,
         ExecutionContext context) throws RepositoryException {
         List<String> relationships = (List<String>) 
context.getMap().get(RELATIONSHIPS);
         // /jcr:root//element(*, ActivityType)[((id = 1234 or id = '1354'))] 
order by jcr:created

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FacetSearcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FacetSearcher.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FacetSearcher.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FacetSearcher.java
 Wed Nov  7 13:41:08 2018
@@ -18,11 +18,11 @@
  */
 package org.apache.jackrabbit.oak.scalability.benchmarks.search;
 
-import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Scalability test for facet query implementation
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.scalabi
 public class FacetSearcher extends SearchScalabilityBenchmark {
 
     @Override
-    protected Query getQuery(@Nonnull QueryManager qm, 
ScalabilityAbstractSuite.ExecutionContext context) throws RepositoryException {
+    protected Query getQuery(@NotNull QueryManager qm, 
ScalabilityAbstractSuite.ExecutionContext context) throws RepositoryException {
 
         final String statement = "select [jcr:path], [facet(jcr:primaryType)] 
from [nt:base] where native('lucene','*:*')";
 
@@ -40,4 +40,4 @@ public class FacetSearcher extends Searc
     }
 
 
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FullTextSearcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FullTextSearcher.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FullTextSearcher.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/FullTextSearcher.java
 Wed Nov  7 13:41:08 2018
@@ -21,12 +21,12 @@ package org.apache.jackrabbit.oak.scalab
 import java.util.List;
 import java.util.Random;
 
-import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
 import 
org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Full text query search
@@ -37,7 +37,7 @@ public class FullTextSearcher extends Se
 
     @SuppressWarnings("deprecation")
     @Override
-    protected Query getQuery(@Nonnull final QueryManager qm, ExecutionContext 
context) throws RepositoryException {
+    protected Query getQuery(@NotNull final QueryManager qm, ExecutionContext 
context) throws RepositoryException {
         @SuppressWarnings("unchecked")
         List<String> paths = (List<String>) 
context.getMap().get(ScalabilityBlobSearchSuite.CTX_SEARCH_PATHS_PROP);
         

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterOrderBySearcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterOrderBySearcher.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterOrderBySearcher.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterOrderBySearcher.java
 Wed Nov  7 13:41:08 2018
@@ -20,7 +20,6 @@ package org.apache.jackrabbit.oak.scalab
 
 import java.util.Calendar;
 
-import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
@@ -29,6 +28,7 @@ import org.apache.jackrabbit.oak.benchma
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
 import 
org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Searches on node with a filter property and orders the results by 2 
properties 
@@ -37,7 +37,7 @@ import org.apache.jackrabbit.oak.scalabi
 public class MultiFilterOrderBySearcher extends PaginationEnabledSearcher {
     @SuppressWarnings("deprecation")
     @Override
-    protected Query getQuery(@Nonnull QueryManager qm, ExecutionContext 
context)
+    protected Query getQuery(@NotNull QueryManager qm, ExecutionContext 
context)
         throws RepositoryException {
         // /jcr:root/LongevitySearchAssets/12345//element(*, 
ParentType)[(@filter = 'true' or not
         // (@filter)] order by @viewed descending, @added descending

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterSplitOrderBySearcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterSplitOrderBySearcher.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterSplitOrderBySearcher.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/MultiFilterSplitOrderBySearcher.java
 Wed Nov  7 13:41:08 2018
@@ -19,7 +19,6 @@
 
 package org.apache.jackrabbit.oak.scalability.benchmarks.search;
 
-import javax.annotation.Nonnull;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.*;
@@ -27,6 +26,7 @@ import javax.jcr.query.*;
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
 import 
org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Splits the query in {@link 
org.apache.jackrabbit.oak.scalability.benchmarks.search.MultiFilterOrderBySearcher}
@@ -63,7 +63,7 @@ public class MultiFilterSplitOrderBySear
         }
     }
 
-    protected Query getStandardQuery(@Nonnull final QueryManager qm, 
ExecutionContext context)
+    protected Query getStandardQuery(@NotNull final QueryManager qm, 
ExecutionContext context)
         throws RepositoryException {
         // /jcr:root/LongevitySearchAssets/12345//element(*, 
ParentType)[(@viewed = 'true')] order
         // by @viewed descending

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/NodeTypeSearcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/NodeTypeSearcher.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/NodeTypeSearcher.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/NodeTypeSearcher.java
 Wed Nov  7 13:41:08 2018
@@ -18,12 +18,12 @@
  */
 package org.apache.jackrabbit.oak.scalability.benchmarks.search;
 
-import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
 import 
org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Searches on the NodeType 
@@ -33,7 +33,7 @@ public class NodeTypeSearcher extends Se
     
     @SuppressWarnings("deprecation")
     @Override
-    protected Query getQuery(@Nonnull final QueryManager qm, ExecutionContext 
context) throws RepositoryException {
+    protected Query getQuery(@NotNull final QueryManager qm, ExecutionContext 
context) throws RepositoryException {
         return qm.createQuery(
                 "/jcr:root/" + ((String) 
context.getMap().get(ScalabilityBlobSearchSuite.CTX_ROOT_NODE_NAME_PROP)) + 
"//element(*, "
                         + 
context.getMap().get(ScalabilityBlobSearchSuite.CTX_FILE_NODE_TYPE_PROP) + ")",

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/OrderBySearcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/OrderBySearcher.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/OrderBySearcher.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/OrderBySearcher.java
 Wed Nov  7 13:41:08 2018
@@ -20,7 +20,6 @@ package org.apache.jackrabbit.oak.scalab
 
 import java.util.Calendar;
 
-import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
@@ -29,13 +28,14 @@ import org.apache.jackrabbit.oak.benchma
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
 import 
org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Searches on path and orders the results by 2 properties
  */
 public class OrderBySearcher extends PaginationEnabledSearcher {
     @SuppressWarnings("deprecation") @Override
-    protected Query getQuery(@Nonnull QueryManager qm, ExecutionContext 
context)
+    protected Query getQuery(@NotNull QueryManager qm, ExecutionContext 
context)
         throws RepositoryException {
         // /jcr:root/LongevitySearchAssets/12345//element(*, ParentType) order 
by @viewed
         // descending, @added descending

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/PaginationEnabledSearcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/PaginationEnabledSearcher.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/PaginationEnabledSearcher.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/PaginationEnabledSearcher.java
 Wed Nov  7 13:41:08 2018
@@ -21,7 +21,6 @@ package org.apache.jackrabbit.oak.scalab
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import javax.annotation.Nonnull;
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
@@ -31,6 +30,7 @@ import javax.jcr.query.QueryResult;
 import javax.jcr.query.RowIterator;
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
 import 
org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Abstract class which defines utility methods for processing results like 
@@ -50,7 +50,7 @@ public abstract class PaginationEnabledS
 
     protected static final String KEYSET_VAL_PROP = "keysetval";
 
-    protected void processResultsOffsetPagination(@Nonnull final QueryManager 
qm,
+    protected void processResultsOffsetPagination(@NotNull final QueryManager 
qm,
             ExecutionContext context) throws RepositoryException {
         for (int page = 0; page < PAGES; page++) {
             Query query = getQuery(qm, context);
@@ -73,7 +73,7 @@ public abstract class PaginationEnabledS
         return last;
     }
 
-    protected void processResultsKeysetPagination(@Nonnull final QueryManager 
qm,
+    protected void processResultsKeysetPagination(@NotNull final QueryManager 
qm,
             ExecutionContext context) throws RepositoryException {
         Calendar now = Calendar.getInstance();
         now.setTimeZone(TimeZone.getTimeZone("GMT"));

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SearchScalabilityBenchmark.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SearchScalabilityBenchmark.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SearchScalabilityBenchmark.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SearchScalabilityBenchmark.java
 Wed Nov  7 13:41:08 2018
@@ -18,7 +18,6 @@
  */
 package org.apache.jackrabbit.oak.scalability.benchmarks.search;
 
-import javax.annotation.Nonnull;
 import javax.jcr.Credentials;
 import javax.jcr.Node;
 import javax.jcr.Repository;
@@ -30,6 +29,7 @@ import javax.jcr.query.QueryResult;
 import javax.jcr.query.RowIterator;
 import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark;
 import 
org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +68,7 @@ public abstract class SearchScalabilityB
         }
     }
 
-    protected abstract Query getQuery(@Nonnull final QueryManager qm, 
ExecutionContext context) 
+    protected abstract Query getQuery(@NotNull final QueryManager qm, 
ExecutionContext context) 
             throws RepositoryException;
 }
 

Modified: 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SplitOrderBySearcher.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SplitOrderBySearcher.java?rev=1846010&r1=1846009&r2=1846010&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SplitOrderBySearcher.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/SplitOrderBySearcher.java
 Wed Nov  7 13:41:08 2018
@@ -21,8 +21,8 @@ package org.apache.jackrabbit.oak.scalab
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityBlobSearchSuite;
 import org.apache.jackrabbit.oak.scalability.suites.ScalabilityNodeSuite;
 import 
org.apache.jackrabbit.oak.scalability.suites.ScalabilityAbstractSuite.ExecutionContext;
+import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
@@ -66,7 +66,7 @@ public class SplitOrderBySearcher extend
         }
     }
 
-    protected Query getStandardQuery(@Nonnull final QueryManager qm,
+    protected Query getStandardQuery(@NotNull final QueryManager qm,
         ExecutionContext context)
         throws RepositoryException {
         // /jcr:root/LongevitySearchAssets/12345//element(*, 
ParentType)[(@viewed = 'true')]


Reply via email to