Repository: archiva Updated Branches: refs/heads/master 03601570e -> 047b7ad17
http://git-wip-us.apache.org/repos/asf/archiva/blob/5fa4ceb7/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java index e4cd0a9..7d6fa86 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java @@ -83,7 +83,7 @@ public class DuplicateArtifactsConsumer @Inject private RepositorySessionFactory repositorySessionFactory; - private List<String> includes = new ArrayList<String>(); + private List<String> includes = new ArrayList<>(); private File repositoryDir; http://git-wip-us.apache.org/repos/asf/archiva/blob/5fa4ceb7/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java index 1ce9002..efa26c5 100644 --- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java +++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java @@ -272,7 +272,7 @@ public class DefaultRepositoryStatisticsManager Date startTime, Date endTime ) throws MetadataRepositoryException { - List<RepositoryStatistics> results = new ArrayList<RepositoryStatistics>(); + List<RepositoryStatistics> results = new ArrayList<>(); List<String> list = metadataRepository.getMetadataFacets( repositoryId, RepositoryStatistics.FACET_ID ); Collections.sort( list, Collections.reverseOrder() ); for ( String name : list ) http://git-wip-us.apache.org/repos/asf/archiva/blob/5fa4ceb7/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java index c063226..2ec08e6 100644 --- a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java +++ b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java @@ -255,7 +255,7 @@ public class RepositoryStatisticsManagerTest addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) ); addStats( new Date( current.getTime() - 1000 ), current ); - ArrayList<String> keys = new ArrayList<String>( statsCreated.keySet() ); + ArrayList<String> keys = new ArrayList<>( statsCreated.keySet() ); expect( metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ) ).andReturn( keys ); @@ -299,7 +299,7 @@ public class RepositoryStatisticsManagerTest addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) ); addStats( new Date( current.getTime() - 1000 ), current ); - List<String> keys = new ArrayList<String>( statsCreated.keySet() ); + List<String> keys = new ArrayList<>( statsCreated.keySet() ); expect( metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ) ).andReturn( keys ); @@ -347,7 +347,7 @@ public class RepositoryStatisticsManagerTest addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) ); addStats( new Date( current.getTime() - 1000 ), current ); - List<String> keys = new ArrayList<String>( statsCreated.keySet() ); + List<String> keys = new ArrayList<>( statsCreated.keySet() ); expect( metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ) ).andReturn( keys ); @@ -395,7 +395,7 @@ public class RepositoryStatisticsManagerTest addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) ); addStats( new Date( current.getTime() - 1000 ), current ); - ArrayList<String> keys = new ArrayList<String>( statsCreated.keySet() ); + ArrayList<String> keys = new ArrayList<>( statsCreated.keySet() ); expect( metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ) ).andReturn( keys ); @@ -447,7 +447,7 @@ public class RepositoryStatisticsManagerTest addStats( new Date( current.getTime() - 3000 ), new Date( current.getTime() - 2000 ) ); addStats( new Date( current.getTime() - 1000 ), current ); - ArrayList<String> keys = new ArrayList<String>( statsCreated.keySet() ); + ArrayList<String> keys = new ArrayList<>( statsCreated.keySet() ); expect( metadataRepository.getMetadataFacets( TEST_REPO_ID, RepositoryStatistics.FACET_ID ) ).andReturn( keys ); http://git-wip-us.apache.org/repos/asf/archiva/blob/5fa4ceb7/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java index aaaaf29..ffc7921 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java @@ -285,7 +285,7 @@ public class Maven2RepositoryMerger Date lastUpdatedTimestamp, String timestamp ) throws RepositoryMetadataException { - ArrayList<String> availableVersions = new ArrayList<String>(); + ArrayList<String> availableVersions = new ArrayList<>(); String latestVersion = artifactMetadata.getProjectVersion(); ArchivaRepositoryMetadata projectMetadata = getMetadata( projectMetaDataFileIntargetRepo ); @@ -376,7 +376,7 @@ public class Maven2RepositoryMerger { List<ArtifactMetadata> targetArtifacts = metadataRepository.getArtifacts( targetRepo ); List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts( sourceRepo ); - List<ArtifactMetadata> conflictsArtifacts = new ArrayList<ArtifactMetadata>(); + List<ArtifactMetadata> conflictsArtifacts = new ArrayList<>(); for ( ArtifactMetadata targetArtifact : targetArtifacts ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/5fa4ceb7/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java index 282aad8..08e0f01 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java +++ b/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMergerTest.java @@ -68,7 +68,7 @@ public class Maven2RepositoryMergerTest private List<ArtifactMetadata> getArtifacts() { - List<ArtifactMetadata> metadata = new ArrayList<ArtifactMetadata>(); + List<ArtifactMetadata> metadata = new ArrayList<>(); ArtifactMetadata artifact1 = new ArtifactMetadata(); artifact1.setNamespace( "com.example.test" ); artifact1.setProject( "test-artifact" ); @@ -102,7 +102,7 @@ public class Maven2RepositoryMergerTest testRepo.setLocation( "target" + File.separatorChar + "test-repository" ); RepositoryScanningConfiguration repoScanConfig = new RepositoryScanningConfiguration(); - List<String> knownContentConsumers = new ArrayList<String>(); + List<String> knownContentConsumers = new ArrayList<>(); knownContentConsumers.add( "metadata-updater12" ); repoScanConfig.setKnownContentConsumers( knownContentConsumers ); c.setRepositoryScanning( repoScanConfig ); @@ -151,7 +151,7 @@ public class Maven2RepositoryMergerTest testRepoWithConflicts.setLocation( sourceRepo ); RepositoryScanningConfiguration repoScanConfig = new RepositoryScanningConfiguration(); - List<String> knownContentConsumers = new ArrayList<String>(); + List<String> knownContentConsumers = new ArrayList<>(); knownContentConsumers.add( "metadata-updater" ); repoScanConfig.setKnownContentConsumers( knownContentConsumers ); c.setRepositoryScanning( repoScanConfig );
