From 9ecc9f28beec7d30a5c8a59e220feba31258c561 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Thu, 29 Jan 2015 15:06:55 +0100
Subject: [PATCH] Upgraded to Jackson 2.4
---
pom.xml | 15 +++++-------
.../model/naerstadmodel/NaerstadModel.java | 4 ++--
.../naerstadmodel/NaerstadModelTest.java | 23 ++++++++++---------
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index f314a05..dfeb7d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,18 +40,15 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.12</version>
- <type>jar</type>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.4.1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.12</version>
- <type>jar</type>
- <scope>provided</scope>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.4.1</version>
</dependency>
</dependencies>
</project>
diff --git a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java b/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java
index e284332..0119311 100644
--- a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java
+++ b/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java
@@ -18,6 +18,8 @@
*/
package no.bioforsk.vips.model.naerstadmodel;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -38,8 +40,6 @@ import no.bioforsk.vips.model.ModelId;
import no.bioforsk.vips.util.CommonNamespaces;
import no.bioforsk.vips.util.WeatherElements;
import no.bioforsk.vips.util.WeatherUtil;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
/**
* Implementation of the Nærstad model for Potato Blight<br/>
diff --git a/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java b/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java
index 965dd50..7aceec7 100644
--- a/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java
+++ b/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java
@@ -19,6 +19,12 @@
package no.bioforsk.vips.model.naerstadmodel;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -34,12 +40,7 @@ import no.bioforsk.vips.entity.WeatherObservation;
import no.bioforsk.vips.model.ConfigValidationException;
import no.bioforsk.vips.model.ModelExcecutionException;
import no.bioforsk.vips.util.JSONUtil;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.MappingJsonFactory;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+
/**
*
@@ -184,7 +185,7 @@ public class NaerstadModelTest extends TestCase {
config.setModelId("NAERSTADMO");
BufferedInputStream inputStream = new BufferedInputStream(this.getClass().getResourceAsStream("/JSONWeatherData.json"));
JsonFactory f = new MappingJsonFactory();
- JsonParser jp = f.createJsonParser(inputStream);
+ JsonParser jp = f.createParser(inputStream);
JsonNode all = jp.readValueAsTree();
List<WeatherObservation> observations = new ArrayList<>();
ObjectMapper mapper = new ObjectMapper();
@@ -194,7 +195,7 @@ public class NaerstadModelTest extends TestCase {
if(all.isArray())
{
for(JsonNode node : all){
- Date timeMeasured = (Date)mapper.convertValue(node.get("timeMeasured").getTextValue(), new TypeReference<Date>(){});
+ Date timeMeasured = (Date)mapper.convertValue(node.get("timeMeasured").asText(), new TypeReference<Date>(){});
if(firstDate == null || firstDate.compareTo(timeMeasured) > 0)
{
firstDate = timeMeasured;
@@ -206,9 +207,9 @@ public class NaerstadModelTest extends TestCase {
//System.out.println(node.toString());
WeatherObservation observation = new WeatherObservation();
observation.setTimeMeasured(timeMeasured);
- observation.setLogIntervalId(node.get("logIntervalId").getIntValue());
- observation.setElementMeasurementTypeId(node.get("elementMeasurementTypeId").getTextValue());
- observation.setValue(node.get("value").getDoubleValue());
+ observation.setLogIntervalId(node.get("logIntervalId").asInt());
+ observation.setElementMeasurementTypeId(node.get("elementMeasurementTypeId").asText());
+ observation.setValue(node.get("value").asDouble());
observations.add(observation);
}
--
GitLab