Merge pull request #16 from dai0304/feature/fix-issue-14

Catch IAE on decode

Author: dai0304

spar-wings-spring-data-chunk/src/main/java/jp/xet/sparwings/spring/data/chunk/SimplePaginationTokenEncoder.java

@@ -100,12 +100,12 @@ <T> Optional<T> extractKey(String paginationToken, String key, Class<T> clazz) {
 		if (paginationToken == null) {
 			return Optional.empty();
 		}
-		byte[] json = decoder.decode(paginationToken);
 		try {
+			byte[] json = decoder.decode(paginationToken);
 			JsonNode keyNode = objectMapper.readTree(json).path(key);
 			T object = objectMapper.treeToValue(keyNode, clazz);
 			return Optional.ofNullable(object);
-		} catch (IOException e) {
+		} catch (IOException | IllegalArgumentException e) {
 			log.warn("Invalid pagination token: {}", paginationToken);
 		}
 		return Optional.empty();

spar-wings-spring-data-chunk/src/test/java/jp/xet/sparwings/spring/data/chunk/SimplePaginationTokenEncoderTest.java

@@ -18,6 +18,8 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+import java.util.Optional;
+
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -60,6 +62,18 @@ public void testInteger() {
 		assertThat(last, is("234"));
 	}
 
+	@Test
+	public void testDecodeFirstInvalid() {
+		Optional<String> actual = sut.extractFirstKey("1");
+		assertThat(actual.isPresent(), is(false));
+	}
+	
+	@Test
+	public void testDecodeLastInvalid() {
+		Optional<String> actual = sut.extractLastKey("1");
+		assertThat(actual.isPresent(), is(false));
+	}
+	
 	@Test
 	public void testCompositeKey() {
 		// setup