Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
portal-backend
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HBP Medical Informatics Platform
portal-backend
Commits
a165a571
Commit
a165a571
authored
6 years ago
by
Ludovic Claude
Browse files
Options
Downloads
Patches
Plain Diff
Update woken-messages to 2.7.1
parent
193de420
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pom.xml
+2
-2
2 additions, 2 deletions
pom.xml
src/main/java/eu/hbp/mip/controllers/MiningApi.java
+12
-3
12 additions, 3 deletions
src/main/java/eu/hbp/mip/controllers/MiningApi.java
with
14 additions
and
5 deletions
pom.xml
+
2
−
2
View file @
a165a571
...
...
@@ -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.1
1
</akka.version>
<akka.version>
2.5.1
2
</akka.version>
<spring-context.version>
4.3.4.RELEASE
</spring-context.version>
<protobuf-java.version>
3.1.0
</protobuf-java.version>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/eu/hbp/mip/controllers/MiningApi.java
+
12
−
3
View file @
a165a571
...
...
@@ -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
.
shap
e
(),
unwrap
(
result
.
algorithm
()
)
,
result
.
type
().
mim
e
(),
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
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment