From bbafa04f93001b310757f0a35ad465d5179fc38e Mon Sep 17 00:00:00 2001
From: Manuel Spuhler <manuel.spuhler@chuv.ch>
Date: Fri, 24 May 2019 10:21:24 +0200
Subject: [PATCH] Cleanup
---
.../eu/hbp/mip/controllers/ExperimentApi.java | 43 +++++++++----------
.../java/eu/hbp/mip/model/Experiment.java | 4 --
.../eu/hbp/mip/model/ExperimentQuery.java | 9 ----
3 files changed, 21 insertions(+), 35 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
index 0507c49cb..9a16db0c1 100644
--- a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
@@ -60,18 +60,7 @@ public class ExperimentApi extends WokenClientController {
public ResponseEntity<String> runExperiment(@RequestBody ExperimentQuery expQuery) {
LOGGER.info("Run an experiment");
- Experiment experiment = new Experiment();
- experiment.setUuid(UUID.randomUUID());
- User user = userInfo.getUser();
-
- experiment.setAlgorithms(gson.toJson(expQuery.getAlgorithms()));
- experiment.setValidations(gson.toJson(expQuery.getValidations()));
- experiment.setName(expQuery.getName());
- experiment.setCreatedBy(user);
- experiment.setModel(modelRepository.findOne(expQuery.getModel()));
- experimentRepository.save(experiment);
-
- LOGGER.info("Experiment saved");
+ Experiment experiment = saveExperiment(expQuery);
sendExperiment(experiment);
return new ResponseEntity<>(gsonOnlyExposed.toJson(experiment.jsonify()), HttpStatus.OK);
@@ -82,16 +71,7 @@ public class ExperimentApi extends WokenClientController {
public ResponseEntity<String> runExaremeExperiment(@RequestBody ExperimentQuery expQuery) {
LOGGER.info("sendExaremeExperiment");
- Experiment experiment = new Experiment();
- experiment.setUuid(UUID.randomUUID());
- User user = userInfo.getUser();
-
- experiment.setAlgorithms(gson.toJson(expQuery.getAlgorithms()));
- experiment.setValidations(gson.toJson(expQuery.getValidations()));
- experiment.setName(expQuery.getName());
- experiment.setCreatedBy(user);
- experiment.setModel(modelRepository.findOne(expQuery.getModel()));
- experimentRepository.save(experiment);
+ Experiment experiment = saveExperiment(expQuery);
String algoCode = expQuery.getAlgorithms().get(0).getCode();
List<AlgorithmParam> params = expQuery.getAlgorithms().get(0).getParameters();
@@ -341,4 +321,23 @@ public class ExperimentApi extends WokenClientController {
return o;
}
+ private Experiment saveExperiment(ExperimentQuery expQuery) {
+ LOGGER.info("sendExaremeExperiment");
+
+ Experiment experiment = new Experiment();
+ experiment.setUuid(UUID.randomUUID());
+ User user = userInfo.getUser();
+
+ experiment.setAlgorithms(gson.toJson(expQuery.getAlgorithms()));
+ experiment.setValidations(gson.toJson(expQuery.getValidations()));
+ experiment.setName(expQuery.getName());
+ experiment.setCreatedBy(user);
+ experiment.setModel(modelRepository.findOne(expQuery.getModel()));
+ experimentRepository.save(experiment);
+
+ LOGGER.info("Experiment saved");
+
+ return experiment;
+ }
+
}
diff --git a/src/main/java/eu/hbp/mip/model/Experiment.java b/src/main/java/eu/hbp/mip/model/Experiment.java
index c84ec57ed..e2def32c3 100644
--- a/src/main/java/eu/hbp/mip/model/Experiment.java
+++ b/src/main/java/eu/hbp/mip/model/Experiment.java
@@ -82,10 +82,6 @@ public class Experiment {
@Expose
private boolean resultsViewed = false;
- @Column(columnDefinition="TEXT")
- @Expose
- private String source;
-
public Experiment() {
/*
* Empty constructor is needed by Hibernate
diff --git a/src/main/java/eu/hbp/mip/model/ExperimentQuery.java b/src/main/java/eu/hbp/mip/model/ExperimentQuery.java
index 2e7e6fd81..333751c43 100644
--- a/src/main/java/eu/hbp/mip/model/ExperimentQuery.java
+++ b/src/main/java/eu/hbp/mip/model/ExperimentQuery.java
@@ -9,7 +9,6 @@ public class ExperimentQuery {
private String name;
private String model;
- private String source;
private List<ExperimentValidator> validations;
private List<Algorithm> algorithms;
@@ -29,14 +28,6 @@ public class ExperimentQuery {
this.model = model;
}
- public String getSource() {
- return source;
- }
-
- public void setSource(String source) {
- this.source = source;
- }
-
public List<ExperimentValidator> getValidations() {
return validations;
}
--
GitLab