Fix checkstyle issues

patrickfav · Nov 30, 2018 · 32bf5ee · 32bf5ee
1 parent 78fc7c2
commit 32bf5ee
Show file tree

Hide file tree

Showing 77 changed files with 212 additions and 137 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -85,16 +85,16 @@
 
         <!-- Size Limitiations -->
         <module name="LineLength"><!-- max char length per line http://checkstyle.sourceforge.net/config_sizes.html#LineLength -->
-            <property name="max" value="300"/>
+            <property name="max" value="1200"/>
         </module>
         <module name="MethodLength"><!-- max line length for single method http://checkstyle.sourceforge.net/config_sizes.html#MethodLength -->
             <property name="max" value="150"/>
         </module>
         <module name="AnonInnerLength"><!-- max line length for anon class http://checkstyle.sourceforge.net/config_sizes.html#AnonInnerLength -->
-            <property name="max" value="85"/>
+            <property name="max" value="100"/>
         </module>
         <module name="ParameterNumber"><!-- max params for method http://checkstyle.sourceforge.net/config_sizes.html#ParameterNumber -->
-            <property name="max" value="10"/>
+            <property name="max" value="15"/>
             <property name="ignoreOverriddenMethods" value="true"/>
             <property name="tokens" value="METHOD_DEF"/>
         </module>

