From cc8b2b1c954a74a49cc5884b30e3d9ee936a0739 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Tue, 2 Aug 2016 13:45:31 +0200
Subject: [PATCH] fix bug found by Sonar
---
.../eu/hbp/mip/controllers/ModelsApi.java | 51 +++++++++----------
1 file changed, 24 insertions(+), 27 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/controllers/ModelsApi.java b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
index c2e371d85..6cbf7f2c8 100644
--- a/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
@@ -186,40 +186,37 @@ public class ModelsApi {
return new ResponseEntity<>(HttpStatus.FORBIDDEN);
}
- if(model != null)
- {
- List<String> yAxisVars = configRepository.findOne(model.getConfig().getId()).getyAxisVariables();
- Collection<String> yAxisVarsColl = new LinkedHashSet<>(yAxisVars);
- model.getConfig().setyAxisVariables(new LinkedList<>(yAxisVarsColl));
+ List<String> yAxisVars = configRepository.findOne(model.getConfig().getId()).getyAxisVariables();
+ Collection<String> yAxisVarsColl = new LinkedHashSet<>(yAxisVars);
+ model.getConfig().setyAxisVariables(new LinkedList<>(yAxisVarsColl));
- List<Variable> varsQuery = queryRepository.findOne(model.getQuery().getId()).getVariables();
- Collection<Variable> varsQueryColl = new LinkedHashSet<>(varsQuery);
- model.getQuery().setVariables(new LinkedList<>(varsQueryColl));
+ List<Variable> varsQuery = queryRepository.findOne(model.getQuery().getId()).getVariables();
+ Collection<Variable> varsQueryColl = new LinkedHashSet<>(varsQuery);
+ model.getQuery().setVariables(new LinkedList<>(varsQueryColl));
- List<Variable> grpgsQuery = queryRepository.findOne(model.getQuery().getId()).getGrouping();
- Collection<Variable> grpgsQueryColl = new LinkedHashSet<>(grpgsQuery);
- model.getQuery().setGrouping(new LinkedList<>(grpgsQueryColl));
+ List<Variable> grpgsQuery = queryRepository.findOne(model.getQuery().getId()).getGrouping();
+ Collection<Variable> grpgsQueryColl = new LinkedHashSet<>(grpgsQuery);
+ model.getQuery().setGrouping(new LinkedList<>(grpgsQueryColl));
- List<Variable> covarsQuery = queryRepository.findOne(model.getQuery().getId()).getCovariables();
- Collection<Variable> covarsQueryColl = new LinkedHashSet<>(covarsQuery);
- model.getQuery().setCovariables(new LinkedList<>(covarsQueryColl));
+ List<Variable> covarsQuery = queryRepository.findOne(model.getQuery().getId()).getCovariables();
+ Collection<Variable> covarsQueryColl = new LinkedHashSet<>(covarsQuery);
+ model.getQuery().setCovariables(new LinkedList<>(covarsQueryColl));
- List<Filter> fltrs = queryRepository.findOne(model.getQuery().getId()).getFilters();
- Collection<Filter> fltrsColl = new LinkedHashSet<>(fltrs);
- model.getQuery().setFilters(new LinkedList<>(fltrsColl));
+ List<Filter> fltrs = queryRepository.findOne(model.getQuery().getId()).getFilters();
+ Collection<Filter> fltrsColl = new LinkedHashSet<>(fltrs);
+ model.getQuery().setFilters(new LinkedList<>(fltrsColl));
- List<String> varsDS = datasetRepository.findOne(model.getDataset().getCode()).getVariable();
- Collection<String> varsDSColl = new LinkedHashSet<>(varsDS);
- model.getDataset().setVariable(new LinkedList<>(varsDSColl));
+ List<String> varsDS = datasetRepository.findOne(model.getDataset().getCode()).getVariable();
+ Collection<String> varsDSColl = new LinkedHashSet<>(varsDS);
+ model.getDataset().setVariable(new LinkedList<>(varsDSColl));
- List<String> grpgsDS = datasetRepository.findOne(model.getDataset().getCode()).getGrouping();
- Collection<String> grpgsDSColl = new LinkedHashSet<>(grpgsDS);
- model.getDataset().setGrouping(new LinkedList<>(grpgsDSColl));
+ List<String> grpgsDS = datasetRepository.findOne(model.getDataset().getCode()).getGrouping();
+ Collection<String> grpgsDSColl = new LinkedHashSet<>(grpgsDS);
+ model.getDataset().setGrouping(new LinkedList<>(grpgsDSColl));
- List<String> headersDS = datasetRepository.findOne(model.getDataset().getCode()).getHeader();
- Collection<String> headersDSColl = new LinkedHashSet<>(headersDS);
- model.getDataset().setHeader(new LinkedList<>(headersDSColl));
- }
+ List<String> headersDS = datasetRepository.findOne(model.getDataset().getCode()).getHeader();
+ Collection<String> headersDSColl = new LinkedHashSet<>(headersDS);
+ model.getDataset().setHeader(new LinkedList<>(headersDSColl));
return new ResponseEntity<>(HttpStatus.OK).ok(model);
}
--
GitLab