From d9d4703dadcfae6d41e5f5b1ab2f46d16befd1d2 Mon Sep 17 00:00:00 2001
From: kostas <kostasfilippop@gmail.com>
Date: Fri, 11 Dec 2020 06:52:50 -0800
Subject: [PATCH] Made so the transient endpoint will work with any algorithm.
---
build.sh | 2 +-
.../eu/hbp/mip/models/DAOs/ExperimentDAO.java | 23 -------------------
.../eu/hbp/mip/models/DTOs/ExperimentDTO.java | 6 ++---
.../hbp/mip/services/ExperimentService.java | 13 -----------
4 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/build.sh b/build.sh
index 458b5c085..6a18d98ec 100755
--- a/build.sh
+++ b/build.sh
@@ -26,7 +26,7 @@ else
DOCKER="sudo docker"
fi
-IMAGE="thanasulas/portal-backend"
+IMAGE="kfilippopolitis/portal-backend"
VCS_REF=$(git describe --tags --dirty)
VERSION=$(git describe --tags --dirty)
diff --git a/src/main/java/eu/hbp/mip/models/DAOs/ExperimentDAO.java b/src/main/java/eu/hbp/mip/models/DAOs/ExperimentDAO.java
index cd3f50757..f634c77a2 100644
--- a/src/main/java/eu/hbp/mip/models/DAOs/ExperimentDAO.java
+++ b/src/main/java/eu/hbp/mip/models/DAOs/ExperimentDAO.java
@@ -84,29 +84,6 @@ public class ExperimentDAO {
success
}
- public enum Type {
- WARNING("text/plain+warning"),
- USER_WARNING("text/plain+user_error"),
- HIGHCHARTS("application/vnd.highcharts+json"),
- JSON("application/json"),
- JSONBTREE("application/binary-tree+json"),
- PFA("application/pfa+json"),
- JSONDATA("application/vnd.dataresource+json"),
- HTML("text/html"),
- TEXT("text/plain");
-
- private String type;
-
- //Constructor to initialize the instance variable
- Type(String type) {
- this.type = type;
- }
-
- public String getType() {
- return this.type;
- }
- }
-
public ExperimentDAO() {
/*
* Empty constructor is needed by Hibernate
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java b/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java
index 5f554dbe6..a1c6e916c 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java
+++ b/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java
@@ -117,7 +117,7 @@ public class ExperimentDTO {
public static class ResultDTO {
private Object data;
- private ExperimentDAO.Type type;
+ private Object type;
public Object getData() {
return this.data;
@@ -127,11 +127,11 @@ public class ExperimentDTO {
this.data = data;
}
- public ExperimentDAO.Type getType() {
+ public Object getType() {
return type;
}
- public void setType(ExperimentDAO.Type type) {
+ public void setType(Object type) {
this.type = type;
}
}
diff --git a/src/main/java/eu/hbp/mip/services/ExperimentService.java b/src/main/java/eu/hbp/mip/services/ExperimentService.java
index 6039d577f..56861903c 100644
--- a/src/main/java/eu/hbp/mip/services/ExperimentService.java
+++ b/src/main/java/eu/hbp/mip/services/ExperimentService.java
@@ -212,12 +212,6 @@ public class ExperimentService {
// Get the type and name of algorithm
String algorithmName = experimentDTO.getAlgorithm().getName();
- if (!allowedTransientAlgorithms(algorithmName)) {
- Logging.LogUserAction(user.getUsername(), endpoint,
- "Not proper algorithm.");
- throw new BadRequestException("Please provide proper algorithm.");
- }
-
algorithmParametersLogging(experimentDTO, endpoint);
if (authenticationIsEnabled) {
@@ -333,13 +327,6 @@ public class ExperimentService {
}
}
- private boolean allowedTransientAlgorithms(String algorithmName) {
- List<String> properAlgorithms = new ArrayList<>();
- properAlgorithms.add("MULTIPLE_HISTOGRAMS");
- properAlgorithms.add("DESCRIPTIVE_STATS");
- return properAlgorithms.contains(algorithmName);
- }
-
private void verifyPatchExperimentNonEditableFields(String uuid, ExperimentDTO experimentDTO, ExperimentDAO experimentDAO, String endpoint) {
if (experimentDTO.getUuid() != null ) {
Logging.LogUserAction(activeUserService.getActiveUser().getUsername(), endpoint, "Uuid is not editable.");
--
GitLab