Some code changes

hzalaz · hzalaz · commit f7402bf99216 · 2016-12-01T14:58:32.000-03:00
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 
 
-# Java JWT [v3]
+# Java JWT
 
 [![Build Status](https://travis-ci.org/auth0/java-jwt.svg?branch=v3)](https://travis-ci.org/auth0/java-jwt)
 [![Coverage Status](https://img.shields.io/codecov/c/github/auth0/java-jwt/v3.svg?style=flat-square)](https://codecov.io/github/auth0/java-jwt)
 [![License](http://img.shields.io/:license-mit-blue.svg?style=flat)](http://doge.mit-license.org)
 
-An implementation of [JSON Web Tokens](http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html) developed against `draft-ietf-oauth-json-web-token-08`.
+A Java implementation of [JSON Web Tokens (draft-ietf-oauth-json-web-token-08)](http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html)
 
 ## Installation
 
diff --git a/lib/src/main/java/com/auth0/jwt/JWT.java b/lib/src/main/java/com/auth0/jwt/JWT.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 @SuppressWarnings("WeakerAccess")
-public final class JWT {
+public abstract class JWT implements DecodedJWT {
 
     /**
      * Decode a given JWT token.
@@ -20,8 +20,8 @@ public final class JWT {
      * @return a decoded token.
      * @throws JWTDecodeException if any part of the token contained an invalid jwt or JSON format of each of the jwt parts.
      */
-    public static DecodedJWT decode(String token) throws JWTDecodeException {
-        return JWTDecoder.decode(token);
+    public static JWT decode(String token) throws JWTDecodeException {
+        return new JWTDecoder(token);
     }
 
     /**
diff --git a/lib/src/main/java/com/auth0/jwt/JWTDecoder.java b/lib/src/main/java/com/auth0/jwt/JWTDecoder.java
@@ -16,30 +16,18 @@
  * The JWTDecoder class holds the decode method to parse a given Token into it's DecodedJWT representation.
  */
 @SuppressWarnings("WeakerAccess")
-final class JWTDecoder implements DecodedJWT {
+final class JWTDecoder extends JWT {
 
     private final String token;
     private Header header;
     private Payload payload;
     private String signature;
 
-    private JWTDecoder(String jwt) throws JWTDecodeException {
+    JWTDecoder(String jwt) throws JWTDecodeException {
         this.token = jwt;
         parseToken(jwt);
     }
 
-    /**
-     * Decode a given Token into a DecodedJWT instance.
-     * Note that this method doesn't verify the DecodedJWT's signature! Use it only if you trust the issuer of the Token.
-     *
-     * @param token the String representation of the DecodedJWT.
-     * @return a decoded DecodedJWT.
-     * @throws JWTDecodeException if any part of the Token contained an invalid DecodedJWT or JSON format.
-     */
-    static DecodedJWT decode(String token) throws JWTDecodeException {
-        return new JWTDecoder(token);
-    }
-
     private void parseToken(String token) throws JWTDecodeException {
         final String[] parts = TokenUtils.splitToken(token);
         final JWTParser converter = new JWTParser();
diff --git a/lib/src/main/java/com/auth0/jwt/JWTVerifier.java b/lib/src/main/java/com/auth0/jwt/JWTVerifier.java
@@ -260,6 +260,7 @@ private void verifyClaims(DecodedJWT jwt, Map<String, Object> claims) {
         for (Map.Entry<String, Object> entry : claims.entrySet()) {
             switch (entry.getKey()) {
                 case PublicClaims.AUDIENCE:
+                    //noinspection unchecked
                     assertValidAudienceClaim(jwt.getAudience(), (List<String>) entry.getValue());
                     break;
                 case PublicClaims.EXPIRES_AT:
diff --git a/lib/src/main/java/com/auth0/jwt/interfaces/DecodedJWT.java b/lib/src/main/java/com/auth0/jwt/interfaces/DecodedJWT.java
@@ -4,4 +4,5 @@
  * The DecodedJWT class represents a Json Web Token.
  */
 public interface DecodedJWT extends Payload, Header, Signature {
+    String getToken();
 }
diff --git a/lib/src/main/java/com/auth0/jwt/interfaces/JWT.java b/lib/src/main/java/com/auth0/jwt/interfaces/JWT.java
diff --git a/lib/src/test/java/com/auth0/jwt/ConcurrentVerifyTest.java b/lib/src/test/java/com/auth0/jwt/ConcurrentVerifyTest.java
@@ -22,7 +22,7 @@ public class ConcurrentVerifyTest {
 
     private static final long TIMEOUT = 10 * 1000 * 1000; //1 min
     private static final int THREAD_COUNT = 100;
-    private static final int REPEAT_COUNT = 2000;
+    private static final int REPEAT_COUNT = 1000;
     private static final String PUBLIC_KEY_FILE = "src/test/resources/rsa-public.pem";
     private static final String PUBLIC_KEY_FILE_256 = "src/test/resources/ec256-key-public.pem";
     private static final String PUBLIC_KEY_FILE_384 = "src/test/resources/ec384-key-public.pem";
diff --git a/lib/src/test/java/com/auth0/jwt/JWTTest.java b/lib/src/test/java/com/auth0/jwt/JWTTest.java
@@ -46,7 +46,7 @@ public void shouldDecodeAStringToken() throws Exception {
     // getToken
     @Test
     public void shouldGetStringToken() throws Exception {
-        JWT jwt = JWT.decode("eyJhbGciOiJIUzI1NiJ9.e30.XmNK3GpH3Ys_7wsYBfq4C3M6goz71I7dTgUkuIa5lyQ");
+        DecodedJWT jwt = JWT.decode("eyJhbGciOiJIUzI1NiJ9.e30.XmNK3GpH3Ys_7wsYBfq4C3M6goz71I7dTgUkuIa5lyQ");
         assertThat(jwt, is(notNullValue()));
         assertThat(jwt.getToken(), is(notNullValue()));
         assertThat(jwt.getToken(), is("eyJhbGciOiJIUzI1NiJ9.e30.XmNK3GpH3Ys_7wsYBfq4C3M6goz71I7dTgUkuIa5lyQ"));

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,5 @@`
`4`	`4`	`* The DecodedJWT class represents a Json Web Token.`
`5`	`5`	`*/`
`6`	`6`	`public interface DecodedJWT extends Payload, Header, Signature {`
	`7`	`+ String getToken();`
`7`	`8`	`}`