Author: angela
Date: Fri Dec 14 15:37:00 2018
New Revision: 1848955
URL: http://svn.apache.org/viewvc?rev=1848955&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncResultImplTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModule.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeContextTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.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/authorization/restriction/CompositeRestrictionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
Fri Dec 14 15:37:00 2018
@@ -309,9 +309,7 @@ public class DefaultSyncContext implemen
log.debug("sync({}) -> {} {}", id, ref.getString(),
timer.getString());
}
return ret;
- } catch (RepositoryException e) {
- throw new SyncException(e);
- } catch (ExternalIdentityException e) {
+ } catch (RepositoryException | ExternalIdentityException e) {
throw new SyncException(e);
}
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
Fri Dec 14 15:37:00 2018
@@ -415,7 +415,7 @@ public class ExternalLoginModule extends
Map<String, Object> attributes = new HashMap<>();
Object shared = sharedState.get(SHARED_KEY_ATTRIBUTES);
if (shared instanceof Map) {
- for (Map.Entry entry : ((Map<?,?>) shared).entrySet()) {
+ for (Map.Entry<?,?> entry : ((Map<?,?>) shared).entrySet()) {
attributes.put(entry.getKey().toString(), entry.getValue());
}
} else if (creds != null) {
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
Fri Dec 14 15:37:00 2018
@@ -196,7 +196,7 @@ public class ExternalLoginModuleFactory
String sncName =
osgiConfig.getConfigValue(PARAM_SYNC_HANDLER_NAME, "");
SyncMBeanImpl bean = new SyncMBeanImpl(contentRepository,
securityProvider, syncManager, sncName, idpManager, idpName);
- Hashtable<String, String> table = new Hashtable();
+ Hashtable<String, String> table = new Hashtable<>();
table.put("type", "UserManagement");
table.put("name", "External Identity Synchronization Management");
table.put("handler", ObjectName.quote(sncName));
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
Fri Dec 14 15:37:00 2018
@@ -193,7 +193,7 @@ public class ExternalPrincipalConfigurat
private final SyncHandlerMappingTracker mappingTracker;
- private Set<ServiceReference> enablingRefs = new HashSet();
+ private Set<ServiceReference> enablingRefs = new HashSet<>();
private boolean isEnabled = false;
public SyncConfigTracker(@NotNull BundleContext context, @NotNull
SyncHandlerMappingTracker mappingTracker) {
@@ -234,7 +234,7 @@ public class ExternalPrincipalConfigurat
}
private Map<String, String[]> getAutoMembership() {
- Map<String, String[]> autoMembership = new HashMap();
+ Map<String, String[]> autoMembership = new HashMap<>();
for (ServiceReference ref : enablingRefs) {
String syncHandlerName =
PropertiesUtil.toString(ref.getProperty(DefaultSyncConfigImpl.PARAM_NAME),
DefaultSyncConfigImpl.PARAM_NAME_DEFAULT);
String[] userAuthMembership =
PropertiesUtil.toStringArray(ref.getProperty(DefaultSyncConfigImpl.PARAM_USER_AUTO_MEMBERSHIP),
new String[0]);
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java
Fri Dec 14 15:37:00 2018
@@ -107,7 +107,7 @@ public class ExternalIdentityRefTest {
@Test
public void testNotEquals() {
- Map<ExternalIdentityRef, ExternalIdentityRef> notEqual = new HashMap();
+ Map<ExternalIdentityRef, ExternalIdentityRef> notEqual = new
HashMap<>();
notEqual.put(refNullProvider, ref);
notEqual.put(refEmptyProvider, ref);
notEqual.put(refNullProvider, null);
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
Fri Dec 14 15:37:00 2018
@@ -140,13 +140,13 @@ public class ExternalLoginModuleAutoMemb
private static void registerSyncHandlerMapping(@NotNull OsgiContext ctx,
@NotNull ExternalSetup setup) {
String syncHandlerName = setup.sc.getName();
- Map props = ImmutableMap.of(
+ Map<String, Object> props = ImmutableMap.of(
DefaultSyncConfigImpl.PARAM_NAME, syncHandlerName,
DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP,
setup.sc.user().getDynamicMembership(),
DefaultSyncConfigImpl.PARAM_USER_AUTO_MEMBERSHIP,
setup.sc.user().getAutoMembership());
ctx.registerService(SyncHandler.class, setup.sh, props);
- Map mappingProps = ImmutableMap.of(
+ Map<String, String> mappingProps = ImmutableMap.of(
SyncHandlerMapping.PARAM_IDP_NAME, setup.idp.getName(),
SyncHandlerMapping.PARAM_SYNC_HANDLER_NAME, syncHandlerName);
ctx.registerService(SyncHandlerMapping.class, new SyncHandlerMapping()
{}, mappingProps);
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
Fri Dec 14 15:37:00 2018
@@ -55,7 +55,7 @@ public class ExternalLoginModuleDynamicM
// now register the sync-handler with the dynamic membership config
// in order to enable dynamic membership with the external principal
configuration
- Map props =
ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP,
syncConfig.user().getDynamicMembership());
+ Map<String, Boolean> props =
ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP,
syncConfig.user().getDynamicMembership());
context.registerService(SyncHandler.class,
WhiteboardUtils.getService(whiteboard, SyncHandler.class), props);
}
@@ -63,10 +63,10 @@ public class ExternalLoginModuleDynamicM
Authorizable a = userMgr.getAuthorizable(id);
assertNotNull(a);
- Set<String> expected = new HashSet();
+ Set<String> expected = new HashSet<>();
calcExpectedPrincipalNames(idp.getUser(id),
syncConfig.user().getMembershipNestingDepth(), expected);
- Set<String> extPrincNames = new HashSet();
+ Set<String> extPrincNames = new HashSet<>();
for (Value v :
a.getProperty(ExternalIdentityConstants.REP_EXTERNAL_PRINCIPAL_NAMES)) {
extPrincNames.add(v.getString());
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
Fri Dec 14 15:37:00 2018
@@ -61,7 +61,6 @@ public class DefaultSyncConfigTest {
assertEquals(Long.MAX_VALUE, authorizableConfig.getExpirationTime());
}
-
@Test
public void testName() {
assertEquals("default", config.getName());
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
Fri Dec 14 15:37:00 2018
@@ -971,7 +971,7 @@ public class DefaultSyncContextTest exte
// create mapping that doesn't match to names in the
external-properties
// -> previously synced properties must be removed
- Map<String, String> mapping = new HashMap();
+ Map<String, String> mapping = new HashMap<>();
Map<String, ?> extProps = externalUser.getProperties();
for (String propName : extProps.keySet()) {
mapping.put(propName, "any");
@@ -992,7 +992,7 @@ public class DefaultSyncContextTest exte
// create mapping that doesn't match to names in the
external-properties
// -> previously synced properties must be removed
- Map<String, String> mapping = new HashMap();
+ Map<String, String> mapping = new HashMap<>();
Map<String, ?> extProps = externalUser.getProperties();
for (String propName : extProps.keySet()) {
mapping.put(propName, "\"any\"");
@@ -1015,7 +1015,7 @@ public class DefaultSyncContextTest exte
// mapping to '"' (i.e. name size = 1) which doesn't qualify as
constant
// -> same behavior expected as with
'testSyncPropertiesMappingRemovesExisting'
- Map<String, String> mapping = new HashMap();
+ Map<String, String> mapping = new HashMap<>();
Map<String, ?> extProps = externalUser.getProperties();
for (String propName : extProps.keySet()) {
mapping.put(propName, "\"");
@@ -1036,7 +1036,7 @@ public class DefaultSyncContextTest exte
// mapping to '"any', which doesn't qualify as constant
// -> same behavior expected as with
'testSyncPropertiesMappingRemovesExisting'
- Map<String, String> mapping = new HashMap();
+ Map<String, String> mapping = new HashMap<>();
Map<String, ?> extProps = externalUser.getProperties();
for (String propName : extProps.keySet()) {
mapping.put(propName, "\"any");
@@ -1054,7 +1054,7 @@ public class DefaultSyncContextTest exte
Authorizable a = syncCtx.createUser(externalUser);
// create exact mapping
- Map<String, String> mapping = new HashMap();
+ Map<String, String> mapping = new HashMap<>();
Map<String, ?> extProps = externalUser.getProperties();
for (String propName : extProps.keySet()) {
mapping.put(propName, propName);
@@ -1083,7 +1083,7 @@ public class DefaultSyncContextTest exte
Authorizable a = syncCtx.createUser(externalUser);
// create exact mapping
- Map<String, String> mapping = new HashMap();
+ Map<String, String> mapping = new HashMap<>();
Map<String, ?> extProps = externalUser.getProperties();
for (String propName : extProps.keySet()) {
mapping.put("a/"+propName, propName);
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncResultImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncResultImplTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncResultImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncResultImplTest.java
Fri Dec 14 15:37:00 2018
@@ -37,7 +37,7 @@ public class DefaultSyncResultImplTest {
@Test
public void testGetIdentity() {
- List<DefaultSyncedIdentity> l = new ArrayList();
+ List<DefaultSyncedIdentity> l = new ArrayList<>();
l.add(new DefaultSyncedIdentity("id", null, true, -1));
l.add(new DefaultSyncedIdentity("id", new ExternalIdentityRef("id",
"idp"), false, 500));
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java
Fri Dec 14 15:37:00 2018
@@ -99,7 +99,7 @@ public class CustomCredentialsSupportTes
return new TestCredentials(USER_ID);
}
- protected CredentialsSupport getCredentialsSupport() {
+ CredentialsSupport getCredentialsSupport() {
return (IDP) idp;
}
@@ -114,7 +114,7 @@ public class CustomCredentialsSupportTes
static final class IDP implements ExternalIdentityProvider,
CredentialsSupport {
- private final Map attributes = Maps.newHashMap(ImmutableMap.of("a",
"a"));
+ private final Map<String, Object> attributes =
Maps.newHashMap(ImmutableMap.of("a", "a"));
@NotNull
@Override
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
Fri Dec 14 15:37:00 2018
@@ -213,7 +213,7 @@ public class DelegateeTest extends Abstr
public void testSyncExternalUsersSaveError() throws Exception {
Root r = preventRootCommit(delegatee);;
- List<String> externalIds = new ArrayList();
+ List<String> externalIds = new ArrayList<>();
for (String id : TEST_IDS) {
externalIds.add(new ExternalIdentityRef(id,
idp.getName()).getString());
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
Fri Dec 14 15:37:00 2018
@@ -480,7 +480,7 @@ public class SyncMBeanImplTest extends A
@Test
public void testSyncAllGroups() throws Exception {
// first sync external users into the repo
- Map<String, String> expected = new HashMap();
+ Map<String, String> expected = new HashMap<>();
Iterator<ExternalGroup> grIt = idp.listGroups();
while (grIt.hasNext()) {
ExternalGroup eg = grIt.next();
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java
Fri Dec 14 15:37:00 2018
@@ -67,7 +67,7 @@ public abstract class AbstractPrincipalT
}
@NotNull
- PrincipalProvider createPrincipalProvider() {
+ private PrincipalProvider createPrincipalProvider() {
Set<String> autoMembership =
ImmutableSet.copyOf(Iterables.concat(syncConfig.user().getAutoMembership(),syncConfig.group().getAutoMembership()));
return new ExternalGroupPrincipalProvider(root,
getSecurityProvider().getConfiguration(UserConfiguration.class),
NamePathMapper.DEFAULT, ImmutableMap.of(idp.getName(),
autoMembership.toArray(new String[0])));
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
Fri Dec 14 15:37:00 2018
@@ -218,8 +218,8 @@ public class ExternalPrincipalConfigurat
@Ignore("TODO: mock doesn't reflect property-changes on the registration.")
@Test
public void testModifySyncHandler() {
- Dictionary<String, Object> enableProps = new
Hashtable(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
- Dictionary<String, Object> disableProps = new
Hashtable(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false));
+ Dictionary<String, Object> enableProps = new
Hashtable<>(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+ Dictionary<String, Object> disableProps = new
Hashtable<>(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false));
DefaultSyncHandler sh = new DefaultSyncHandler();
BundleContext bundleContext = context.bundleContext();
@@ -236,8 +236,8 @@ public class ExternalPrincipalConfigurat
@Test
public void testRemoveSyncHandler() {
- Dictionary<String, Object> enableProps = new
Hashtable(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
- Dictionary<String, Object> disableProps = new
Hashtable(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false));
+ Dictionary<String, Object> enableProps = new
Hashtable<>(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+ Dictionary<String, Object> disableProps = new
Hashtable<>(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false));
DefaultSyncHandler sh = new DefaultSyncHandler();
BundleContext bundleContext = context.bundleContext();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java
Fri Dec 14 15:37:00 2018
@@ -125,9 +125,7 @@ class LoginContextProviderImpl implement
log.warn("No configuration found for application {}
though fetching JAAS " +
"configuration from SPI {} is enabled.",
appName, configSpiName);
}
- } catch (NoSuchAlgorithmException e) {
- log.warn("Error fetching JAAS config from SPI {}",
configSpiName, e);
- } catch (NoSuchProviderException e) {
+ } catch (NoSuchAlgorithmException | NoSuchProviderException e)
{
log.warn("Error fetching JAAS config from SPI {}",
configSpiName, e);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
Fri Dec 14 15:37:00 2018
@@ -167,15 +167,9 @@ public final class TokenLoginModule exte
TokenInfo ti = tokenProvider.createToken(shared);
if (ti != null) {
TokenCredentials tc = new
TokenCredentials(ti.getToken());
- Map<String, String> attributes =
ti.getPrivateAttributes();
- for (String name : attributes.keySet()) {
- tc.setAttribute(name, attributes.get(name));
- }
- attributes = ti.getPublicAttributes();
- for (String name : attributes.keySet()) {
- tc.setAttribute(name, attributes.get(name));
- }
- sharedState.put(SHARED_KEY_ATTRIBUTES, attributes);
+ ti.getPrivateAttributes().forEach((key, value) ->
tc.setAttribute(key, value));
+ ti.getPublicAttributes().forEach((key, value) ->
tc.setAttribute(key, value));
+ sharedState.put(SHARED_KEY_ATTRIBUTES,
ti.getPublicAttributes());
updateSubject(tc, null, null);
} else {
// failed to create token -> fail commit()
@@ -197,7 +191,7 @@ public final class TokenLoginModule exte
@NotNull
@Override
protected Set<Class> getSupportedCredentials() {
- return Collections.<Class>singleton(TokenCredentials.class);
+ return Collections.singleton(TokenCredentials.class);
}
@Override
@@ -230,9 +224,7 @@ public final class TokenLoginModule exte
TokenProviderCallback tcCallback = new TokenProviderCallback();
callbackHandler.handle(new Callback[] {tcCallback});
provider = tcCallback.getTokenProvider();
- } catch (IOException e) {
- log.warn(e.getMessage());
- } catch (UnsupportedCallbackException e) {
+ } catch (IOException | UnsupportedCallbackException e) {
log.warn(e.getMessage());
}
}
@@ -250,10 +242,7 @@ public final class TokenLoginModule exte
private static AuthInfo getAuthInfo(@Nullable TokenInfo tokenInfo,
@NotNull Set<? extends Principal> principals) {
if (tokenInfo != null) {
Map<String, Object> attributes = new HashMap<>();
- Map<String, String> publicAttributes =
tokenInfo.getPublicAttributes();
- for (String attrName : publicAttributes.keySet()) {
- attributes.put(attrName, publicAttributes.get(attrName));
- }
+ tokenInfo.getPublicAttributes().forEach((key, value) ->
attributes.put(key, value));
return new AuthInfoImpl(tokenInfo.getUserId(), attributes,
principals);
} else {
return null;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
Fri Dec 14 15:37:00 2018
@@ -433,12 +433,11 @@ class TokenProviderImpl implements Token
tokenNode.setProperty(TOKEN_ATTRIBUTE_KEY, keyHash);
setExpirationTime(tokenNode, expTime);
- for (String name : attributes.keySet()) {
+ attributes.forEach((name, value) -> {
if (!RESERVED_ATTRIBUTES.contains(name)) {
- String attr = attributes.get(name).toString();
- tokenNode.setProperty(name, attr);
+ tokenNode.setProperty(name, value.toString());
}
- }
+ });
return new TokenInfoImpl(tokenNode, token, id, null);
}
@@ -526,8 +525,8 @@ class TokenProviderImpl implements Token
expirationTime = getExpirationTime(tokenTree, Long.MIN_VALUE);
key = TreeUtil.getString(tokenTree, TOKEN_ATTRIBUTE_KEY);
- mandatoryAttributes = new HashMap();
- publicAttributes = new HashMap();
+ mandatoryAttributes = new HashMap<>();
+ publicAttributes = new HashMap<>();
for (PropertyState propertyState : tokenTree.getProperties()) {
String name = propertyState.getName();
String value = propertyState.getValue(STRING);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
Fri Dec 14 15:37:00 2018
@@ -266,9 +266,7 @@ public final class LoginModuleImpl exten
Map<String, Object> attributes = new HashMap<>();
Object shared = sharedState.get(SHARED_KEY_ATTRIBUTES);
if (shared instanceof Map) {
- for (Object key : ((Map) shared).keySet()) {
- attributes.put(key.toString(), ((Map) shared).get(key));
- }
+ ((Map<?,?>) shared).forEach((key, value) ->
attributes.put(key.toString(), value));
} else if (creds instanceof SimpleCredentials) {
SimpleCredentials sc = (SimpleCredentials) creds;
for (String attrName : sc.getAttributeNames()) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
Fri Dec 14 15:37:00 2018
@@ -243,9 +243,9 @@ public class AccessControlImporter imple
private final boolean isAllow;
private Principal principal;
- private List<Privilege> privileges = new ArrayList();
- private Map<String, Value> restrictions = new HashMap();
- private Map<String, Value[]> mvRestrictions = new HashMap();
+ private List<Privilege> privileges = new ArrayList<>();
+ private Map<String, Value> restrictions = new HashMap<>();
+ private Map<String, Value[]> mvRestrictions = new HashMap<>();
private boolean ignore;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
Fri Dec 14 15:37:00 2018
@@ -244,8 +244,8 @@ public class AccessControlManagerImpl ex
// calculate single and mv restriction and drop the rep:nodePath
restriction
// present with the principal-based-entries.
- Map<String, Value> restrictions = new HashMap();
- Map<String, Value[]> mvRestrictions = new HashMap();
+ Map<String, Value> restrictions = new HashMap<>();
+ Map<String, Value[]> mvRestrictions = new HashMap<>();
for (Restriction r : ace.getRestrictions()) {
String name = r.getDefinition().getName();
if (REP_NODE_PATH.equals(name)) {
@@ -466,7 +466,7 @@ public class AccessControlManagerImpl ex
if (mixins == null) {
tree.setProperty(JcrConstants.JCR_MIXINTYPES,
Collections.singleton(mixinName), Type.NAMES);
} else {
- PropertyBuilder pb = PropertyBuilder.copy(Type.NAME, mixins);
+ PropertyBuilder<String> pb = PropertyBuilder.copy(Type.NAME,
mixins);
pb.addValue(mixinName);
tree.setProperty(pb.getPropertyState());
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionCacheBuilder.java
Fri Dec 14 15:37:00 2018
@@ -105,7 +105,7 @@ final class PermissionCacheBuilder {
String path = e.getKey();
Collection<PermissionEntry> pathEntries =
pathEntryMap.get(path);
if (pathEntries == null) {
- pathEntries = new TreeSet(e.getValue());
+ pathEntries = new TreeSet<>(e.getValue());
pathEntryMap.put(path, pathEntries);
} else {
pathEntries.addAll(e.getValue());
@@ -142,7 +142,7 @@ final class PermissionCacheBuilder {
@Override
public Collection<PermissionEntry> getEntries(@NotNull String path) {
- Collection<PermissionEntry> ret = new TreeSet();
+ Collection<PermissionEntry> ret = new TreeSet<>();
for (String name : existingNames) {
cache.load(store, ret, name, path);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java
Fri Dec 14 15:37:00 2018
@@ -47,7 +47,7 @@ class PrivilegeDefinitionReader implemen
*/
@NotNull
Map<String, PrivilegeDefinition> readDefinitions() {
- Map<String, PrivilegeDefinition> definitions = new HashMap();
+ Map<String, PrivilegeDefinition> definitions = new HashMap<>();
for (Tree child : privilegesTree.getChildren()) {
if (isPrivilegeDefinition(child)) {
PrivilegeDefinition def = PrivilegeUtil.readDefinition(child);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
Fri Dec 14 15:37:00 2018
@@ -55,7 +55,7 @@ class PrivilegeManagerImpl implements Pr
//---------------------------------------------------< PrivilegeManager
>---
@Override
public Privilege[] getRegisteredPrivileges() {
- Set<Privilege> privileges = new HashSet();
+ Set<Privilege> privileges = new HashSet<>();
for (PrivilegeDefinition def : getPrivilegeDefinitions()) {
privileges.add(getPrivilege(def));
}
@@ -102,7 +102,7 @@ class PrivilegeManagerImpl implements Pr
if (jcrNames == null || jcrNames.length == 0) {
oakNames = Collections.emptySet();
} else {
- oakNames = new HashSet(jcrNames.length);
+ oakNames = new HashSet<>(jcrNames.length);
for (String jcrName : jcrNames) {
String oakName = getOakName(jcrName);
oakNames.add(oakName);
@@ -176,7 +176,7 @@ class PrivilegeManagerImpl implements Pr
@Override
public Privilege[] getDeclaredAggregatePrivileges() {
Set<String> declaredAggregateNames =
definition.getDeclaredAggregateNames();
- Set<Privilege> declaredAggregates = new
HashSet(declaredAggregateNames.size());
+ Set<Privilege> declaredAggregates = new
HashSet<>(declaredAggregateNames.size());
for (String oakName : declaredAggregateNames) {
if (oakName.equals(definition.getName())) {
log.warn("Found cyclic privilege aggregation -> ignore
declared aggregate " + oakName);
@@ -194,7 +194,7 @@ class PrivilegeManagerImpl implements Pr
@Override
public Privilege[] getAggregatePrivileges() {
- Set<Privilege> aggr = new HashSet();
+ Set<Privilege> aggr = new HashSet<>();
for (Privilege decl : getDeclaredAggregatePrivileges()) {
aggr.add(decl);
if (decl.isAggregate()) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
Fri Dec 14 15:37:00 2018
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
/**
* AuthorizableIterator...
*/
-final class AuthorizableIterator implements Iterator {
+final class AuthorizableIterator implements Iterator<Authorizable> {
private static final Logger log =
LoggerFactory.getLogger(AuthorizableIterator.class);
@@ -42,7 +42,7 @@ final class AuthorizableIterator impleme
static AuthorizableIterator create(Iterator<String> authorizableOakPaths,
UserManagerImpl userManager,
AuthorizableType authorizableType) {
- Iterator it = Iterators.transform(authorizableOakPaths, new
PathToAuthorizable(userManager, authorizableType));
+ Iterator<Authorizable> it = Iterators.transform(authorizableOakPaths,
new PathToAuthorizable(userManager, authorizableType));
long size = getSize(authorizableOakPaths);
return new AuthorizableIterator(Iterators.filter(it,
Predicates.notNull()), size);
}
@@ -75,7 +75,7 @@ final class AuthorizableIterator impleme
//--------------------------------------------------------------------------
- private static long getSize(Iterator it) {
+ private static long getSize(Iterator<String> it) {
if (it instanceof RangeIterator) {
return ((RangeIterator) it).getSize();
} else {
@@ -86,7 +86,7 @@ final class AuthorizableIterator impleme
private static class PathToAuthorizable implements Function<String,
Authorizable> {
private final UserManagerImpl userManager;
- private final Predicate predicate;
+ private final Predicate<Authorizable> predicate;
PathToAuthorizable(UserManagerImpl userManager, AuthorizableType type)
{
this.userManager = userManager;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java
Fri Dec 14 15:37:00 2018
@@ -41,10 +41,10 @@ final class AuthorizableWrapper<T extend
}
static Iterator<Authorizable> createIterator(Iterator<Authorizable> dlgs,
AutoSaveEnabledManager mgr) {
- return Iterators.transform(dlgs, new AuthorizableWrapper(mgr));
+ return Iterators.transform(dlgs, new
AuthorizableWrapper<Authorizable>(mgr));
}
static Iterator<Group> createGroupIterator(Iterator<Group> dlgs,
AutoSaveEnabledManager mgr) {
- return Iterators.transform(dlgs, new AuthorizableWrapper(mgr));
+ return Iterators.transform(dlgs, new AuthorizableWrapper<Group>(mgr));
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
Fri Dec 14 15:37:00 2018
@@ -330,7 +330,7 @@ public class UserQueryManager {
*/
private static final class UniqueResultPredicate implements
Predicate<Authorizable> {
- private final Set<String> authorizableIds = new HashSet();
+ private final Set<String> authorizableIds = new HashSet<>();
@Override
public boolean apply(@Nullable Authorizable input) {
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Fri Dec 14 15:37:00 2018
@@ -266,7 +266,7 @@ public abstract class CompositeConfigura
private static final class Ranking {
- private Map<SecurityConfiguration, Integer> m = new
ConcurrentHashMap();
+ private Map<SecurityConfiguration, Integer> m = new
ConcurrentHashMap<>();
private int get(@NotNull SecurityConfiguration configuration) {
Integer ranking = m.get(configuration);
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
Fri Dec 14 15:37:00 2018
@@ -283,8 +283,8 @@ public final class ConfigurationParamete
} else if (clazz == Set.class ||
Set.class.isAssignableFrom(clazz)) {
if (configProperty instanceof Set) {
return (T) configProperty;
- } else if (configProperty instanceof Collection) {
- return (T) ImmutableSet.copyOf((Collection)
configProperty);
+ } else if (configProperty instanceof Collection<?>) {
+ return (T) ImmutableSet.copyOf((Collection<?>)
configProperty);
} else if (configProperty.getClass().isArray()) {
return (T) ImmutableSet.copyOf((Object[]) configProperty);
} else {
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModule.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModule.java
Fri Dec 14 15:37:00 2018
@@ -102,9 +102,7 @@ public final class GuestLoginModule impl
sharedState.put(AbstractLoginModule.SHARED_KEY_CREDENTIALS, guestCredentials);
return true;
}
- } catch (IOException e) {
- log.debug("Login: Failed to retrieve Credentials from
CallbackHandler", e);
- } catch (UnsupportedCallbackException e) {
+ } catch (IOException | UnsupportedCallbackException e) {
log.debug("Login: Failed to retrieve Credentials from
CallbackHandler", e);
}
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/AbstractCredentials.java
Fri Dec 14 15:37:00 2018
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullabl
public abstract class AbstractCredentials implements Credentials {
- protected final Map<String,Object> attributes = new HashMap();
+ protected final Map<String,Object> attributes = new HashMap<>();
protected final String userId;
public AbstractCredentials(@NotNull String userId) {
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
Fri Dec 14 15:37:00 2018
@@ -154,7 +154,7 @@ public class CompositeConfigurationTest
SecurityConfiguration r200second = new SecurityConfiguration.Default();
compositeConfiguration.addConfiguration(r200second,
ConfigurationParameters.of(Constants.SERVICE_RANKING, 200));
- List l = getConfigurations();
+ List<?> l = getConfigurations();
assertArrayEquals(new SecurityConfiguration[]{r200, r200second, r150,
r100, r50, rUndef}, l.toArray(new SecurityConfiguration[0]));
// remove and add new
@@ -178,7 +178,7 @@ public class CompositeConfigurationTest
addConfiguration(sc);
removeConfiguration(def);
- List configurations = getConfigurations();
+ List<?> configurations = getConfigurations();
assertEquals(1, configurations.size());
assertEquals(sc, configurations.iterator().next());
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeContextTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeContextTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeContextTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeContextTest.java
Fri Dec 14 15:37:00 2018
@@ -43,7 +43,7 @@ public class CompositeContextTest extend
@Test
public void testGetContext() throws Exception {
- Class cls = Class.forName(CompositeConfiguration.class.getName() +
"$CompositeContext");
+ Class<?> cls = Class.forName(CompositeConfiguration.class.getName() +
"$CompositeContext");
Field def = cls.getDeclaredField("defaultCtx");
def.setAccessible(true);
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
Fri Dec 14 15:37:00 2018
@@ -328,16 +328,16 @@ public class ConfigurationParametersTest
Set<TestObject> testObjectSet = ImmutableSet.copyOf(testObjectArray);
// map of config value (key) and expected result set.
- Map<Object, Set> configValues = new HashMap<>();
+ Map<Object, Set<?>> configValues = new HashMap<>();
configValues.put("a", ImmutableSet.of("a"));
configValues.put(stringArray, stringSet);
configValues.put(stringSet, stringSet);
configValues.put(testObjectArray, testObjectSet);
configValues.put(testObjectSet, testObjectSet);
configValues.put(new String[0], Collections.<String>emptySet());
- configValues.put(new HashSet(), Collections.emptySet());
+ configValues.put(new HashSet<>(), Collections.emptySet());
configValues.put(ImmutableSet.of(), Collections.emptySet());
- configValues.put(new ArrayList(), Collections.emptySet());
+ configValues.put(new ArrayList<>(), Collections.emptySet());
configValues.put(ConfigurationParameters.EMPTY,
Collections.<String>emptySet());
Set<String> defaultStrings = ImmutableSet.of("abc", "def", "ghi");
@@ -351,7 +351,7 @@ public class ConfigurationParametersTest
config = ConfigurationParameters.of("key", value);
}
- Set expected = configValues.get(value);
+ Set<?> expected = configValues.get(value);
assertEquals(expected, config.getConfigValue("key",
Collections.emptySet()));
assertEquals(expected, config.getConfigValue("key",
Collections.<String>emptySet()));
assertEquals(expected, config.getConfigValue("key",
ImmutableSet.of()));
@@ -474,9 +474,9 @@ public class ConfigurationParametersTest
configValues.put(testObjectArray, stringArray);
configValues.put(testObjectSet, stringArray);
configValues.put(new String[0], new String[0]);
- configValues.put(new HashSet(), new String[0]);
+ configValues.put(new HashSet<>(), new String[0]);
configValues.put(ImmutableSet.of(), new String[0]);
- configValues.put(new ArrayList(), new String[0]);
+ configValues.put(new ArrayList<>(), new String[0]);
configValues.put(ConfigurationParameters.EMPTY, new String[0]);
for (Object value : configValues.keySet()) {
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
Fri Dec 14 15:37:00 2018
@@ -66,14 +66,14 @@ import static org.junit.Assert.assertTru
public class AbstractLoginModuleTest {
- private static AbstractLoginModule initLoginModule(Class
supportedCredentials, Map sharedState) {
+ private static AbstractLoginModule initLoginModule(Class<?>
supportedCredentials, Map<String, ?> sharedState) {
AbstractLoginModule lm = new TestLoginModule(supportedCredentials);
lm.initialize(new Subject(), null, sharedState, null);
return lm;
}
- private static AbstractLoginModule initLoginModule(Class
supportedCredentials, CallbackHandler cbh) {
+ private static AbstractLoginModule initLoginModule(Class<?>
supportedCredentials, CallbackHandler cbh) {
AbstractLoginModule lm = new TestLoginModule(supportedCredentials);
lm.initialize(new Subject(), cbh, Collections.<String,
Object>emptyMap(), null);
return lm;
@@ -133,7 +133,7 @@ public class AbstractLoginModuleTest {
@Test
public void testGetSharedLoginName() {
- Map<String, String> sharedState = new HashMap();
+ Map<String, String> sharedState = new HashMap<>();
sharedState.put(AbstractLoginModule.SHARED_KEY_LOGIN_NAME, "test");
AbstractLoginModule lm = initLoginModule(TestCredentials.class,
sharedState);
@@ -146,7 +146,7 @@ public class AbstractLoginModuleTest {
@Test
public void testGetSharedCredentials() {
- Map<String, Object> sharedState = new HashMap();
+ Map<String, Object> sharedState = new HashMap<>();
sharedState.put(AbstractLoginModule.SHARED_KEY_CREDENTIALS, new
TestCredentials());
AbstractLoginModule lm = initLoginModule(TestCredentials.class,
sharedState);
@@ -170,7 +170,7 @@ public class AbstractLoginModuleTest {
@Test
public void testGetCredentialsFromSharedState() {
- Map<String, Credentials> sharedState = new HashMap();
+ Map<String, Credentials> sharedState = new HashMap<>();
sharedState.put(AbstractLoginModule.SHARED_KEY_CREDENTIALS, new
TestCredentials());
AbstractLoginModule lm = initLoginModule(TestCredentials.class,
sharedState);
@@ -254,7 +254,7 @@ public class AbstractLoginModuleTest {
@Test
public void testGetSharedPreAuthLogin() {
- Map<String, PreAuthenticatedLogin> sharedState = new HashMap();
+ Map<String, PreAuthenticatedLogin> sharedState = new HashMap<>();
AbstractLoginModule loginModule =
initLoginModule(TestCredentials.class, sharedState);
PreAuthenticatedLogin preAuthenticatedLogin = new
PreAuthenticatedLogin("userId");
@@ -265,7 +265,7 @@ public class AbstractLoginModuleTest {
@Test
public void testGetSharedPreAuthLoginWrongEntry() {
- Map sharedState = new HashMap();
+ Map<String, String> sharedState = new HashMap<>();
AbstractLoginModule loginModule =
initLoginModule(TestCredentials.class, sharedState);
sharedState.put(AbstractLoginModule.SHARED_KEY_PRE_AUTH_LOGIN,
"wrongType");
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java
Fri Dec 14 15:37:00 2018
@@ -42,13 +42,13 @@ import static org.junit.Assert.assertTru
*/
public class GuestLoginModuleTest {
+ private Subject subject = new Subject();
+ private Map<String, ?> sharedState = new HashMap<>();
private LoginModule guestLoginModule = new GuestLoginModule();
@Test
public void testNullLogin() throws LoginException {
- Subject subject = new Subject();
CallbackHandler cbh = new TestCallbackHandler(null);
- Map sharedState = new HashMap();
guestLoginModule.initialize(subject, cbh, sharedState,
Collections.<String, Object>emptyMap());
assertTrue(guestLoginModule.login());
@@ -65,9 +65,7 @@ public class GuestLoginModuleTest {
@Test
public void testGuestCredentials() throws LoginException {
- Subject subject = new Subject();
CallbackHandler cbh = new TestCallbackHandler(new GuestCredentials());
- Map sharedState = new HashMap();
guestLoginModule.initialize(subject, cbh, sharedState,
Collections.<String, Object>emptyMap());
assertFalse(guestLoginModule.login());
@@ -82,9 +80,7 @@ public class GuestLoginModuleTest {
@Test
public void testSimpleCredentials() throws LoginException {
- Subject subject = new Subject();
CallbackHandler cbh = new TestCallbackHandler(new
SimpleCredentials("test", new char[0]));
- Map sharedState = new HashMap();
guestLoginModule.initialize(subject, cbh, sharedState,
Collections.<String, Object>emptyMap());
assertFalse(guestLoginModule.login());
@@ -99,9 +95,7 @@ public class GuestLoginModuleTest {
@Test
public void testThrowingCallbackhandler() throws LoginException {
- Subject subject = new Subject();
CallbackHandler cbh = new ThrowingCallbackHandler(true);
- Map sharedState = new HashMap();
guestLoginModule.initialize(subject, cbh, sharedState,
Collections.<String, Object>emptyMap());
assertFalse(guestLoginModule.login());
@@ -115,9 +109,7 @@ public class GuestLoginModuleTest {
@Test
public void testThrowingCallbackhandler2() throws LoginException {
- Subject subject = new Subject();
CallbackHandler cbh = new ThrowingCallbackHandler(false);
- Map sharedState = new HashMap();
guestLoginModule.initialize(subject, cbh, sharedState,
Collections.<String, Object>emptyMap());
assertFalse(guestLoginModule.login());
@@ -159,5 +151,4 @@ public class GuestLoginModuleTest {
}
}
}
-
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java
Fri Dec 14 15:37:00 2018
@@ -67,7 +67,7 @@ public class AbstractAccessControlListTe
}
protected RestrictionProvider getRestrictionProvider() {
- Map<String, RestrictionDefinition> rDefs = new HashMap();
+ Map<String, RestrictionDefinition> rDefs = new HashMap<>();
rDefs.put("r1", new RestrictionDefinitionImpl("r1", Type.STRING,
true));
rDefs.put("r2", new RestrictionDefinitionImpl("r2", Type.LONGS,
false));
@@ -117,7 +117,7 @@ public class AbstractAccessControlListTe
}
protected List<JackrabbitAccessControlEntry> createTestEntries() throws
RepositoryException {
- List<JackrabbitAccessControlEntry> entries = new ArrayList(3);
+ List<JackrabbitAccessControlEntry> entries = new ArrayList<>(3);
for (int i = 0; i < 3; i++) {
entries.add(createEntry(
new PrincipalImpl("testPrincipal" + i),
PrivilegeBits.BUILT_IN.get(PrivilegeConstants.JCR_READ), true));
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
Fri Dec 14 15:37:00 2018
@@ -132,7 +132,7 @@ public class ImmutableACLTest extends Ab
@Test
public void testImmutable() throws Exception {
- List<JackrabbitAccessControlEntry> entries = new ArrayList();
+ List<JackrabbitAccessControlEntry> entries = new ArrayList<>();
entries.add(createEntry(true, PrivilegeConstants.JCR_READ,
PrivilegeConstants.JCR_ADD_CHILD_NODES));
entries.add(createEntry(false,
PrivilegeConstants.JCR_LIFECYCLE_MANAGEMENT));
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=1848955&r1=1848954&r2=1848955&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
Fri Dec 14 15:37:00 2018
@@ -94,7 +94,7 @@ public class AbstractRestrictionProvider
Tree restrictionsTree = Mockito.mock(Tree.class);;
when(restrictionsTree.getName()).thenReturn(REP_RESTRICTIONS);
when(restrictionsTree.getProperty(JcrConstants.JCR_PRIMARYTYPE)).thenReturn(PropertyStates.createProperty(JcrConstants.JCR_PRIMARYTYPE,
NT_REP_RESTRICTIONS, Type.NAME));
- List<PropertyState> properties = new ArrayList();
+ List<PropertyState> properties = new ArrayList<>();
for (Restriction r : restrictions) {
when(restrictionsTree.getProperty(r.getDefinition().getName())).thenReturn(r.getProperty());
properties.add(r.getProperty());
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
Fri Dec 14 15:37:00 2018
@@ -106,7 +106,7 @@ public class CompositeRestrictionProvide
Tree restrictionsTree = Mockito.mock(Tree.class);;
when(restrictionsTree.getName()).thenReturn(REP_RESTRICTIONS);
when(restrictionsTree.getProperty(JcrConstants.JCR_PRIMARYTYPE)).thenReturn(PropertyStates.createProperty(JcrConstants.JCR_PRIMARYTYPE,
NT_REP_RESTRICTIONS, Type.NAME));
- List<PropertyState> properties = new ArrayList();
+ List<PropertyState> properties = new ArrayList<>();
for (Restriction r : restrictions) {
when(restrictionsTree.getProperty(r.getDefinition().getName())).thenReturn(r.getProperty());
properties.add(r.getProperty());
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
Fri Dec 14 15:37:00 2018
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
*/
public class RestrictionImplTest {
- private final Type type = Type.NAME;
+ private final Type<String> type = Type.NAME;
private final String name = "test:defName";
private final String value = "value";
private final boolean isMandatory = true;
@@ -49,7 +49,7 @@ public class RestrictionImplTest {
restriction = new RestrictionImpl(property, isMandatory);
}
- private static PropertyState createProperty(String name, String value,
Type type) {
+ private static PropertyState createProperty(String name, String value,
Type<String> type) {
return PropertyStates.createProperty(name, value, type);
}
@@ -114,7 +114,7 @@ public class RestrictionImplTest {
@Test
public void testNotEqual() {
- List<Restriction> rs = new ArrayList();
+ List<Restriction> rs = new ArrayList<>();
// - different type
rs.add(new RestrictionImpl(PropertyStates.createProperty(name, value,
Type.STRING), isMandatory));
// - different multi-value status
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProviderTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProviderTest.java
Fri Dec 14 15:37:00 2018
@@ -69,7 +69,7 @@ public class DefaultAuthorizableActionPr
@Test
public void testNullActionConfig() {
- Map<String, String[]> m = new HashMap();
+ Map<String, String[]> m = new HashMap<>();
m.put(DefaultAuthorizableActionProvider.ENABLED_ACTIONS, null);
AuthorizableActionProvider actionProvider = new
DefaultAuthorizableActionProvider(ConfigurationParameters.of(m));
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java?rev=1848955&r1=1848954&r2=1848955&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
Fri Dec 14 15:37:00 2018
@@ -90,7 +90,7 @@ public class PasswordValidationActionTes
@Test
public void testPasswordValidationActionValid() throws Exception {
- List<String> valid = new ArrayList();
+ List<String> valid = new ArrayList<>();
valid.add("abCDefGH");
valid.add("Abbbbbbbbbbbb");
valid.add("cDDDDDDDDDDDDDDDDD");
