several improvements

BastiaanJansen · BastiaanJansen · commit 12e9c07b4e56 · 2022-02-23T19:30:39.000+01:00
diff --git a/src/main/java/com/bastiaanjansen/jwt/Claims.java b/src/main/java/com/bastiaanjansen/jwt/Claims.java
@@ -1,6 +1,6 @@
 package com.bastiaanjansen.jwt;
 
-import com.bastiaanjansen.jwt.Utils.Base64Utils;
+import com.bastiaanjansen.jwt.utils.Base64Utils;
 import org.json.JSONObject;
 
 import java.util.Arrays;
diff --git a/src/main/java/com/bastiaanjansen/jwt/DefaultJWTValidator.java b/src/main/java/com/bastiaanjansen/jwt/DefaultJWTValidator.java
@@ -1,7 +1,7 @@
 package com.bastiaanjansen.jwt;
 
-import com.bastiaanjansen.jwt.Exceptions.JWTExpiredException;
-import com.bastiaanjansen.jwt.Exceptions.JWTValidationException;
+import com.bastiaanjansen.jwt.exceptions.JWTExpiredException;
+import com.bastiaanjansen.jwt.exceptions.JWTValidationException;
 
 import java.nio.charset.StandardCharsets;
 import java.util.*;
diff --git a/src/main/java/com/bastiaanjansen/jwt/Header.java b/src/main/java/com/bastiaanjansen/jwt/Header.java
@@ -1,6 +1,6 @@
 package com.bastiaanjansen.jwt;
 
-import com.bastiaanjansen.jwt.Utils.Base64Utils;
+import com.bastiaanjansen.jwt.utils.Base64Utils;
 import org.json.JSONObject;
 
 import java.util.Map;
diff --git a/src/main/java/com/bastiaanjansen/jwt/JWT.java b/src/main/java/com/bastiaanjansen/jwt/JWT.java
@@ -1,15 +1,15 @@
 package com.bastiaanjansen.jwt;
 
