diff --git a/src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java b/src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java index 5ac49a402094cf3c435537ddf95f60d162dbbd46..a15fd37cdfa9ac00e69687e1a419f5359522edd6 100644 --- a/src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java +++ b/src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java @@ -27,6 +27,7 @@ import retrofit2.Call; import retrofit2.Response; import java.io.IOException; +import java.net.ConnectException; import java.util.ArrayList; import java.util.List; @@ -69,27 +70,27 @@ public class AlgorithmsAPI { logger.LogUserAction("Executing..."); ArrayList<ExaremeAlgorithmDTO> mipengineAlgorithms = getMIPEngineAlgorithms(logger); - logger.LogUserAction("Loaded " + mipengineAlgorithms.size() + " mipengine algorithms"); ArrayList<ExaremeAlgorithmDTO> exaremeAlgorithms = getExaremeAlgorithms(logger); - logger.LogUserAction("Loaded " + exaremeAlgorithms.size() + " exareme algorithms"); ArrayList<ExaremeAlgorithmDTO> galaxyAlgorithms = getGalaxyWorkflows(logger); - logger.LogUserAction("Loaded " + galaxyAlgorithms.size() + " galaxy algorithms"); ArrayList<ExaremeAlgorithmDTO> algorithms = new ArrayList<>(); if (exaremeAlgorithms != null) { algorithms.addAll(exaremeAlgorithms); + logger.LogUserAction("Loaded " + exaremeAlgorithms.size() + " exareme algorithms"); } else { - logger.LogUserAction("Getting exareme algorithms failed and returned null"); + logger.LogUserAction("Fetching exareme algorithms failed"); } if (mipengineAlgorithms != null) { algorithms.addAll(mipengineAlgorithms); + logger.LogUserAction("Loaded " + mipengineAlgorithms.size() + " mipengine algorithms"); } else { - logger.LogUserAction("Getting mipengine algorithms failed and returned null"); + logger.LogUserAction("Fetching mipengine algorithms failed"); } if (galaxyAlgorithms != null) { algorithms.addAll(galaxyAlgorithms); + logger.LogUserAction("Loaded " + galaxyAlgorithms.size() + " galaxy algorithms"); } else { - logger.LogUserAction("Getting galaxy workflows failed and returned null"); + logger.LogUserAction("Fetching galaxy workflows failed"); } List<String> disabledAlgorithms = new ArrayList<>(); @@ -126,6 +127,9 @@ public class AlgorithmsAPI { new TypeToken<ArrayList<ExaremeAlgorithmDTO>>() { }.getType() ); + } catch (ConnectException e) { + logger.LogUserAction("An exception occurred: " + e.getMessage()); + return null; } catch (IOException e) { logger.LogUserAction("An exception occurred: " + e.getMessage()); return null; @@ -153,6 +157,9 @@ public class AlgorithmsAPI { new TypeToken<ArrayList<MIPEngineAlgorithmDTO>>() { }.getType() ); + } catch (ConnectException e) { + logger.LogUserAction("An exception occurred: " + e.getMessage()); + return null; } catch (IOException e) { logger.LogUserAction("An exception occurred: " + e.getMessage()); return null; diff --git a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java b/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java index d1f5947c889c6581b341e4561e0c65e336f980ff..88b5fb627da14791c2e772fca65d06cef3a4f5e2 100644 --- a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java +++ b/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java @@ -9,7 +9,7 @@ import java.util.List; @AllArgsConstructor public class ExaremeAlgorithmResultDTO { private int code; - private List<Object> results; + private List<Object> result; } diff --git a/src/main/java/eu/hbp/mip/services/ExperimentService.java b/src/main/java/eu/hbp/mip/services/ExperimentService.java index c421fd4717e85b99e06d46f9c6be304f8b22c2da..1bd848ed64f22c27c2170a450ca103a723199f0c 100644 --- a/src/main/java/eu/hbp/mip/services/ExperimentService.java +++ b/src/main/java/eu/hbp/mip/services/ExperimentService.java @@ -209,9 +209,9 @@ public class ExperimentService { // Results are stored in the experiment object ExaremeAlgorithmResultDTO exaremeAlgorithmResultDTO = runExperiment(experimentDTO, logger); - logger.LogUserAction("Experiment with uuid: " + experimentDTO.getUuid() + "gave response code: " + exaremeAlgorithmResultDTO.getCode() + " and result: " + exaremeAlgorithmResultDTO.getResults()); + logger.LogUserAction("Experiment with uuid: " + experimentDTO.getUuid() + "gave response code: " + exaremeAlgorithmResultDTO.getCode() + " and result: " + exaremeAlgorithmResultDTO.getResult()); - experimentDTO.setResult((exaremeAlgorithmResultDTO.getCode() >= 400) ? null : exaremeAlgorithmResultDTO.getResults()); + experimentDTO.setResult((exaremeAlgorithmResultDTO.getCode() >= 400) ? null : exaremeAlgorithmResultDTO.getResult()); experimentDTO.setStatus((exaremeAlgorithmResultDTO.getCode() >= 400) ? ExperimentDAO.Status.error : ExperimentDAO.Status.success); return experimentDTO; @@ -504,9 +504,9 @@ public class ExperimentService { // Results are stored in the experiment object ExaremeAlgorithmResultDTO exaremeAlgorithmResultDTO = runExperiment(finalExperimentDTO, logger); - Logger.LogExperimentAction(experimentDAO.getName(), experimentDAO.getUuid(), "Experiment with uuid: " + experimentDAO.getUuid() + "gave response code: " + exaremeAlgorithmResultDTO.getCode() + " and result: " + exaremeAlgorithmResultDTO.getResults()); + Logger.LogExperimentAction(experimentDAO.getName(), experimentDAO.getUuid(), "Experiment with uuid: " + experimentDAO.getUuid() + "gave response code: " + exaremeAlgorithmResultDTO.getCode() + " and result: " + exaremeAlgorithmResultDTO.getResult()); - experimentDAO.setResult((exaremeAlgorithmResultDTO.getCode() >= 400) ? null : JsonConverters.convertObjectToJsonString(exaremeAlgorithmResultDTO.getResults())); + experimentDAO.setResult((exaremeAlgorithmResultDTO.getCode() >= 400) ? null : JsonConverters.convertObjectToJsonString(exaremeAlgorithmResultDTO.getResult())); experimentDAO.setStatus((exaremeAlgorithmResultDTO.getCode() >= 400) ? ExperimentDAO.Status.error : ExperimentDAO.Status.success); } catch (Exception e) { Logger.LogExperimentAction(experimentDAO.getName(), experimentDAO.getUuid(), "There was an exception: " + e.getMessage());