Repository: archiva Updated Branches: refs/heads/master ff99d5a20 -> d9de8dc7a
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java index 652b5d0..d2aae47 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java @@ -259,7 +259,7 @@ public class ArchivaConfigurableUsersManager public List<User> findUsersByEmailKey( String emailKey, boolean orderAscending ) throws UserManagerException { - List<User> users = new ArrayList<User>(); + List<User> users = new ArrayList<>(); for ( UserManager userManager : userManagerPerId.values() ) { @@ -275,7 +275,7 @@ public class ArchivaConfigurableUsersManager public List<User> findUsersByFullNameKey( String fullNameKey, boolean orderAscending ) throws UserManagerException { - List<User> users = new ArrayList<User>(); + List<User> users = new ArrayList<>(); for ( UserManager userManager : userManagerPerId.values() ) { @@ -291,7 +291,7 @@ public class ArchivaConfigurableUsersManager public List<User> findUsersByQuery( UserQuery query ) throws UserManagerException { - List<User> users = new ArrayList<User>(); + List<User> users = new ArrayList<>(); for ( UserManager userManager : userManagerPerId.values() ) { @@ -307,7 +307,7 @@ public class ArchivaConfigurableUsersManager public List<User> findUsersByUsernameKey( String usernameKey, boolean orderAscending ) throws UserManagerException { - List<User> users = new ArrayList<User>(); + List<User> users = new ArrayList<>(); for ( UserManager userManager : userManagerPerId.values() ) { @@ -328,7 +328,7 @@ public class ArchivaConfigurableUsersManager public List<User> getUsers() throws UserManagerException { - List<User> users = new ArrayList<User>(); + List<User> users = new ArrayList<>(); for ( UserManager userManager : userManagerPerId.values() ) { @@ -344,7 +344,7 @@ public class ArchivaConfigurableUsersManager public List<User> getUsers( boolean orderAscending ) throws UserManagerException { - List<User> users = new ArrayList<User>(); + List<User> users = new ArrayList<>(); for ( UserManager userManager : userManagerPerId.values() ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java index 0cf3583..ec129a5 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLdapRoleMapperConfiguration.java @@ -155,7 +155,7 @@ public class ArchivaLdapRoleMapperConfiguration RedbackRuntimeConfiguration redbackRuntimeConfiguration = redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration(); - List<LdapGroupMapping> ldapGroupMappings = new ArrayList<LdapGroupMapping>( mappings.size() ); + List<LdapGroupMapping> ldapGroupMappings = new ArrayList<>( mappings.size() ); for ( Map.Entry<String, List<String>> entry : mappings.entrySet() ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java index a6090ce..2b14fe2 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java @@ -75,7 +75,7 @@ public class ArchivaLockedAdminEnvironmentCheck List<String> userManagerImpls = redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().getUserManagerImpls(); - userManagers = new ArrayList<UserManager>( userManagerImpls.size() ); + userManagers = new ArrayList<>( userManagerImpls.size() ); for ( String beanId : userManagerImpls ) { @@ -100,7 +100,7 @@ public class ArchivaLockedAdminEnvironmentCheck { continue; } - List<String> roles = new ArrayList<String>(); + List<String> roles = new ArrayList<>(); roles.add( RedbackRoleConstants.SYSTEM_ADMINISTRATOR_ROLE ); List<UserAssignment> systemAdminstrators; http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java index 7320d5a..c511b02 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java @@ -250,7 +250,7 @@ public class ArchivaRbacManager throw new RbacManagerException( lastException.getMessage(), lastException ); } - return new ArrayList<Role>( allRoles.values() ); + return new ArrayList<>( allRoles.values() ); } public void removeRole( Role role ) @@ -381,7 +381,7 @@ public class ArchivaRbacManager { throw new RbacManagerException( lastException.getMessage(), lastException ); } - return new ArrayList<Permission>( allPermissions.values() ); + return new ArrayList<>( allPermissions.values() ); } public void removePermission( Permission permission ) @@ -505,7 +505,7 @@ public class ArchivaRbacManager { throw new RbacManagerException( lastException.getMessage(), lastException ); } - return new ArrayList<Operation>( allOperations.values() ); + return new ArrayList<>( allOperations.values() ); } public void removeOperation( Operation operation ) @@ -629,7 +629,7 @@ public class ArchivaRbacManager { throw new RbacManagerException( lastException.getMessage(), lastException ); } - return new ArrayList<Resource>( allResources.values() ); + return new ArrayList<>( allResources.values() ); } public void removeResource( Resource resource ) @@ -820,13 +820,13 @@ public class ArchivaRbacManager { throw new RbacManagerException( lastException.getMessage(), lastException ); } - return new ArrayList<UserAssignment>( allUserAssignments.values() ); + return new ArrayList<>( allUserAssignments.values() ); } public List<UserAssignment> getUserAssignmentsForRoles( Collection<String> roleNames ) throws RbacManagerException { - List<UserAssignment> allUserAssignments = new ArrayList<UserAssignment>(); + List<UserAssignment> allUserAssignments = new ArrayList<>(); boolean allFailed = true; Exception lastException = null; for ( RBACManager rbacManager : rbacManagersPerId.values() ) http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java index e54a503..4707c32 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java @@ -78,7 +78,7 @@ public class ArchivaUserManagerAuthenticator List<String> userManagerImpls = redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().getUserManagerImpls(); - userManagers = new ArrayList<UserManager>( userManagerImpls.size() ); + userManagers = new ArrayList<>( userManagerImpls.size() ); for ( String beanId : userManagerImpls ) { @@ -99,7 +99,7 @@ public class ArchivaUserManagerAuthenticator String username = null; Exception resultException = null; PasswordBasedAuthenticationDataSource source = (PasswordBasedAuthenticationDataSource) ds; - List<AuthenticationFailureCause> authnResultErrors = new ArrayList<AuthenticationFailureCause>(); + List<AuthenticationFailureCause> authnResultErrors = new ArrayList<>(); for ( UserManager userManager : userManagers ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java index 3f4c209..7d7ac0b 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java @@ -181,12 +181,12 @@ public class SecuritySynchronization stopWatch.reset(); stopWatch.start(); - List<String> violations = new ArrayList<String>(); + List<String> violations = new ArrayList<>(); for ( Entry<String, EnvironmentCheck> entry : checkers.entrySet() ) { EnvironmentCheck check = entry.getValue(); - List<String> v = new ArrayList<String>(); + List<String> v = new ArrayList<>(); check.validateEnvironment( v ); log.info( "Environment Check: {} -> {} violation(s)", entry.getKey(), v.size() ); for ( String s : v ) http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java index 03dd1d2..2e35ba6 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java @@ -294,7 +294,7 @@ public abstract class AbstractDownloadTest { try { - List<String> entriesNames = new ArrayList<String>(); + List<String> entriesNames = new ArrayList<>(); Enumeration<? extends ZipEntry> entries = zipFile.entries(); while ( entries.hasMoreElements() ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java index f38a0d6..e9e717d 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java @@ -52,7 +52,7 @@ public class SecuritySystemStub { Map<String, String> users = new HashMap<String, String>(); - List<String> repoIds = new ArrayList<String>(); + List<String> repoIds = new ArrayList<>(); public SecuritySystemStub() { http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java index 8f9fc13..940fa6e 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestMetadataRepository.java @@ -40,9 +40,9 @@ public class TestMetadataRepository private static final String TEST_NAMESPACE = "org.apache.archiva"; - private List<ArtifactMetadata> artifacts = new ArrayList<ArtifactMetadata>(); + private List<ArtifactMetadata> artifacts = new ArrayList<>(); - private List<String> versions = new ArrayList<String>(); + private List<String> versions = new ArrayList<>(); public TestMetadataRepository() {
