metafacture-files/ (main): Fix Checkstyle violations.

Author: blackwinter

metafacture-files/src/main/java/org/metafacture/files/DirReader.java

@@ -13,11 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.metafacture.files;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Arrays;
+package org.metafacture.files;
 
 import org.metafacture.framework.FluxCommand;
 import org.metafacture.framework.ObjectReceiver;
@@ -26,6 +23,10 @@
 import org.metafacture.framework.annotations.Out;
 import org.metafacture.framework.helpers.DefaultObjectPipe;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+
 /**
  * Reads a directory and emits all filenames found.
  *
@@ -40,42 +41,47 @@ public final class DirReader extends DefaultObjectPipe<String, ObjectReceiver<St
 
     private boolean recursive;
 
-    private String filenameFilterPattern = null;
+    private String filenameFilterPattern;
+
+    public DirReader() {
+    }
 
     public void setRecursive(final boolean recursive) {
         this.recursive = recursive;
     }
 
-    public void setFilenamePattern(final String filenameFilterPattern) {
-        this.filenameFilterPattern = filenameFilterPattern;
+    public void setFilenamePattern(final String newFilenameFilterPattern) {
+        filenameFilterPattern = newFilenameFilterPattern;
     }
 
     @Override
     public void process(final String dir) {
         final File file = new File(dir);
         if (file.isDirectory()) {
             dir(file);
-        } else {
+        }
+        else {
             getReceiver().process(dir);
         }
     }
 
     private void dir(final File dir) {
         final ObjectReceiver<String> receiver = getReceiver();
-        final File[] files = filenameFilterPattern == null ? dir.listFiles()
-                : dir.listFiles(new FilenameFilter() {
+        final File[] files = filenameFilterPattern == null ? dir.listFiles() :
+                dir.listFiles(new FilenameFilter() {
                     @Override
                     public boolean accept(final File dir, final String name) {
                         return name.matches(filenameFilterPattern);
                     }
                 });
         Arrays.sort(files);
-        for (File file : files) {
+        for (final File file : files) {
             if (file.isDirectory()) {
                 if (recursive) {
                     dir(file);
                 }
-            } else {
+            }
+            else {
                 receiver.process(file.getAbsolutePath());
             }
         }

metafacture-files/src/main/java/org/metafacture/files/FileDigestCalculator.java

@@ -13,13 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.metafacture.files;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+package org.metafacture.files;
 
 import org.metafacture.framework.FluxCommand;
 import org.metafacture.framework.MetafactureException;
@@ -30,6 +25,12 @@
 import org.metafacture.framework.helpers.DefaultObjectPipe;
 import org.metafacture.framework.objects.Triple;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
 /**
  * Interprets the input string as a file name and computes a cryptographic hash
  * for the file.
@@ -48,13 +49,13 @@ public final class FileDigestCalculator extends
 
     private static final int HIGH_NIBBLE = 0xf0;
     private static final int LOW_NIBBLE = 0x0f;
-    private static final char[] NIBBLE_TO_HEX =
-            { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+    private static final char[] NIBBLE_TO_HEX = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+    private static final int NIBBLE_TO_HEX_SHIFT_WIDTH = 4;
 
     private final DigestAlgorithm algorithm;
     private final MessageDigest messageDigest;
 
-
     public FileDigestCalculator(final DigestAlgorithm algorithm) {
         this.algorithm = algorithm;
         this.messageDigest = this.algorithm.getInstance();
@@ -72,12 +73,17 @@ public void process(final String file) {
         try {
             stream = new FileInputStream(file);
             digest = bytesToHex(getDigest(stream, messageDigest));
-        } catch (IOException e) {
+        }
+        catch (final IOException e) {
             throw new MetafactureException(e);
-        } finally {
+        }
+        finally {
             if (stream != null) {
-                try { stream.close(); }
-                catch (final IOException e) { }
+                try {
+                    stream.close();
+                }
+                catch (final IOException e) {
+                }
             }
         }
         getReceiver().process(new Triple(file, algorithm.name(), digest));
@@ -96,8 +102,8 @@ private static byte[] getDigest(final InputStream stream, final MessageDigest me
 
     private static String bytesToHex(final byte[] bytes) {
         final char[] hex = new char[bytes.length * 2];
-        for (int i=0; i < bytes.length; ++i) {
-            hex[i * 2] = NIBBLE_TO_HEX[(bytes[i] & HIGH_NIBBLE) >>> 4];
+        for (int i = 0; i < bytes.length; ++i) {
+            hex[i * 2] = NIBBLE_TO_HEX[(bytes[i] & HIGH_NIBBLE) >>> NIBBLE_TO_HEX_SHIFT_WIDTH];
             hex[i * 2 + 1] = NIBBLE_TO_HEX[bytes[i] & LOW_NIBBLE];
         }
         return new String(hex);
@@ -115,19 +121,20 @@ public enum DigestAlgorithm {
         SHA1("SHA-1"),
         SHA256("SHA-256"),
         SHA384("SHA-384"),
-        SHA512 ("SHA-512");
+        SHA512("SHA-512");
 
         private final String identifier;
 
-        private DigestAlgorithm(final String identifier) {
+        DigestAlgorithm(final String identifier) {
             this.identifier = identifier;
         }
 
         public MessageDigest getInstance() {
             try {
                 return MessageDigest.getInstance(identifier);
-            } catch (NoSuchAlgorithmException e) {
-                throw new MetafactureException (e);
+            }
+            catch (final NoSuchAlgorithmException e) {
+                throw new MetafactureException(e);
             }
         }