From 2d5dcdae6dca3b5c813e41fec20a3c722b676549 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 13 Mar 2018 11:21:49 +0100
Subject: [PATCH] Final adaptations to GIS aware result object
---
src/main/java/no/nibio/vips/core/VIPSCoreApplication.java | 3 ++-
src/main/java/no/nibio/vips/core/config/JacksonConfig.java | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
index 0597d0c..2b2a649 100755
--- a/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
+++ b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
@@ -25,7 +25,7 @@ import javax.ws.rs.core.Application;
/**
* Responsible for adding REST resources
- * @copyright 2013-2014 {@link http://www.nibio.no NIBIO}
+ * @copyright 2013-2018 {@link http://www.nibio.no NIBIO}
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
@ApplicationPath("/")
@@ -56,5 +56,6 @@ public class VIPSCoreApplication extends Application
*/
private void addRestResourceClasses(Set<Class<?>> resources) {
resources.add(no.nibio.vips.core.config.JacksonConfig.class);
+ resources.add(no.nibio.vips.core.service.ModelResourceImpl.class);
}
}
\ No newline at end of file
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 493834c..ed2c61c 100755
--- a/src/main/java/no/nibio/vips/core/config/JacksonConfig.java
+++ b/src/main/java/no/nibio/vips/core/config/JacksonConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
+ * Copyright (c) 2018 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCore.
* VIPSCore is free software: you can redistribute it and/or modify
@@ -19,6 +19,7 @@
package no.nibio.vips.core.config;
+import com.bedatadriven.jackson.datatype.jts.JtsModule;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.ContextResolver;
@@ -29,7 +30,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
/**
* This config ensures that Jackson serializes dates as [ISO-8601 ]-compliant notation,
* and not a timestamp
- * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2018 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
@Provider
@@ -41,6 +42,7 @@ public class JacksonConfig implements ContextResolver<ObjectMapper>{
{
objectMapper = new ObjectMapper();
objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+ objectMapper.registerModule(new JtsModule());
}
@Override
--
GitLab