svn commit: r1831769 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security: authorization/AuthorizationInitializer.java user/UserInitializer.java

[angela]

Author: angela
Date: Thu May 17 11:26:09 2018
New Revision: 1831769

URL: http://svn.apache.org/viewvc?rev=1831769&view=rev
Log:
minor improvement: unused imports, missing annotations, indention

Modified:
    
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/user/UserInitializer.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java?rev=1831769&r1=1831768&r2=1831769&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java
 Thu May 17 11:26:09 2018
@@ -16,6 +16,8 @@
  */
 package org.apache.jackrabbit.oak.security.authorization;
 
+import javax.annotation.Nonnull;
+
 import com.google.common.collect.ImmutableList;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.oak.api.Type;
@@ -45,8 +47,8 @@ class AuthorizationInitializer implement
 
     private final MountInfoProvider mountInfoProvider;
 
-    public AuthorizationInitializer(MountInfoProvider mountInfoProvider) {
-            this.mountInfoProvider = mountInfoProvider;
+    public AuthorizationInitializer(@Nonnull MountInfoProvider 
mountInfoProvider) {
+        this.mountInfoProvider = mountInfoProvider;
     }
 
     @Override
@@ -57,9 +59,7 @@ class AuthorizationInitializer implement
             NodeBuilder acPrincipalName = 
IndexUtils.createIndexDefinition(index, "acPrincipalName", true, false,
                     ImmutableList.<String>of(REP_PRINCIPAL_NAME),
                     ImmutableList.<String>of(NT_REP_DENY_ACE, 
NT_REP_GRANT_ACE, NT_REP_ACE));
-            acPrincipalName.setProperty("info",
-                    "Oak index used by authorization to quickly search a 
principal by name."
-                    );
+            acPrincipalName.setProperty("info", "Oak index used by 
authorization to quickly search a principal by name.");
         }
 
         // create the permission store and the root for this workspace.

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java?rev=1831769&r1=1831768&r2=1831769&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
 Thu May 17 11:26:09 2018
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.oak.security.user;
 
+import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
 
 import com.google.common.base.Strings;
@@ -31,8 +32,8 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
 import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
 import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.plugins.tree.factories.RootFactory;
 import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
+import org.apache.jackrabbit.oak.plugins.tree.factories.RootFactory;
 import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
 import org.apache.jackrabbit.oak.spi.lifecycle.WorkspaceInitializer;
 import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider;
@@ -48,7 +49,6 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static 
org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.squeeze;
 
@@ -88,7 +88,7 @@ class UserInitializer implements Workspa
     private QueryIndexProvider queryIndexProvider = new 
CompositeQueryIndexProvider(new PropertyIndexProvider(),
             new NodeTypeIndexProvider());
 
-    UserInitializer(SecurityProvider securityProvider) {
+    UserInitializer(@Nonnull SecurityProvider securityProvider) {
         this.securityProvider = securityProvider;
     }