BATCH-2691: remove leaky abstraction of json parsing exceptions by

wrapping them in a ParseException

Author: fmbenhassine

spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/json/JsonItemReaderFunctionalTests.java

@@ -18,13 +18,15 @@
 
 import java.math.BigDecimal;
 
+import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStreamException;
+import org.springframework.batch.item.ParseException;
 import org.springframework.batch.item.json.builder.JsonItemReaderBuilder;
 import org.springframework.batch.item.json.domain.Trade;
 import org.springframework.core.io.ByteArrayResource;
@@ -102,7 +104,8 @@ public void testInvalidResourceFormat() {
 
 	@Test
 	public void testInvalidResourceContent() throws Exception {
-		this.expectedException.expect(getJsonParsingException());
+		this.expectedException.expect(ParseException.class);
+		this.expectedException.expectCause(Matchers.instanceOf(getJsonParsingException()));
 		JsonItemReader<Trade> itemReader = new JsonItemReaderBuilder<Trade>()
 				.jsonObjectReader(getJsonObjectReader())
 				.resource(new ByteArrayResource("[{]".getBytes()))

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/json/GsonJsonObjectReader.java

@@ -16,13 +16,17 @@
 
 package org.springframework.batch.item.json;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 
+import org.springframework.batch.item.ParseException;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 
@@ -74,8 +78,12 @@ public void open(Resource resource) throws Exception {
 
 	@Override
 	public T read() throws Exception {
-		if (this.jsonReader.hasNext()) {
-			return this.mapper.fromJson(this.jsonReader, this.itemType);
+		try {
+			if (this.jsonReader.hasNext()) {
+				return this.mapper.fromJson(this.jsonReader, this.itemType);
+			}
+		} catch (IOException |JsonIOException | JsonSyntaxException e) {
+			throw new ParseException("Unable to read next JSON object", e);
 		}
 		return null;
 	}

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/json/JacksonJsonObjectReader.java

@@ -16,12 +16,14 @@
 
 package org.springframework.batch.item.json;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.springframework.batch.item.ParseException;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 
@@ -72,8 +74,12 @@ public void open(Resource resource) throws Exception {
 
 	@Override
 	public T read() throws Exception {
-		if (this.jsonParser.nextToken() == JsonToken.START_OBJECT) {
-			return this.mapper.readValue(this.jsonParser, this.itemType);
+		try {
+			if (this.jsonParser.nextToken() == JsonToken.START_OBJECT) {
+				return this.mapper.readValue(this.jsonParser, this.itemType);
+			}
+		} catch (IOException e) {
+			throw new ParseException("Unable to read next JSON object", e);
 		}
 		return null;
 	}