From 3443a360cfaa59dd5f278f50ad2a280869944cfd Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 20 Mar 2019 13:18:21 +0100
Subject: [PATCH] Adapting to Wildfly 16 by actively excluding JSONB, to keep
RestEasy using Jackson
---
src/main/java/no/nibio/vips/core/VIPSCoreApplication.java | 1 -
.../java/no/nibio/vips/core/service/ModelResourceImpl.java | 5 -----
src/main/webapp/WEB-INF/jboss-deployment-structure.xml | 3 +++
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
index 2b2a649..8e46dda 100755
--- a/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
+++ b/src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
@@ -56,6 +56,5 @@ 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/service/ModelResourceImpl.java b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
index 5fb1fec..cab6b58 100755
--- a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
@@ -281,11 +281,6 @@ public class ModelResourceImpl implements ModelResource{
@Override
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
{
Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 9e6b595..1a1e057 100755
--- a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -26,5 +26,8 @@ along with VIPSCore. If not, see <http://www.nibio.no/licenses/>.
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
</dependencies>
+ <exclusions>
+ <module name="org.jboss.resteasy.resteasy-json-binding-provider"/>
+ </exclusions>
</deployment>
</jboss-deployment-structure>
--
GitLab