Refactor the code to use diamond operators (<>) and try with resources

Author: plamentotev

src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java

@@ -65,7 +65,7 @@ public static void chmod( @Nonnull File file, int mode )
     @Nonnull
     public static Set<PosixFilePermission> getPermissions( int mode )
     {
-        Set<PosixFilePermission> perms = new HashSet<PosixFilePermission>();
+        Set<PosixFilePermission> perms = new HashSet<>();
         //add owners permission
         if ( ( mode & 0400 ) > 0 )
         {

src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java

@@ -183,8 +183,8 @@ public static Map<String, PlexusIoResourceAttributes> getFileAttributesByPath( F
     public static @Nonnull Map<String, PlexusIoResourceAttributes> getFileAttributesByPath(@Nonnull File dir, boolean recursive )
         throws IOException
     {
-        Map<Integer, String> userCache = new HashMap<Integer, String>();
-        Map<Integer, String> groupCache = new HashMap<Integer, String>();
+        Map<Integer, String> userCache = new HashMap<>();
+        Map<Integer, String> groupCache = new HashMap<>();
         final List<String> fileAndDirectoryNames;
         if ( recursive && dir.isDirectory() )
         {
@@ -195,8 +195,7 @@ public static Map<String, PlexusIoResourceAttributes> getFileAttributesByPath( F
             fileAndDirectoryNames = Collections.singletonList( dir.getAbsolutePath() );
         }
 
-        final Map<String, PlexusIoResourceAttributes> attributesByPath =
-            new LinkedHashMap<String, PlexusIoResourceAttributes>();
+        final Map<String, PlexusIoResourceAttributes> attributesByPath = new LinkedHashMap<>();
 
         for ( String fileAndDirectoryName : fileAndDirectoryNames )
         {

src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java

@@ -145,8 +145,8 @@ private void addResources( List<PlexusIoResource> result, String[] resources )
     {
 
         final File dir = getBaseDir();
-        final HashMap<Integer, String> cache1 = new HashMap<Integer, String>();
-        final HashMap<Integer, String> cache2 = new HashMap<Integer, String>();
+        final HashMap<Integer, String> cache1 = new HashMap<>();
+        final HashMap<Integer, String> cache2 = new HashMap<>();
         for ( String name : resources )
         {
             String sourceDir = name.replace( '\\', '/' );
@@ -241,7 +241,7 @@ public Iterator<PlexusIoResource> getResources()
         ds.setFollowSymlinks( isFollowingSymLinks() );
         ds.scan();
 
-        final List<PlexusIoResource> result = new ArrayList<PlexusIoResource>();
+        final List<PlexusIoResource> result = new ArrayList<>();
         if ( isIncludingEmptyDirectories() )
         {
             String[] dirs = ds.getIncludedDirectories();

src/main/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactory.java

@@ -30,7 +30,7 @@ public class ProxyFactory
     public static PlexusIoResource createProxy(@Nonnull PlexusIoResource target, Object alternateSupplier)
     {
 
-        List<Class> interfaces = new ArrayList<Class>(  );
+        List<Class> interfaces = new ArrayList<>(  );
         interfaces.add( PlexusIoResource.class);
         if (target instanceof SymlinkDestinationSupplier ) interfaces.add( SymlinkDestinationSupplier.class);
         if (target instanceof FileSupplier ) interfaces.add( FileSupplier.class);

src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java

@@ -39,8 +39,8 @@ public void testGetPosixFileAttributes()
         }
 
         File file = new File( "." );
-        Map<Integer, String> userCache = new HashMap<Integer, String>();
-        Map<Integer, String> groupCache = new HashMap<Integer, String>();
+        Map<Integer, String> userCache = new HashMap<>();
+        Map<Integer, String> groupCache = new HashMap<>();
 
         PlexusIoResourceAttributes fa = new FileAttributes( file, userCache, groupCache );
         assertNotNull( fa );

src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java

@@ -114,8 +114,7 @@ private void createZipFile( File dest, File dir ) throws IOException
     private void compare( InputStream in, File file )
         throws IOException
     {
-        InputStream fIn = new FileInputStream( file );
-        try
+        try( InputStream fIn = new FileInputStream( file ) )
         {
             for ( ;; )
             {
@@ -128,10 +127,6 @@ private void compare( InputStream in, File file )
                 }
             }
         }
-        finally
-        {
-            fIn.close();
-        }
     }
 
     private void compare( PlexusIoResource res, File file )