Skip to content
Snippets Groups Projects
Commit 06322f8e authored by Mirco Nasuti's avatar Mirco Nasuti
Browse files

Trying to fix 5 sonar blockers

parent 604e923e
No related branches found
No related tags found
No related merge requests found
......@@ -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 {
......
......@@ -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);
}
......
......@@ -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);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment