Skip to content
Snippets Groups Projects
Commit 222f4e42 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Upgraded to Jackson 2.4

parent a94f3547
No related branches found
No related tags found
No related merge requests found
...@@ -40,18 +40,15 @@ ...@@ -40,18 +40,15 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core</artifactId>
<version>1.9.12</version> <version>2.4.1</version>
<type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-databind</artifactId>
<version>1.9.12</version> <version>2.4.1</version>
<type>jar</type>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -42,8 +42,8 @@ import no.bioforsk.vips.util.InvalidAggregationTypeException; ...@@ -42,8 +42,8 @@ import no.bioforsk.vips.util.InvalidAggregationTypeException;
import no.bioforsk.vips.util.WeatherElements; import no.bioforsk.vips.util.WeatherElements;
import no.bioforsk.vips.util.WeatherObservationListException; import no.bioforsk.vips.util.WeatherObservationListException;
import no.bioforsk.vips.util.WeatherUtil; import no.bioforsk.vips.util.WeatherUtil;
import org.codehaus.jackson.map.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.codehaus.jackson.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
/** /**
* This model is based on the old one in VIPS * This model is based on the old one in VIPS
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
package no.bioforsk.vips.model.applescabmodel; package no.bioforsk.vips.model.applescabmodel;
import com.fasterxml.jackson.core.JsonFactory;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
...@@ -41,12 +42,11 @@ import no.bioforsk.vips.model.ConfigValidationException; ...@@ -41,12 +42,11 @@ import no.bioforsk.vips.model.ConfigValidationException;
import no.bioforsk.vips.model.ModelExcecutionException; import no.bioforsk.vips.model.ModelExcecutionException;
import no.bioforsk.vips.util.CommonNamespaces; import no.bioforsk.vips.util.CommonNamespaces;
import no.bioforsk.vips.util.WeatherObservationListException; import no.bioforsk.vips.util.WeatherObservationListException;
import org.codehaus.jackson.JsonFactory; import com.fasterxml.jackson.core.JsonParser;
import org.codehaus.jackson.JsonNode; import com.fasterxml.jackson.databind.MappingJsonFactory;
import org.codehaus.jackson.JsonParser; import com.fasterxml.jackson.databind.ObjectMapper;
import org.codehaus.jackson.map.MappingJsonFactory; import com.fasterxml.jackson.core.type.TypeReference;
import org.codehaus.jackson.map.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode;
import org.codehaus.jackson.type.TypeReference;
/** /**
* *
...@@ -281,7 +281,7 @@ public class AppleScabModelTest extends TestCase { ...@@ -281,7 +281,7 @@ public class AppleScabModelTest extends TestCase {
if(all.isArray()) if(all.isArray())
{ {
for(JsonNode node : all){ 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) if(firstDate == null || firstDate.compareTo(timeMeasured) > 0)
{ {
firstDate = timeMeasured; firstDate = timeMeasured;
...@@ -293,9 +293,9 @@ public class AppleScabModelTest extends TestCase { ...@@ -293,9 +293,9 @@ public class AppleScabModelTest extends TestCase {
//System.out.println(node.toString()); //System.out.println(node.toString());
WeatherObservation observation = new WeatherObservation(); WeatherObservation observation = new WeatherObservation();
observation.setTimeMeasured(timeMeasured); observation.setTimeMeasured(timeMeasured);
observation.setLogIntervalId(node.get("logIntervalId").getIntValue()); observation.setLogIntervalId(node.get("logIntervalId").asInt());
observation.setElementMeasurementTypeId(node.get("elementMeasurementTypeId").getTextValue()); observation.setElementMeasurementTypeId(node.get("elementMeasurementTypeId").asText());
observation.setValue(node.get("value").getDoubleValue()); observation.setValue(node.get("value").asDouble());
observations.add(observation); observations.add(observation);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment