diff --git a/src/main/java/org/hbp/mip/MIPApplication.java b/src/main/java/org/hbp/mip/MIPApplication.java index 5a00a3a7d94c4fc4c0f300247848e2f8c964fa52..0c44fef61108fcd62b46653bdc996ceb42480967 100644 --- a/src/main/java/org/hbp/mip/MIPApplication.java +++ b/src/main/java/org/hbp/mip/MIPApplication.java @@ -210,6 +210,7 @@ public class MIPApplication extends WebSecurityConfigurerAdapter { session.getTransaction().rollback(); throw e; } + return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); } return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/src/main/java/org/hbp/mip/controllers/ArticlesApi.java b/src/main/java/org/hbp/mip/controllers/ArticlesApi.java index 2ac7d351b2549ce7107a965041b1b47a82e4fde4..8a0a15e52e478f36a86eb326239cfa3c7f0d7f88 100644 --- a/src/main/java/org/hbp/mip/controllers/ArticlesApi.java +++ b/src/main/java/org/hbp/mip/controllers/ArticlesApi.java @@ -163,6 +163,7 @@ public class ArticlesApi { session.getTransaction().rollback(); throw e; } + return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); } return new ResponseEntity<>(HttpStatus.CREATED); @@ -192,7 +193,7 @@ public class ArticlesApi { if (!article.getStatus().equals("published") && !article.getCreatedBy().getUsername().equals(user.getUsername())) { - return ResponseEntity.status(HttpStatus.FORBIDDEN).body(null); + return new ResponseEntity<>(HttpStatus.FORBIDDEN); } } catch (Exception e) { @@ -272,17 +273,4 @@ public class ArticlesApi { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - - @ApiOperation(value = "Delete an article", response = Void.class) - @ApiResponses(value = { @ApiResponse(code = 200, message = "Article deleted") }) - @RequestMapping(value = "/{slug}", method = RequestMethod.DELETE) - public ResponseEntity<Void> deleteAnArticle( - @ApiParam(value = "slug", required = true) @PathVariable("slug") String slug - ) { - - // TODO : Implement delete method - - return new ResponseEntity<>(HttpStatus.OK); - } - } diff --git a/src/main/java/org/hbp/mip/controllers/ModelsApi.java b/src/main/java/org/hbp/mip/controllers/ModelsApi.java index 938464ded7195adfde2aec51fa6cec3d731740e1..7041bbe76420928f5a0785f4301fb5fb300f681f 100644 --- a/src/main/java/org/hbp/mip/controllers/ModelsApi.java +++ b/src/main/java/org/hbp/mip/controllers/ModelsApi.java @@ -227,7 +227,7 @@ public class ModelsApi { if (!model.getValid() && !model.getCreatedBy().getUsername().equals(user.getUsername())) { - return ResponseEntity.status(HttpStatus.FORBIDDEN).body(null); + return new ResponseEntity<>(HttpStatus.FORBIDDEN); } } catch (Exception e) @@ -425,17 +425,5 @@ public class ModelsApi { return sb.toString(); } - @ApiOperation(value = "Delete a model", response = Void.class) - @ApiResponses(value = { @ApiResponse(code = 200, message = "Model deleted") }) - @RequestMapping(value = "/{slug}", method = RequestMethod.DELETE) - public ResponseEntity<Void> deleteAModel( - @ApiParam(value = "slug", required = true) @PathVariable("slug") String slug - ) { - - // TODO : Implement delete method - - return new ResponseEntity<>(HttpStatus.OK); - } - }