Skip to content
Snippets Groups Projects
Commit 3635745e authored by Ludovic Claude's avatar Ludovic Claude
Browse files

Update woken-messages to 3.0.1

parent 73e6075d
No related branches found
No related tags found
1 merge request!4[pull] master from LREN-CHUV:master
......@@ -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>
......
......@@ -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);
......
......@@ -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());
......
......@@ -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(),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment