diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java index 93699235a5820b367468af5bf031a39714cfc6dd..28d94981ef94b25063224056e1d6e9fe585f1a45 100644 --- a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java +++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java @@ -210,7 +210,7 @@ public class ExperimentApi { Timeout timeout = new Timeout(Duration.create(5, "seconds")); Future<Object> future = Patterns.ask(wokenActor, new MethodsQuery(), timeout); - Methods result = null; + Methods result; try { result = (Methods) Await.result(future, timeout.duration()); } catch (Exception e) { @@ -281,7 +281,7 @@ public class ExperimentApi { private void sendExperiment(Experiment experiment) throws MalformedURLException { // this runs in the background. For future optimization: use a thread pool - final eu.hbp.mip.messages.external.ExperimentQuery experimentQuery = experiment.computeQuery(); + final eu.hbp.mip.messages.external.ExperimentQuery experimentQuery = experiment.prepareQuery(); LOGGER.info("Akka is trying to reach remote " + wokenRefPath); ActorSelection wokenActor = actorSystem.actorSelection(wokenRefPath); diff --git a/src/main/java/eu/hbp/mip/model/Experiment.java b/src/main/java/eu/hbp/mip/model/Experiment.java index 949d359d8650f139e00cda18a7d039c1c7b6b8f2..c4baf011f2cdeafd62602ea414aef704e82a5479 100644 --- a/src/main/java/eu/hbp/mip/model/Experiment.java +++ b/src/main/java/eu/hbp/mip/model/Experiment.java @@ -91,7 +91,7 @@ public class Experiment { */ } - public ExperimentQuery computeQuery() { + public ExperimentQuery prepareQuery() { List<VariableId> variables = new LinkedList<>(); List<VariableId> covariables = new LinkedList<>(); List<VariableId> grouping = new LinkedList<>(); @@ -141,12 +141,12 @@ public class Experiment { validations.add(new Validation(v.getCode(), v.getName(), params)); } - Seq<VariableId> variablesSeq = JavaConverters.asScalaIteratorConverter(variables.iterator()).asScala().toSeq(); - Seq<VariableId> covariablesSeq = JavaConverters.asScalaIteratorConverter(covariables.iterator()).asScala().toSeq(); - Seq<VariableId> groupingSeq = JavaConverters.asScalaIteratorConverter(grouping.iterator()).asScala().toSeq(); - Seq<Filter> filtersSeq = JavaConverters.asScalaIteratorConverter(filters.iterator()).asScala().toSeq(); - Seq<Algorithm> algorithmsSeq = JavaConverters.asScalaIteratorConverter(algorithms.iterator()).asScala().toSeq(); - Seq<Validation> validationsSeq = JavaConverters.asScalaIteratorConverter(validations.iterator()).asScala().toSeq(); + Seq<VariableId> variablesSeq = JavaConverters.asScalaIteratorConverter(variables.iterator()).asScala().toSeq().toList(); + Seq<VariableId> covariablesSeq = JavaConverters.asScalaIteratorConverter(covariables.iterator()).asScala().toSeq().toList(); + Seq<VariableId> groupingSeq = JavaConverters.asScalaIteratorConverter(grouping.iterator()).asScala().toSeq().toList(); + Seq<Filter> filtersSeq = JavaConverters.asScalaIteratorConverter(filters.iterator()).asScala().toSeq().toList(); + Seq<Algorithm> algorithmsSeq = JavaConverters.asScalaIteratorConverter(algorithms.iterator()).asScala().toSeq().toList(); + Seq<Validation> validationsSeq = JavaConverters.asScalaIteratorConverter(validations.iterator()).asScala().toSeq().toList(); return new ExperimentQuery(variablesSeq, covariablesSeq, groupingSeq, filtersSeq, algorithmsSeq, validationsSeq); }