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

Merge branch 'sonar_suggestions' into 'master' 

fix bug found by Sonar



See merge request !29
parents 4cab6a9e cc8b2b1c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/eu/hbp/mip/controllers/ModelsApi.java
+ 24
− 27
View file @ 0f932e0e
...@@ -186,40 +186,37 @@ public class ModelsApi { ...@@ -186,40 +186,37 @@ public class ModelsApi {
return new ResponseEntity<>(HttpStatus.FORBIDDEN); return new ResponseEntity<>(HttpStatus.FORBIDDEN);
} }
if(model != null) List<String> yAxisVars = configRepository.findOne(model.getConfig().getId()).getyAxisVariables();
{ Collection<String> yAxisVarsColl = new LinkedHashSet<>(yAxisVars);
List<String> yAxisVars = configRepository.findOne(model.getConfig().getId()).getyAxisVariables(); model.getConfig().setyAxisVariables(new LinkedList<>(yAxisVarsColl));
Collection<String> yAxisVarsColl = new LinkedHashSet<>(yAxisVars);
model.getConfig().setyAxisVariables(new LinkedList<>(yAxisVarsColl));
List<Variable> varsQuery = queryRepository.findOne(model.getQuery().getId()).getVariables(); List<Variable> varsQuery = queryRepository.findOne(model.getQuery().getId()).getVariables();
Collection<Variable> varsQueryColl = new LinkedHashSet<>(varsQuery); Collection<Variable> varsQueryColl = new LinkedHashSet<>(varsQuery);
model.getQuery().setVariables(new LinkedList<>(varsQueryColl)); model.getQuery().setVariables(new LinkedList<>(varsQueryColl));
List<Variable> grpgsQuery = queryRepository.findOne(model.getQuery().getId()).getGrouping(); List<Variable> grpgsQuery = queryRepository.findOne(model.getQuery().getId()).getGrouping();
Collection<Variable> grpgsQueryColl = new LinkedHashSet<>(grpgsQuery); Collection<Variable> grpgsQueryColl = new LinkedHashSet<>(grpgsQuery);
model.getQuery().setGrouping(new LinkedList<>(grpgsQueryColl)); model.getQuery().setGrouping(new LinkedList<>(grpgsQueryColl));
List<Variable> covarsQuery = queryRepository.findOne(model.getQuery().getId()).getCovariables(); List<Variable> covarsQuery = queryRepository.findOne(model.getQuery().getId()).getCovariables();
Collection<Variable> covarsQueryColl = new LinkedHashSet<>(covarsQuery); Collection<Variable> covarsQueryColl = new LinkedHashSet<>(covarsQuery);
model.getQuery().setCovariables(new LinkedList<>(covarsQueryColl)); model.getQuery().setCovariables(new LinkedList<>(covarsQueryColl));
List<Filter> fltrs = queryRepository.findOne(model.getQuery().getId()).getFilters(); List<Filter> fltrs = queryRepository.findOne(model.getQuery().getId()).getFilters();
Collection<Filter> fltrsColl = new LinkedHashSet<>(fltrs); Collection<Filter> fltrsColl = new LinkedHashSet<>(fltrs);
model.getQuery().setFilters(new LinkedList<>(fltrsColl)); model.getQuery().setFilters(new LinkedList<>(fltrsColl));
List<String> varsDS = datasetRepository.findOne(model.getDataset().getCode()).getVariable(); List<String> varsDS = datasetRepository.findOne(model.getDataset().getCode()).getVariable();
Collection<String> varsDSColl = new LinkedHashSet<>(varsDS); Collection<String> varsDSColl = new LinkedHashSet<>(varsDS);
model.getDataset().setVariable(new LinkedList<>(varsDSColl)); model.getDataset().setVariable(new LinkedList<>(varsDSColl));
List<String> grpgsDS = datasetRepository.findOne(model.getDataset().getCode()).getGrouping(); List<String> grpgsDS = datasetRepository.findOne(model.getDataset().getCode()).getGrouping();
Collection<String> grpgsDSColl = new LinkedHashSet<>(grpgsDS); Collection<String> grpgsDSColl = new LinkedHashSet<>(grpgsDS);
model.getDataset().setGrouping(new LinkedList<>(grpgsDSColl)); model.getDataset().setGrouping(new LinkedList<>(grpgsDSColl));
List<String> headersDS = datasetRepository.findOne(model.getDataset().getCode()).getHeader(); List<String> headersDS = datasetRepository.findOne(model.getDataset().getCode()).getHeader();
Collection<String> headersDSColl = new LinkedHashSet<>(headersDS); Collection<String> headersDSColl = new LinkedHashSet<>(headersDS);
model.getDataset().setHeader(new LinkedList<>(headersDSColl)); model.getDataset().setHeader(new LinkedList<>(headersDSColl));
}
return new ResponseEntity<>(HttpStatus.OK).ok(model); return new ResponseEntity<>(HttpStatus.OK).ok(model);
} }
......
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