From d6c28781b0b0f9de8142c8b96b810ab6c415cb26 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 10 Apr 2014 23:11:38 +1000
Subject: more diamond

---
 .../repository/cassandra/CassandraMetadataRepository.java      | 10 +++++-----
 .../cassandra/CassandraRepositorySessionFactory.java           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'archiva-modules/plugins/metadata-store-cassandra')

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 67a17cd5a..86513b344 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() );
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 cef2fd7ce..ef0f23986 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() )
         {
-- 
cgit v1.2.3