Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Jackson dependency to require the latest for the JsonLineMapper

Browse Source
This commit is contained in:
Michael Minella
2017-01-16 13:56:30 -06:00
parent e2a3fd9862
commit c824ccf7aa
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@@ -76,8 +76,7 @@ allprojects {
hibernateValidatorVersion = '5.3.0.CR1'
hsqldbVersion = '2.3.3'
ibatisVersion = '2.3.4.726'
jacksonVersion = '1.9.13'
jackson2Version = "2.4.6" //?
jackson2Version = "2.8.6" //?
javaMailVersion = '1.5.6'
javaxBatchApiVersion = '1.0'
javaxInjectVersion = '1'
@@ -335,7 +334,7 @@ project('spring-batch-infrastructure') {
optional "javax.jms:javax.jms-api:$jmsVersion"
optional "org.slf4j:slf4j-log4j12:$slf4jVersion"
optional "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
optional "com.fasterxml.jackson.core:jackson-databind:${jackson2Version}"
compile("org.hibernate:hibernate-core:$hibernateVersion") { dep ->
optional dep
exclude group: 'org.jboss.spec.javax.transaction', module: 'jboss-transaction-api_1.1_spec'

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/JsonLineMapper.java
View File

@@ -17,8 +17,9 @@ package org.springframework.batch.item.file.mapping;
import java.util.Map;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.map.MappingJsonFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.MappingJsonFactory;
import org.springframework.batch.item.file.LineMapper;
/**
@@ -51,7 +52,7 @@ public class JsonLineMapper implements LineMapper<Map<String, Object>> {
@Override
public Map<String, Object> mapLine(String line, int lineNumber) throws Exception {
Map<String, Object> result;
JsonParser parser = factory.createJsonParser(line);
JsonParser parser = factory.createParser(line);
@SuppressWarnings("unchecked")
Map<String, Object> token = parser.readValueAs(Map.class);
result = token;

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/JsonLineMapperTests.java
View File

@@ -15,13 +15,13 @@
*/
package org.springframework.batch.item.file.mapping;
import static org.junit.Assert.assertEquals;
import java.util.Map;
import org.codehaus.jackson.JsonParseException;
import com.fasterxml.jackson.core.JsonParseException;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class JsonLineMapperTests {
private JsonLineMapper mapper = new JsonLineMapper();