From 06322f8ed7e775c071c298c8f03823401273cac0 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Wed, 29 Jun 2016 14:48:20 +0200
Subject: [PATCH] Trying to fix 5 sonar blockers
---
.../org/hbp/mip/controllers/ArticlesApi.java | 2 +-
.../hbp/mip/controllers/ExperimentApi.java | 6 --
.../org/hbp/mip/controllers/ModelsApi.java | 73 ++++++++++---------
3 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/src/main/java/org/hbp/mip/controllers/ArticlesApi.java b/src/main/java/org/hbp/mip/controllers/ArticlesApi.java
index 8a0a15e52..4e22f7b5b 100644
--- a/src/main/java/org/hbp/mip/controllers/ArticlesApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ArticlesApi.java
@@ -134,7 +134,7 @@ public class ArticlesApi {
} catch (IOException e) {
e.printStackTrace();
}
- String slug = slg.slugify(article.getTitle());
+ String slug = slg != null ? slg.slugify(article.getTitle()) : null;
i = 0;
do {
diff --git a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java b/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
index 7e04a8d22..8cb6c074b 100644
--- a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
@@ -346,9 +346,6 @@ public class ExperimentApi {
throw e;
}
- if (experiment == null) {
- return new ResponseEntity<>("Not found", HttpStatus.NOT_FOUND);
- }
return new ResponseEntity<>(gson.toJson(experiment), HttpStatus.OK);
}
@@ -388,9 +385,6 @@ public class ExperimentApi {
throw e;
}
- if (experiment == null) {
- return new ResponseEntity<>("Not found", HttpStatus.NOT_FOUND);
- }
return new ResponseEntity<>(gson.toJson(experiment), HttpStatus.OK);
}
diff --git a/src/main/java/org/hbp/mip/controllers/ModelsApi.java b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
index 7041bbe76..3a9393fa2 100644
--- a/src/main/java/org/hbp/mip/controllers/ModelsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
@@ -166,7 +166,7 @@ public class ModelsApi {
} catch (IOException e) {
e.printStackTrace();
}
- String slug = slg.slugify(model.getTitle());
+ String slug = slg != null ? slg.slugify(model.getTitle()) : null;
i = 0;
do {
@@ -260,45 +260,48 @@ public class ModelsApi {
}
}
- List<Variable> vars = new LinkedList<>();
- for (Variable var : q.getVariables()) {
- Variable v = new Variable();
- v.setCode(var.getCode());
- vars.add(v);
- }
+ if(q != null) {
- List<Variable> covs = new LinkedList<>();
- for (Variable cov : q.getCovariables()) {
- Variable v = new Variable();
- v.setCode(cov.getCode());
- covs.add(v);
- }
+ List<Variable> vars = new LinkedList<>();
+ for (Variable var : q.getVariables()) {
+ Variable v = new Variable();
+ v.setCode(var.getCode());
+ vars.add(v);
+ }
- List<Variable> grps = new LinkedList<>();
- for (Variable grp : q.getGrouping()) {
- Variable v = new Variable();
- v.setCode(grp.getCode());
- grps.add(v);
- }
+ List<Variable> covs = new LinkedList<>();
+ for (Variable cov : q.getCovariables()) {
+ Variable v = new Variable();
+ v.setCode(cov.getCode());
+ covs.add(v);
+ }
- List<Filter> fltrs = new LinkedList<>();
- for (Filter fltr : q.getFilters()) {
- Filter f = new Filter();
- f.setId(fltr.getId());
- f.setOperator(fltr.getOperator());
- f.setValues(fltr.getValues());
- f.setVariable(fltr.getVariable());
- fltrs.add(f);
- }
+ List<Variable> grps = new LinkedList<>();
+ for (Variable grp : q.getGrouping()) {
+ Variable v = new Variable();
+ v.setCode(grp.getCode());
+ grps.add(v);
+ }
- org.hbp.mip.model.Query myQuery = new org.hbp.mip.model.Query();
- myQuery.setId(q.getId());
- myQuery.setVariables(vars);
- myQuery.setCovariables(covs);
- myQuery.setGrouping(grps);
- myQuery.setFilters(fltrs);
+ List<Filter> fltrs = new LinkedList<>();
+ for (Filter fltr : q.getFilters()) {
+ Filter f = new Filter();
+ f.setId(fltr.getId());
+ f.setOperator(fltr.getOperator());
+ f.setValues(fltr.getValues());
+ f.setVariable(fltr.getVariable());
+ fltrs.add(f);
+ }
- model.setQuery(myQuery);
+ org.hbp.mip.model.Query myQuery = new org.hbp.mip.model.Query();
+ myQuery.setId(q.getId());
+ myQuery.setVariables(vars);
+ myQuery.setCovariables(covs);
+ myQuery.setGrouping(grps);
+ myQuery.setFilters(fltrs);
+
+ model.setQuery(myQuery);
+ }
Dataset ds = CSVUtil.parseValues(DATA_FILE, model.getQuery());
model.setDataset(ds);
--
GitLab