diff --git a/pom.xml b/pom.xml index f3898c720d98edb3cb4ae46f82a701a9e0a6bc09..6bd53e3efb4a6beaca5b1d1ca49d8131b7ad64d5 100644 --- a/pom.xml +++ b/pom.xml @@ -19,11 +19,9 @@ <scope>test</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> <properties> diff --git a/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java b/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java index dadb99ecf13d9bfe2503144e2d75f4b369831d56..48802e014495e08a396a5028d1fa2115e73415b3 100644 --- a/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java +++ b/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java @@ -20,6 +20,8 @@ package no.bioforsk.vips.model.oatfloweringmodel; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -37,8 +39,7 @@ import no.bioforsk.vips.model.ModelExcecutionException; import no.bioforsk.vips.model.ModelId; import no.bioforsk.vips.util.WeatherElements; import no.bioforsk.vips.util.WeatherUtil; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; + /** * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a> diff --git a/src/test/java/OatFloweringModelTest.java b/src/test/java/OatFloweringModelTest.java index d41395947a012adc9c7104cdcb28a3d2c0ad593f..67d50620e49ac7e7c45253e1bc7bd09ae43044d5 100644 --- a/src/test/java/OatFloweringModelTest.java +++ b/src/test/java/OatFloweringModelTest.java @@ -17,6 +17,12 @@ * */ +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; @@ -29,12 +35,6 @@ import no.bioforsk.vips.entity.WeatherObservation; import no.bioforsk.vips.model.ConfigValidationException; import no.bioforsk.vips.model.ModelExcecutionException; import no.bioforsk.vips.model.oatfloweringmodel.OatFloweringModel; -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; import org.junit.After; import org.junit.AfterClass; import static org.junit.Assert.*; @@ -120,7 +120,7 @@ public class OatFloweringModelTest { config.setModelId("OATFLOWERM"); BufferedInputStream inputStream = new BufferedInputStream(this.getClass().getResourceAsStream(fileName)); 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(); @@ -131,7 +131,7 @@ public class OatFloweringModelTest { { for(JsonNode node : all){ System.out.println(node.toString()); - 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; @@ -140,9 +140,9 @@ public class OatFloweringModelTest { System.out.println(node.get("elementMeasurementTypeId")); WeatherObservation observation = new WeatherObservation(); observation.setTimeMeasured(timeMeasured); - observation.setLogIntervalId(Integer.valueOf(node.get("logIntervalId").getTextValue())); - observation.setElementMeasurementTypeId(node.get("elementMeasurementTypeId").getTextValue()); - observation.setValue(Double.valueOf(node.get("value").getTextValue())); + observation.setLogIntervalId(Integer.valueOf(node.get("logIntervalId").asText())); + observation.setElementMeasurementTypeId(node.get("elementMeasurementTypeId").asText()); + observation.setValue(Double.valueOf(node.get("value").asText())); observations.add(observation); System.out.println("logIntevalId=" + observation.getLogIntervalId()); }