From d9242013ec9b581650d11e0c67be243359e1388c Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 26 Nov 2020 15:00:19 +0100
Subject: [PATCH] A bit of tidying up
---
.../no/nibio/vips/core/config/JacksonConfig.java | 1 -
.../nibio/vips/core/service/ModelResourceImpl.java | 13 ++++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/no/nibio/vips/core/config/JacksonConfig.java b/src/main/java/no/nibio/vips/core/config/JacksonConfig.java
index db1aa09..3c0e551 100755
--- a/src/main/java/no/nibio/vips/core/config/JacksonConfig.java
+++ b/src/main/java/no/nibio/vips/core/config/JacksonConfig.java
@@ -47,7 +47,6 @@ public class JacksonConfig implements ContextResolver<ObjectMapper>{
{
objectMapper = new ObjectMapper();
objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
- objectMapper.registerModule(new JtsModule());
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
objectMapper.registerModule(new JtsModule());
objectMapper.registerModule(new JavaTimeModule());
diff --git a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
index f33c1c6..4b099ab 100755
--- a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
@@ -316,13 +316,12 @@ public class ModelResourceImpl implements ModelResource{
{
try
{
- DataTransformer dt = new DataTransformer();
- config.setConfigParameter("observations", dt.getVIPSWeatherData(config.getWeatherData()));
- Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
- calledModel.setConfiguration(config);
- List<Result> results = calledModel.getResult();
- return Response.ok().entity(dt.getIPMDecisionsModelOutput(results)).build();
-
+ DataTransformer dt = new DataTransformer();
+ config.setConfigParameter("observations", dt.getVIPSWeatherData(config.getWeatherData()));
+ Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
+ calledModel.setConfiguration(config);
+ List<Result> results = calledModel.getResult();
+ return Response.ok().entity(dt.getIPMDecisionsModelOutput(results)).build();
}
catch(Exception ex)
{
--
GitLab