svn commit: r1849071 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/ oak-security-spi/src/test/java/org/apache/...

[angela]

Author: angela
Date: Mon Dec 17 09:17:37 2018
New Revision: 1849071

URL: http://svn.apache.org/viewvc?rev=1849071&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
- redundant array creation for vararg params

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
    
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
    
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java

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=1849071&r1=1849070&r2=1849071&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
 Mon Dec 17 09:17:37 2018
@@ -115,7 +115,7 @@ class UserInitializer implements Workspa
             if (!index.hasChild("authorizableId")) {
                 Tree authorizableId = IndexUtils.createIndexDefinition(index, 
"authorizableId", true,
                         new String[]{REP_AUTHORIZABLE_ID},
-                        new String[]{NT_REP_AUTHORIZABLE});
+                        NT_REP_AUTHORIZABLE);
                 authorizableId.setProperty("info",
                         "Oak index used by the user management " + 
                         "to enforce uniqueness of rep:authorizableId property 
values.");
@@ -123,7 +123,7 @@ class UserInitializer implements Workspa
             if (!index.hasChild("principalName")) {
                 Tree principalName = IndexUtils.createIndexDefinition(index, 
"principalName", true,
                         new String[]{REP_PRINCIPAL_NAME},
-                        new String[]{NT_REP_AUTHORIZABLE});
+                        NT_REP_AUTHORIZABLE);
                 principalName.setProperty("info",
                         "Oak index used by the user management " +
                         "to enforce uniqueness of rep:principalName property 
values, " +
@@ -132,7 +132,7 @@ class UserInitializer implements Workspa
             if (!index.hasChild("repMembers")) {
                 Tree members = IndexUtils.createIndexDefinition(index, 
"repMembers", false,
                         new String[]{REP_MEMBERS},
-                        new String[]{NT_REP_MEMBER_REFERENCES});
+                        NT_REP_MEMBER_REFERENCES);
                 members.setProperty("info",
                         "Oak index used by the user management to lookup group 
membership.");
             }

Modified: 
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java?rev=1849071&r1=1849070&r2=1849071&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
 Mon Dec 17 09:17:37 2018
@@ -271,7 +271,7 @@ public class AbstractRestrictionProvider
 
     @Test
     public void testCreateEmptyMvRestriction2() throws Exception {
-        Restriction r = restrictionProvider.createRestriction(testPath, 
REP_NT_NAMES, new Value[0]);
+        Restriction r = restrictionProvider.createRestriction(testPath, 
REP_NT_NAMES);
         assertNotNull(r);
         assertEquals(REP_NT_NAMES, r.getDefinition().getName());
         assertEquals(Type.NAMES, r.getDefinition().getRequiredType());

Modified: 
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java?rev=1849071&r1=1849070&r2=1849071&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
 Mon Dec 17 09:17:37 2018
@@ -86,7 +86,7 @@ public class PrivilegeBitsProviderTest i
 
     @Test
     public void testGetBitsEmptyArray() {
-        assertEquals(PrivilegeBits.EMPTY, bitsProvider.getBits(new String[0]));
+        assertEquals(PrivilegeBits.EMPTY, bitsProvider.getBits());
     }
 
     @Test
@@ -238,7 +238,7 @@ public class PrivilegeBitsProviderTest i
 
     @Test
     public void testGetAggregatedPrivilegeNamesEmptyArray() {
-        
assertTrue(Iterables.isEmpty(bitsProvider.getAggregatedPrivilegeNames(new 
String[0])));
+        
assertTrue(Iterables.isEmpty(bitsProvider.getAggregatedPrivilegeNames()));
     }
 
     @Test