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

As far as we got for now. MAJOR issues with JSONB replacing Jackson still unresolved!

parent 5e678944
No related branches found
No related tags found
2 merge requests!2Develop,!1Ny server 2019
This commit is part of merge request !2. Comments created here will be created in the context of that merge request.
...@@ -18,6 +18,5 @@ Any value defined here will override the pom.xml file value but is only applicab ...@@ -18,6 +18,5 @@ Any value defined here will override the pom.xml file value but is only applicab
<netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license> <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>WildFly</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server> <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>WildFly</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.7-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion> <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.7-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>
<netbeans.hint.jdkPlatform>JDK_1.8_SUN</netbeans.hint.jdkPlatform>
</properties> </properties>
</project-shared-configuration> </project-shared-configuration>
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version> <version>2.0.2</version>
<configuration> <configuration>
<source>1.8</source> <source>10</source>
<target>1.8</target> <target>10</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
package no.nibio.vips.core.config; package no.nibio.vips.core.config;
import com.bedatadriven.jackson.datatype.jts.JtsModule; import com.bedatadriven.jackson.datatype.jts.JtsModule;
import com.fasterxml.jackson.databind.DeserializationFeature;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.ContextResolver;
...@@ -43,6 +44,8 @@ public class JacksonConfig implements ContextResolver<ObjectMapper>{ ...@@ -43,6 +44,8 @@ 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.registerModule(new JtsModule());
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
objectMapper.registerModule(new JtsModule());
} }
@Override @Override
......
...@@ -24,6 +24,7 @@ import java.net.URLClassLoader; ...@@ -24,6 +24,7 @@ import java.net.URLClassLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -252,6 +253,7 @@ public class ModelResourceImpl implements ModelResource{ ...@@ -252,6 +253,7 @@ public class ModelResourceImpl implements ModelResource{
@Override @Override
public Response runModel(ModelConfiguration config) public Response runModel(ModelConfiguration config)
{ {
System.out.println("runModel 1");
try try
{ {
Model calledModel = ModelFactory.getInstance().getModelInstance(config.getModelId()); Model calledModel = ModelFactory.getInstance().getModelInstance(config.getModelId());
...@@ -279,6 +281,11 @@ public class ModelResourceImpl implements ModelResource{ ...@@ -279,6 +281,11 @@ public class ModelResourceImpl implements ModelResource{
@Override @Override
public Response runModel(@PathParam("modelId") String modelId, ModelConfiguration config) public Response runModel(@PathParam("modelId") String modelId, ModelConfiguration config)
{ {
System.out.println("runModel 2");
List observations = (List) config.getConfigParameter("observations");
Map obs = (Map) observations.get(0);
System.out.println(obs.get("timeMeasured"));
System.out.println(obs.get("validitySignature"));
try try
{ {
Model calledModel = ModelFactory.getInstance().getModelInstance(modelId); Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment