From a165a5714ca3ea49611cea9b4cfbfd28ad73eb28 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Thu, 19 Apr 2018 12:33:13 +0200
Subject: [PATCH] Update woken-messages to 2.7.1
---
pom.xml | 4 ++--
.../java/eu/hbp/mip/controllers/MiningApi.java | 15 ++++++++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f17c9dec..99577ee1d 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.6.5</woken-messages.version>
+ <woken-messages.version>2.7.1</woken-messages.version>
<javax-inject.version>1</javax-inject.version>
- <akka.version>2.5.11</akka.version>
+ <akka.version>2.5.12</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/controllers/MiningApi.java b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
index 655d159d0..625b45279 100644
--- a/src/main/java/eu/hbp/mip/controllers/MiningApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import scala.Option;
+import scala.Some;
import java.io.IOException;
import java.sql.Date;
@@ -93,10 +95,10 @@ public class MiningApi extends WokenClientController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("{\"error\":\"" + result.error().get() + "\"}");
} else {
Mining mining = new Mining(
- result.jobId(),
+ unwrap(result.jobId()),
result.node(),
- result.algorithm(),
- result.shape(),
+ unwrap(result.algorithm()),
+ result.type().mime(),
Date.from(result.timestamp().toInstant()),
result.data().get().compactPrint()
);
@@ -106,6 +108,13 @@ public class MiningApi extends WokenClientController {
}
}
+ private static String unwrap(Option<String> option) {
+ if (option.isDefined())
+ return option.get();
+ else
+ return "";
+ }
+
private static boolean isExaremeAlgo(eu.hbp.mip.model.MiningQuery query) {
return query.getAlgorithm().getCode().length() > 0 && "WP_".equals(
query.getAlgorithm().getCode().substring(0, 3));
--
GitLab