diff --git a/pom.xml b/pom.xml index b8ef659dc0c4ae426db049b437137ec337da32fd..89122a6bc8a09c8d6478544840f1d5f280f81448 100644 --- a/pom.xml +++ b/pom.xml @@ -13,19 +13,16 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.9.12</version> - <type>jar</type> - <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> - </dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.4.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.4.1</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java b/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java index c21341bdfe9863d0483689ece51c93848c8d07de..567e912d7fb692e83bf96bc5f91ea9b9215fe457 100644 --- a/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java +++ b/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java @@ -19,6 +19,8 @@ package no.bioforsk.vips.model.grassdryingmodel; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -38,8 +40,6 @@ import no.bioforsk.vips.model.ModelId; import no.bioforsk.vips.util.WeatherElements; import no.bioforsk.vips.util.WeatherObservationListException; 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/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java b/src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java index 3134b63c219caec5322fd66d207588c0bb49d8d4..5d58496f705438c9a2949b9c94f2ee00108dfe66 100644 --- a/src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java +++ b/src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java @@ -19,6 +19,12 @@ package no.bioforsk.vips.model.grassdryingmodel; +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; @@ -28,8 +34,6 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.TimeZone; -import java.util.logging.Level; -import java.util.logging.Logger; import static junit.framework.Assert.fail; import no.bioforsk.vips.entity.ModelConfiguration; import no.bioforsk.vips.entity.Result; @@ -37,12 +41,6 @@ import no.bioforsk.vips.entity.WeatherObservation; import no.bioforsk.vips.model.ConfigValidationException; import no.bioforsk.vips.model.ModelExcecutionException; import no.bioforsk.vips.util.WeatherElements; -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.*; @@ -229,7 +227,7 @@ public class GrassDryingModelTest { config.setConfigParameter("timeZone", cal.getTimeZone().getID()); 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(); @@ -239,7 +237,7 @@ public class GrassDryingModelTest { 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; @@ -251,9 +249,9 @@ public class GrassDryingModelTest { //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); }