Merge pull request #57 from BastiaanJansen/dev

Dependency upgrade and fixed code style issues.

Author: BastiaanJansen

README.md

@@ -30,23 +30,23 @@ The following features are supported:
 <dependency>
     <groupId>com.github.bastiaanjansen</groupId>
     <artifactId>otp-java</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 </dependency>
 ```
 
 ### Gradle
 ```gradle
-implementation 'com.github.bastiaanjansen:otp-java:1.3.0'
+implementation 'com.github.bastiaanjansen:otp-java:1.3.1'
 ```
 
 ### Scala SBT
 ```scala
-libraryDependencies += "com.github.bastiaanjansen" % "otp-java" % "1.3.0"
+libraryDependencies += "com.github.bastiaanjansen" % "otp-java" % "1.3.1"
 ```
 
 ### Apache Ivy
 ```xml
-<dependency org="com.github.bastiaanjansen" name="otp-java" rev="1.3.0" />
+<dependency org="com.github.bastiaanjansen" name="otp-java" rev="1.3.1" />
 ```
 
 Or you can download the source from the [GitHub releases page](https://github.com/BastiaanJansen/OTP-Java/releases).

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>com.github.bastiaanjansen</groupId>
     <artifactId>otp-java</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 
     <name>OTP-Java</name>
     <description>A small and easy-to-use one-time password generator for Java according to RFC 4226 (HOTP) and RFC 6238 (TOTP).</description>
@@ -49,19 +49,19 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.8.1</version>
+            <version>3.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.7.0</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.11</version>
+            <version>1.15</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>

src/main/java/com/bastiaanjansen/otp/HOTP.java

@@ -15,7 +15,7 @@
  * @see OTP
  */
 public final class HOTP extends OTP implements HOTPGenerator, HOTPVerifier {
-    private final static String OTP_TYPE = "hotp";
+    private static final String OTP_TYPE = "hotp";
 
     private HOTP(final Builder builder) {
         super(builder);
@@ -68,6 +68,7 @@ public static HOTP withDefaultValues(final byte[] secret) {
      * @return generated HOTP code
      * @throws IllegalArgumentException when code could not be generated
      */
+    @Override
     public String generate(long counter) throws IllegalArgumentException {
         return super.generate(counter);
     }

src/main/java/com/bastiaanjansen/otp/OTP.java

@@ -20,7 +20,7 @@
  * @author Bastiaan Jansen
  */
 class OTP {
-    private final static String URL_SCHEME = "otpauth";
+    private static final String URL_SCHEME = "otpauth";
 
     /**
      * Default value for password length
@@ -262,7 +262,7 @@ protected abstract static class Builder<T extends OTP, B extends Builder<T, B>>
          */
         private final byte[] secret;
 
-        public Builder(final byte[] secret) {
+        protected Builder(final byte[] secret) {
             this.secret = secret;
             this.passwordLength = DEFAULT_PASSWORD_LENGTH;
             this.algorithm = DEFAULT_HMAC_ALGORITHM;

src/main/java/com/bastiaanjansen/otp/SecretGenerator.java

@@ -11,10 +11,12 @@
  */
 public class SecretGenerator {
 
+    private SecretGenerator() {}
+
     /**
      * Default amount of bits for secret generation
      */
-    public final static int DEFAULT_BITS = 160;
+    public static final int DEFAULT_BITS = 160;
 
     /**
      * Generate an OTP base32 secret with default amount of bits

src/main/java/com/bastiaanjansen/otp/TOTP.java

@@ -19,7 +19,7 @@
  * @see OTP
  */
 public final class TOTP extends OTP implements TOTPGenerator, TOTPVerifier {
-    private final static String OTP_TYPE = "totp";
+    private static final String OTP_TYPE = "totp";
 
     /**
      * Default time interval for a time-based one-time password

src/main/java/com/bastiaanjansen/otp/helpers/URIHelper.java

@@ -14,6 +14,8 @@
  */
 public class URIHelper {
 
+    private URIHelper() {}
+
     public static final String DIGITS = "digits";
     public static final String SECRET = "secret";
     public static final String ALGORITHM = "algorithm";