Skip to content
Snippets Groups Projects
Commit 79e2837f authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Adding data type check of fieldObservations

parent d77e37b2
No related branches found
No related tags found
No related merge requests found
...@@ -320,7 +320,8 @@ public class ModelResourceImpl implements ModelResource{ ...@@ -320,7 +320,8 @@ public class ModelResourceImpl implements ModelResource{
{ {
config.setConfigParameter("observations", dt.getVIPSWeatherData(config.getWeatherData())); config.setConfigParameter("observations", dt.getVIPSWeatherData(config.getWeatherData()));
} }
if(config.getConfigParameter("fieldObservations") != null)
if(config.getConfigParameter("fieldObservations") != null && List.class.isAssignableFrom(config.getConfigParameter("fieldObservations").getClass()))
{ {
config.setConfigParameter("pestObservations", dt.getVIPSPestObservations( config.setConfigParameter("pestObservations", dt.getVIPSPestObservations(
(List) config.getConfigParameter("fieldObservations"), (List) config.getConfigParameter("fieldObservations"),
...@@ -328,6 +329,10 @@ public class ModelResourceImpl implements ModelResource{ ...@@ -328,6 +329,10 @@ public class ModelResourceImpl implements ModelResource{
) )
); );
} }
else if(!List.class.isAssignableFrom(config.getConfigParameter("fieldObservations").getClass()))
{
throw new ConfigValidationException("ERROR: fieldObservations must be of type array");
}
Model calledModel = ModelFactory.getInstance().getModelInstance(modelId); Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
calledModel.setConfiguration(config); calledModel.setConfiguration(config);
List<Result> results = calledModel.getResult(); List<Result> results = calledModel.getResult();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment