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

A bit of tidying up

parent 45ef21bb
No related branches found
No related tags found
1 merge request!6Ipm decisions
...@@ -47,7 +47,6 @@ public class JacksonConfig implements ContextResolver<ObjectMapper>{ ...@@ -47,7 +47,6 @@ public class JacksonConfig implements ContextResolver<ObjectMapper>{
{ {
objectMapper = new ObjectMapper(); objectMapper = new ObjectMapper();
objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
objectMapper.registerModule(new JtsModule());
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
objectMapper.registerModule(new JtsModule()); objectMapper.registerModule(new JtsModule());
objectMapper.registerModule(new JavaTimeModule()); objectMapper.registerModule(new JavaTimeModule());
......
...@@ -316,13 +316,12 @@ public class ModelResourceImpl implements ModelResource{ ...@@ -316,13 +316,12 @@ public class ModelResourceImpl implements ModelResource{
{ {
try try
{ {
DataTransformer dt = new DataTransformer(); DataTransformer dt = new DataTransformer();
config.setConfigParameter("observations", dt.getVIPSWeatherData(config.getWeatherData())); config.setConfigParameter("observations", dt.getVIPSWeatherData(config.getWeatherData()));
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();
return Response.ok().entity(dt.getIPMDecisionsModelOutput(results)).build(); return Response.ok().entity(dt.getIPMDecisionsModelOutput(results)).build();
} }
catch(Exception ex) catch(Exception ex)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment