From 3635745e900e929de2cb7eb7610c80936e020ffd Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Wed, 20 Feb 2019 00:49:17 +0100
Subject: [PATCH] Update woken-messages to 3.0.1
---
pom.xml | 4 ++--
src/main/java/eu/hbp/mip/StartupTasks.java | 2 +-
src/main/java/eu/hbp/mip/controllers/DatasetsApi.java | 2 +-
src/main/java/eu/hbp/mip/controllers/MiningApi.java | 5 +----
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index da8cae4dc..36768550b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,9 @@
<spring-data-jpa.version>1.10.11.RELEASE</spring-data-jpa.version>
<spring-boot-starter-actuator.version>1.4.7.RELEASE</spring-boot-starter-actuator.version>
<aspectjweaver.version>1.8.9</aspectjweaver.version>
- <woken-messages.version>2.9.6</woken-messages.version>
+ <woken-messages.version>3.0.1</woken-messages.version>
<javax-inject.version>1</javax-inject.version>
- <akka.version>2.5.20</akka.version>
+ <akka.version>2.5.21</akka.version>
<spring-context.version>4.3.4.RELEASE</spring-context.version>
<protobuf-java.version>3.1.0</protobuf-java.version>
diff --git a/src/main/java/eu/hbp/mip/StartupTasks.java b/src/main/java/eu/hbp/mip/StartupTasks.java
index fa58eaf92..acbf8f0c9 100644
--- a/src/main/java/eu/hbp/mip/StartupTasks.java
+++ b/src/main/java/eu/hbp/mip/StartupTasks.java
@@ -47,7 +47,7 @@ public class StartupTasks implements ApplicationListener<ApplicationReadyEvent>
for (int i = 0; i < 5; i++) {
try {
for (Dataset dataset : datasetsApi.fetchDatasets()) {
- final String code = dataset.dataset().code();
+ final String code = dataset.id().code();
Variable v = variableRepository.findOne(code);
if (v == null) {
LOGGER.info("Store additional variable {}", code);
diff --git a/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java b/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
index 99d5b8497..7798b0ab9 100644
--- a/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
@@ -49,7 +49,7 @@ public class DatasetsApi extends WokenClientController {
for (Dataset d: fetchDatasets()) {
DatasetDescription dataset = new DatasetDescription();
LOGGER.info("Dataset {}", d);
- dataset.setCode(d.dataset().code());
+ dataset.setCode(d.id().code());
dataset.setLabel(d.label());
dataset.setDescription(d.description());
dataset.setAnonymisationLevel(d.anonymisationLevel().toString());
diff --git a/src/main/java/eu/hbp/mip/controllers/MiningApi.java b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
index 21720df30..bf89261eb 100644
--- a/src/main/java/eu/hbp/mip/controllers/MiningApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
@@ -2,11 +2,9 @@ package eu.hbp.mip.controllers;
import com.google.gson.Gson;
import eu.hbp.mip.akka.WokenClientController;
-import eu.hbp.mip.configuration.SecurityConfiguration;
import eu.hbp.mip.model.Mining;
import eu.hbp.mip.model.User;
import eu.hbp.mip.model.UserInfo;
-import eu.hbp.mip.utils.HTTPUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
@@ -22,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import scala.Option;
-import java.io.IOException;
import java.sql.Date;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@@ -61,7 +58,7 @@ public class MiningApi extends WokenClientController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("{\"error\":\"" + result.error().get() + "\"}");
} else {
Mining mining = new Mining(
- unwrap(result.jobId()),
+ result.jobId(),
result.node(),
unwrap(result.algorithm()),
result.type().mime(),
--
GitLab