Restore speed improvements #79
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -22,6 +22,7 @@ | |||||
| import java.nio.file.LinkOption; | ||||||
| import java.nio.file.Path; | ||||||
| import java.nio.file.attribute.FileOwnerAttributeView; | ||||||
| import java.nio.file.attribute.FileTime; | ||||||
| import java.nio.file.attribute.PosixFilePermission; | ||||||
| import java.security.Principal; | ||||||
| import java.util.Collections; | ||||||
|
|
@@ -39,6 +40,10 @@ | |||||
| public class FileAttributes | ||||||
| implements PlexusIoResourceAttributes | ||||||
| { | ||||||
| public static final LinkOption[] FOLLOW_LINK_OPTIONS = new LinkOption[] { }; | ||||||
|
|
||||||
| public static final LinkOption[] NOFOLLOW_LINK_OPTIONS = new LinkOption[] { LinkOption.NOFOLLOW_LINKS }; | ||||||
|
|
||||||
| @Nullable | ||||||
| private final Integer groupId; | ||||||
|
|
||||||
|
|
@@ -52,69 +57,101 @@ public class FileAttributes | |||||
|
|
||||||
| private final boolean symbolicLink; | ||||||
|
|
||||||
| private final boolean regularFile; | ||||||
|
|
||||||
| private final boolean directory; | ||||||
|
|
||||||
| private final boolean other; | ||||||
|
|
||||||
| private final int octalMode; | ||||||
|
|
||||||
| private final Set<PosixFilePermission> permissions; | ||||||
|
|
||||||
| private final long size; | ||||||
|
|
||||||
| private final FileTime lastModifiedTime; | ||||||
|
|
||||||
| /** | ||||||
| * @deprecated use {@link #FileAttributes(File)} and remove the unused userCache and groupCache parameters | ||||||
| */ | ||||||
| @Deprecated | ||||||
| public FileAttributes( @Nonnull File file, @Nonnull Map<Integer, String> userCache, | ||||||
gnodet marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. InlineMeSuggester: This deprecated API looks inlineable. If you'd like the body of the API to be inlined to its callers, please annotate it with @InlineMe.
Suggested change
(at-me in a reply with Was this a good recommendation? |
||||||
| @Nonnull Map<Integer, String> groupCache ) | ||||||
| throws IOException | ||||||
| { | ||||||
| this( file ); | ||||||
| } | ||||||
|
|
||||||
| public FileAttributes( @Nonnull File file ) | ||||||
| throws IOException | ||||||
| { | ||||||
| this( file, false ); | ||||||
| } | ||||||
|
|
||||||
| public FileAttributes( @Nonnull File file, boolean followLinks ) | ||||||
| throws IOException | ||||||
| { | ||||||
| LinkOption[] options = followLinks ? FOLLOW_LINK_OPTIONS : NOFOLLOW_LINK_OPTIONS; | ||||||
| Path path = file.toPath(); | ||||||
| Set<String> views = path.getFileSystem().supportedFileAttributeViews(); | ||||||
| String names; | ||||||
| if ( views.contains( "unix" ) ) | ||||||
| { | ||||||
| names = "unix:*"; | ||||||
| } | ||||||
| else if ( views.contains( "posix" ) ) | ||||||
| { | ||||||
| names = "posix:*"; | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| names = "basic:*"; | ||||||
| } | ||||||
| Map<String, Object> attrs = Files.readAttributes( path, names, options ); | ||||||
| if ( !attrs.containsKey( "group" ) && !attrs.containsKey( "owner" ) && views.contains( "owner" ) ) | ||||||
| { | ||||||
| Map<String, Object> ownerAttrs = Files.readAttributes( path, "owner:*", options ); | ||||||
| Map<String, Object> newAttrs = new HashMap<>( attrs ); | ||||||
| newAttrs.putAll( ownerAttrs ); | ||||||
| attrs = newAttrs; | ||||||
| } | ||||||
| this.groupId = (Integer) attrs.get( "gid" ); | ||||||
| this.groupName = attrs.containsKey( "group" ) ? ((Principal) attrs.get( "group" ) ).getName() : null; | ||||||
| this.userId = (Integer) attrs.get( "uid" ); | ||||||
| this.userName = attrs.containsKey( "owner" ) ? ((Principal) attrs.get( "owner" ) ).getName() : null; | ||||||
| this.symbolicLink = (Boolean) attrs.get( "isSymbolicLink" ); | ||||||
| this.regularFile = (Boolean) attrs.get( "isRegularFile" ); | ||||||
| this.directory = (Boolean) attrs.get( "isDirectory" ); | ||||||
| this.other = (Boolean) attrs.get( "isOther" ); | ||||||
michael-o marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| this.octalMode = attrs.containsKey( "mode" ) ? (Integer) attrs.get( "mode" ) & 0xfff : PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE; | ||||||
| this.permissions = attrs.containsKey( "permissions" ) ? (Set<PosixFilePermission>) attrs.get( "permissions" ) : Collections.<PosixFilePermission>emptySet(); | ||||||
| this.size = (Long) attrs.get( "size" ); | ||||||
| this.lastModifiedTime = (FileTime) attrs.get( "lastModifiedTime" ); | ||||||
| } | ||||||
|
|
||||||
| public FileAttributes( @Nullable Integer userId, String userName, @Nullable Integer groupId, @Nullable String groupName, | ||||||
| int octalMode, boolean symbolicLink, boolean regularFile, boolean directory, boolean other, | ||||||
| Set<PosixFilePermission> permissions, long size, FileTime lastModifiedTime ) | ||||||
| { | ||||||
| this.userId = userId; | ||||||
| this.userName = userName; | ||||||
| this.groupId = groupId; | ||||||
| this.groupName = groupName; | ||||||
| this.octalMode = octalMode; | ||||||
| this.symbolicLink = symbolicLink; | ||||||
| this.regularFile = regularFile; | ||||||
| this.directory = directory; | ||||||
| this.other = other; | ||||||
| this.permissions = permissions; | ||||||
| this.size = size; | ||||||
| this.lastModifiedTime = lastModifiedTime; | ||||||
| } | ||||||
|
|
||||||
| public static @Nonnull | ||||||
| PlexusIoResourceAttributes uncached( @Nonnull File file ) | ||||||
| throws IOException | ||||||
| { | ||||||
| return new FileAttributes( file ); | ||||||
| } | ||||||
|
|
||||||
| @Nullable | ||||||
|
|
@@ -290,4 +327,34 @@ public boolean isSymbolicLink() | |||||
| { | ||||||
| return symbolicLink; | ||||||
| } | ||||||
|
|
||||||
| public boolean isRegularFile() | ||||||
| { | ||||||
| return regularFile; | ||||||
| } | ||||||
|
|
||||||
| public boolean isDirectory() | ||||||
| { | ||||||
| return directory; | ||||||
| } | ||||||
|
|
||||||
| public boolean isOther() | ||||||
| { | ||||||
| return other; | ||||||
| } | ||||||
|
|
||||||
| public long getSize() | ||||||
| { | ||||||
| return size; | ||||||
| } | ||||||
|
|
||||||
| public FileTime getLastModifiedTime() | ||||||
| { | ||||||
| return lastModifiedTime; | ||||||
| } | ||||||
|
|
||||||
| protected Set<PosixFilePermission> getPermissions() | ||||||
| { | ||||||
| return permissions; | ||||||
| } | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MutablePublicArray: Non-empty arrays are mutable, so this
public static finalarray is not a constant and can be modified by clients of this class. Prefer an ImmutableList, or provide an accessor method that returns a defensive copy.(at-me in a reply with
helporignore)Was this a good recommendation?
[ 🙁 Not relevant ] - [ 😕 Won't fix ] - [ 😑 Not critical, will fix ] - [ 🙂 Critical, will fix ] - [ 😊 Critical, fixing now ]