From 79a2d5d053caa663c878424a0602340264b86ab2 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Wed, 1 Jun 2016 08:39:48 +0200
Subject: [PATCH] cleaned code
---
src/main/java/org/hbp/mip/MIPApplication.java | 1 +
.../org/hbp/mip/controllers/ArticlesApi.java | 16 ++--------------
.../java/org/hbp/mip/controllers/ModelsApi.java | 14 +-------------
3 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/hbp/mip/MIPApplication.java b/src/main/java/org/hbp/mip/MIPApplication.java
index 5a00a3a7d..0c44fef61 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 2ac7d351b..8a0a15e52 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 938464ded..7041bbe76 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);
- }
-
}
--
GitLab