diff --git a/src/main/java/at/favre/tools/dice/encode/Encoder.java b/src/main/java/at/favre/tools/dice/encode/Encoder.java
@@ -41,6 +41,7 @@ public interface Encoder {
 
     /**
      * Description on how the output should be formatted (newlines, separators, etc.)
+     *
      * @return
      */
     EncoderFormat getEncoderFormat();

diff --git a/src/main/java/at/favre/tools/dice/encode/EncoderHandler.java b/src/main/java/at/favre/tools/dice/encode/EncoderHandler.java
@@ -17,13 +17,40 @@
 package at.favre.tools.dice.encode;
 
 import at.favre.lib.bytes.Bytes;
-import at.favre.tools.dice.encode.byteencoder.*;
+import at.favre.tools.dice.encode.byteencoder.AByteEncoder;
+import at.favre.tools.dice.encode.byteencoder.Base10Encoder;
+import at.favre.tools.dice.encode.byteencoder.Base16Encoder;
+import at.favre.tools.dice.encode.byteencoder.Base26Encoder;
+import at.favre.tools.dice.encode.byteencoder.Base2Encoder;
+import at.favre.tools.dice.encode.byteencoder.Base32Encoder;
+import at.favre.tools.dice.encode.byteencoder.Base36Encoder;
+import at.favre.tools.dice.encode.byteencoder.Base58Encoder;
+import at.favre.tools.dice.encode.byteencoder.Base64Encoder;
+import at.favre.tools.dice.encode.byteencoder.Base85Encoder;
+import at.favre.tools.dice.encode.byteencoder.Base8Encoder;
 import at.favre.tools.dice.encode.imgencoder.HexBlockImageEncoder;
-import at.favre.tools.dice.encode.languages.*;
+import at.favre.tools.dice.encode.languages.CEncoder;
+import at.favre.tools.dice.encode.languages.CSharpEncoder;
+import at.favre.tools.dice.encode.languages.GoByteArrayEncoder;
+import at.favre.tools.dice.encode.languages.JavaByteArrayEncoder;
+import at.favre.tools.dice.encode.languages.JsEncoder;
+import at.favre.tools.dice.encode.languages.KotlinByteArrayEncoder;
+import at.favre.tools.dice.encode.languages.NodeJsEncoder;
+import at.favre.tools.dice.encode.languages.PerlEncoder;
+import at.favre.tools.dice.encode.languages.PhpEncoder;
+import at.favre.tools.dice.encode.languages.Python3Encoder;
+import at.favre.tools.dice.encode.languages.RubyEncoder;
+import at.favre.tools.dice.encode.languages.RustEncoder;
+import at.favre.tools.dice.encode.languages.SwiftEncoder;
 import at.favre.tools.dice.encode.textencoder.RawByteEncoder;
 import at.favre.tools.dice.encode.textencoder.Utf8Encoder;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
 
 public final class EncoderHandler {
 
@@ -116,6 +143,4 @@ public String getSupportedEncodingList() {
         sb.delete(sb.length() - 2, sb.length());
         return sb.toString();
     }
-
-
 }
diff --git a/src/main/java/at/favre/tools/dice/encode/byteencoder/AByteRadixEncoder.java b/src/main/java/at/favre/tools/dice/encode/byteencoder/AByteRadixEncoder.java
@@ -31,6 +31,4 @@ public String encode(byte[] array) {
     public String encodePadded(byte[] array) {
         return String.format("%" + maxLength(array, getRadix()) + "s", encode(array)).replace(' ', '0');
     }
-
-
 }
diff --git a/src/main/java/at/favre/tools/dice/encode/byteencoder/Base2Encoder.java b/src/main/java/at/favre/tools/dice/encode/byteencoder/Base2Encoder.java
@@ -25,7 +25,7 @@
  */
 public class Base2Encoder extends AByteEncoder {
 
-    private final static int GROUP_LENGTH = 8;
+    private static final int GROUP_LENGTH = 8;
 
     @Override
     public String encode(byte[] array) {

diff --git a/src/main/java/at/favre/tools/dice/encode/byteencoder/Base58Encoder.java b/src/main/java/at/favre/tools/dice/encode/byteencoder/Base58Encoder.java
@@ -16,7 +16,6 @@
 
 package at.favre.tools.dice.encode.byteencoder;
 
-
 import at.favre.tools.dice.encode.impl.Base58;
 
 /**

diff --git a/src/main/java/at/favre/tools/dice/encode/byteencoder/Base85Encoder.java b/src/main/java/at/favre/tools/dice/encode/byteencoder/Base85Encoder.java
@@ -20,7 +20,7 @@
 
 /**
  * Encodes in to ascii85 e.g. <code>9jqo^BlbD-BleB1DJ</code>, used by Adobe.
- *
+ * <p>
  * See https://github.com/fzakaria/ascii85
  */
 public class Base85Encoder extends AByteEncoder {

diff --git a/src/main/java/at/favre/tools/dice/encode/imgencoder/HexBlockImageEncoder.java b/src/main/java/at/favre/tools/dice/encode/imgencoder/HexBlockImageEncoder.java
@@ -21,8 +21,7 @@
 public class HexBlockImageEncoder extends AEncoder {
     // All possible Blocks: {'▁', '▂', '▃', '▄', '▅', '▆', '▇', '█', '▉', '▊', '▋', '▌', '▍', '▎', '▏', '▐', '░', '▒', '▓', '▔', '▕', '▖', '▗', '▘', '▝', '▚', '▞', '▙', '▛', '▜', '▟'};
 
-    private static final Character[] IMG_CHARS =
-            {'▁', '▃', '▅', '▇', '▍', '▐', '░', '▒', '▓', '▖', '▘', '▝', '▚', '▙', '▛', '▜'};
+    private static final Character[] IMG_CHARS = {'▁', '▃', '▅', '▇', '▍', '▐', '░', '▒', '▓', '▖', '▘', '▝', '▚', '▙', '▛', '▜'};
 
     @Override
     public String encode(byte[] array) {

diff --git a/src/main/java/at/favre/tools/dice/encode/impl/Base58.java b/src/main/java/at/favre/tools/dice/encode/impl/Base58.java
@@ -43,10 +43,10 @@
  * number of leading zeros (which are otherwise lost during the mathematical operations on the
  * numbers), and finally represent the resulting base-58 digits as alphanumeric ASCII characters.
  */
-public class Base58 {
-    public static final char[] BITCOIN_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz".toCharArray();
-    public static final char[] RIPPLE_ALPHABET = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz".toCharArray();
-    public static final char[] FLICKR_ALPHABET = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ".toCharArray();
+public final class Base58 {
+    private static final char[] BITCOIN_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz".toCharArray();
+    private static final char[] RIPPLE_ALPHABET = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz".toCharArray();
+    private static final char[] FLICKR_ALPHABET = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ".toCharArray();
 
     public static Base58 BitcoinEncoder() {
         return new Base58(BITCOIN_ALPHABET);
@@ -181,4 +181,4 @@ private static byte divmod(byte[] number, int firstDigit, int base, int divisor)
         return (byte) remainder;
     }
 
-}
+}
diff --git a/src/main/java/at/favre/tools/dice/rnd/entropy/BCThreadedEntropySource.java b/src/main/java/at/favre/tools/dice/rnd/entropy/BCThreadedEntropySource.java
@@ -27,7 +27,9 @@
  * Threaded Seed Generator based on the one found in Bouncy Castle implementation
  */
 public class BCThreadedEntropySource implements ExpandableEntropySource {
-    private final static byte[] SALT = new byte[]{0x48, (byte) 0xB8, (byte) 0x96, (byte) 0xC6, (byte) 0x87, 0x5C, (byte) 0xD0, (byte) 0xF9, (byte) 0x9D, 0x60, (byte) 0xFA, 0x11, 0x3E, 0x68, 0x2A, (byte) 0xD0, 0x48, (byte) 0xE3, (byte) 0x83, (byte) 0x90, (byte) 0xA2, 0x3E, 0x79, (byte) 0xCB, 0x52, (byte) 0xBF, (byte) 0xB9, 0x4C, 0x67, 0x1B, (byte) 0xEF, 0x49};
+    private static final byte[] SALT = new byte[]{0x48, (byte) 0xB8, (byte) 0x96, (byte) 0xC6, (byte) 0x87, 0x5C, (byte) 0xD0, (byte) 0xF9, (byte) 0x9D, 0x60,
+            (byte) 0xFA, 0x11, 0x3E, 0x68, 0x2A, (byte) 0xD0, 0x48, (byte) 0xE3, (byte) 0x83, (byte) 0x90, (byte) 0xA2, 0x3E, 0x79, (byte) 0xCB, 0x52, (byte) 0xBF,
+            (byte) 0xB9, 0x4C, 0x67, 0x1B, (byte) 0xEF, 0x49};
 
     private final SeedGenerator threadedSeedGenerator;
     private final BlockingQueue<Byte> buffer = new ArrayBlockingQueue<>(64);

diff --git a/src/main/java/at/favre/tools/dice/rnd/entropy/ExternalStrongSeedEntropySource.java b/src/main/java/at/favre/tools/dice/rnd/entropy/ExternalStrongSeedEntropySource.java
@@ -28,7 +28,8 @@
  * adding an monotonic counter, to generate different outputs each call)
  */
 public final class ExternalStrongSeedEntropySource implements ExpandableEntropySource {
-    private final static byte[] SALT = new byte[]{0x57, 0x58, 0x6E, (byte) 0x9A, 0x7C, (byte) 0xE4, 0x2E, 0x57, 0x61, 0x07, 0x18, (byte) 0xD9, (byte) 0x90, (byte) 0xFE, (byte) 0xC7, 0x2A, (byte) 0xA7, (byte) 0xEE, (byte) 0xFD, 0x10, 0x38, (byte) 0x87, 0x19, (byte) 0x85, (byte) 0xA1, 0x71, 0x3E, 0x31, 0x41, 0x74, 0x60, 0x66};
+    private static final byte[] SALT = new byte[]{0x57, 0x58, 0x6E, (byte) 0x9A, 0x7C, (byte) 0xE4, 0x2E, 0x57, 0x61, 0x07, 0x18, (byte) 0xD9, (byte) 0x90, (byte) 0xFE,
+            (byte) 0xC7, 0x2A, (byte) 0xA7, (byte) 0xEE, (byte) 0xFD, 0x10, 0x38, (byte) 0x87, 0x19, (byte) 0x85, (byte) 0xA1, 0x71, 0x3E, 0x31, 0x41, 0x74, 0x60, 0x66};
 
     private byte[] internalSeed;
     private long counter = Long.MIN_VALUE;

diff --git a/src/main/java/at/favre/tools/dice/rnd/entropy/ExternalWeakSeedEntropySource.java b/src/main/java/at/favre/tools/dice/rnd/entropy/ExternalWeakSeedEntropySource.java
@@ -27,7 +27,9 @@
  * therefore mixing the weaker source with a stronger, unpredictable one.
  */
 public final class ExternalWeakSeedEntropySource extends SecureRandomEntropySource {
-    private static final byte[] SALT = new byte[]{(byte) 0x80, (byte) 0xFD, (byte) 0xDE, 0x4B, (byte) 0xFB, (byte) 0xC9, 0x48, 0x02, (byte) 0xDF, 0x47, (byte) 0x95, (byte) 0xE5, (byte) 0xB1, 0x24, (byte) 0x9C, 0x3F, 0x4A, 0x5C, 0x16, 0x03, 0x0D, 0x18, 0x3B, (byte) 0xB5, 0x3E, 0x26, (byte) 0xBF, (byte) 0xF5, 0x09, 0x79, 0x5F, (byte) 0xA1};
+    private static final byte[] SALT = new byte[]{(byte) 0x80, (byte) 0xFD, (byte) 0xDE, 0x4B, (byte) 0xFB, (byte) 0xC9, 0x48, 0x02, (byte) 0xDF, 0x47,
+            (byte) 0x95, (byte) 0xE5, (byte) 0xB1, 0x24, (byte) 0x9C, 0x3F, 0x4A, 0x5C, 0x16, 0x03, 0x0D, 0x18, 0x3B, (byte) 0xB5, 0x3E, 0x26, (byte) 0xBF,
+            (byte) 0xF5, 0x09, 0x79, 0x5F, (byte) 0xA1};
 
     public ExternalWeakSeedEntropySource(String seed) {
         this(seed.getBytes(StandardCharsets.UTF_8));

diff --git a/src/main/java/at/favre/tools/dice/rnd/entropy/HKDFEntropyPool.java b/src/main/java/at/favre/tools/dice/rnd/entropy/HKDFEntropyPool.java
@@ -31,14 +31,15 @@
  * bit strings.
  */
 public final class HKDFEntropyPool implements EntropyPool {
-    private final static int DEFAULT_INTERNAL_SEED_LENGTH = 32;
-    private final static byte[] SALT = new byte[]{0x0B, 0x40, (byte) 0xC3, (byte) 0x91, 0x73, (byte) 0x88, 0x58, 0x6A, 0x22, (byte) 0xD4, (byte) 0xC3, 0x04, 0x16, 0x1F, (byte) 0xB9, (byte) 0xE7, 0x21, 0x50, 0x4E, (byte) 0x8A, (byte) 0xDC, 0x0D, 0x6C, (byte) 0xCC, (byte) 0x90, 0x5A, 0x7A, 0x1C, 0x2A, (byte) 0xBB, 0x38, (byte) 0xE8};
+    private static final int DEFAULT_INTERNAL_SEED_LENGTH = 32;
+    private static final byte[] SALT = new byte[]{0x0B, 0x40, (byte) 0xC3, (byte) 0x91, 0x73, (byte) 0x88, 0x58, 0x6A, 0x22, (byte) 0xD4, (byte) 0xC3,
+            0x04, 0x16, 0x1F, (byte) 0xB9, (byte) 0xE7, 0x21, 0x50, 0x4E, (byte) 0x8A, (byte) 0xDC, 0x0D, 0x6C, (byte) 0xCC, (byte) 0x90, 0x5A, 0x7A,
+            0x1C, 0x2A, (byte) 0xBB, 0x38, (byte) 0xE8};
 
     private final List<ExpandableEntropySource> entropySourceList = new LinkedList<>();
 
     private final int sourceSeedLengthBytes;
 
-
     public HKDFEntropyPool() {
         this(DEFAULT_INTERNAL_SEED_LENGTH);
     }

diff --git a/src/main/java/at/favre/tools/dice/rnd/entropy/JDKThreadedEntropySource.java b/src/main/java/at/favre/tools/dice/rnd/entropy/JDKThreadedEntropySource.java
@@ -31,7 +31,9 @@
  * environment provides good entropy.
  */
 public final class JDKThreadedEntropySource implements ExpandableEntropySource {
-    private final static byte[] SALT = new byte[]{0x75, (byte) 0xCC, 0x3A, 0x7B, 0x21, 0x6D, 0x08, (byte) 0xAD, (byte) 0xD9, (byte) 0xD7, (byte) 0xA3, 0x35, 0x1C, 0x56, 0x13, 0x2C, 0x44, 0x2E, 0x74, (byte) 0xB2, 0x14, 0x2C, 0x15, 0x39, 0x5A, (byte) 0xC6, (byte) 0xBA, 0x3C, (byte) 0xCF, 0x71, 0x19, 0x2B};
+    private static final byte[] SALT = new byte[]{0x75, (byte) 0xCC, 0x3A, 0x7B, 0x21, 0x6D, 0x08, (byte) 0xAD, (byte) 0xD9, (byte) 0xD7, (byte) 0xA3,
+            0x35, 0x1C, 0x56, 0x13, 0x2C, 0x44, 0x2E, 0x74, (byte) 0xB2, 0x14, 0x2C, 0x15, 0x39, 0x5A, (byte) 0xC6, (byte) 0xBA, 0x3C, (byte) 0xCF,
+            0x71, 0x19, 0x2B};
 
     private final ThreadedSeedGenerator threadedSeedGenerator;
 
@@ -101,21 +103,19 @@ private static class ThreadedSeedGenerator implements Runnable {
             start = end = 0;
 
             final ThreadGroup[] finalsg = new ThreadGroup[1];
-            Thread t = java.security.AccessController.doPrivileged
-                    ((PrivilegedAction<Thread>) () -> {
-                        ThreadGroup parent, group =
-                                Thread.currentThread().getThreadGroup();
-                        while ((parent = group.getParent()) != null)
-                            group = parent;
-                        finalsg[0] = new ThreadGroup
-                                (group, "Dice SeedGenerator ThreadGroup");
-                        Thread newT = new Thread(finalsg[0],
-                                ThreadedSeedGenerator.this,
-                                "Dice SeedGenerator Thread");
-                        newT.setPriority(Thread.MIN_PRIORITY);
-                        newT.setDaemon(true);
-                        return newT;
-                    });
+            Thread t = java.security.AccessController.doPrivileged((PrivilegedAction<Thread>) () -> {
+                ThreadGroup parent, group = Thread.currentThread().getThreadGroup();
+                while ((parent = group.getParent()) != null) {
+                    group = parent;
+                }
+                finalsg[0] = new ThreadGroup(group, "Dice SeedGenerator ThreadGroup");
+                Thread newT = new Thread(finalsg[0],
+                        ThreadedSeedGenerator.this,
+                        "Dice SeedGenerator Thread");
+                newT.setPriority(Thread.MIN_PRIORITY);
+                newT.setDaemon(true);
+                return newT;
+            });
             seedGroup = finalsg[0];
             t.start();
         }
@@ -124,7 +124,7 @@ private static class ThreadedSeedGenerator implements Runnable {
          * This method does the actual work. It collects random bytes and
          * pushes them into the queue.
          */
-        final public void run() {
+        public final void run() {
             try {
                 while (true) {
                     // Queue full? Wait till there's room.
@@ -143,8 +143,7 @@ final public void run() {
                         // Start some noisy threads
                         try {
                             BogusThread bt = new BogusThread();
-                            Thread t = new Thread
-                                    (seedGroup, bt, "Dice SeedGenerator Thread");
+                            Thread t = new Thread(seedGroup, bt, "Dice SeedGenerator Thread");
                             t.start();
                         } catch (Exception e) {
                             throw new InternalError("internal error: " +
@@ -154,7 +153,6 @@ final public void run() {
                         // We wait 250milli quanta, so the minimum wait time
                         // cannot be under 250milli.
                         int latch = 0;
-                        latch = 0;
                         long l = System.currentTimeMillis() + 50;
                         while (System.currentTimeMillis() < l) {
                             synchronized (this) {
@@ -230,12 +228,12 @@ byte getSeedByte() {
          */
 
         private static class BogusThread implements Runnable {
-            final public void run() {
+            public final void run() {
                 try {
                     for (int i = 0; i < 5; i++)
                         Thread.sleep(50);
                     // System.gc();
-                } catch (Exception e) {
+                } catch (Exception ignored) {
                 }
             }
         }

diff --git a/src/main/java/at/favre/tools/dice/rnd/entropy/NonceEntropySource.java b/src/main/java/at/favre/tools/dice/rnd/entropy/NonceEntropySource.java
@@ -31,7 +31,9 @@
  * See http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-90Ar1.pdf Section 8.6.7.
  */
 public final class NonceEntropySource implements ExpandableEntropySource {
-    private final static byte[] SALT = new byte[]{0x48, (byte) 0xB8, (byte) 0x96, (byte) 0xC6, (byte) 0x87, 0x5C, (byte) 0xD0, (byte) 0xF9, (byte) 0x9D, 0x60, (byte) 0xFA, 0x11, 0x3E, 0x68, 0x2A, (byte) 0xD0, 0x48, (byte) 0xE3, (byte) 0x83, (byte) 0x90, (byte) 0xA2, 0x3E, 0x79, (byte) 0xCB, 0x52, (byte) 0xBF, (byte) 0xB9, 0x4C, 0x67, 0x1B, (byte) 0xEF, 0x49};
+    private static final byte[] SALT = new byte[]{0x48, (byte) 0xB8, (byte) 0x96, (byte) 0xC6, (byte) 0x87, 0x5C, (byte) 0xD0, (byte) 0xF9, (byte) 0x9D,
+            0x60, (byte) 0xFA, 0x11, 0x3E, 0x68, 0x2A, (byte) 0xD0, 0x48, (byte) 0xE3, (byte) 0x83, (byte) 0x90, (byte) 0xA2, 0x3E, 0x79, (byte) 0xCB,
+            0x52, (byte) 0xBF, (byte) 0xB9, 0x4C, 0x67, 0x1B, (byte) 0xEF, 0x49};
 
     private long sequenceCounter;
     private long lastAccess = System.nanoTime();

diff --git a/src/main/java/at/favre/tools/dice/rnd/entropy/PersonalizationSource.java b/src/main/java/at/favre/tools/dice/rnd/entropy/PersonalizationSource.java
@@ -34,7 +34,11 @@
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
 
 /**
  * Reads static and dynamic data from the machine like MAC addresses and cpu usage to pin the
@@ -46,8 +50,10 @@
  * See: http://csrc.nist.gov/publications/nistpubs/800-90A/SP800-90A.pdf
  */
 public final class PersonalizationSource implements ExpandableEntropySource {
-    private static final byte[] STATIC_RANDOM = new byte[]{0x0B, 0x40, (byte) 0xC3, (byte) 0x91, 0x73, (byte) 0x88, 0x58, 0x6A, 0x22, (byte) 0xD4, (byte) 0xC3, 0x04, 0x16, 0x1F, (byte) 0xB9, (byte) 0xE7, 0x21, 0x50, 0x4E, (byte) 0x8A, (byte) 0xDC, 0x0D, 0x6C, (byte) 0xCC, (byte) 0x90, 0x5A, 0x7A, 0x1C, 0x2A, (byte) 0xBB, 0x38, (byte) 0xE8};
-    private static final byte[] SALT = new byte[]{0x0B, 0x40, (byte) 0xC3, (byte) 0x91, 0x73, (byte) 0x88, 0x58, 0x6A, 0x22, (byte) 0xD4, (byte) 0xC3, 0x04, 0x16, 0x1F, (byte) 0xB9, (byte) 0xE7, 0x21, 0x50, 0x4E, (byte) 0x8A, (byte) 0xDC, 0x0D, 0x6C, (byte) 0xCC, (byte) 0x90, 0x5A, 0x7A, 0x1C, 0x2A, (byte) 0xBB, 0x38, (byte) 0xE8};
+    private static final byte[] STATIC_RANDOM = new byte[]{0x0B, 0x40, (byte) 0xC3, (byte) 0x91, 0x73, (byte) 0x88, 0x58, 0x6A, 0x22, (byte) 0xD4, (byte) 0xC3, 0x04, 0x16, 0x1F,
+            (byte) 0xB9, (byte) 0xE7, 0x21, 0x50, 0x4E, (byte) 0x8A, (byte) 0xDC, 0x0D, 0x6C, (byte) 0xCC, (byte) 0x90, 0x5A, 0x7A, 0x1C, 0x2A, (byte) 0xBB, 0x38, (byte) 0xE8};
+    private static final byte[] SALT = new byte[]{0x0B, 0x40, (byte) 0xC3, (byte) 0x91, 0x73, (byte) 0x88, 0x58, 0x6A, 0x22, (byte) 0xD4, (byte) 0xC3, 0x04, 0x16, 0x1F, (byte) 0xB9,
+            (byte) 0xE7, 0x21, 0x50, 0x4E, (byte) 0x8A, (byte) 0xDC, 0x0D, 0x6C, (byte) 0xCC, (byte) 0x90, 0x5A, 0x7A, 0x1C, 0x2A, (byte) 0xBB, 0x38, (byte) 0xE8};
 
     private byte[] readTempDirContent() {
         File f = new File(System.getProperty("java.io.tmpdir"));

diff --git a/src/main/java/at/favre/tools/dice/service/AServiceHandler.java b/src/main/java/at/favre/tools/dice/service/AServiceHandler.java
@@ -26,7 +26,7 @@
 import java.util.concurrent.TimeUnit;
 
 public abstract class AServiceHandler<T> implements ServiceHandler<T> {
-    private final static String USER_AGENT = "dice/" + MiscUtil.jarVersion() + " (" + System.getProperty("os.name") + "; Java " + System.getProperty("java.version") + ") github.com/patrickfav/dice";
+    private static final String USER_AGENT = "dice/" + MiscUtil.jarVersion() + " (" + System.getProperty("os.name") + "; Java " + System.getProperty("java.version") + ") github.com/patrickfav/dice";
     protected final boolean debug;
 
     protected AServiceHandler(boolean debug) {

diff --git a/src/main/java/at/favre/tools/dice/service/anuquantum/AnuQuantumServiceHandler.java b/src/main/java/at/favre/tools/dice/service/anuquantum/AnuQuantumServiceHandler.java
@@ -32,7 +32,7 @@
  * See https://qrng.anu.edu.au/
  */
 public final class AnuQuantumServiceHandler extends AServiceHandler {
-    final static int ENTROPY_SEED_LENGTH_BYTE = 24;
+    static final int ENTROPY_SEED_LENGTH_BYTE = 24;
 
     public AnuQuantumServiceHandler(boolean debug) {
         super(debug);

diff --git a/src/main/java/at/favre/tools/dice/service/hotbits/HotbitsServiceHandler.java b/src/main/java/at/favre/tools/dice/service/hotbits/HotbitsServiceHandler.java
@@ -32,7 +32,7 @@
  * See https://www.fourmilab.ch/hotbits/
  */
 public final class HotbitsServiceHandler extends AServiceHandler {
-    final static int ENTROPY_SEED_LENGTH_BYTE = 24;
+    static final int ENTROPY_SEED_LENGTH_BYTE = 24;
 
     public HotbitsServiceHandler(boolean debug) {
         super(debug);

diff --git a/src/main/java/at/favre/tools/dice/service/randomorg/RandomOrgService.java b/src/main/java/at/favre/tools/dice/service/randomorg/RandomOrgService.java
@@ -29,4 +29,4 @@ public interface RandomOrgService {
     @Headers({"DNT: 1"})
     @POST("/json-rpc/1/invoke")
     Call<String> getRandom(@HeaderMap Map<String, String> headers, @Body RandomOrgBlobRequest request);
-}
+}
diff --git a/src/main/java/at/favre/tools/dice/service/randomorg/RandomOrgServiceHandler.java b/src/main/java/at/favre/tools/dice/service/randomorg/RandomOrgServiceHandler.java
@@ -38,7 +38,7 @@
  * See https://www.random.org/
  */
 public final class RandomOrgServiceHandler extends AServiceHandler {
-    final static int ENTROPY_SEED_LENGTH_BIT = 192;
+    static final int ENTROPY_SEED_LENGTH_BIT = 192;
 
     public RandomOrgServiceHandler(boolean debug) {
         super(debug);