diff --git a/election-api-java/src/main/java/bbc/news/elections/controllers/ResultsController.java b/election-api-java/src/main/java/bbc/news/elections/controllers/ResultsController.java index 05ac937..dc6623f 100644 --- a/election-api-java/src/main/java/bbc/news/elections/controllers/ResultsController.java +++ b/election-api-java/src/main/java/bbc/news/elections/controllers/ResultsController.java @@ -24,17 +24,17 @@ public ResultsController(ResultService resultService) { @GetMapping("/result/{id}") ConstituencyResult getResult(@PathVariable Integer id) { - ConstituencyResult result = resultService.GetResult(id); + ConstituencyResult result = resultService.getResult(id); if (result == null) { throw new ResultNotFoundException(id); } - return resultService.GetResult(id); + return result; } @PostMapping("/result") ResponseEntity newResult(@RequestBody ConstituencyResult result) { if (result.getId() != null) { - resultService.NewResult(result); + resultService.newResult(result); return ResponseEntity.created(URI.create("/result/"+result.getId())).build(); } return ResponseEntity.badRequest().body("Id was null"); diff --git a/election-api-java/src/main/java/bbc/news/elections/service/MapBasedRepository.java b/election-api-java/src/main/java/bbc/news/elections/service/MapBasedRepository.java index f3c712d..abea5cb 100644 --- a/election-api-java/src/main/java/bbc/news/elections/service/MapBasedRepository.java +++ b/election-api-java/src/main/java/bbc/news/elections/service/MapBasedRepository.java @@ -16,17 +16,17 @@ public MapBasedRepository() { } @Override - public ConstituencyResult GetResult(Integer id) { + public ConstituencyResult getResult(Integer id) { return results.get(id); } @Override - public void NewResult(ConstituencyResult result) { + public void newResult(ConstituencyResult result) { results.put(result.getId(), result); } @Override - public Map GetAll() { + public Map getAll() { return results; } diff --git a/election-api-java/src/main/java/bbc/news/elections/service/ResultService.java b/election-api-java/src/main/java/bbc/news/elections/service/ResultService.java index 7ed1fcf..31d8d37 100644 --- a/election-api-java/src/main/java/bbc/news/elections/service/ResultService.java +++ b/election-api-java/src/main/java/bbc/news/elections/service/ResultService.java @@ -2,12 +2,11 @@ import bbc.news.elections.model.ConstituencyResult; -import java.util.List; import java.util.Map; public interface ResultService { - ConstituencyResult GetResult(Integer id); - void NewResult(ConstituencyResult result); - Map GetAll(); + ConstituencyResult getResult(Integer id); + void newResult(ConstituencyResult result); + Map getAll(); void reset(); }