From c70efd94825d5f76b1f57b153aa9d25593588e96 Mon Sep 17 00:00:00 2001 From: Mirco Nasuti <mirco.nasuti@chuv.ch> Date: Thu, 10 Nov 2016 09:27:22 +0100 Subject: [PATCH] Use validation on experiment queries --- src/main/java/eu/hbp/mip/controllers/ExperimentApi.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java index 9a9788b71..2def1e82b 100644 --- a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java +++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java @@ -3,6 +3,7 @@ package eu.hbp.mip.controllers; import com.google.common.collect.Lists; import com.google.gson.*; import eu.hbp.mip.configuration.SecurityConfiguration; +import eu.hbp.mip.model.ExperimentQuery; import eu.hbp.mip.model.User; import eu.hbp.mip.utils.HTTPUtil; import io.swagger.annotations.*; @@ -70,9 +71,11 @@ public class ExperimentApi { @ApiOperation(value = "Send a request to the workflow to run an experiment", response = Experiment.class) @RequestMapping(method = RequestMethod.POST) - public ResponseEntity<String> runExperiment(@RequestBody String incomingQueryString) { + public ResponseEntity<String> runExperiment(@RequestBody ExperimentQuery incomingQueryObj) { LOGGER.info("Run an experiment"); + String incomingQueryString = new Gson().toJson(incomingQueryObj); + JsonObject incomingQuery = gson.fromJson(incomingQueryString, JsonObject.class); Experiment experiment = new Experiment(); -- GitLab