-import com.bastiaanjansen.jwt.Algorithms.Algorithm;
+import com.bastiaanjansen.jwt.algorithms.Algorithm;
 
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
-import com.bastiaanjansen.jwt.Exceptions.JWTCreationException;
-import com.bastiaanjansen.jwt.Exceptions.JWTDecodeException;
-import com.bastiaanjansen.jwt.Exceptions.JWTValidationException;
-import com.bastiaanjansen.jwt.Exceptions.JWTSignException;
-import com.bastiaanjansen.jwt.Utils.Base64Utils;
+import com.bastiaanjansen.jwt.exceptions.JWTCreationException;
+import com.bastiaanjansen.jwt.exceptions.JWTDecodeException;
+import com.bastiaanjansen.jwt.exceptions.JWTValidationException;
+import com.bastiaanjansen.jwt.exceptions.JWTSignException;
+import com.bastiaanjansen.jwt.utils.Base64Utils;
 import org.json.JSONException;
 
 /**
@@ -86,10 +86,8 @@ public static JWT fromRawJWT(Algorithm algorithm, String jwt) throws JWTDecodeEx
                 throw new JWTCreationException("Algorithm defined in header does not match " + algorithm.getName());
 
             return new JWT(algorithm, header, payload, signature);
-        } catch (IllegalArgumentException e) {
+        } catch (IllegalArgumentException | JSONException e) {
             throw new JWTDecodeException("Error decoding JWT");
-        } catch (JSONException e) {
-            throw new JWTCreationException("JSON is not valid");
         }
     }
 
diff --git a/src/main/java/com/bastiaanjansen/jwt/JWTValidator.java b/src/main/java/com/bastiaanjansen/jwt/JWTValidator.java
@@ -1,6 +1,6 @@
 package com.bastiaanjansen.jwt;
 
-import com.bastiaanjansen.jwt.Exceptions.JWTValidationException;
+import com.bastiaanjansen.jwt.exceptions.JWTValidationException;
 
 /**
  * Interface which should be implemented by JWT validators.
diff --git a/src/main/java/com/bastiaanjansen/jwt/Payload.java b/src/main/java/com/bastiaanjansen/jwt/Payload.java
@@ -1,10 +1,9 @@
 package com.bastiaanjansen.jwt;
 
-import com.bastiaanjansen.jwt.Utils.Base64Utils;
+import com.bastiaanjansen.jwt.utils.Base64Utils;
 import org.json.JSONObject;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 
 public class Payload extends Claims {
diff --git a/src/main/java/com/bastiaanjansen/jwt/algorithms/Algorithm.java b/src/main/java/com/bastiaanjansen/jwt/algorithms/Algorithm.java
@@ -1,7 +1,7 @@
-package com.bastiaanjansen.jwt.Algorithms;
+package com.bastiaanjansen.jwt.algorithms;
 
-import com.bastiaanjansen.jwt.Exceptions.JWTSignException;
-import com.bastiaanjansen.jwt.Exceptions.JWTValidationException;
+import com.bastiaanjansen.jwt.exceptions.JWTSignException;
+import com.bastiaanjansen.jwt.exceptions.JWTValidationException;
 
 import java.nio.charset.StandardCharsets;
 import java.security.KeyPair;
diff --git a/src/main/java/com/bastiaanjansen/jwt/algorithms/HMACAlgorithm.java b/src/main/java/com/bastiaanjansen/jwt/algorithms/HMACAlgorithm.java
@@ -1,9 +1,7 @@
-package com.bastiaanjansen.jwt.Algorithms;
+package com.bastiaanjansen.jwt.algorithms;
 
-import com.bastiaanjansen.jwt.Exceptions.JWTSignException;
-import com.bastiaanjansen.jwt.Exceptions.JWTValidationException;
-import com.bastiaanjansen.jwt.JWT;
-import com.bastiaanjansen.jwt.Utils.Base64Utils;
+import com.bastiaanjansen.jwt.exceptions.JWTSignException;
+import com.bastiaanjansen.jwt.exceptions.JWTValidationException;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
diff --git a/src/main/java/com/bastiaanjansen/jwt/algorithms/RSAAlgorithm.java b/src/main/java/com/bastiaanjansen/jwt/algorithms/RSAAlgorithm.java
@@ -1,7 +1,7 @@
-package com.bastiaanjansen.jwt.Algorithms;
+package com.bastiaanjansen.jwt.algorithms;
 
-import com.bastiaanjansen.jwt.Exceptions.JWTSignException;
-import com.bastiaanjansen.jwt.Exceptions.JWTValidationException;
+import com.bastiaanjansen.jwt.exceptions.JWTSignException;
+import com.bastiaanjansen.jwt.exceptions.JWTValidationException;
 
 import java.nio.charset.StandardCharsets;
 import java.security.*;
diff --git a/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTCreationException.java b/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTCreationException.java
@@ -1,4 +1,4 @@
-package com.bastiaanjansen.jwt.Exceptions;
+package com.bastiaanjansen.jwt.exceptions;
 
 public class JWTCreationException extends JWTException {
 
diff --git a/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTDecodeException.java b/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTDecodeException.java
@@ -1,4 +1,4 @@
-package com.bastiaanjansen.jwt.Exceptions;
+package com.bastiaanjansen.jwt.exceptions;
 
 public class JWTDecodeException extends JWTException {
 
diff --git a/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTException.java b/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTException.java
@@ -1,4 +1,4 @@
-package com.bastiaanjansen.jwt.Exceptions;
+package com.bastiaanjansen.jwt.exceptions;
 
 public class JWTException extends Exception {
 
diff --git a/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTExpiredException.java b/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTExpiredException.java
@@ -1,4 +1,4 @@
-package com.bastiaanjansen.jwt.Exceptions;
+package com.bastiaanjansen.jwt.exceptions;
 
 public class JWTExpiredException extends JWTValidationException {
     public JWTExpiredException() {}
diff --git a/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTSignException.java b/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTSignException.java
@@ -1,4 +1,4 @@
-package com.bastiaanjansen.jwt.Exceptions;
+package com.bastiaanjansen.jwt.exceptions;
 
 public class JWTSignException extends JWTException {
 
diff --git a/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTValidationException.java b/src/main/java/com/bastiaanjansen/jwt/exceptions/JWTValidationException.java
@@ -1,4 +1,4 @@
-package com.bastiaanjansen.jwt.Exceptions;
+package com.bastiaanjansen.jwt.exceptions;
 
 public class JWTValidationException extends JWTException {
 
diff --git a/src/main/java/com/bastiaanjansen/jwt/utils/Base64Utils.java b/src/main/java/com/bastiaanjansen/jwt/utils/Base64Utils.java
@@ -1,7 +1,6 @@
-package com.bastiaanjansen.jwt.Utils;
+package com.bastiaanjansen.jwt.utils;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Base64;
 
 /**
diff --git a/src/test/java/com/bastiaanjansen/jwt/App.java b/src/test/java/com/bastiaanjansen/jwt/App.java
@@ -1,18 +1,7 @@
 package com.bastiaanjansen.jwt;
 
-import com.bastiaanjansen.jwt.Algorithms.Algorithm;
-import com.bastiaanjansen.jwt.Exceptions.JWTCreationException;
-import com.bastiaanjansen.jwt.Exceptions.JWTException;
-
-import java.security.*;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Base64;
-import java.util.Calendar;
-import java.util.Date;
+import com.bastiaanjansen.jwt.algorithms.Algorithm;
+import com.bastiaanjansen.jwt.exceptions.JWTCreationException;
 
 public class App {
     public static void main(String[] args) throws JWTCreationException {
diff --git a/src/test/java/com/bastiaanjansen/jwt/DefaultJWTValidatorTest.java b/src/test/java/com/bastiaanjansen/jwt/DefaultJWTValidatorTest.java
@@ -1,10 +1,10 @@
 package com.bastiaanjansen.jwt;
 
-import com.bastiaanjansen.jwt.Algorithms.Algorithm;
-import com.bastiaanjansen.jwt.Exceptions.JWTCreationException;
-import com.bastiaanjansen.jwt.Exceptions.JWTDecodeException;
-import com.bastiaanjansen.jwt.Exceptions.JWTExpiredException;
-import com.bastiaanjansen.jwt.Exceptions.JWTValidationException;
+import com.bastiaanjansen.jwt.algorithms.Algorithm;
+import com.bastiaanjansen.jwt.exceptions.JWTCreationException;
+import com.bastiaanjansen.jwt.exceptions.JWTDecodeException;
+import com.bastiaanjansen.jwt.exceptions.JWTExpiredException;
+import com.bastiaanjansen.jwt.exceptions.JWTValidationException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/bastiaanjansen/jwt/JWTTest.java b/src/test/java/com/bastiaanjansen/jwt/JWTTest.java
@@ -1,8 +1,8 @@
 package com.bastiaanjansen.jwt;
 
-import com.bastiaanjansen.jwt.Algorithms.Algorithm;
-import com.bastiaanjansen.jwt.Exceptions.JWTCreationException;
-import com.bastiaanjansen.jwt.Exceptions.JWTDecodeException;
+import com.bastiaanjansen.jwt.algorithms.Algorithm;
+import com.bastiaanjansen.jwt.exceptions.JWTCreationException;
+import com.bastiaanjansen.jwt.exceptions.JWTDecodeException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -249,7 +249,7 @@ void fromRawJWT_issuedAt() throws JWTDecodeException, JWTCreationException {
     void fromRawMalformedJWT_throwsJWTCreationException() {
         String jwt = "eyJhbGciOiJIUzM4NCIssdsdjkhInR5cCI6IkpXVCJ9shdkshdsdssdljs.eyJpc3MiOiJpc3N1ZXIiLCJhdWQiOiJhdWRpZW5jZSIsImlhdCI6MTYxNDY3NjkyNjE3MiwianRpIjoiaWQifQ.ibsMduBXhE8Y1TkDAazH-J7BaAtcJTcwmHfzvQg9EWS6uKZFsA_7z4LYtSa-nnR1";
 
-        assertThrows(JWTCreationException.class, () -> JWT.fromRawJWT(algorithm, jwt));
+        assertThrows(JWTDecodeException.class, () -> JWT.fromRawJWT(algorithm, jwt));
     }
 
     @Test
diff --git a/src/test/java/com/bastiaanjansen/jwt/algorithms/HMACAlgorithmTest.java b/src/test/java/com/bastiaanjansen/jwt/algorithms/HMACAlgorithmTest.java
@@ -1,13 +1,11 @@
-package com.bastiaanjansen.jwt.Algorithms;
+package com.bastiaanjansen.jwt.algorithms;
 
-import com.bastiaanjansen.jwt.Exceptions.JWTSignException;
-import com.bastiaanjansen.jwt.Exceptions.JWTValidationException;
+import com.bastiaanjansen.jwt.exceptions.JWTSignException;
+import com.bastiaanjansen.jwt.exceptions.JWTValidationException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Base64;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/src/test/java/com/bastiaanjansen/jwt/algorithms/RSAAlgorithmTest.java b/src/test/java/com/bastiaanjansen/jwt/algorithms/RSAAlgorithmTest.java
@@ -1,7 +1,7 @@
-package com.bastiaanjansen.jwt.Algorithms;
+package com.bastiaanjansen.jwt.algorithms;
 
-import com.bastiaanjansen.jwt.Exceptions.JWTSignException;
-import com.bastiaanjansen.jwt.Exceptions.JWTValidationException;
+import com.bastiaanjansen.jwt.exceptions.JWTSignException;
+import com.bastiaanjansen.jwt.exceptions.JWTValidationException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.bastiaanjansen.jwt.Exceptions;`
	`1`	`+package com.bastiaanjansen.jwt.exceptions;`
`2`	`2`
`3`	`3`	`public class JWTCreationException extends JWTException {`
`4`	`4`