Improved performance of java7 file attribute retrieval

Author: krosenvold

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

@@ -15,8 +15,6 @@
  */
 package org.codehaus.plexus.components.io.attributes;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -29,6 +27,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * @author Kristian Rosenvold
  */
@@ -124,7 +125,7 @@ public static BasicFileAttributes getFileAttributes( @Nonnull File file )
     public static BasicFileAttributes getFileAttributes( Path path )
         throws IOException
     {
-        if ( path.getFileSystem().supportedFileAttributeViews().contains( "posix" ) )
+        if (isUnix(path))
         {
 
             try
@@ -139,6 +140,10 @@ public static BasicFileAttributes getFileAttributes( Path path )
         return Files.readAttributes( path, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS );
     }
 
+    public static boolean isUnix(Path path) {
+        return path.getFileSystem().supportedFileAttributeViews().contains("unix");
+    }
+
     @Nullable
     public static FileOwnerAttributeView getFileOwnershipInfo( @Nonnull File file )
         throws IOException

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

@@ -16,20 +16,21 @@
  * limitations under the License.
  */
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.LinkOption;
 import java.nio.file.attribute.FileOwnerAttributeView;
-import java.nio.file.attribute.PosixFileAttributes;
 import java.nio.file.attribute.PosixFilePermission;
+import java.security.Principal;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /*
  * File attributes for a java7 file that are backed on disk by a file.
  * Immutable
@@ -59,12 +60,13 @@ public Java7FileAttributes( @Nonnull File file,  @Nonnull Map<Integer, String> u
         throws IOException
     {
 
-        BasicFileAttributes basicFileAttributes = Java7AttributeUtils.getFileAttributes( file );
 
-        if ( basicFileAttributes instanceof PosixFileAttributes )
+        if (Java7AttributeUtils.isUnix(file.toPath()))
         {
-            this.permissions = ( (PosixFileAttributes) basicFileAttributes ).permissions();
-            groupId = (Integer) Files.readAttributes( file.toPath(), "unix:gid" ).get( "gid" );
+            Map<String, Object> attrs = Files.readAttributes(file.toPath(), "unix:*", LinkOption.NOFOLLOW_LINKS);
+            this.permissions = (Set<PosixFilePermission>) attrs.get("permissions");
+
+            groupId = (Integer) attrs.get("gid");
 
             String groupName = groupCache.get( groupId );
             if ( groupName != null )
@@ -73,21 +75,22 @@ public Java7FileAttributes( @Nonnull File file,  @Nonnull Map<Integer, String> u
             }
             else
             {
-                this.groupName = ( (PosixFileAttributes) basicFileAttributes ).group().getName();
+                this.groupName = ((Principal) attrs.get("group")).getName();
                 groupCache.put( groupId, this.groupName );
             }
-            userId = (Integer) Files.readAttributes( file.toPath(), "unix:uid" ).get( "uid" );
+            userId = (Integer) attrs.get("uid");
             String userName = userCache.get( userId );
             if ( userName != null )
             {
                 this.userName = userName;
             }
             else
             {
-                this.userName = ( (PosixFileAttributes) basicFileAttributes ).owner().getName();
+                this.userName = ((Principal) attrs.get("owner")).getName();
                 userCache.put( userId, this.userName );
             }
             octalMode = calculatePosixOctalMode();
+            symbolicLink = (Boolean) attrs.get("isSymbolicLink");
         } else {
             FileOwnerAttributeView fa = Java7AttributeUtils.getFileOwnershipInfo( file );
             this.userName = fa.getOwner().getName();
@@ -96,9 +99,9 @@ public Java7FileAttributes( @Nonnull File file,  @Nonnull Map<Integer, String> u
             this.groupId = null;
             octalMode = -1;
             permissions = Collections.emptySet();
+            symbolicLink = Files.isSymbolicLink(file.toPath());
         }
 
-        symbolicLink = Files.isSymbolicLink( file.toPath() );
     }
 
     public static  @Nonnull PlexusIoResourceAttributes uncached(  @Nonnull File file )

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

@@ -34,6 +34,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
 
 /**
  * Implementation of {@link PlexusIoResourceCollection} for the set
@@ -209,21 +211,48 @@ public void forEach( PlexusIoResourceConsumer resourceConsumer )
                 throws IOException
             {
                 Iterator<PlexusIoResource> resources = getResources();
-                while (resources.hasNext()){
+                while ( resources.hasNext() )
+                {
                     PlexusIoResource next = resources.next();
-                    if (isSelected( next ))
+                    if ( isSelected( next ) )
                     {
                         resourceConsumer.accept( next );
                     }
                 }
-                if (resources instanceof Closeable )
+                if ( resources instanceof Closeable )
+                {
+                    ( (Closeable) resources ).close();
+                }
+
+            }
+
+            public void forEach( ExecutorService es, final PlexusIoResourceConsumer resourceConsumer )
+                throws IOException
+            {
+                Iterator<PlexusIoResource> resources = getResources();
+                while ( resources.hasNext() )
+                {
+                    final PlexusIoResource next = resources.next();
+                    Callable future = new Callable()
+                    {
+                        public Object call()
+                            throws Exception
+                        {
+                            resourceConsumer.accept( next );
+                            return this;
+                        }
+                    };
+                    es.submit( future );
+                }
+                if ( resources instanceof Closeable )
                 {
-                    ((Closeable)resources).close();
+                    ( (Closeable) resources ).close();
                 }
 
             }
         };
-    }
+
+    };
 
     public Iterator<PlexusIoResource> getResources()
         throws IOException