You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/04/10 03:43:26 UTC
[2/3] use diamond operator
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
index 93933ad..b49a649 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
@@ -75,7 +75,7 @@ public class DefaultArchivaAdministration
public List<LegacyArtifactPath> getLegacyArtifactPaths()
throws RepositoryAdminException
{
- List<LegacyArtifactPath> legacyArtifactPaths = new ArrayList<LegacyArtifactPath>(
+ List<LegacyArtifactPath> legacyArtifactPaths = new ArrayList<>(
getArchivaConfiguration().getConfiguration().getLegacyArtifactPaths().size() );
for ( org.apache.archiva.configuration.LegacyArtifactPath legacyArtifactPath : getArchivaConfiguration().getConfiguration().getLegacyArtifactPaths() )
{
@@ -268,7 +268,7 @@ public class DefaultArchivaAdministration
{
return Collections.emptyList();
}
- List<FileType> fileTypes = new ArrayList<FileType>( configFileTypes.size() );
+ List<FileType> fileTypes = new ArrayList<>( configFileTypes.size() );
for ( org.apache.archiva.configuration.FileType fileType : configFileTypes )
{
fileTypes.add( getModelMapper().map( fileType, FileType.class ) );
@@ -279,14 +279,14 @@ public class DefaultArchivaAdministration
public List<String> getKnownContentConsumers()
throws RepositoryAdminException
{
- return new ArrayList<String>(
+ return new ArrayList<>(
getArchivaConfiguration().getConfiguration().getRepositoryScanning().getKnownContentConsumers() );
}
public List<String> getInvalidContentConsumers()
throws RepositoryAdminException
{
- return new ArrayList<String>(
+ return new ArrayList<>(
getArchivaConfiguration().getConfiguration().getRepositoryScanning().getInvalidContentConsumers() );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
index 425fd52..91a5f86 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
@@ -109,7 +109,7 @@ public class DefaultRepositoryGroupAdmin
throws RepositoryAdminException
{
List<RepositoryGroup> repositoriesGroups =
- new ArrayList<RepositoryGroup>( getArchivaConfiguration().getConfiguration().getRepositoryGroups().size() );
+ new ArrayList<>( getArchivaConfiguration().getConfiguration().getRepositoryGroups().size() );
for ( RepositoryGroupConfiguration repositoryGroupConfiguration : getArchivaConfiguration().getConfiguration().getRepositoryGroups() )
{
@@ -289,7 +289,7 @@ public class DefaultRepositoryGroupAdmin
java.util.List<String> repos = map.get( groupId );
if ( repos == null )
{
- repos = new ArrayList<String>();
+ repos = new ArrayList<>();
map.put( groupId, repos );
}
repos.add( repo.getId() );
@@ -311,7 +311,7 @@ public class DefaultRepositoryGroupAdmin
java.util.List<String> groups = map.get( repositoryId );
if ( groups == null )
{
- groups = new ArrayList<String>();
+ groups = new ArrayList<>();
map.put( repositoryId, groups );
}
groups.add( group.getId() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
index 34c89b8..5931eb1 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
@@ -418,7 +418,7 @@ public class DefaultManagedRepositoryAdmin
// olamy: copy list for reading as a unit test in webapp fail with ConcurrentModificationException
List<ProxyConnectorConfiguration> proxyConnectors =
- new ArrayList<ProxyConnectorConfiguration>( config.getProxyConnectors() );
+ new ArrayList<>( config.getProxyConnectors() );
for ( ProxyConnectorConfiguration proxyConnector : proxyConnectors )
{
if ( StringUtils.equals( proxyConnector.getSourceRepoId(), repository.getId() ) )
@@ -438,7 +438,7 @@ public class DefaultManagedRepositoryAdmin
// copy to prevent UnsupportedOperationException
RepositoryGroupConfiguration repositoryGroupConfiguration =
config.findRepositoryGroupById( repoGroup );
- List<String> repos = new ArrayList<String>( repositoryGroupConfiguration.getRepositories() );
+ List<String> repos = new ArrayList<>( repositoryGroupConfiguration.getRepositories() );
config.removeRepositoryGroup( repositoryGroupConfiguration );
repos.remove( repository.getId() );
repositoryGroupConfiguration.setRepositories( repos );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java
index bf0bde9..321c88b 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java
@@ -47,7 +47,7 @@ public class DefaultNetworkProxyAdmin
throws RepositoryAdminException
{
List<NetworkProxy> networkProxies =
- new ArrayList<NetworkProxy>( getArchivaConfiguration().getConfiguration().getNetworkProxies().size() );
+ new ArrayList<>( getArchivaConfiguration().getConfiguration().getNetworkProxies().size() );
for ( NetworkProxyConfiguration networkProxyConfiguration : getArchivaConfiguration().getConfiguration().getNetworkProxies() )
{
networkProxies.add( getNetworkProxy( networkProxyConfiguration ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
index bd9fdab..22fc10b 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
@@ -63,7 +63,7 @@ public class DefaultProxyConnectorAdmin
{
List<ProxyConnectorConfiguration> proxyConnectorConfigurations =
getArchivaConfiguration().getConfiguration().getProxyConnectors();
- List<ProxyConnector> proxyConnectors = new ArrayList<ProxyConnector>( proxyConnectorConfigurations.size() );
+ List<ProxyConnector> proxyConnectors = new ArrayList<>( proxyConnectorConfigurations.size() );
for ( ProxyConnectorConfiguration configuration : proxyConnectorConfigurations )
{
proxyConnectors.add( getProxyConnector( configuration ) );
@@ -152,7 +152,7 @@ public class DefaultProxyConnectorAdmin
{
if ( patterns != null )
{
- List<String> rawPatterns = new ArrayList<String>( patterns.size() );
+ List<String> rawPatterns = new ArrayList<>( patterns.size() );
for ( String pattern : patterns )
{
rawPatterns.add( StringUtils.replace( pattern, "\\\\", "\\" ) );
@@ -177,7 +177,7 @@ public class DefaultProxyConnectorAdmin
List<ProxyConnector> connectors = proxyConnectorMap.get( key );
if ( connectors == null )
{
- connectors = new ArrayList<ProxyConnector>( 1 );
+ connectors = new ArrayList<>( 1 );
proxyConnectorMap.put( key, connectors );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java
index 71b6560..276808e 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnectorrule/DefaultProxyConnectorRuleAdmin.java
@@ -41,7 +41,7 @@ import java.util.List;
* @author Olivier Lamy
* @since 1.4-M3
*/
-@Service ("proxyConnectorRuleAdmin#default")
+@Service("proxyConnectorRuleAdmin#default")
public class DefaultProxyConnectorRuleAdmin
extends AbstractRepositoryAdmin
implements ProxyConnectorRuleAdmin
@@ -57,8 +57,7 @@ public class DefaultProxyConnectorRuleAdmin
{
return Collections.emptyList();
}
- List<ProxyConnectorRule> proxyConnectorRules =
- new ArrayList<ProxyConnectorRule>( proxyConnectorRuleConfigurations.size() );
+ List<ProxyConnectorRule> proxyConnectorRules = new ArrayList<>( proxyConnectorRuleConfigurations.size() );
for ( ProxyConnectorRuleConfiguration proxyConnectorRuleConfiguration : proxyConnectorRuleConfigurations )
{
@@ -120,8 +119,7 @@ public class DefaultProxyConnectorRuleAdmin
boolean toSave = false;
- List<ProxyConnectorRuleConfiguration> proxyConnectorRuleConfigurations =
- new ArrayList<ProxyConnectorRuleConfiguration>();
+ List<ProxyConnectorRuleConfiguration> proxyConnectorRuleConfigurations = new ArrayList<>();
for ( ProxyConnectorRuleConfiguration proxyConnectorRuleConfiguration : configuration.getProxyConnectorRuleConfigurations() )
{
@@ -157,7 +155,7 @@ public class DefaultProxyConnectorRuleAdmin
proxyConnectorRule.getProxyConnectorRuleType().getRuleType() ) )
{
List<ProxyConnectorConfiguration> proxyConnectors =
- new ArrayList<ProxyConnectorConfiguration>( proxyConnectorRule.getProxyConnectors().size() );
+ new ArrayList<>( proxyConnectorRule.getProxyConnectors().size() );
for ( ProxyConnector proxyConnector : proxyConnectorRule.getProxyConnectors() )
{
ProxyConnectorConfiguration proxyConnectorConfiguration = new ProxyConnectorConfiguration();
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
index 058670b..c5d17a9 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
@@ -52,7 +52,7 @@ import java.util.Map;
* @author Olivier Lamy
* @since 1.4-M1
*/
-@Service ( "remoteRepositoryAdmin#default" )
+@Service("remoteRepositoryAdmin#default")
public class DefaultRemoteRepositoryAdmin
extends AbstractRepositoryAdmin
implements RemoteRepositoryAdmin
@@ -115,8 +115,8 @@ public class DefaultRemoteRepositoryAdmin
public List<RemoteRepository> getRemoteRepositories()
throws RepositoryAdminException
{
- List<RemoteRepository> remoteRepositories = new ArrayList<RemoteRepository>(
- getArchivaConfiguration().getConfiguration().getRemoteRepositories().size() );
+ List<RemoteRepository> remoteRepositories =
+ new ArrayList<>( getArchivaConfiguration().getConfiguration().getRemoteRepositories().size() );
for ( RemoteRepositoryConfiguration repositoryConfiguration : getArchivaConfiguration().getConfiguration().getRemoteRepositories() )
{
RemoteRepository remoteRepository =
@@ -199,8 +199,7 @@ public class DefaultRemoteRepositoryAdmin
// TODO use ProxyConnectorAdmin interface ?
// [MRM-520] Proxy Connectors are not deleted with the deletion of a Repository.
- List<ProxyConnectorConfiguration> proxyConnectors =
- new ArrayList<ProxyConnectorConfiguration>( configuration.getProxyConnectors() );
+ List<ProxyConnectorConfiguration> proxyConnectors = new ArrayList<>( configuration.getProxyConnectors() );
for ( ProxyConnectorConfiguration proxyConnector : proxyConnectors )
{
if ( StringUtils.equals( proxyConnector.getTargetRepoId(), repositoryId ) )
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
index 0ed0819..356f00c 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
@@ -52,7 +52,7 @@ import java.util.Set;
* @author Olivier Lamy
* @since 1.4-M4
*/
-@Service( "redbackRuntimeConfigurationAdmin#default" )
+@Service("redbackRuntimeConfigurationAdmin#default")
public class DefaultRedbackRuntimeConfigurationAdmin
extends AbstractRepositoryAdmin
implements RedbackRuntimeConfigurationAdmin, UserConfiguration
@@ -68,9 +68,9 @@ public class DefaultRedbackRuntimeConfigurationAdmin
@Inject
public DefaultRedbackRuntimeConfigurationAdmin( ArchivaConfiguration archivaConfiguration,//
- @Named( value = "userConfiguration#redback" ) //
+ @Named(value = "userConfiguration#redback") //
UserConfiguration userConfiguration,
- @Named( value = "cache#users" ) Cache usersCache )
+ @Named(value = "cache#users") Cache usersCache )
{
this.archivaConfiguration = archivaConfiguration;
this.userConfiguration = userConfiguration;
@@ -164,7 +164,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
Collection<String> keys = userConfiguration.getKeys();
- List<LdapGroupMapping> ldapGroupMappings = new ArrayList<LdapGroupMapping>();
+ List<LdapGroupMapping> ldapGroupMappings = new ArrayList<>();
for ( String key : keys )
{
@@ -344,7 +344,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
if ( mappings != null && mappings.size() > 0 )
{
- List<LdapGroupMapping> ldapGroupMappings = new ArrayList<LdapGroupMapping>( mappings.size() );
+ List<LdapGroupMapping> ldapGroupMappings = new ArrayList<>( mappings.size() );
for ( org.apache.archiva.configuration.LdapGroupMapping mapping : mappings )
{
@@ -417,7 +417,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
{
List<org.apache.archiva.configuration.LdapGroupMapping> mappings =
- new ArrayList<org.apache.archiva.configuration.LdapGroupMapping>( ldapGroupMappings.size() );
+ new ArrayList<>( ldapGroupMappings.size() );
for ( LdapGroupMapping ldapGroupMapping : ldapGroupMappings )
{
@@ -425,7 +425,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
org.apache.archiva.configuration.LdapGroupMapping mapping =
new org.apache.archiva.configuration.LdapGroupMapping();
mapping.setGroup( ldapGroupMapping.getGroup() );
- mapping.setRoleNames( new ArrayList<String>( ldapGroupMapping.getRoleNames() ) );
+ mapping.setRoleNames( new ArrayList<>( ldapGroupMapping.getRoleNames() ) );
mappings.add( mapping );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java
index 42387a6..37135a1 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockAuditListener.java
@@ -33,7 +33,7 @@ public class MockAuditListener
implements AuditListener
{
- private List<AuditEvent> auditEvents = new ArrayList<AuditEvent>();
+ private List<AuditEvent> auditEvents = new ArrayList<>();
public void auditEvent( AuditEvent event )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
index 656076e..43a7048 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
@@ -349,8 +349,8 @@ public class MetadataTools
@PostConstruct
public void initialize()
{
- this.artifactPatterns = new ArrayList<String>();
- this.proxies = new HashMap<String, Set<String>>();
+ this.artifactPatterns = new ArrayList<>();
+ this.proxies = new HashMap<>();
initConfigVariables();
configuration.addChangeListener( this );
@@ -504,7 +504,7 @@ public class MetadataTools
private List<ArchivaRepositoryMetadata> getMetadatasForManagedRepository(
ManagedRepositoryContent managedRepository, String logicalResource )
{
- List<ArchivaRepositoryMetadata> metadatas = new ArrayList<ArchivaRepositoryMetadata>();
+ List<ArchivaRepositoryMetadata> metadatas = new ArrayList<>();
File file = new File( managedRepository.getRepoRoot(), logicalResource );
if ( file.exists() )
{
@@ -622,7 +622,7 @@ public class MetadataTools
else
{
// Add the plugins to the metadata model.
- metadata.setPlugins( new ArrayList<Plugin>( allPlugins ) );
+ metadata.setPlugins( new ArrayList<>( allPlugins ) );
// artifact ID was actually the last part of the group
metadata.setGroupId( metadata.getGroupId() + "." + metadata.getArtifactId() );
@@ -643,12 +643,12 @@ public class MetadataTools
private void updateMetadataVersions( Collection<String> allVersions, ArchivaRepositoryMetadata metadata )
{
// Sort the versions
- List<String> sortedVersions = new ArrayList<String>( allVersions );
+ List<String> sortedVersions = new ArrayList<>( allVersions );
Collections.sort( sortedVersions, VersionComparator.getInstance() );
// Split the versions into released and snapshots.
- List<String> releasedVersions = new ArrayList<String>();
- List<String> snapshotVersions = new ArrayList<String>();
+ List<String> releasedVersions = new ArrayList<>();
+ List<String> snapshotVersions = new ArrayList<>();
for ( String version : sortedVersions )
{
@@ -795,7 +795,7 @@ public class MetadataTools
}
// sort the list to determine to aide in determining the Latest version.
- List<String> sortedVersions = new ArrayList<String>();
+ List<String> sortedVersions = new ArrayList<>();
sortedVersions.addAll( snapshotVersions );
Collections.sort( sortedVersions, new VersionComparator() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
index a3ecbf8..7f06360 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
@@ -210,7 +210,7 @@ public class RepositoryMetadataMerge
return null;
}
- List<Plugin> result = new ArrayList<Plugin>();
+ List<Plugin> result = new ArrayList<>();
for (Plugin plugin : plugins)
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
index c9bf803..d485bd8 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
@@ -99,8 +99,8 @@ public class DefaultRepositoryScanner
// Setup Includes / Excludes.
- List<String> allExcludes = new ArrayList<String>();
- List<String> allIncludes = new ArrayList<String>();
+ List<String> allExcludes = new ArrayList<>();
+ List<String> allIncludes = new ArrayList<>();
if ( CollectionUtils.isNotEmpty( ignoredContentPatterns ) )
{
@@ -147,7 +147,7 @@ public class DefaultRepositoryScanner
private List<String> gatherIds( List<? extends RepositoryContentConsumer> consumers )
{
- List<String> ids = new ArrayList<String>();
+ List<String> ids = new ArrayList<>();
for ( RepositoryContentConsumer consumer : consumers )
{
ids.add( consumer.getId() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
index 3ba6a25..c45d815 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
@@ -164,7 +164,7 @@ public class RepositoryContentConsumers
{
return selectedKnownConsumers;
}
- List<KnownRepositoryContentConsumer> ret = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> ret = new ArrayList<>();
List<String> knownSelected = getSelectedKnownConsumerIds();
@@ -195,7 +195,7 @@ public class RepositoryContentConsumers
return selectedInvalidConsumers;
}
- List<InvalidRepositoryContentConsumer> ret = new ArrayList<InvalidRepositoryContentConsumer>();
+ List<InvalidRepositoryContentConsumer> ret = new ArrayList<>();
List<String> invalidSelected = getSelectedInvalidConsumerIds();
@@ -219,7 +219,7 @@ public class RepositoryContentConsumers
*/
public List<KnownRepositoryContentConsumer> getAvailableKnownConsumers()
{
- return new ArrayList<KnownRepositoryContentConsumer>(
+ return new ArrayList<>(
applicationContext.getBeansOfType( KnownRepositoryContentConsumer.class ).values() );
}
@@ -232,7 +232,7 @@ public class RepositoryContentConsumers
*/
public List<InvalidRepositoryContentConsumer> getAvailableInvalidConsumers()
{
- return new ArrayList<InvalidRepositoryContentConsumer>(
+ return new ArrayList<>(
applicationContext.getBeansOfType( InvalidRepositoryContentConsumer.class ).values() );
}
@@ -261,7 +261,7 @@ public class RepositoryContentConsumers
// - do not create missing/fix invalid checksums and update metadata when deploying from webdav since these are uploaded by maven
if ( !updateRelatedArtifacts )
{
- List<KnownRepositoryContentConsumer> clone = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> clone = new ArrayList<>();
clone.addAll( selectedKnownConsumers );
for ( KnownRepositoryContentConsumer consumer : clone )
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
index bb88c71..c75e6e5 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
@@ -42,7 +42,7 @@ public class KnownScanConsumer
{
private int processCount = 0;
- private List<String> includes = new ArrayList<String>();
+ private List<String> includes = new ArrayList<>();
private boolean processUnmodified = false;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
index fb5c871..a19b16d 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java
@@ -143,7 +143,7 @@ public class RepositoryScannerTest
private List<String> getIgnoreList()
{
- List<String> ignores = new ArrayList<String>();
+ List<String> ignores = new ArrayList<>();
ignores.addAll( Arrays.asList( RepositoryScanner.IGNORABLE_CONTENT ) );
return ignores;
}
@@ -154,12 +154,12 @@ public class RepositoryScannerTest
{
ManagedRepository repository = createSimpleRepository();
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>();
KnownScanConsumer consumer = new KnownScanConsumer();
consumer.setIncludes( ARTIFACT_PATTERNS );
knownConsumers.add( consumer );
- List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<InvalidRepositoryContentConsumer>();
+ List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<>();
InvalidScanConsumer badconsumer = new InvalidScanConsumer();
invalidConsumers.add( badconsumer );
@@ -181,12 +181,12 @@ public class RepositoryScannerTest
{
ManagedRepository repository = createSimpleRepository();
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>();
KnownScanConsumer consumer = new KnownScanConsumer();
consumer.setIncludes( ARTIFACT_PATTERNS );
knownConsumers.add( consumer );
- List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<InvalidRepositoryContentConsumer>();
+ List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<>();
InvalidScanConsumer badconsumer = new InvalidScanConsumer();
invalidConsumers.add( badconsumer );
@@ -207,13 +207,13 @@ public class RepositoryScannerTest
{
ManagedRepository repository = createSimpleRepository();
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>();
KnownScanConsumer consumer = new KnownScanConsumer();
consumer.setProcessUnmodified( true );
consumer.setIncludes( ARTIFACT_PATTERNS );
knownConsumers.add( consumer );
- List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<InvalidRepositoryContentConsumer>();
+ List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<>();
InvalidScanConsumer badconsumer = new InvalidScanConsumer();
invalidConsumers.add( badconsumer );
@@ -234,14 +234,14 @@ public class RepositoryScannerTest
{
ManagedRepository repository = createDefaultRepository();
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>();
KnownScanConsumer consumer = new KnownScanConsumer();
consumer.setIncludes(
new String[]{ "**/*.jar", "**/*.war", "**/*.pom", "**/maven-metadata.xml", "**/*-site.xml", "**/*.zip",
"**/*.tar.gz", "**/*.sha1", "**/*.md5" } );
knownConsumers.add( consumer );
- List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<InvalidRepositoryContentConsumer>();
+ List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<>();
InvalidScanConsumer badconsumer = new InvalidScanConsumer();
invalidConsumers.add( badconsumer );
@@ -259,7 +259,7 @@ public class RepositoryScannerTest
public void testDefaultRepositoryArtifactScanner()
throws Exception
{
- List<String> actualArtifactPaths = new ArrayList<String>();
+ List<String> actualArtifactPaths = new ArrayList<>();
actualArtifactPaths.add( "invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar" );
actualArtifactPaths.add( "invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar" );
@@ -295,12 +295,12 @@ public class RepositoryScannerTest
ManagedRepository repository = createDefaultRepository();
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>();
KnownScanConsumer consumer = new KnownScanConsumer();
consumer.setIncludes( ARTIFACT_PATTERNS );
knownConsumers.add( consumer );
- List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<InvalidRepositoryContentConsumer>();
+ List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<>();
InvalidScanConsumer badconsumer = new InvalidScanConsumer();
invalidConsumers.add( badconsumer );
@@ -317,7 +317,7 @@ public class RepositoryScannerTest
public void testDefaultRepositoryMetadataScanner()
throws Exception
{
- List<String> actualMetadataPaths = new ArrayList<String>();
+ List<String> actualMetadataPaths = new ArrayList<>();
actualMetadataPaths.add( "org/apache/maven/some-ejb/1.0/maven-metadata.xml" );
actualMetadataPaths.add( "org/apache/maven/update/test-not-updated/maven-metadata.xml" );
@@ -332,12 +332,12 @@ public class RepositoryScannerTest
ManagedRepository repository = createDefaultRepository();
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>();
KnownScanConsumer knownConsumer = new KnownScanConsumer();
knownConsumer.setIncludes( new String[]{ "**/maven-metadata*.xml" } );
knownConsumers.add( knownConsumer );
- List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<InvalidRepositoryContentConsumer>();
+ List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<>();
InvalidScanConsumer badconsumer = new InvalidScanConsumer();
invalidConsumers.add( badconsumer );
@@ -354,7 +354,7 @@ public class RepositoryScannerTest
public void testDefaultRepositoryProjectScanner()
throws Exception
{
- List<String> actualProjectPaths = new ArrayList<String>();
+ List<String> actualProjectPaths = new ArrayList<>();
actualProjectPaths.add( "org/apache/maven/A/1.0/A-1.0.pom" );
actualProjectPaths.add( "org/apache/maven/B/2.0/B-2.0.pom" );
@@ -369,12 +369,12 @@ public class RepositoryScannerTest
ManagedRepository repository = createDefaultRepository();
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>();
KnownScanConsumer consumer = new KnownScanConsumer();
consumer.setIncludes( new String[]{ "**/*.pom" } );
knownConsumers.add( consumer );
- List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<InvalidRepositoryContentConsumer>();
+ List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<>();
InvalidScanConsumer badconsumer = new InvalidScanConsumer();
invalidConsumers.add( badconsumer );
@@ -391,7 +391,7 @@ public class RepositoryScannerTest
public void testLegacyRepositoryArtifactScanner()
throws Exception
{
- List<String> actualArtifactPaths = new ArrayList<String>();
+ List<String> actualArtifactPaths = new ArrayList<>();
actualArtifactPaths.add( "invalid/jars/1.0/invalid-1.0.jar" );
actualArtifactPaths.add( "invalid/jars/invalid-1.0.rar" );
@@ -410,12 +410,12 @@ public class RepositoryScannerTest
ManagedRepository repository = createLegacyRepository();
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>();
KnownScanConsumer consumer = new KnownScanConsumer();
consumer.setIncludes( ARTIFACT_PATTERNS );
knownConsumers.add( consumer );
- List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<InvalidRepositoryContentConsumer>();
+ List<InvalidRepositoryContentConsumer> invalidConsumers = new ArrayList<>();
InvalidScanConsumer badconsumer = new InvalidScanConsumer();
invalidConsumers.add( badconsumer );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/utils/ListGenerator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/utils/ListGenerator.java b/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/utils/ListGenerator.java
index d0abc42..b9a22be 100644
--- a/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/utils/ListGenerator.java
+++ b/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/utils/ListGenerator.java
@@ -58,7 +58,7 @@ public class ListGenerator
return null;
}
- List<FrameworkMethod> generated = new ArrayList<FrameworkMethod>();
+ List<FrameworkMethod> generated = new ArrayList<>();
testRound = Math.min( MAXROUND, testRound );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/AbstractTransactionEvent.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/AbstractTransactionEvent.java b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/AbstractTransactionEvent.java
index 7dbe03b..73fabc9 100644
--- a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/AbstractTransactionEvent.java
+++ b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/AbstractTransactionEvent.java
@@ -40,11 +40,11 @@ import java.util.Map;
public abstract class AbstractTransactionEvent
implements TransactionEvent
{
- private Map<File, File> backups = new HashMap<File, File>();
+ private Map<File, File> backups = new HashMap<>();
- private List<File> createdDirs = new ArrayList<File>();
+ private List<File> createdDirs = new ArrayList<>();
- private List<File> createdFiles = new ArrayList<File>();
+ private List<File> createdFiles = new ArrayList<>();
/**
* {@link List}<{@link Digester}>
@@ -75,7 +75,7 @@ public abstract class AbstractTransactionEvent
protected void mkDirs( File dir )
throws IOException
{
- List<File> createDirs = new ArrayList<File>();
+ List<File> createDirs = new ArrayList<>();
File parent = dir;
while ( !parent.exists() || !parent.isDirectory() )
@@ -87,7 +87,7 @@ public abstract class AbstractTransactionEvent
while ( !createDirs.isEmpty() )
{
- File directory = (File) createDirs.remove( createDirs.size() - 1 );
+ File directory = createDirs.remove( createDirs.size() - 1 );
if ( directory.mkdir() )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/FileTransaction.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/FileTransaction.java b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/FileTransaction.java
index 35d8b00..80fab4b 100644
--- a/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/FileTransaction.java
+++ b/archiva-modules/archiva-base/archiva-transaction/src/main/java/org/apache/archiva/transaction/FileTransaction.java
@@ -32,7 +32,7 @@ import org.codehaus.plexus.digest.Digester;
*/
public class FileTransaction
{
- private List<AbstractTransactionEvent> events = new ArrayList<AbstractTransactionEvent>();
+ private List<AbstractTransactionEvent> events = new ArrayList<>();
public void commit()
throws TransactionException
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
index 2b418b8..f9c6507 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
@@ -100,9 +100,9 @@ public class DefaultRepositoryArchivaTaskScheduler
public static final String CRON_HOURLY = "0 0 * * * ?";
- private Set<String> jobs = new HashSet<String>();
+ private Set<String> jobs = new HashSet<>();
- private List<String> queuedRepos = new ArrayList<String>();
+ private List<String> queuedRepos = new ArrayList<>();
@PostConstruct
public void startup()
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java
index 2cb62ef..5e4a331 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java
@@ -108,7 +108,7 @@ public class MockArchivaAdministration
public List<String> getKnownContentConsumers()
throws RepositoryAdminException
{
- return new ArrayList<String>(
+ return new ArrayList<>(
getArchivaConfiguration().getConfiguration().getRepositoryScanning().getKnownContentConsumers() );
}
@@ -133,7 +133,7 @@ public class MockArchivaAdministration
public List<String> getInvalidContentConsumers()
throws RepositoryAdminException
{
- return new ArrayList<String>(
+ return new ArrayList<>(
getArchivaConfiguration().getConfiguration().getRepositoryScanning().getInvalidContentConsumers() );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java
index aed2a95..a8b02b2 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockManagedRepositoryAdmin.java
@@ -45,7 +45,7 @@ public class MockManagedRepositoryAdmin
List<ManagedRepositoryConfiguration> managedRepoConfigs =
getArchivaConfiguration().getConfiguration().getManagedRepositories();
- List<ManagedRepository> managedRepos = new ArrayList<ManagedRepository>( managedRepoConfigs.size() );
+ List<ManagedRepository> managedRepos = new ArrayList<>( managedRepoConfigs.size() );
for ( ManagedRepositoryConfiguration repoConfig : managedRepoConfigs )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
index cf98060..ba02a2c 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
@@ -82,7 +82,7 @@ public class TestRepositoryStatisticsManager
List<RepositoryStatistics> stats = repoStats.get( repositoryId );
if ( stats == null )
{
- stats = new ArrayList<RepositoryStatistics>();
+ stats = new ArrayList<>();
repoStats.put( repositoryId, stats );
}
return stats;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java
index 209e1cc..e38706c 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/SearchRequest.java
@@ -62,7 +62,7 @@ public class SearchRequest
/**
* repositories
*/
- private List<String> repositories = new ArrayList<String>();
+ private List<String> repositories = new ArrayList<>();
/**
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
index c586e38..c05da22 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
@@ -77,7 +77,7 @@ public abstract class AbstractRestService
protected Logger log = LoggerFactory.getLogger( getClass() );
@Inject
- private List<AuditListener> auditListeners = new ArrayList<AuditListener>();
+ private List<AuditListener> auditListeners = new ArrayList<>();
@Inject
protected UserRepositories userRepositories;
@@ -272,7 +272,7 @@ public abstract class AbstractRestService
{
if ( artifactMetadatas != null && !artifactMetadatas.isEmpty() )
{
- List<Artifact> artifacts = new ArrayList<Artifact>( artifactMetadatas.size() );
+ List<Artifact> artifacts = new ArrayList<>( artifactMetadatas.size() );
for ( ArtifactMetadata artifact : artifactMetadatas )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
index 855d3d6..df86ba4 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
@@ -144,7 +144,7 @@ public class DefaultBrowseService
repositorySession.close();
}
- List<BrowseResultEntry> browseGroupResultEntries = new ArrayList<BrowseResultEntry>( namespaces.size() );
+ List<BrowseResultEntry> browseGroupResultEntries = new ArrayList<>( namespaces.size() );
for ( String namespace : namespaces )
{
browseGroupResultEntries.add( new BrowseResultEntry( namespace, false ) );
@@ -196,7 +196,7 @@ public class DefaultBrowseService
repositorySession.close();
}
List<BrowseResultEntry> browseGroupResultEntries =
- new ArrayList<BrowseResultEntry>( namespaces.size() + projects.size() );
+ new ArrayList<>( namespaces.size() + projects.size() );
for ( String namespace : namespaces )
{
browseGroupResultEntries.add( new BrowseResultEntry( namespace, false ).groupId( namespace ) );
@@ -219,7 +219,7 @@ public class DefaultBrowseService
try
{
Collection<String> versions = getVersions( selectedRepos, groupId, artifactId );
- return new VersionsList( new ArrayList<String>( versions ) );
+ return new VersionsList( new ArrayList<>( versions ) );
}
catch ( MetadataResolutionException e )
{
@@ -247,7 +247,7 @@ public class DefaultBrowseService
versions.addAll( projectVersions );
}
- List<String> sortedVersions = new ArrayList<String>( versions );
+ List<String> sortedVersions = new ArrayList<>( versions );
Collections.sort( sortedVersions, VersionComparator.getInstance() );
@@ -499,7 +499,7 @@ public class DefaultBrowseService
public List<Artifact> getDependees( String groupId, String artifactId, String version, String repositoryId )
throws ArchivaRestServiceException
{
- List<ProjectVersionReference> references = new ArrayList<ProjectVersionReference>();
+ List<ProjectVersionReference> references = new ArrayList<>();
// TODO: what if we get duplicates across repositories?
RepositorySession repositorySession = repositorySessionFactory.createSession();
try
@@ -523,7 +523,7 @@ public class DefaultBrowseService
repositorySession.close();
}
- List<Artifact> artifacts = new ArrayList<Artifact>( references.size() );
+ List<Artifact> artifacts = new ArrayList<>( references.size() );
for ( ProjectVersionReference projectVersionReference : references )
{
@@ -549,7 +549,7 @@ public class DefaultBrowseService
return Collections.emptyList();
}
Map<String, String> map = metadataFacet.toProperties();
- List<Entry> entries = new ArrayList<Entry>( map.size() );
+ List<Entry> entries = new ArrayList<>( map.size() );
for ( Map.Entry<String, String> entry : map.entrySet() )
{
@@ -711,7 +711,7 @@ public class DefaultBrowseService
{
List<String> selectedRepos = getSelectedRepos( repositoryId );
- List<Artifact> artifactDownloadInfos = new ArrayList<Artifact>();
+ List<Artifact> artifactDownloadInfos = new ArrayList<>();
RepositorySession session = repositorySessionFactory.createSession();
@@ -721,7 +721,7 @@ public class DefaultBrowseService
{
for ( String repoId : selectedRepos )
{
- List<ArtifactMetadata> artifacts = new ArrayList<ArtifactMetadata>(
+ List<ArtifactMetadata> artifacts = new ArrayList<>(
metadataResolver.resolveArtifacts( session, repoId, groupId, artifactId, version ) );
Collections.sort( artifacts, ArtifactMetadataVersionComparator.INSTANCE );
if ( artifacts != null && !artifacts.isEmpty() )
@@ -1037,7 +1037,7 @@ public class DefaultBrowseService
jarFile.close();
}
}
- List<ArtifactContentEntry> sorted = new ArrayList<ArtifactContentEntry>( artifactContentEntryMap.values() );
+ List<ArtifactContentEntry> sorted = new ArrayList<>( artifactContentEntryMap.values() );
Collections.sort( sorted, ArtifactContentEntryComparator.INSTANCE );
return sorted;
}
@@ -1060,7 +1060,7 @@ public class DefaultBrowseService
if ( currentList == null )
{
- currentList = new ArrayList<ArtifactContentEntry>();
+ currentList = new ArrayList<>();
currentList.add( current );
perDepthList.put( current.getDepth(), currentList );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java
index d309c98..dc187af 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultMergeRepositoriesService.java
@@ -197,7 +197,7 @@ public class DefaultMergeRepositoriesService
String sourceRepoId, String repoid )
throws RepositoryMergerException
{
- List<ArtifactMetadata> artifactsWithOutSnapshots = new ArrayList<ArtifactMetadata>();
+ List<ArtifactMetadata> artifactsWithOutSnapshots = new ArrayList<>();
for ( ArtifactMetadata metadata : sourceArtifacts )
{
if ( VersionUtil.isSnapshot( metadata.getProjectVersion() ) )
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
index a7c1c49..4cab81d 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
@@ -42,9 +42,9 @@ public class DefaultPluginsServices
implements PluginsService
{
- private List<String> repositoryType = new ArrayList<String>();
+ private List<String> repositoryType = new ArrayList<>();
- private List<String> adminFeatures = new ArrayList<String>();
+ private List<String> adminFeatures = new ArrayList<>();
private ApplicationContext appCont;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
index aa1a7bd..fa1861c 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
@@ -49,7 +49,7 @@ public class DefaultProxyConnectorService
@Inject
public DefaultProxyConnectorService( ApplicationContext applicationContext )
{
- allPolicies = new ArrayList<Policy>( getBeansOfType( applicationContext, Policy.class ).values() );
+ allPolicies = new ArrayList<>( getBeansOfType( applicationContext, Policy.class ).values() );
}
public List<ProxyConnector> getProxyConnectors()
@@ -146,7 +146,7 @@ public class DefaultProxyConnectorService
public List<PolicyInformation> getAllPolicyInformations()
throws ArchivaRestServiceException
{
- List<PolicyInformation> policyInformations = new ArrayList<PolicyInformation>( allPolicies.size() );
+ List<PolicyInformation> policyInformations = new ArrayList<>( allPolicies.size() );
for ( Policy policy : allPolicies )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index 1b214be..c47e1d3 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -200,8 +200,7 @@ public class DefaultRedbackRuntimeConfigurationService
return Collections.emptyList();
}
- List<UserManagerImplementationInformation> informations =
- new ArrayList<UserManagerImplementationInformation>( beans.size() );
+ List<UserManagerImplementationInformation> informations = new ArrayList<>( beans.size() );
for ( Map.Entry<String, UserManager> entry : beans.entrySet() )
{
@@ -229,8 +228,7 @@ public class DefaultRedbackRuntimeConfigurationService
return Collections.emptyList();
}
- List<RBACManagerImplementationInformation> informations =
- new ArrayList<RBACManagerImplementationInformation>( beans.size() );
+ List<RBACManagerImplementationInformation> informations = new ArrayList<>( beans.size() );
for ( Map.Entry<String, RBACManager> entry : beans.entrySet() )
{
@@ -314,12 +312,12 @@ public class DefaultRedbackRuntimeConfigurationService
}
catch ( InvalidNameException e )
{
- log.warn( "fail to get ldapConnection: {}", e.getMessage(), e);
+ log.warn( "fail to get ldapConnection: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
catch ( LdapException e )
{
- log.warn( "fail to get ldapConnection: {}", e.getMessage(), e);
+ log.warn( "fail to get ldapConnection: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
finally
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
index dfdfc43..08c7c1d 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
@@ -73,7 +73,7 @@ public class DefaultReportRepositoriesService
try
{
MetadataRepository metadataRepository = repositorySession.getRepository();
- List<RepositoryStatistics> stats = new ArrayList<RepositoryStatistics>();
+ List<RepositoryStatistics> stats = new ArrayList<>();
for ( String repo : repositoriesId )
{
try
@@ -140,10 +140,10 @@ public class DefaultReportRepositoriesService
if ( !ALL_REPOSITORIES.equals( repository ) )
{
- observableRepositories = Collections.<String>singletonList( repository );
+ observableRepositories = Collections.singletonList( repository );
}
- List<RepositoryProblemFacet> problemArtifacts = new ArrayList<RepositoryProblemFacet>();
+ List<RepositoryProblemFacet> problemArtifacts = new ArrayList<>();
MetadataRepository metadataRepository = repositorySession.getRepository();
for ( String repoId : observableRepositories )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index 1f682bc..c90589c 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -554,7 +554,7 @@ public class DefaultRepositoriesService
boolean fixChecksums, ArtifactTransferRequest artifactTransferRequest )
throws RepositoryMetadataException
{
- List<String> availableVersions = new ArrayList<String>();
+ List<String> availableVersions = new ArrayList<>();
String latestVersion = artifactTransferRequest.getVersion();
File projectDir = new File( targetPath ).getParentFile();
@@ -1123,7 +1123,7 @@ public class DefaultRepositoriesService
Artifact artifact )
throws RepositoryMetadataException
{
- List<String> availableVersions = new ArrayList<String>();
+ List<String> availableVersions = new ArrayList<>();
String latestVersion = "";
if ( metadataFile.exists() )
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
index afabd66..8269e76 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
@@ -48,10 +48,10 @@ public class DefaultRepositoryGroupService
try
{
List<RepositoryGroup> repositoriesGroups =
- new ArrayList<RepositoryGroup>( repositoryGroupAdmin.getRepositoriesGroups().size() );
+ new ArrayList<>( repositoryGroupAdmin.getRepositoriesGroups().size() );
for ( org.apache.archiva.admin.model.beans.RepositoryGroup repoGroup : repositoryGroupAdmin.getRepositoriesGroups() )
{
- repositoriesGroups.add( new RepositoryGroup( repoGroup.getId(), new ArrayList<String>(
+ repositoriesGroups.add( new RepositoryGroup( repoGroup.getId(), new ArrayList<>(
repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() ).mergedIndexTtl(
repoGroup.getMergedIndexTtl() ).cronExpression( repoGroup.getCronExpression() ) );
}
@@ -82,7 +82,7 @@ public class DefaultRepositoryGroupService
try
{
return repositoryGroupAdmin.addRepositoryGroup(
- new org.apache.archiva.admin.model.beans.RepositoryGroup( repoGroup.getId(), new ArrayList<String>(
+ new org.apache.archiva.admin.model.beans.RepositoryGroup( repoGroup.getId(), new ArrayList<>(
repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() ).mergedIndexTtl(
repoGroup.getMergedIndexTtl() ).cronExpression( repoGroup.getCronExpression() ),
getAuditInformation() );
@@ -99,7 +99,7 @@ public class DefaultRepositoryGroupService
try
{
return repositoryGroupAdmin.updateRepositoryGroup(
- new org.apache.archiva.admin.model.beans.RepositoryGroup( repoGroup.getId(), new ArrayList<String>(
+ new org.apache.archiva.admin.model.beans.RepositoryGroup( repoGroup.getId(), new ArrayList<>(
repoGroup.getRepositories() ) ).mergedIndexPath( repoGroup.getMergedIndexPath() ).mergedIndexTtl(
repoGroup.getMergedIndexTtl() ).cronExpression( repoGroup.getCronExpression() ),
getAuditInformation() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
index bc1f2cc..f171373 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
@@ -170,7 +170,7 @@ public class DefaultSearchService
}
try
{
- return new GroupIdList( new ArrayList<String>( repositorySearch.getAllGroupIds( getPrincipal(), repos ) ) );
+ return new GroupIdList( new ArrayList<>( repositorySearch.getAllGroupIds( getPrincipal(), repos ) ) );
}
catch ( RepositorySearchException e )
{
@@ -209,7 +209,7 @@ public class DefaultSearchService
{
return Collections.emptyList();
}
- List<Artifact> artifacts = new ArrayList<Artifact>( searchResults.getReturnedHitsCount() );
+ List<Artifact> artifacts = new ArrayList<>( searchResults.getReturnedHitsCount() );
for ( SearchResultHit hit : searchResults.getHits() )
{
// duplicate Artifact one per available version
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java
index 7bd92c0..21d329f 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/AddAdminRepoConsumerClosure.java
@@ -34,7 +34,7 @@ import java.util.List;
public class AddAdminRepoConsumerClosure
implements Closure
{
- private List<AdminRepositoryConsumer> list = new ArrayList<AdminRepositoryConsumer>();
+ private List<AdminRepositoryConsumer> list = new ArrayList<>();
private List<String> selectedIds;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
index e51ec85..e0d3379 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/RssFeedGenerator.java
@@ -72,7 +72,7 @@ public class RssFeedGenerator
private List<SyndEntry> getEntries( List<RssFeedEntry> dataEntries )
{
- List<SyndEntry> entries = new ArrayList<SyndEntry>();
+ List<SyndEntry> entries = new ArrayList<>();
SyndEntry entry;
SyndContent description;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
index 90d983a..776274a 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessor.java
@@ -102,7 +102,7 @@ public class NewArtifactsRssFeedProcessor
long tmp = 0;
RssFeedEntry entry = null;
- List<RssFeedEntry> entries = new ArrayList<RssFeedEntry>();
+ List<RssFeedEntry> entries = new ArrayList<>();
String description = "";
int idx = 0;
for ( ArtifactMetadata artifact : artifacts )
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
index a41c0df..eb315d2 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/main/java/org/apache/archiva/rss/processor/NewVersionsOfArtifactRssFeedProcessor.java
@@ -81,7 +81,7 @@ public class NewVersionsOfArtifactRssFeedProcessor
MetadataRepository metadataRepository )
throws FeedException
{
- List<ArtifactMetadata> artifacts = new ArrayList<ArtifactMetadata>();
+ List<ArtifactMetadata> artifacts = new ArrayList<>();
try
{
for ( String repoId : metadataRepository.getRepositories() )
@@ -106,7 +106,7 @@ public class NewVersionsOfArtifactRssFeedProcessor
long tmp = 0;
RssFeedEntry entry = null;
- List<RssFeedEntry> entries = new ArrayList<RssFeedEntry>();
+ List<RssFeedEntry> entries = new ArrayList<>();
String description = "";
int idx = 0;
for ( ArtifactMetadata artifact : artifacts )
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
index c011fb8..40cab4f 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java
@@ -57,7 +57,7 @@ public class RssFeedGeneratorTest
public void testNewFeed()
throws Exception
{
- List<RssFeedEntry> entries = new ArrayList<RssFeedEntry>();
+ List<RssFeedEntry> entries = new ArrayList<>();
RssFeedEntry entry = new RssFeedEntry( "Item 1" );
Date whenGathered = new Date( System.currentTimeMillis() );
@@ -95,7 +95,7 @@ public class RssFeedGeneratorTest
public void testNoDataEntries()
throws Exception
{
- List<RssFeedEntry> entries = new ArrayList<RssFeedEntry>();
+ List<RssFeedEntry> entries = new ArrayList<>();
SyndFeed feed =
generator.generateFeed( "Test Feed", "The test feed from Archiva.", entries );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
index a83f383..ad06d3d 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
+++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
@@ -72,7 +72,7 @@ public class NewArtifactsRssFeedProcessorTest
public void testProcess()
throws Exception
{
- List<ArtifactMetadata> newArtifacts = new ArrayList<ArtifactMetadata>();
+ List<ArtifactMetadata> newArtifacts = new ArrayList<>();
Date whenGathered = Calendar.getInstance().getTime();
newArtifacts.add( createArtifact( "artifact-one", "1.0", whenGathered ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
index d266b52..cb13c7e 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
@@ -81,7 +81,7 @@ public class DefaultUserRepositories
{
List<ManagedRepository> managedRepositories = getAccessibleRepositories( principal, operation );
- List<String> repoIds = new ArrayList<String>( managedRepositories.size() );
+ List<String> repoIds = new ArrayList<>( managedRepositories.size() );
for ( ManagedRepository managedRepository : managedRepositories )
{
repoIds.add( managedRepository.getId() );
@@ -101,7 +101,7 @@ public class DefaultUserRepositories
{
SecuritySession securitySession = createSession( principal );
- List<ManagedRepository> managedRepositories = new ArrayList<ManagedRepository>();
+ List<ManagedRepository> managedRepositories = new ArrayList<>();
try
{
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/api/DefaultFileUploadService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
index 59c352b..936e159 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
@@ -604,7 +604,7 @@ public class DefaultFileUploadService
String artifactId, String version, String packaging )
throws RepositoryMetadataException
{
- List<String> availableVersions = new ArrayList<String>();
+ List<String> availableVersions = new ArrayList<>();
String latestVersion = version;
File projectDir = new File( targetPath ).getParentFile();
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/rss/RssFeedServlet.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
index e822c6b..cc9ae88 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
@@ -240,7 +240,7 @@ public class RssFeedServlet
UnauthorizedException
{
String auth = req.getHeader( "Authorization" );
- List<String> repoIds = new ArrayList<String>();
+ List<String> repoIds = new ArrayList<>();
if ( repositoryId != null )
{