From c2b1975bb76c3a4b4803e553be17e5a83b637e8b Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 20 Mar 2019 13:17:55 +0100
Subject: [PATCH] Adapting to Wildfly 16 by actively excluding JSONB, to keep
RestEasy using Jackson
---
pom.xml | 4 +--
.../controller/session/ForecastBean.java | 27 ++++++++++---------
.../WEB-INF/jboss-deployment-structure.xml | 3 +++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3d90876a..f5d987b2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-spatial</artifactId>
- <version>5.3.8.Final</version>
+ <version>5.3.9.Final</version>
<exclusions>
<exclusion>
<artifactId>postgresql</artifactId>
@@ -168,7 +168,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>5.3.8.Final</version>
+ <version>5.3.9.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
index a9713273..7af5806b 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
@@ -50,6 +50,7 @@ import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
+import javax.ws.rs.ProcessingException;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
@@ -597,19 +598,19 @@ public class ForecastBean {
{
ex.printStackTrace();
}*/
- Response resp = this.getManagerResource().runModel(config.getModelId(), request);
- if(resp.getStatus() == Response.Status.OK.getStatusCode())
- {
- //System.out.println(resp.readEntity(String.class));
- List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>(){});
- //System.out.println("ForecastConfigId=" + forecastConfiguration.getForecastConfigurationId() + ", resultsize=" + results.size());
- // We delete all former results before we store the new ones
- SessionControllerGetter.getForecastBean().storeResults(forecastConfiguration,results);
- }
- else
- {
- throw new RunModelException(resp.readEntity(String.class));
- }
+ Response resp = this.getManagerResource().runModel(config.getModelId(), request);
+ if(resp.getStatus() == Response.Status.OK.getStatusCode())
+ {
+ //System.out.println(resp.readEntity(String.class));
+ List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>(){});
+ //System.out.println("ForecastConfigId=" + forecastConfiguration.getForecastConfigurationId() + ", resultsize=" + results.size());
+ // We delete all former results before we store the new ones
+ SessionControllerGetter.getForecastBean().storeResults(forecastConfiguration,results);
+ }
+ else
+ {
+ throw new RunModelException(resp.readEntity(String.class));
+ }
//System.out.println("Finished runModel for wsId" + forecastConfiguration.getWeatherStationPointOfInterestId());
}
diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 2414fddc..9c3a1bfd 100755
--- a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -6,5 +6,8 @@
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="org.apache.httpcomponents" />
</dependencies>
+ <exclusions>
+ <module name="org.jboss.resteasy.resteasy-json-binding-provider"/>
+ </exclusions>
</deployment>
</jboss-deployment-structure>
\ No newline at end of file
--
GitLab