more diamond

3 files changed, 7 insertions, 11 deletions

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 1fd14aa57..21bcdd096 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
@@ -279,7 +279,7 @@ public class DefaultArchivaConfiguration
                 // Fix policies
                 boolean connectorValid = true;
 
-                Map<String, String> policies = new HashMap<String, String>();
+                Map<String, String> policies = new HashMap<>();
                 // Make copy of policies
                 policies.putAll( connector.getPolicies() );
                 // Clear out policies
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 7ad6d762c..f0ad020c7 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
@@ -45,7 +45,7 @@ import java.util.Map;
 /**
  * FileTypes
  */
-@Service ("fileTypes")
+@Service("fileTypes")
 public class FileTypes
     implements RegistryListener
 {
@@ -57,17 +57,14 @@ public class FileTypes
 
     public static final String IGNORED = "ignored";
 
-    /**
-     *
-     */
     @Inject
-    @Named (value = "archivaConfiguration#default")
+    @Named(value = "archivaConfiguration#default")
     private ArchivaConfiguration archivaConfiguration;
 
     /**
      * Map of default values for the file types.
      */
-    private Map<String, List<String>> defaultTypeMap = new HashMap<String, List<String>>();
+    private Map<String, List<String>> defaultTypeMap = new HashMap<>();
 
     private List<String> artifactPatterns;
 
@@ -87,15 +84,14 @@ public class FileTypes
 
     /**
      * Get the list of patterns for a specified filetype.
-     *
-     * <p>
+     * <p/>
+     * <p/>
      * You will always get a list.  In this order.
      * <ul>
      * <li>The Configured List</li>
      * <li>The Default List</li>
      * <li>A single item list of <code>&quot;**&#47;*&quot;</code></li>
      * </ul>
-     * 
      *
      * @param id the id to lookup.
      * @return the list of patterns.
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
index 32b70f074..bf1637607 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java
@@ -33,7 +33,7 @@ import java.util.Map;
 public class FiletypeToMapClosure
     implements Closure
 {
-    private Map<String, FileType> map = new HashMap<String, FileType>();
+    private Map<String, FileType> map = new HashMap<>();
 
     public void execute( Object input )
     {