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:27 UTC
[3/3] git commit: use diamond operator
use diamond operator
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/d9de8dc7
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/d9de8dc7
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/d9de8dc7
Branch: refs/heads/master
Commit: d9de8dc7afe4a1e22257a9437d68649eee8f3047
Parents: ff99d5a
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 10 11:43:11 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 10 11:43:11 2014 +1000
----------------------------------------------------------------------
.../java/org/apache/archiva/cli/ArchivaCli.java | 15 +++---
.../archiva/cli/ArtifactCountConsumer.java | 2 +-
.../artifact/LegacyToDefaultConverter.java | 17 +------
.../artifact/LegacyToDefaultConverterTest.java | 2 +-
.../archiva/checksum/ChecksummedFile.java | 6 +--
.../apache/archiva/checksum/ChecksumTest.java | 2 +-
.../archiva/common/utils/VersionComparator.java | 4 +-
.../common/utils/VersionComparatorTest.java | 6 +--
.../DefaultArchivaConfiguration.java | 8 ++--
.../apache/archiva/configuration/FileTypes.java | 2 +-
...nnectorConfigurationOrderComparatorTest.java | 6 +--
.../core/ArtifactMissingChecksumsConsumer.java | 2 +-
.../consumers/core/AutoRemoveConsumer.java | 2 +-
.../consumers/core/AutoRenameConsumer.java | 2 +-
.../consumers/core/MetadataUpdaterConsumer.java | 2 +-
.../core/ValidateChecksumConsumer.java | 4 +-
...CleanupReleasedSnapshotsRepositoryPurge.java | 2 +-
.../core/repository/DaysOldRepositoryPurge.java | 2 +-
.../repository/RepositoryPurgeConsumer.java | 14 +-----
.../RetentionCountRepositoryPurge.java | 2 +-
.../consumers/lucene/NexusIndexerConsumer.java | 2 +-
.../ArchivaMetadataCreationConsumer.java | 12 +----
.../DefaultLegacyRepositoryConverter.java | 2 +-
.../legacy/LegacyConverterArtifactConsumer.java | 2 +-
.../converter/RepositoryConverterTest.java | 2 +-
.../indexer/search/MavenRepositorySearch.java | 4 +-
.../archiva/indexer/search/SearchFields.java | 2 +-
.../archiva/indexer/search/SearchResultHit.java | 2 +-
.../archiva/indexer/search/SearchResults.java | 2 +-
.../search/MavenRepositorySearchTest.java | 50 ++++++++++----------
.../apache/archiva/maven2/model/TreeEntry.java | 2 +-
.../archiva/model/ArchivaModelCloner.java | 4 +-
.../archiva/policies/AbstractUpdatePolicy.java | 2 +-
.../archiva/policies/CachedFailuresPolicy.java | 5 +-
.../apache/archiva/policies/ChecksumPolicy.java | 2 +-
.../policies/PropagateErrorsDownloadPolicy.java | 2 +-
.../PropagateErrorsOnUpdateDownloadPolicy.java | 2 +-
.../proxy/DefaultRepositoryProxyConnectors.java | 8 ++--
.../archiva/proxy/AbstractProxyTestCase.java | 6 +--
.../archiva/proxy/MetadataTransferTest.java | 6 +--
.../model/AbstractRepositoryConnector.java | 8 ++--
.../archiva/admin/model/beans/FileType.java | 2 +-
.../admin/model/beans/LdapConfiguration.java | 2 +-
.../admin/model/beans/ProxyConnectorRule.java | 2 +-
.../beans/RedbackRuntimeConfiguration.java | 4 +-
.../admin/model/beans/RemoteRepository.java | 4 +-
.../admin/model/beans/RepositoryGroup.java | 2 +-
.../repository/AbstractRepositoryAdmin.java | 3 +-
.../admin/DefaultArchivaAdministration.java | 8 ++--
.../group/DefaultRepositoryGroupAdmin.java | 6 +--
.../managed/DefaultManagedRepositoryAdmin.java | 4 +-
.../networkproxy/DefaultNetworkProxyAdmin.java | 2 +-
.../DefaultProxyConnectorAdmin.java | 6 +--
.../DefaultProxyConnectorRuleAdmin.java | 10 ++--
.../remote/DefaultRemoteRepositoryAdmin.java | 9 ++--
...DefaultRedbackRuntimeConfigurationAdmin.java | 14 +++---
.../archiva/admin/mock/MockAuditListener.java | 2 +-
.../repository/metadata/MetadataTools.java | 16 +++----
.../metadata/RepositoryMetadataMerge.java | 2 +-
.../scanner/DefaultRepositoryScanner.java | 6 +--
.../scanner/RepositoryContentConsumers.java | 10 ++--
.../repository/scanner/KnownScanConsumer.java | 2 +-
.../scanner/RepositoryScannerTest.java | 42 ++++++++--------
.../archiva/test/utils/ListGenerator.java | 2 +-
.../transaction/AbstractTransactionEvent.java | 10 ++--
.../archiva/transaction/FileTransaction.java | 2 +-
.../DefaultRepositoryArchivaTaskScheduler.java | 4 +-
.../archiva/mock/MockArchivaAdministration.java | 4 +-
.../mock/MockManagedRepositoryAdmin.java | 2 +-
.../TestRepositoryStatisticsManager.java | 2 +-
.../archiva/rest/api/model/SearchRequest.java | 2 +-
.../rest/services/AbstractRestService.java | 4 +-
.../rest/services/DefaultBrowseService.java | 22 ++++-----
.../DefaultMergeRepositoriesService.java | 2 +-
.../rest/services/DefaultPluginsServices.java | 4 +-
.../services/DefaultProxyConnectorService.java | 4 +-
...faultRedbackRuntimeConfigurationService.java | 10 ++--
.../DefaultReportRepositoriesService.java | 6 +--
.../services/DefaultRepositoriesService.java | 4 +-
.../services/DefaultRepositoryGroupService.java | 8 ++--
.../rest/services/DefaultSearchService.java | 4 +-
.../utils/AddAdminRepoConsumerClosure.java | 2 +-
.../apache/archiva/rss/RssFeedGenerator.java | 2 +-
.../processor/NewArtifactsRssFeedProcessor.java | 2 +-
.../NewVersionsOfArtifactRssFeedProcessor.java | 4 +-
.../archiva/rss/RssFeedGeneratorTest.java | 4 +-
.../NewArtifactsRssFeedProcessorTest.java | 2 +-
.../security/DefaultUserRepositories.java | 4 +-
.../web/api/DefaultFileUploadService.java | 2 +-
.../apache/archiva/web/rss/RssFeedServlet.java | 2 +-
.../ArchivaConfigurableUsersManager.java | 12 ++---
.../ArchivaLdapRoleMapperConfiguration.java | 2 +-
.../ArchivaLockedAdminEnvironmentCheck.java | 4 +-
.../web/security/ArchivaRbacManager.java | 12 ++---
.../ArchivaUserManagerAuthenticator.java | 4 +-
.../web/startup/SecuritySynchronization.java | 4 +-
.../remotedownload/AbstractDownloadTest.java | 2 +-
.../archiva/web/rss/SecuritySystemStub.java | 2 +-
.../webtest/memory/TestMetadataRepository.java | 4 +-
99 files changed, 252 insertions(+), 301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
----------------------------------------------------------------------
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
index a650495..73662e6 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
@@ -24,17 +24,16 @@ import com.sampullara.cli.Argument;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
+import org.apache.archiva.consumers.ConsumerException;
+import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
+import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.consumers.RepositoryContentConsumer;
import org.apache.archiva.converter.RepositoryConversionException;
import org.apache.archiva.converter.legacy.LegacyRepositoryConverter;
import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
import org.apache.archiva.repository.scanner.RepositoryScanner;
import org.apache.archiva.repository.scanner.RepositoryScannerException;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.archiva.consumers.ConsumerException;
-import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
-import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.archiva.consumers.RepositoryContentConsumer;
import org.apache.maven.artifact.manager.WagonManager;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -167,13 +166,13 @@ public class ArchivaCli
repo.setName( "Archiva CLI Provided Repo" );
repo.setLocation( path );
- List<KnownRepositoryContentConsumer> knownConsumerList = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumerList = new ArrayList<>();
knownConsumerList.addAll( getConsumerList( consumers ) );
List<InvalidRepositoryContentConsumer> invalidConsumerList = Collections.emptyList();
- List<String> ignoredContent = new ArrayList<String>();
+ List<String> ignoredContent = new ArrayList<>();
ignoredContent.addAll( Arrays.asList( RepositoryScanner.IGNORABLE_CONTENT ) );
RepositoryScanner scanner = lookup( RepositoryScanner.class );
@@ -201,7 +200,7 @@ public class ArchivaCli
private List<KnownRepositoryContentConsumer> getConsumerList( String[] consumers )
throws ConsumerException, PlexusSisuBridgeException
{
- List<KnownRepositoryContentConsumer> consumerList = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> consumerList = new ArrayList<>();
Map<String, KnownRepositoryContentConsumer> availableConsumers = getConsumers();
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
index a0404ed..7efde16 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArtifactCountConsumer.java
@@ -52,7 +52,7 @@ public class ArtifactCountConsumer
public ArtifactCountConsumer()
{
// TODO: shouldn't this use filetypes?
- includes = new ArrayList<String>();
+ includes = new ArrayList<>();
includes.add( "**/*.pom" );
includes.add( "**/*.jar" );
includes.add( "**/*.war" );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
index 4fe0536..f55e1e5 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
@@ -82,29 +82,14 @@ public class LegacyToDefaultConverter
@Inject
private DigesterUtils digesterUtils;
- /**
- *
- */
private ModelConverter translator;
- /**
- *
- */
private ArtifactFactory artifactFactory;
- /**
- *
- */
private ArtifactHandlerManager artifactHandlerManager;
- /**
- * default-value="false"
- */
private boolean force;
- /**
- * default-value="false"
- */
private boolean dryrun;
private Map<Artifact, List<String>> warnings = new HashMap<Artifact, List<String>>();
@@ -686,7 +671,7 @@ public class LegacyToDefaultConverter
List<String> messages = warnings.get( artifact );
if ( messages == null )
{
- messages = new ArrayList<String>( 1 );
+ messages = new ArrayList<>( 1 );
}
messages.add( message );
warnings.put( artifact, messages );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
index 2ab82c6..6333b4d 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
@@ -813,7 +813,7 @@ public class LegacyToDefaultConverterTest
{
// test multiple artifacts are converted
- List<Artifact> artifacts = new ArrayList<Artifact>();
+ List<Artifact> artifacts = new ArrayList<>();
artifacts.add( createArtifact( "test", "artifact-one", "1.0.0" ) );
artifacts.add( createArtifact( "test", "artifact-two", "1.0.0" ) );
artifacts.add( createArtifact( "test", "artifact-three", "1.0.0" ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
index b505494..9e9378e 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
@@ -20,14 +20,12 @@ package org.apache.archiva.checksum;
*/
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -143,7 +141,7 @@ public class ChecksummedFile
try (FileInputStream fis = new FileInputStream( referenceFile ))
{
- List<Checksum> checksums = new ArrayList<Checksum>( algorithms.length );
+ List<Checksum> checksums = new ArrayList<>( algorithms.length );
// Create checksum object for each algorithm.
for ( ChecksumAlgorithm checksumAlgorithm : algorithms )
{
@@ -215,7 +213,7 @@ public class ChecksummedFile
*/
public boolean fixChecksums( ChecksumAlgorithm[] algorithms )
{
- List<Checksum> checksums = new ArrayList<Checksum>( algorithms.length );
+ List<Checksum> checksums = new ArrayList<>( algorithms.length );
// Create checksum object for each algorithm.
for ( ChecksumAlgorithm checksumAlgorithm : algorithms )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumTest.java b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumTest.java
index 7f66f16..11df7b9 100644
--- a/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumTest.java
+++ b/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/ChecksumTest.java
@@ -71,7 +71,7 @@ public class ChecksumTest
{
Checksum checksumSha1 = new Checksum( ChecksumAlgorithm.SHA1 );
Checksum checksumMd5 = new Checksum( ChecksumAlgorithm.MD5 );
- List<Checksum> checksums = new ArrayList<Checksum>();
+ List<Checksum> checksums = new ArrayList<>();
checksums.add( checksumSha1 );
checksums.add( checksumMd5 );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
index 73d0cd7..bbdbbd3 100644
--- a/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
+++ b/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
@@ -60,7 +60,7 @@ public class VersionComparator
public VersionComparator()
{
- specialWords = new ArrayList<String>( 23 );
+ specialWords = new ArrayList<>( 23 );
// ids that refer to LATEST
specialWords.add( "final" );
@@ -204,7 +204,7 @@ public class VersionComparator
int modeDigit = 1;
int modeText = 2;
- List<String> parts = new ArrayList<String>();
+ List<String> parts = new ArrayList<>();
int len = version.length();
int i = 0;
int start = 0;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionComparatorTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionComparatorTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionComparatorTest.java
index 59e9dde..d21d5fe 100644
--- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionComparatorTest.java
+++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionComparatorTest.java
@@ -19,13 +19,13 @@ package org.apache.archiva.common.utils;
* under the License.
*/
+import junit.framework.TestCase;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import junit.framework.TestCase;
-
/**
* VersionComparatorTest
*
@@ -97,7 +97,7 @@ public class VersionComparatorTest
private void assertSort( String[] rawVersions, String[] expectedSort )
{
- List<String> versions = new ArrayList<String>();
+ List<String> versions = new ArrayList<>();
versions.addAll( Arrays.asList( rawVersions ) );
Collections.sort( versions, VersionComparator.getInstance() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index 757a116..1fd14aa 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -270,7 +270,7 @@ public class DefaultArchivaConfiguration
// Create a copy of the list to read from (to prevent concurrent modification exceptions)
List<ProxyConnectorConfiguration> proxyConnectorList =
- new ArrayList<ProxyConnectorConfiguration>( config.getProxyConnectors() );
+ new ArrayList<>( config.getProxyConnectors() );
// Remove the old connector list.
config.getProxyConnectors().clear();
@@ -727,7 +727,7 @@ public class DefaultArchivaConfiguration
{
List<String> knowContentConsumers =
- new ArrayList<String>( configuration.getRepositoryScanning().getKnownContentConsumers().size() );
+ new ArrayList<>( configuration.getRepositoryScanning().getKnownContentConsumers().size() );
for ( String knowContentConsumer : configuration.getRepositoryScanning().getKnownContentConsumers() )
{
if ( !dbConsumers.contains( knowContentConsumer ) )
@@ -743,7 +743,7 @@ public class DefaultArchivaConfiguration
if ( !configuration.getRepositoryScanning().getKnownContentConsumers().contains( "create-archiva-metadata" ) )
{
List<String> knowContentConsumers =
- new ArrayList<String>( configuration.getRepositoryScanning().getKnownContentConsumers() );
+ new ArrayList<>( configuration.getRepositoryScanning().getKnownContentConsumers() );
knowContentConsumers.add( "create-archiva-metadata" );
configuration.getRepositoryScanning().setKnownContentConsumers( knowContentConsumers );
}
@@ -752,7 +752,7 @@ public class DefaultArchivaConfiguration
if ( !configuration.getRepositoryScanning().getKnownContentConsumers().contains( "duplicate-artifacts" ) )
{
List<String> knowContentConsumers =
- new ArrayList<String>( configuration.getRepositoryScanning().getKnownContentConsumers() );
+ new ArrayList<>( configuration.getRepositoryScanning().getKnownContentConsumers() );
knowContentConsumers.add( "duplicate-artifacts" );
configuration.getRepositoryScanning().setKnownContentConsumers( knowContentConsumers );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
index 31f645f..7ad6d76 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
@@ -226,7 +226,7 @@ public class FileTypes
List<String> patterns = defaultTypeMap.get( filetype.getId() );
if ( patterns == null )
{
- patterns = new ArrayList<String>( filetype.getPatterns().size() );
+ patterns = new ArrayList<>( filetype.getPatterns().size() );
}
patterns.addAll( filetype.getPatterns() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java
index 2e23b5a..9bac5bf 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparatorTest.java
@@ -40,7 +40,7 @@ public class ProxyConnectorConfigurationOrderComparatorTest
@Test
public void testSortOfAllZeros()
{
- List<ProxyConnectorConfiguration> proxies = new ArrayList<ProxyConnectorConfiguration>();
+ List<ProxyConnectorConfiguration> proxies = new ArrayList<>();
proxies.add( createConnector( "corporate", 0 ) );
proxies.add( createConnector( "snapshots", 0 ) );
@@ -55,7 +55,7 @@ public class ProxyConnectorConfigurationOrderComparatorTest
@Test
public void testSortNormal()
{
- List<ProxyConnectorConfiguration> proxies = new ArrayList<ProxyConnectorConfiguration>();
+ List<ProxyConnectorConfiguration> proxies = new ArrayList<>();
proxies.add( createConnector( "corporate", 3 ) );
proxies.add( createConnector( "snapshots", 1 ) );
@@ -70,7 +70,7 @@ public class ProxyConnectorConfigurationOrderComparatorTest
@Test
public void testSortPartial()
{
- List<ProxyConnectorConfiguration> proxies = new ArrayList<ProxyConnectorConfiguration>();
+ List<ProxyConnectorConfiguration> proxies = new ArrayList<>();
proxies.add( createConnector( "corporate", 3 ) );
proxies.add( createConnector( "snapshots", 0 ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
index da32e74..5767231 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
@@ -70,7 +70,7 @@ public class ArtifactMissingChecksumsConsumer
private File repositoryDir;
- private List<String> includes = new ArrayList<String>( 0 );
+ private List<String> includes = new ArrayList<>( 0 );
@Inject
public ArtifactMissingChecksumsConsumer( ArchivaConfiguration configuration, FileTypes filetypes )
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
index 264d657..cc8b19d 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
@@ -73,7 +73,7 @@ public class AutoRemoveConsumer
private File repositoryDir;
- private List<String> includes = new ArrayList<String>( 0 );
+ private List<String> includes = new ArrayList<>( 0 );
public String getId()
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
index 9ef7b5c..d996e10 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
@@ -61,7 +61,7 @@ public class AutoRenameConsumer
private File repositoryDir;
- private List<String> includes = new ArrayList<String>( 3 );
+ private List<String> includes = new ArrayList<>( 3 );
private Map<String, String> extensionRenameMap = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
index 9c13706..521a922 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
@@ -109,7 +109,7 @@ public class MetadataUpdaterConsumer
private File repositoryDir;
- private List<String> includes = new ArrayList<String>( 0 );
+ private List<String> includes = new ArrayList<>( 0 );
private long scanStartTimestamp = 0;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
index 5e1983c..69e590c 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
@@ -174,8 +174,8 @@ public class ValidateChecksumConsumer
throws PlexusSisuBridgeException
{
checksum = plexusSisuBridge.lookup( ChecksumFile.class );
- List<Digester> allDigesters = new ArrayList<Digester>( digesterUtils.getAllDigesters() );
- includes = new ArrayList<String>( allDigesters.size() );
+ List<Digester> allDigesters = new ArrayList<>( digesterUtils.getAllDigesters() );
+ includes = new ArrayList<>( allDigesters.size() );
for ( Digester digester : allDigesters )
{
includes.add( "**/*" + digester.getFilenameExtension() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
index 86a5844..f812482 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
@@ -112,7 +112,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge
reference.setArtifactId( artifactRef.getArtifactId() );
// Gether the released versions
- List<String> releasedVersions = new ArrayList<String>();
+ List<String> releasedVersions = new ArrayList<>();
List<ManagedRepository> repos = managedRepositoryAdmin.getManagedRepositories();
for ( ManagedRepository repo : repos )
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
index 7902d68..5262bff 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
@@ -86,7 +86,7 @@ public class DaysOldRepositoryPurge
reference.setArtifactId( artifact.getArtifactId() );
reference.setVersion( artifact.getVersion() );
- List<String> versions = new ArrayList<String>( repository.getVersions( reference ) );
+ List<String> versions = new ArrayList<>( repository.getVersions( reference ) );
Collections.sort( versions, VersionComparator.getInstance() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
index 33fd3ee..06f872f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
@@ -68,9 +68,6 @@ public class RepositoryPurgeConsumer
*/
private String description = "Purge repository of old snapshots";
- /**
- *
- */
@Inject
@Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration configuration;
@@ -78,27 +75,18 @@ public class RepositoryPurgeConsumer
@Inject
private ManagedRepositoryAdmin managedRepositoryAdmin;
- /**
- *
- */
@Inject
@Named( value = "repositoryContentFactory#default" )
private RepositoryContentFactory repositoryContentFactory;
- /**
- *
- */
@Inject
private MetadataTools metadataTools;
- /**
- *
- */
@Inject
@Named( value = "fileTypes" )
private FileTypes filetypes;
- private List<String> includes = new ArrayList<String>();
+ private List<String> includes = new ArrayList<>();
private RepositoryPurge repoPurge;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
index 8636f38..85deca3 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
@@ -71,7 +71,7 @@ public class RetentionCountRepositoryPurge
reference.setArtifactId( artifact.getArtifactId() );
reference.setVersion( artifact.getVersion() );
- List<String> versions = new ArrayList<String>( repository.getVersions( reference ) );
+ List<String> versions = new ArrayList<>( repository.getVersions( reference ) );
Collections.sort( versions, VersionComparator.getInstance() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
index 8e1b286..e5f8b90 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
@@ -76,7 +76,7 @@ public class NexusIndexerConsumer
private NexusIndexer nexusIndexer;
- private List<String> includes = new ArrayList<String>( 0 );
+ private List<String> includes = new ArrayList<>( 0 );
private ManagedRepository repository;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
index 12a7d10..39e5a94 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
@@ -62,29 +62,19 @@ public class ArchivaMetadataCreationConsumer
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer, RegistryListener
{
- /**
- * default-value="create-archiva-metadata"
- */
private String id = "create-archiva-metadata";
- /**
- * default-value="Create basic metadata for Archiva to be able to reference the artifact"
- */
private String description = "Create basic metadata for Archiva to be able to reference the artifact";
- /**
- */
@Inject
private ArchivaConfiguration configuration;
- /**
- */
@Inject
private FileTypes filetypes;
private Date whenGathered;
- private List<String> includes = new ArrayList<String>( 0 );
+ private List<String> includes = new ArrayList<>( 0 );
/**
* FIXME: this could be multiple implementations and needs to be configured.
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
index 1e9ce7b..216bc47 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
@@ -101,7 +101,7 @@ public class DefaultLegacyRepositoryConverter
legacyConverterConsumer.setExcludes( fileExclusionPatterns );
legacyConverterConsumer.setDestinationRepository( repository );
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>( 1 );
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>( 1 );
knownConsumers.add( legacyConverterConsumer );
List<InvalidRepositoryContentConsumer> invalidConsumers = Collections.emptyList();
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
index 8d1d93e..cdff873 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
@@ -81,7 +81,7 @@ public class LegacyConverterArtifactConsumer
public LegacyConverterArtifactConsumer( PlexusSisuBridge plexusSisuBridge )
throws PlexusSisuBridgeException
{
- includes = new ArrayList<String>( 3 );
+ includes = new ArrayList<>( 3 );
includes.add( "**/*.jar" );
includes.add( "**/*.ear" );
includes.add( "**/*.war" );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
index 3b9e6a9..893b9df 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
@@ -154,7 +154,7 @@ public class RepositoryConverterTest
{
File legacyRepoDir = new File( sourceRepository.getBasedir() );
File destRepoDir = new File( targetRepository.getLocation() );
- List<String> excludes = new ArrayList<String>();
+ List<String> excludes = new ArrayList<>();
repositoryConverter.convertLegacyRepository( legacyRepoDir, destRepoDir, excludes );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
index 45b5db0..7e2fb57 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
@@ -288,7 +288,7 @@ public class MavenRepositorySearch
private List<IndexingContext> getIndexingContexts( List<String> ids )
{
- List<IndexingContext> contexts = new ArrayList<IndexingContext>( ids.size() );
+ List<IndexingContext> contexts = new ArrayList<>( ids.size() );
for ( String id : ids )
{
@@ -363,7 +363,7 @@ public class MavenRepositorySearch
}
}
- return new ArrayList<String>( indexingContextIds );
+ return new ArrayList<>( indexingContextIds );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java
index cd34f70..fd23534 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchFields.java
@@ -52,7 +52,7 @@ public class SearchFields
/**
* 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-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java
index 7d61679..a493431 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java
@@ -42,7 +42,7 @@ public class SearchResultHit
private String repositoryId = "";
- private List<String> versions = new ArrayList<String>();
+ private List<String> versions = new ArrayList<>();
private String packaging;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java
index 9ca4ec3..1ea1a53 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java
@@ -59,7 +59,7 @@ public class SearchResults
*/
public List<SearchResultHit> getHits()
{
- return new ArrayList<SearchResultHit>( hits.values() );
+ return new ArrayList<>( hits.values() );
}
/**
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
index 7ab8375..83d1938 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
@@ -46,7 +46,7 @@ public class MavenRepositorySearchTest
private void createSimpleIndex( boolean scan )
throws Exception
{
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar" ) );
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
@@ -60,7 +60,7 @@ public class MavenRepositorySearchTest
private void createIndexContainingMoreArtifacts( boolean scan )
throws Exception
{
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar" ) );
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
@@ -82,7 +82,7 @@ public class MavenRepositorySearchTest
private void createIndexContainingMultipleArtifactsSameVersion( boolean scan )
throws Exception
{
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar" ) );
@@ -188,7 +188,7 @@ public class MavenRepositorySearchTest
{
createIndexContainingMultipleArtifactsSameVersion( false );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
// search artifactId
@@ -218,7 +218,7 @@ public class MavenRepositorySearchTest
{
createIndexContainingMultipleArtifactsSameVersion( true );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
// search artifactId
@@ -255,7 +255,7 @@ public class MavenRepositorySearchTest
{
createSimpleIndex( false );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
@@ -275,7 +275,7 @@ public class MavenRepositorySearchTest
{
createSimpleIndex( true );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
// page 1
@@ -324,14 +324,14 @@ public class MavenRepositorySearchTest
{
createSimpleIndex( true );
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_2
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar" ) );
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_2
+ "/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar" ) );
createIndex( TEST_REPO_2, files, false );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
selectedRepos.add( TEST_REPO_2 );
@@ -369,7 +369,7 @@ public class MavenRepositorySearchTest
{
createSimpleIndex( false );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
@@ -388,7 +388,7 @@ public class MavenRepositorySearchTest
public void testNoIndexFound()
throws Exception
{
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
@@ -406,7 +406,7 @@ public class MavenRepositorySearchTest
public void testRepositoryNotFound()
throws Exception
{
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( "non-existing-repo" );
EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
@@ -426,10 +426,10 @@ public class MavenRepositorySearchTest
{
createSimpleIndex( true );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
- List<String> previousSearchTerms = new ArrayList<String>();
+ List<String> previousSearchTerms = new ArrayList<>();
previousSearchTerms.add( "archiva-test" );
EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 2 );
@@ -455,14 +455,14 @@ public class MavenRepositorySearchTest
public void testAdvancedSearch()
throws Exception
{
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_2
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar" ) );
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_2
+ "/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar" ) );
createIndex( TEST_REPO_2, files, false );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_2 );
SearchFields searchFields = new SearchFields();
@@ -493,7 +493,7 @@ public class MavenRepositorySearchTest
{
createIndexContainingMoreArtifacts( false );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
SearchFields searchFields = new SearchFields();
@@ -541,14 +541,14 @@ public class MavenRepositorySearchTest
public void testAdvancedSearchArtifactIdHasNumericChar()
throws Exception
{
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
files.add( new File( FileUtil.getBasedir(),
"src/test/" + TEST_REPO_1 + "/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar" ) );
files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
+ "/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar" ) );
createIndex( TEST_REPO_1, files, true );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
SearchFields searchFields = new SearchFields();
@@ -590,7 +590,7 @@ public class MavenRepositorySearchTest
public void testAdvancedSearchSearchFieldsAreNull()
throws Exception
{
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
SearchFields searchFields = new SearchFields();
@@ -618,7 +618,7 @@ public class MavenRepositorySearchTest
public void testAdvancedSearchSearchFieldsAreBlank()
throws Exception
{
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
SearchFields searchFields = new SearchFields();
@@ -654,7 +654,7 @@ public class MavenRepositorySearchTest
{
createSimpleIndex( true );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
SearchFields searchFields = new SearchFields();
@@ -689,7 +689,7 @@ public class MavenRepositorySearchTest
{
createIndexContainingMoreArtifacts( true );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
SearchFields searchFields = new SearchFields();
@@ -714,7 +714,7 @@ public class MavenRepositorySearchTest
{
createSimpleIndex( true );
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
SearchFields searchFields = new SearchFields();
@@ -768,7 +768,7 @@ public class MavenRepositorySearchTest
public void testAdvancedSearchNoIndexFound()
throws Exception
{
- List<String> selectedRepos = new ArrayList<String>();
+ List<String> selectedRepos = new ArrayList<>();
selectedRepos.add( TEST_REPO_1 );
SearchFields searchFields = new SearchFields();
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java b/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
index b122780..7a0db88 100644
--- a/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
+++ b/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
@@ -34,7 +34,7 @@ public class TreeEntry
implements Serializable
{
- private List<TreeEntry> childs = new ArrayList<TreeEntry>();
+ private List<TreeEntry> childs = new ArrayList<>();
private Artifact artifact;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
index 4601de0..ac70ecf 100644
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
@@ -109,7 +109,7 @@ public class ArchivaModelCloner
return null;
}
- List<ArtifactReference> ret = new ArrayList<ArtifactReference>( artifactReferenceList.size() );
+ List<ArtifactReference> ret = new ArrayList<>( artifactReferenceList.size() );
for ( ArtifactReference ref : artifactReferenceList )
{
@@ -126,7 +126,7 @@ public class ArchivaModelCloner
return null;
}
- List<String> ret = new ArrayList<String>( simple.size() );
+ List<String> ret = new ArrayList<>( simple.size() );
for ( String txt : simple )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
index 19e829f..2c9b847 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
@@ -81,7 +81,7 @@ public abstract class AbstractUpdatePolicy
*/
public static final String ONCE = "once";
- private List<String> options = new ArrayList<String>( 5 );
+ private List<String> options = new ArrayList<>( 5 );
public AbstractUpdatePolicy()
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
index bdb45b2..6976c45 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
@@ -52,13 +52,10 @@ public class CachedFailuresPolicy
*/
public static final String YES = "yes";
- /**
- *
- */
@Inject
private UrlFailureCache urlFailureCache;
- private List<String> options = new ArrayList<String>( 2 );
+ private List<String> options = new ArrayList<>( 2 );
public CachedFailuresPolicy()
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
index eff2a37..878079e 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
@@ -66,7 +66,7 @@ public class ChecksumPolicy
private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{ ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 };
- private List<String> options = new ArrayList<String>( 3 );
+ private List<String> options = new ArrayList<>( 3 );
public ChecksumPolicy()
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java
index d4e2341..32ac4df 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java
@@ -54,7 +54,7 @@ public class PropagateErrorsDownloadPolicy
*/
public static final String IGNORE = "ignore";
- private List<String> options = new ArrayList<String>( 3 );
+ private List<String> options = new ArrayList<>( 3 );
public PropagateErrorsDownloadPolicy()
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
index 7641183..6b5c95c 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
@@ -45,7 +45,7 @@ public class PropagateErrorsOnUpdateDownloadPolicy
*/
public static final String NOT_PRESENT = "artifact not already present";
- private List<String> options = new ArrayList<String>( 2 );
+ private List<String> options = new ArrayList<>( 2 );
public PropagateErrorsOnUpdateDownloadPolicy()
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
index ec6e593..9976eb3 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -193,7 +193,7 @@ public class DefaultRepositoryProxyConnectors
connector.setDisabled( proxyConfig.isDisabled() );
// Copy any blacklist patterns.
- List<String> blacklist = new ArrayList<String>( 0 );
+ List<String> blacklist = new ArrayList<>( 0 );
if ( CollectionUtils.isNotEmpty( proxyConfig.getBlackListPatterns() ) )
{
blacklist.addAll( proxyConfig.getBlackListPatterns() );
@@ -201,7 +201,7 @@ public class DefaultRepositoryProxyConnectors
connector.setBlacklist( blacklist );
// Copy any whitelist patterns.
- List<String> whitelist = new ArrayList<String>( 0 );
+ List<String> whitelist = new ArrayList<>( 0 );
if ( CollectionUtils.isNotEmpty( proxyConfig.getWhiteListPatterns() ) )
{
whitelist.addAll( proxyConfig.getWhiteListPatterns() );
@@ -236,7 +236,7 @@ public class DefaultRepositoryProxyConnectors
if ( connectors == null )
{
// Create if we are the first.
- connectors = new ArrayList<ProxyConnector>( 1 );
+ connectors = new ArrayList<>( 1 );
}
// Add the connector.
@@ -285,7 +285,7 @@ public class DefaultRepositoryProxyConnectors
List<ProxyConnectorRuleConfiguration> all )
{
List<ProxyConnectorRuleConfiguration> proxyConnectorRuleConfigurations =
- new ArrayList<ProxyConnectorRuleConfiguration>();
+ new ArrayList<>();
for ( ProxyConnectorRuleConfiguration proxyConnectorRuleConfiguration : all )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
index e3f39d2..98c17a9 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
@@ -144,9 +144,9 @@ public abstract class AbstractProxyTestCase
config =
(MockConfiguration) applicationContext.getBean( "archivaConfiguration#mock", ArchivaConfiguration.class );
- config.getConfiguration().setManagedRepositories( new ArrayList<ManagedRepositoryConfiguration>() );
- config.getConfiguration().setRemoteRepositories( new ArrayList<RemoteRepositoryConfiguration>() );
- config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>() );
+ config.getConfiguration().setManagedRepositories( new ArrayList<>() );
+ config.getConfiguration().setRemoteRepositories( new ArrayList<>() );
+ config.getConfiguration().setProxyConnectors( new ArrayList<>() );
// Setup source repository (using default layout)
String name = getClass().getSimpleName();
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
index ed7f04b..24624b2 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
@@ -186,7 +186,7 @@ public class MetadataTransferTest
String requestedResource = "org/apache/maven/test/get-default-metadata-nonexistant/maven-metadata.xml";
setupTestableManagedRepository( requestedResource );
- config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( ) );
+ config.getConfiguration().setProxyConnectors( new ArrayList<>( ) );
assertResourceNotFound( requestedResource );
@@ -206,7 +206,7 @@ public class MetadataTransferTest
String requestedResource = "org/apache/maven/test/get-project-metadata/maven-metadata.xml";
setupTestableManagedRepository( requestedResource );
- config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( ) );
+ config.getConfiguration().setProxyConnectors( new ArrayList<>( ) );
assertResourceExists( requestedResource );
@@ -333,7 +333,7 @@ public class MetadataTransferTest
setupTestableManagedRepository( requestedResource );
- config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( ) );
+ config.getConfiguration().setProxyConnectors( new ArrayList<>( ) );
// Configure Connector (usually done within archiva.xml configuration)
saveConnector( ID_DEFAULT_MANAGED, ID_PROXIED1, ChecksumPolicy.FIX, ReleasesPolicy.ALWAYS,
SnapshotsPolicy.ALWAYS, CachedFailuresPolicy.NO, false );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
index f6afff0..4e55a7c 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
@@ -142,7 +142,7 @@ public abstract class AbstractRepositoryConnector
{
if ( this.blackListPatterns == null )
{
- this.blackListPatterns = new ArrayList<String>( 0 );
+ this.blackListPatterns = new ArrayList<>( 0 );
}
return this.blackListPatterns;
@@ -217,7 +217,7 @@ public abstract class AbstractRepositoryConnector
{
if ( this.whiteListPatterns == null )
{
- this.whiteListPatterns = new ArrayList<String>( 0 );
+ this.whiteListPatterns = new ArrayList<>( 0 );
}
return this.whiteListPatterns;
@@ -365,7 +365,7 @@ public abstract class AbstractRepositoryConnector
public List<PropertyEntry> getPoliciesEntries()
{
- policiesEntries = new ArrayList<PropertyEntry>( getPolicies().size() );
+ policiesEntries = new ArrayList<>( getPolicies().size() );
for ( Map.Entry<String, String> entry : getPolicies().entrySet() )
{
policiesEntries.add( new PropertyEntry( entry.getKey(), entry.getValue() ) );
@@ -383,7 +383,7 @@ public abstract class AbstractRepositoryConnector
public List<PropertyEntry> getPropertiesEntries()
{
- propertiesEntries = new ArrayList<PropertyEntry>( getProperties().size() );
+ propertiesEntries = new ArrayList<>( getProperties().size() );
for ( Map.Entry<String, String> entry : getProperties().entrySet() )
{
propertiesEntries.add( new PropertyEntry( entry.getKey(), entry.getValue() ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java
index 7185e75..4e25a0d 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java
@@ -66,7 +66,7 @@ public class FileType
{
if ( patterns == null )
{
- this.patterns = new ArrayList<String>( 0 );
+ this.patterns = new ArrayList<>( 0 );
}
return patterns;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LdapConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LdapConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LdapConfiguration.java
index 09c7eb5..bc8c721 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LdapConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/LdapConfiguration.java
@@ -212,7 +212,7 @@ public class LdapConfiguration
public List<PropertyEntry> getExtraPropertiesEntries()
{
- extraPropertiesEntries = new ArrayList<PropertyEntry>( getExtraProperties().size() );
+ extraPropertiesEntries = new ArrayList<>( getExtraProperties().size() );
for ( Map.Entry<String, String> entry : getExtraProperties().entrySet() )
{
extraPropertiesEntries.add( new PropertyEntry( entry.getKey(), entry.getValue() ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ProxyConnectorRule.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ProxyConnectorRule.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ProxyConnectorRule.java
index f672bee..b4e7101 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ProxyConnectorRule.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ProxyConnectorRule.java
@@ -75,7 +75,7 @@ public class ProxyConnectorRule
{
if ( this.proxyConnectors == null )
{
- this.proxyConnectors = new ArrayList<ProxyConnector>();
+ this.proxyConnectors = new ArrayList<>();
}
return proxyConnectors;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
index 7e9cf66..dda660a 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RedbackRuntimeConfiguration.java
@@ -38,12 +38,12 @@ public class RedbackRuntimeConfiguration
/**
* Field userManagerImpls.
*/
- private List<String> userManagerImpls = new ArrayList<String>();
+ private List<String> userManagerImpls = new ArrayList<>();
/**
* Field rbacManagerImpls.
*/
- private java.util.List<String> rbacManagerImpls = new ArrayList<String>();
+ private java.util.List<String> rbacManagerImpls = new ArrayList<>();
private LdapConfiguration ldapConfiguration;
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
index 924924b..3adbf76 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RemoteRepository.java
@@ -249,7 +249,7 @@ public class RemoteRepository
public List<PropertyEntry> getExtraParametersEntries()
{
- this.extraParametersEntries = new ArrayList<PropertyEntry>();
+ this.extraParametersEntries = new ArrayList<>();
for ( Map.Entry<String, String> entry : getExtraParameters().entrySet() )
{
this.extraParametersEntries.add( new PropertyEntry( entry.getKey(), entry.getValue() ) );
@@ -292,7 +292,7 @@ public class RemoteRepository
public List<PropertyEntry> getExtraHeadersEntries()
{
- this.extraHeadersEntries = new ArrayList<PropertyEntry>();
+ this.extraHeadersEntries = new ArrayList<>();
for ( Map.Entry<String, String> entry : getExtraHeaders().entrySet() )
{
this.extraHeadersEntries.add( new PropertyEntry( entry.getKey(), entry.getValue() ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9de8dc7/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
index 8a116e1..4f0c3c8 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
@@ -97,7 +97,7 @@ public class RepositoryGroup
{
if ( this.repositories == null )
{
- this.repositories = new ArrayList<String>( 0 );
+ this.repositories = new ArrayList<>( 0 );
}
return this.repositories;
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/AbstractRepositoryAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
index ab771b3..3baa426 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java
@@ -47,8 +47,7 @@ public abstract class AbstractRepositoryAdmin
protected Logger log = LoggerFactory.getLogger( getClass() );
@Inject
- private List<AuditListener> auditListeners = new ArrayList<AuditListener>();
-
+ private List<AuditListener> auditListeners = new ArrayList<>();
@Inject
private RepositoryCommonValidator repositoryCommonValidator;