Repository: archiva Updated Branches: refs/heads/master b24415306 -> d6c28781b
http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java index 67a17cd..86513b3 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java +++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java @@ -1041,7 +1041,7 @@ public class CassandraMetadataRepository .addEqualsExpression( "projectVersion", projectVersion ) // .execute(); - Map<String, Map<String, String>> metadataFacetsPerFacetIds = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, String>> metadataFacetsPerFacetIds = new HashMap<>(); for ( Row<String, String, String> row : result.get() ) { @@ -1050,7 +1050,7 @@ public class CassandraMetadataRepository Map<String, String> metaValues = metadataFacetsPerFacetIds.get( facetId ); if ( metaValues == null ) { - metaValues = new HashMap<String, String>(); + metaValues = new HashMap<>(); metadataFacetsPerFacetIds.put( facetId, metaValues ); } metaValues.put( getStringValue( columnSlice, "key" ), getStringValue( columnSlice, "value" ) ); @@ -1578,7 +1578,7 @@ public class CassandraMetadataRepository { return null; } - Map<String, String> map = new HashMap<String, String>( size ); + Map<String, String> map = new HashMap<>( size ); for ( Row<String, String, String> row : result.get() ) { ColumnSlice<String, String> columnSlice = row.getColumnSlice(); @@ -1780,7 +1780,7 @@ public class CassandraMetadataRepository { // cql cannot run or in queries so running twice the query - Map<String, ArtifactMetadata> artifactMetadataMap = new HashMap<String, ArtifactMetadata>(); + Map<String, ArtifactMetadata> artifactMetadataMap = new HashMap<>(); RangeSlicesQuery<String, String, String> query = HFactory // .createRangeSlicesQuery( keyspace, ss, ss, ss ) // @@ -2116,7 +2116,7 @@ public class CassandraMetadataRepository if ( !facetModels.isEmpty() ) { MetadataFacet metadataFacet = metadataFacetFactory.createMetadataFacet(); - Map<String, String> props = new HashMap<String, String>( facetModels.size() ); + Map<String, String> props = new HashMap<>( facetModels.size() ); for ( MetadataFacetModel metadataFacetModel : facetModels ) { props.put( metadataFacetModel.getKey(), metadataFacetModel.getValue() ); http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java index cef2fd7..ef0f239 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java +++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java @@ -65,7 +65,7 @@ public class CassandraRepositorySessionFactory applicationContext.getBeansOfType( MetadataFacetFactory.class ); // olamy with spring the "id" is now "metadataFacetFactory#hint" // whereas was only hint with plexus so let remove metadataFacetFactory# - metadataFacetFactories = new HashMap<String, MetadataFacetFactory>( tmpMetadataFacetFactories.size() ); + metadataFacetFactories = new HashMap<>( tmpMetadataFacetFactories.size() ); for ( Map.Entry<String, MetadataFacetFactory> entry : tmpMetadataFacetFactories.entrySet() ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java index b373c8d..e12ca7a 100644 --- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java +++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java @@ -357,7 +357,7 @@ public class FileMetadataRepository if ( metadataFacetFactory != null ) { metadataFacet = metadataFacetFactory.createMetadataFacet( repositoryId, name ); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for ( Object key : new ArrayList( properties.keySet() ) ) { String property = (String) key; @@ -447,7 +447,7 @@ public class FileMetadataRepository public Collection<ArtifactMetadata> getArtifacts( String repoId, String namespace, String projectId, String projectVersion ) { - Map<String, ArtifactMetadata> artifacts = new HashMap<String, ArtifactMetadata>(); + Map<String, ArtifactMetadata> artifacts = new HashMap<>(); File directory = new File( getDirectory( repoId ), namespace + "/" + projectId + "/" + projectVersion ); @@ -516,7 +516,7 @@ public class FileMetadataRepository { MetadataFacet facet = factory.createMetadataFacet(); String prefix = propertyPrefix + facet.getFacetId(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for ( Object key : new ArrayList( properties.keySet() ) ) { String property = (String) key; @@ -1029,7 +1029,7 @@ public class FileMetadataRepository else { MetadataFacet facet = factory.createMetadataFacet(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for ( Object key : new ArrayList( properties.keySet() ) ) { String property = (String) key; http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java index 54ca6ca..0f775a2 100644 --- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java +++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java @@ -70,7 +70,7 @@ public class FileRepositorySessionFactory applicationContext.getBeansOfType( MetadataFacetFactory.class ); // olamy with spring the "id" is now "metadataFacetFactory#hint" // whereas was only hint with plexus so let remove metadataFacetFactory# - metadataFacetFactories = new HashMap<String, MetadataFacetFactory>( tmpMetadataFacetFactories.size() ); + metadataFacetFactories = new HashMap<>( tmpMetadataFacetFactories.size() ); for ( Map.Entry<String, MetadataFacetFactory> entry : tmpMetadataFacetFactories.entrySet() ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java index 2acdbaa..cbe0f5d 100644 --- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java +++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java @@ -482,7 +482,7 @@ public class JcrMetadataRepository if ( metadataFacetFactory != null ) { metadataFacet = metadataFacetFactory.createMetadataFacet( repositoryId, name ); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for ( Property property : JcrUtils.getProperties( node ) ) { String p = property.getName(); @@ -931,7 +931,7 @@ public class JcrMetadataRepository else { MetadataFacet facet = factory.createMetadataFacet(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for ( Property property : JcrUtils.getProperties( n ) ) { String p = property.getName(); @@ -1351,7 +1351,7 @@ public class JcrMetadataRepository else { MetadataFacet facet = factory.createMetadataFacet(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for ( Property p : JcrUtils.getProperties( n ) ) { String property = p.getName(); http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java index 954743c..fcd7fed 100644 --- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java +++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java @@ -101,7 +101,7 @@ public class JcrRepositorySessionFactory // olamy with spring the "id" is now "metadataFacetFactory#hint" // whereas was only hint with plexus so let remove metadataFacetFactory# Map<String, MetadataFacetFactory> cleanedMetadataFacetFactories = - new HashMap<String, MetadataFacetFactory>( metadataFacetFactories.size() ); + new HashMap<>( metadataFacetFactories.size() ); for ( Map.Entry<String, MetadataFacetFactory> entry : metadataFacetFactories.entrySet() ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java b/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java index f8a6090..76b79e2 100644 --- a/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java +++ b/archiva-modules/plugins/npanday-support/src/main/java/org/apache/archiva/plugins/npanday/NPandayArtifactMappingProvider.java @@ -37,7 +37,7 @@ public class NPandayArtifactMappingProvider public NPandayArtifactMappingProvider() { - extensionToTypeMap = new HashMap<String, String>(); + extensionToTypeMap = new HashMap<>(); // TODO: this could be one of many - we need to look up the artifact metadata from the POM instead // should do this anyway so that plugins don't compete for providing an extension @@ -46,7 +46,7 @@ public class NPandayArtifactMappingProvider extensionToTypeMap.put( "netmodule", "dotnet-module" ); extensionToTypeMap.put( "exe", "dotnet-executable" ); - typeToExtensionMap = new HashMap<String, String>(); + typeToExtensionMap = new HashMap<>(); typeToExtensionMap.put( "dotnet-library", "dll" ); typeToExtensionMap.put( "dotnet-library-config", "dll.config" ); typeToExtensionMap.put( "dotnet-executable", "exe" ); http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java index 328ccf8..3262b3e 100644 --- a/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java +++ b/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java @@ -55,7 +55,7 @@ public class RepositoryProblemFacet public Map<String, String> toProperties() { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put( "repositoryId", repositoryId ); map.put( "namespace", namespace ); map.put( "project", project ); http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/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 efa26c5..736b465 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 @@ -196,7 +196,7 @@ public class DefaultRepositoryStatisticsManager QueryResult queryResult = query.execute(); - Map<String, Integer> totalByType = new HashMap<String, Integer>(); + Map<String, Integer> totalByType = new HashMap<>(); long totalSize = 0, totalArtifacts = 0; for ( Row row : JcrUtils.getRows( queryResult ) ) { http://git-wip-us.apache.org/repos/asf/archiva/blob/d6c28781/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java index f32c699..eab3e82 100644 --- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java +++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java @@ -170,7 +170,7 @@ public class RepositoryStatistics public Map<String, String> toProperties() { - Map<String, String> properties = new HashMap<String, String>(); + Map<String, String> properties = new HashMap<>(); properties.put( "scanEndTime", String.valueOf( scanEndTime.getTime() ) ); properties.put( "scanStartTime", String.valueOf( scanStartTime.getTime() ) ); properties.put( "totalArtifactCount", String.valueOf( totalArtifactCount ) );
