From e22bc53601b0eb8ca1dba2c044d8f4beb0f5fdcd Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 12 Jan 2023 11:20:18 +0100
Subject: [PATCH] fix: Jackson deserialization to interface (depends on fix in
VIPSCommon)
---
.gitignore | 1 +
.../DeliaRadicumFloralisObservationModel.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 23176e3..7f86821 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
target/
classes/
+.idea/
diff --git a/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java b/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java
index e6c4293..5e83339 100755
--- a/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java
@@ -63,7 +63,7 @@ public class DeliaRadicumFloralisObservationModel extends I18nImpl implements Mo
private ObjectMapper objectMapper;
- private List<ObservationImpl> pestObservations;
+ private List<Observation> pestObservations;
private TimeZone timeZone;
private Date startDateGrowth;
private Date endDateCalculation;
@@ -260,7 +260,7 @@ public class DeliaRadicumFloralisObservationModel extends I18nImpl implements Mo
@Override
public void setConfiguration(ModelConfiguration config) throws ConfigValidationException {
this.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
- this.pestObservations = this.getObjectMapper().convertValue(config.getConfigParameter("pestObservations"), new TypeReference<List<ObservationImpl>>(){});
+ this.pestObservations = this.getObjectMapper().convertValue(config.getConfigParameter("pestObservations"), new TypeReference<List<Observation>>(){});
Collections.sort(this.pestObservations);
// Setting timezone
this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone"));
--
GitLab