From e174d2cc6a7481f7460cea1a0e8d2e1fd15e68b7 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Thu, 1 Jun 2017 11:03:10 -0700 Subject: [PATCH] Making sure the model handles no observations without throwing an error --- .../DeliaRadicumFloralisObservationModel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 feab648..f9df9e3 100755 --- a/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java +++ b/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java @@ -261,10 +261,6 @@ public class DeliaRadicumFloralisObservationModel extends I18nImpl implements Mo 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>>(){}); - if(this.pestObservations == null || this.pestObservations.isEmpty()) - { - throw new ConfigValidationException("ERROR: No observations"); - } Collections.sort(this.pestObservations); // Setting timezone this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone")); @@ -314,6 +310,10 @@ public class DeliaRadicumFloralisObservationModel extends I18nImpl implements Mo } public Observation getObservationValidForDate(Date currentDate) { + if(this.pestObservations == null || this.pestObservations.isEmpty()) + { + return null; + } Long currentTime = currentDate.getTime(); Observation currentObservation = null; for(Observation obs:this.pestObservations) -- GitLab