From ebc7488afc6f420e8acd8e08c8579e925b04b620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?= Date: Fri, 26 Aug 2022 16:07:20 +0200 Subject: [PATCH] Use ResponseEntity for controllers --- .../api/controllers/DocumentController.java | 74 +++++++++---------- .../api/controllers/LivenessController.java | 10 ++- 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/src/main/java/es/bsc/inb/etransafe/pretox/rest/api/controllers/DocumentController.java b/src/main/java/es/bsc/inb/etransafe/pretox/rest/api/controllers/DocumentController.java index b15d474..e320a6a 100644 --- a/src/main/java/es/bsc/inb/etransafe/pretox/rest/api/controllers/DocumentController.java +++ b/src/main/java/es/bsc/inb/etransafe/pretox/rest/api/controllers/DocumentController.java @@ -33,23 +33,23 @@ public class DocumentController { public DocumentService documentService; @PutMapping(value ="/{id}/srfinding/update") - public SRDomainFinding updateFinding(@PathVariable(value="id") Long id,@RequestBody SRDomainFinding srDomainFinding) { - return documentService.saveFinding(id, srDomainFinding); + public ResponseEntity updateFinding(@PathVariable(value="id") Long id,@RequestBody SRDomainFinding srDomainFinding) { + return new ResponseEntity(documentService.saveFinding(id, srDomainFinding), HttpStatus.OK); } @GetMapping - public List findAll() { - return documentService.findAll(); + public ResponseEntity> findAll() { + return new ResponseEntity>(documentService.findAll(), HttpStatus.OK); } @GetMapping(value ="/{id}") - public DocumentAnnotations find(@PathVariable(value="id") Long id) { - return documentService.findDocumentAnnotationsByDocumentId(id); + public ResponseEntity find(@PathVariable(value="id") Long id) { + return new ResponseEntity(documentService.findDocumentAnnotationsByDocumentId(id), HttpStatus.OK); } @GetMapping(value = "/srdomain/{id}") - public DocumentAnnotations findSRDomainDocument(@PathVariable(value="id") Long id) { - return documentService.findDocumentSRDomainByDocumentId(id); + public ResponseEntity findSRDomainDocument(@PathVariable(value="id") Long id) { + return new ResponseEntity(documentService.findDocumentSRDomainByDocumentId(id), HttpStatus.OK); } // @GetMapping(value = "/document_data/{id}") @@ -58,28 +58,28 @@ public class DocumentController { // } @GetMapping(value = "/{id}/srdomain") - public DocumentAnnotations findDocumentSRDomain(@PathVariable(value="id") Long id) { - return documentService.findDocumentSRDomainByDocumentId(id); + public ResponseEntity findDocumentSRDomain(@PathVariable(value="id") Long id) { + return new ResponseEntity(documentService.findDocumentSRDomainByDocumentId(id), HttpStatus.OK); } @PutMapping(value = "/{id}/move/{status}") - public String moveDocument(@PathVariable(value="id") Long id, @PathVariable(value="status") Status status) { + public ResponseEntity moveDocument(@PathVariable(value="id") Long id, @PathVariable(value="status") Status status) { documentService.moveDocument(id, status); - return "true"; + return new ResponseEntity(HttpStatus.OK); } @PutMapping(value = "/{id}/srfinding/{srFindingId}/export/{export}") - public String setExportFinding(@PathVariable(value="id") Long id, @PathVariable(value="srFindingId") Integer srDomainId, @PathVariable(value="export") Boolean export_srDomain) { + public ResponseEntity setExportFinding(@PathVariable(value="id") Long id, @PathVariable(value="srFindingId") Integer srDomainId, @PathVariable(value="export") Boolean export_srDomain) { documentService.setExportSRDomainFinding(id, srDomainId, export_srDomain); - return "true"; + return new ResponseEntity(HttpStatus.OK); } @PutMapping(value = "/{id}/srfinding/{srFindingId}/validation/{status}") - public String setSRFindingValidation(@PathVariable(value="id") Long id, @PathVariable(value="srFindingId") Integer srDomainId, @PathVariable(value="status") String status) { + public ResponseEntity setSRFindingValidation(@PathVariable(value="id") Long id, @PathVariable(value="srFindingId") Integer srDomainId, @PathVariable(value="status") String status) { documentService.setValidationSRDomainFinding(id, srDomainId, status); - return "true"; + return new ResponseEntity(HttpStatus.OK); } // @RequestMapping(value = "/{id}/findingValidation/{findingId}/{status}") @@ -91,41 +91,41 @@ public class DocumentController { @GetMapping(value = "/{id}/evidence/sentences") - public String findSentencesEvidence(@PathVariable(value="id") Long id) { + public ResponseEntity findSentencesEvidence(@PathVariable(value="id") Long id) { String snippet = documentService.findSentencesEvidenceByDocumentId(id); - return snippet; + return new ResponseEntity(snippet, HttpStatus.OK); } @GetMapping(value = "/{id}/evidence/sentence/{sentenceId}") - public String findSentence(@PathVariable(value="id") Long id, @PathVariable(value="sentenceId") Integer sentenceId) { + public ResponseEntity findSentence(@PathVariable(value="id") Long id, @PathVariable(value="sentenceId") Integer sentenceId) { String snippet = documentService.findSentenceEvidenceByDocumentIdAndSentenceId(id, sentenceId); - return snippet; + return new ResponseEntity(snippet, HttpStatus.OK); } @GetMapping(value = "/{id}/evidence/findings") - public String findAllFindingEvidence(@PathVariable(value="id") Long id) { + public ResponseEntity findAllFindingEvidence(@PathVariable(value="id") Long id) { String snippet = documentService.findFindingsEvidenceByDocumentId(id); - return snippet; + return new ResponseEntity(snippet, HttpStatus.OK); } @GetMapping(value = "/{id}/evidence/finding/{findingId}") - public String findFinding(@PathVariable(value="id") Long id, @PathVariable(value="findingId") Integer findingId) { + public ResponseEntity findFinding(@PathVariable(value="id") Long id, @PathVariable(value="findingId") Integer findingId) { String snippet = documentService.findFindingEvidenceByDocumentIdAndFindingId(id, findingId); - return snippet; + return new ResponseEntity(snippet, HttpStatus.OK); } @GetMapping(value = "/{id}/evidence/all") - public String findAllEvidence(@PathVariable(value="id") Long id) { + public ResponseEntity findAllEvidence(@PathVariable(value="id") Long id) { String snippet = documentService.findAllEvidenceByDocumentId(id); - return snippet; + return new ResponseEntity(snippet, HttpStatus.OK); } @GetMapping(value = "/{id}/text") - public String findDocumentText(@PathVariable(value="id") Long id) { + public ResponseEntity findDocumentText(@PathVariable(value="id") Long id) { String snippet = documentService.findTextByDocumentId(id); - return snippet; + return new ResponseEntity(snippet, HttpStatus.OK); } @@ -142,25 +142,19 @@ public class DocumentController { } @DeleteMapping(value = "/remove/{id}") - public String removeDocument(@PathVariable("id") long documentId){ + public ResponseEntity removeDocument(@PathVariable("id") long documentId){ documentService.removeDocument(documentId); - return "true"; + return new ResponseEntity(HttpStatus.OK); } @GetMapping(value = "/restore/{id}") - public String restoreDocument(@PathVariable("id") long documentId){ + public ResponseEntity restoreDocument(@PathVariable("id") long documentId){ documentService.restoreDocument(documentId); - return "true"; + return new ResponseEntity(HttpStatus.OK); } @GetMapping(value = "/{id}/tracking") - public DocumentTracking findTrackings(@PathVariable(value="id") Long id) { - return documentService.findTrackings(id); + public ResponseEntity findTrackings(@PathVariable(value="id") Long id) { + return new ResponseEntity(documentService.findTrackings(id), HttpStatus.OK); } - - - - - - } \ No newline at end of file diff --git a/src/main/java/es/bsc/inb/etransafe/pretox/rest/api/controllers/LivenessController.java b/src/main/java/es/bsc/inb/etransafe/pretox/rest/api/controllers/LivenessController.java index 9a93907..3e265d4 100644 --- a/src/main/java/es/bsc/inb/etransafe/pretox/rest/api/controllers/LivenessController.java +++ b/src/main/java/es/bsc/inb/etransafe/pretox/rest/api/controllers/LivenessController.java @@ -1,5 +1,7 @@ package es.bsc.inb.etransafe.pretox.rest.api.controllers; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -9,13 +11,13 @@ import org.springframework.web.bind.annotation.RestController; public class LivenessController { @GetMapping(path = "/liveness") - public String liveness() { - return "true"; + public ResponseEntity liveness() { + return new ResponseEntity(HttpStatus.OK); } @GetMapping(path = "/readiness") - public String readeness() { - return "true"; + public ResponseEntity readeness() { + return new ResponseEntity(HttpStatus.OK); } } -- GitLab