fix claim.isNull() method

lbalmaceda · lbalmaceda · commit 9a496ad7fb96 · 2017-04-07T16:56:19.000-03:00
diff --git a/lib/src/main/java/com/auth0/jwt/impl/JsonNodeClaim.java b/lib/src/main/java/com/auth0/jwt/impl/JsonNodeClaim.java
@@ -102,7 +102,7 @@ public <T> T as(Class<T> tClazz) throws JWTDecodeException {
 
     @Override
     public boolean isNull() {
-        return !(data.isArray() || data.canConvertToLong() || data.isTextual() || data.isNumber() || data.isBoolean());
+        return !(data.isObject() || data.isArray() || data.canConvertToLong() || data.isTextual() || data.isNumber() || data.isBoolean());
     }
 
     /**
diff --git a/lib/src/test/java/com/auth0/jwt/JWTDecoderTest.java b/lib/src/test/java/com/auth0/jwt/JWTDecoderTest.java
@@ -192,11 +192,11 @@ public void shouldGetValidClaim() throws Exception {
     }
 
     @Test
-    public void shouldGetNullClaimIfClaimValueIsNull() throws Exception {
+    public void shouldNotGetNullClaimIfClaimIsEmptyObject() throws Exception {
         DecodedJWT jwt = JWTDecoder.decode("eyJhbGciOiJIUzI1NiJ9.eyJvYmplY3QiOnt9fQ.d3nUeeL_69QsrHL0ZWij612LHEQxD8EZg1rNoY3a4aI");
         assertThat(jwt, is(notNullValue()));
         assertThat(jwt.getClaim("object"), is(notNullValue()));
-        assertThat(jwt.getClaim("object").isNull(), is(true));
+        assertThat(jwt.getClaim("object").isNull(), is(false));
     }
 
     @Test
diff --git a/lib/src/test/java/com/auth0/jwt/impl/JsonNodeClaimTest.java b/lib/src/test/java/com/auth0/jwt/impl/JsonNodeClaimTest.java
@@ -12,10 +12,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Map;
+import java.util.*;
 
 import static com.auth0.jwt.impl.JWTParser.getDefaultObjectMapper;
 import static com.auth0.jwt.impl.JsonNodeClaim.claimFromNode;
@@ -268,12 +265,82 @@ public void shouldReturnBaseClaimWhenParsingNullValue() throws Exception {
     }
 
     @Test
-    public void shouldReturnValidButNullClaimIfTreeIsEmpty() throws Exception {
+    public void shouldReturnNonNullClaimWhenParsingObject() throws Exception {
         JsonNode value = mapper.valueToTree(new Object());
         Claim claim = claimFromNode(value);
 
         assertThat(claim, is(notNullValue()));
         assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
-        assertThat(claim.isNull(), is(true));
+        assertThat(claim.isNull(), is(false));
+    }
+
+    @Test
+    public void shouldReturnNonNullClaimWhenParsingArray() throws Exception {
+        JsonNode value = mapper.valueToTree(new String[]{});
+        Claim claim = claimFromNode(value);
+
+        assertThat(claim, is(notNullValue()));
+        assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
+        assertThat(claim.isNull(), is(false));
+    }
+
+    @Test
+    public void shouldReturnNonNullClaimWhenParsingList() throws Exception {
+        JsonNode value = mapper.valueToTree(new ArrayList<String>());
+        Claim claim = claimFromNode(value);
+
+        assertThat(claim, is(notNullValue()));
+        assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
+        assertThat(claim.isNull(), is(false));
+    }
+
+    @Test
+    public void shouldReturnNonNullClaimWhenParsingStringValue() throws Exception {
+        JsonNode value = mapper.valueToTree("");
+        Claim claim = claimFromNode(value);
+
+        assertThat(claim, is(notNullValue()));
+        assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
+        assertThat(claim.isNull(), is(false));
+    }
+
+    @Test
+    public void shouldReturnNonNullClaimWhenParsingIntValue() throws Exception {
+        JsonNode value = mapper.valueToTree(Integer.MAX_VALUE);
+        Claim claim = claimFromNode(value);
+
+        assertThat(claim, is(notNullValue()));
+        assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
+        assertThat(claim.isNull(), is(false));
+    }
+
+    @Test
+    public void shouldReturnNonNullClaimWhenParsingDoubleValue() throws Exception {
+        JsonNode value = mapper.valueToTree(Double.MAX_VALUE);
+        Claim claim = claimFromNode(value);
+
+        assertThat(claim, is(notNullValue()));
+        assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
+        assertThat(claim.isNull(), is(false));
+    }
+
+    @Test
+    public void shouldReturnNonNullClaimWhenParsingDateValue() throws Exception {
+        JsonNode value = mapper.valueToTree(new Date());
+        Claim claim = claimFromNode(value);
+
+        assertThat(claim, is(notNullValue()));
+        assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
+        assertThat(claim.isNull(), is(false));
+    }
+
+    @Test
+    public void shouldReturnNonNullClaimWhenParsingBooleanValue() throws Exception {
+        JsonNode value = mapper.valueToTree(Boolean.TRUE);
+        Claim claim = claimFromNode(value);
+
+        assertThat(claim, is(notNullValue()));
+        assertThat(claim, is(instanceOf(JsonNodeClaim.class)));
+        assertThat(claim.isNull(), is(false));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public <T> T as(Class<T> tClazz) throws JWTDecodeException {`
`102`	`102`
`103`	`103`	`@Override`
`104`	`104`	`public boolean isNull() {`
`105`		`- return !(data.isArray() \|\| data.canConvertToLong() \|\| data.isTextual() \|\| data.isNumber() \|\| data.isBoolean());`
	`105`	`+ return !(data.isObject() \|\| data.isArray() \|\| data.canConvertToLong() \|\| data.isTextual() \|\| data.isNumber() \|\| data.isBoolean());`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -192,11 +192,11 @@ public void shouldGetValidClaim() throws Exception {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`@Test`
`195`		`- public void shouldGetNullClaimIfClaimValueIsNull() throws Exception {`
	`195`	`+ public void shouldNotGetNullClaimIfClaimIsEmptyObject() throws Exception {`
`196`	`196`	`DecodedJWT jwt = JWTDecoder.decode("eyJhbGciOiJIUzI1NiJ9.eyJvYmplY3QiOnt9fQ.d3nUeeL_69QsrHL0ZWij612LHEQxD8EZg1rNoY3a4aI");`
`197`	`197`	`assertThat(jwt, is(notNullValue()));`
`198`	`198`	`assertThat(jwt.getClaim("object"), is(notNullValue()));`
`199`		`- assertThat(jwt.getClaim("object").isNull(), is(true));`
	`199`	`+ assertThat(jwt.getClaim("object").isNull(), is(false));`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`@Test`