more diamond

3 files changed, 7 insertions, 7 deletions

diff --git a/archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java b/archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java
index 6a88d6540..7c4a9383b 100644
--- a/archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java
+++ b/archiva-modules/metadata/metadata-model-maven2/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java
@@ -91,7 +91,7 @@ public class MavenArtifactFacet
 
     public Map<String, String> toProperties()
     {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put( "type", type );
         if ( classifier != null )
         {
diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/FacetedMetadata.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/FacetedMetadata.java
index e2261a199..97e00a6ce 100644
--- a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/FacetedMetadata.java
+++ b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/FacetedMetadata.java
@@ -32,7 +32,7 @@ public abstract class FacetedMetadata
     /**
      * The facets to store, keyed by the {@linkplain MetadataFacet#getFacetId() Facet ID} of the metadata.
      */
-    private Map<String, MetadataFacet> facets = new HashMap<String, MetadataFacet>();
+    private Map<String, MetadataFacet> facets = new HashMap<>();
 
     /**
      * Add a new facet to the metadata. If it already exists, it will be replaced.
diff --git a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
index 5f7f8c0a2..21e404862 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
@@ -94,7 +94,7 @@ public abstract class AbstractMetadataRepositoryTest
 
     protected static Map<String, MetadataFacetFactory> createTestMetadataFacetFactories()
     {
-        Map<String, MetadataFacetFactory> factories = new HashMap<String, MetadataFacetFactory>();
+        Map<String, MetadataFacetFactory> factories = new HashMap<>();
         factories.put( TEST_FACET_ID, new MetadataFacetFactory()
         {
             public MetadataFacet createMetadataFacet()
@@ -461,7 +461,7 @@ public abstract class AbstractMetadataRepositoryTest
         ProjectVersionMetadata metadata = new ProjectVersionMetadata();
         metadata.setId( TEST_PROJECT_VERSION );
 
-        Map<String, String> additionalProps = new HashMap<String, String>();
+        Map<String, String> additionalProps = new HashMap<>();
         additionalProps.put( "deleteKey", "deleteValue" );
 
         MetadataFacet facet = new TestMetadataFacet( TEST_FACET_ID, "baz", additionalProps );
@@ -529,7 +529,7 @@ public abstract class AbstractMetadataRepositoryTest
     {
         ArtifactMetadata metadata = createArtifact();
 
-        Map<String, String> additionalProps = new HashMap<String, String>();
+        Map<String, String> additionalProps = new HashMap<>();
         additionalProps.put( "deleteKey", "deleteValue" );
 
         MetadataFacet facet = new TestMetadataFacet( TEST_FACET_ID, "baz", additionalProps );
@@ -1555,7 +1555,7 @@ public abstract class AbstractMetadataRepositoryTest
                 }
                 else
                 {
-                    Map<String, String> props = new HashMap<String, String>();
+                    Map<String, String> props = new HashMap<>();
                     props.put( "foo", value );
 
                     for ( String key : additionalProps.keySet() )
@@ -1583,7 +1583,7 @@ public abstract class AbstractMetadataRepositoryTest
 
             if ( additionalProps == null )
             {
-                additionalProps = new HashMap<String, String>();
+                additionalProps = new HashMap<>();
             }
 
             for ( String key : properties.keySet() )