Code cleanup

Author: slachiewicz

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

@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+@SuppressWarnings("OctalInteger")
 public final class AttributeConstants {
 
     public static final int OCTAL_OWNER_READ = 0400;

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

@@ -33,6 +33,7 @@
 /**
  * @author Kristian Rosenvold
  */
+@SuppressWarnings("OctalInteger")
 public class AttributeUtils {
     /*
     Reads last-modified with proper failure handling if something goes wrong.
@@ -101,7 +102,6 @@ public static BasicFileAttributes getFileAttributes(@Nonnull File file) throws I
 
     public static BasicFileAttributes getFileAttributes(Path path) throws IOException {
         if (isUnix(path)) {
-
             try {
                 return Files.readAttributes(path, PosixFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
             } catch (UnsupportedOperationException ignore) {

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

@@ -112,9 +112,10 @@ public FileAttributes(@Nonnull File file, boolean followLinks) throws IOExceptio
         this.octalMode = attrs.containsKey("mode")
                 ? (Integer) attrs.get("mode") & 0xfff
                 : PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE;
+        //noinspection unchecked
         this.permissions = attrs.containsKey("permissions")
                 ? (Set<PosixFilePermission>) attrs.get("permissions")
-                : Collections.<PosixFilePermission>emptySet();
+                : Collections.emptySet();
         this.size = (Long) attrs.get("size");
         this.lastModifiedTime = (FileTime) attrs.get("lastModifiedTime");
     }

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

@@ -72,9 +72,6 @@ public interface PlexusIoResourceAttributes {
      */
     int getOctalMode();
 
-    // @Nonnull
-    // String getOctalModeString();
-
     /**
      * Indicates if this is a symbolic link element.
      * For file-based resource attributes this value may be always "false" for versions prior to java7.

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

@@ -35,14 +35,13 @@ public class SymlinkUtils {
      * @throws java.io.IOException
      */
     public static @Nonnull File readSymbolicLink(@Nonnull File symlink) throws IOException {
-        final java.nio.file.Path path = java.nio.file.Files.readSymbolicLink(symlink.toPath());
-        return path.toFile();
+        return Files.readSymbolicLink(symlink.toPath()).toFile();
     }
 
     public static @Nonnull File createSymbolicLink(@Nonnull File symlink, File target) throws IOException {
         Path link = symlink.toPath();
         if (!Files.exists(link, LinkOption.NOFOLLOW_LINKS)) {
-            link = java.nio.file.Files.createSymbolicLink(link, target.toPath());
+            link = Files.createSymbolicLink(link, target.toPath());
         }
         return link.toFile();
     }

src/main/java/org/codehaus/plexus/components/io/attributes/proxy/PlexusIoProxyResourceAttributes.java

@@ -6,7 +6,7 @@
 
 public class PlexusIoProxyResourceAttributes implements PlexusIoResourceAttributes {
 
-    PlexusIoResourceAttributes target;
+    final PlexusIoResourceAttributes target;
 
     public PlexusIoProxyResourceAttributes(PlexusIoResourceAttributes thisAttr) {
         this.target = thisAttr;
@@ -45,11 +45,6 @@ public Integer getUserId() {
         return target.getUserId();
     }
 
-    /*    public String getOctalModeString()
-        {
-            return target.getOctalModeString();
-        }
-    */
     public boolean isOwnerWritable() {
         return target.isOwnerWritable();
     }

src/main/java/org/codehaus/plexus/components/io/filemappers/AbstractFileMapper.java

@@ -29,7 +29,7 @@ public abstract class AbstractFileMapper implements FileMapper {
      * Checks the input and returns it without modifications.
      */
     public @Nonnull String getMappedFileName(@Nonnull String pName) {
-        if (pName == null || pName.length() == 0) {
+        if (pName == null || pName.isEmpty()) {
             throw new IllegalArgumentException("The source name must not be null.");
         }
         return pName;

src/main/java/org/codehaus/plexus/components/io/filemappers/FileExtensionMapper.java

@@ -42,7 +42,7 @@ public void setTargetExtension(String pTargetExtension) {
         if (pTargetExtension == null) {
             throw new IllegalArgumentException("The target extension is null.");
         }
-        if (pTargetExtension.length() == 0) {
+        if (pTargetExtension.isEmpty()) {
             throw new IllegalArgumentException("The target extension is empty.");
         }
         if (pTargetExtension.charAt(0) == '.') {

src/main/java/org/codehaus/plexus/components/io/filemappers/IdentityMapper.java

@@ -31,7 +31,7 @@ public class IdentityMapper extends AbstractFileMapper {
 
     @Nonnull
     public String getMappedFileName(@Nonnull String pName) {
-        if (pName == null || pName.length() == 0) {
+        if (pName == null || pName.isEmpty()) {
             throw new IllegalArgumentException("The source name must not be null.");
         }
         return pName;

src/main/java/org/codehaus/plexus/components/io/filemappers/MergeFileMapper.java

@@ -41,7 +41,7 @@ public void setTargetName(String pName) {
         if (pName == null) {
             throw new IllegalArgumentException("The target name is null.");
         }
-        if (pName.length() == 0) {
+        if (pName.isEmpty()) {
             throw new IllegalArgumentException("The target name is empty.");
         }
         targetName = pName;