From 34dd842d17cd4db89e96731e9fcecb22074d24ac Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 28 Apr 2020 17:42:17 +0200
Subject: [PATCH] Fixing deserialization of Weather data
---
.../model/septoriahumiditymodel/SeptoriaHumidityModel.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java b/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java
index 507a97e..c13bba7 100644
--- a/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java
+++ b/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java
@@ -19,7 +19,6 @@
package no.nibio.vips.model.septoriahumiditymodel;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.text.ParseException;
@@ -311,9 +310,7 @@ public class SeptoriaHumidityModel extends I18nImpl implements Model {
// Object deserialization tool
ObjectMapper mapper = new ObjectMapper();
-
-
-
+
// TODO: Have defaults for these?
try
{
@@ -399,7 +396,7 @@ public class SeptoriaHumidityModel extends I18nImpl implements Model {
this.lastSprayingProtectionEnd = DateTimeInterval.getLastEndDate(Arrays.asList(new DateTimeInterval[]{this.protectionPeriod1,this.protectionPeriod2}));
}
- List<WeatherObservation> observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){});
+ List<WeatherObservation> observations = this.modelUtil.extractWeatherObservationList(config.getConfigParameter("observations"));
for(WeatherObservation o:observations)
{
switch(o.getElementMeasurementTypeId())
--
GitLab