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

Adapting to Wildfly 16 by actively excluding JSONB, to keep RestEasy using Jackson

parent 8e44b0f5
Branches
Tags
2 merge requests!17Develop,!12Ny server 2019
This commit is part of merge request !12. Comments created here will be created in the context of that merge request.
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-spatial</artifactId> <artifactId>hibernate-spatial</artifactId>
<version>5.3.8.Final</version> <version>5.3.9.Final</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<version>5.3.8.Final</version> <version>5.3.9.Final</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -50,6 +50,7 @@ import javax.persistence.EntityManager; ...@@ -50,6 +50,7 @@ import javax.persistence.EntityManager;
import javax.persistence.NoResultException; import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import javax.persistence.Query; import javax.persistence.Query;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.client.Client; import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget; import javax.ws.rs.client.WebTarget;
...@@ -597,19 +598,19 @@ public class ForecastBean { ...@@ -597,19 +598,19 @@ public class ForecastBean {
{ {
ex.printStackTrace(); ex.printStackTrace();
}*/ }*/
Response resp = this.getManagerResource().runModel(config.getModelId(), request); Response resp = this.getManagerResource().runModel(config.getModelId(), request);
if(resp.getStatus() == Response.Status.OK.getStatusCode()) if(resp.getStatus() == Response.Status.OK.getStatusCode())
{ {
//System.out.println(resp.readEntity(String.class)); //System.out.println(resp.readEntity(String.class));
List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>(){}); List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>(){});
//System.out.println("ForecastConfigId=" + forecastConfiguration.getForecastConfigurationId() + ", resultsize=" + results.size()); //System.out.println("ForecastConfigId=" + forecastConfiguration.getForecastConfigurationId() + ", resultsize=" + results.size());
// We delete all former results before we store the new ones // We delete all former results before we store the new ones
SessionControllerGetter.getForecastBean().storeResults(forecastConfiguration,results); SessionControllerGetter.getForecastBean().storeResults(forecastConfiguration,results);
} }
else else
{ {
throw new RunModelException(resp.readEntity(String.class)); throw new RunModelException(resp.readEntity(String.class));
} }
//System.out.println("Finished runModel for wsId" + forecastConfiguration.getWeatherStationPointOfInterestId()); //System.out.println("Finished runModel for wsId" + forecastConfiguration.getWeatherStationPointOfInterestId());
} }
......
...@@ -6,5 +6,8 @@ ...@@ -6,5 +6,8 @@
<module name="com.fasterxml.jackson.core.jackson-core" /> <module name="com.fasterxml.jackson.core.jackson-core" />
<module name="org.apache.httpcomponents" /> <module name="org.apache.httpcomponents" />
</dependencies> </dependencies>
<exclusions>
<module name="org.jboss.resteasy.resteasy-json-binding-provider"/>
</exclusions>
</deployment> </deployment>
</jboss-deployment-structure> </jboss-deployment-structure>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment