SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove @ResponseBody when using ResponseEntity (#1125)

Browse Source
This commit is contained in:
Johnny Lim
2018-09-04 22:55:08 +09:00
committed by Ryan Baxter
parent 4ee026b03d
commit f7fa6dde60
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/EncryptionController.java
View File

@@ -92,7 +92,6 @@ public class EncryptionController {
}
@ExceptionHandler(KeyFormatException.class)
@ResponseBody
public ResponseEntity<Map<String, Object>> keyFormat() {
Map<String, Object> body = new HashMap<>();
body.put("status", "BAD_REQUEST");
@@ -101,9 +100,8 @@ public class EncryptionController {
}
@ExceptionHandler(KeyNotAvailableException.class)
@ResponseBody
public ResponseEntity<Map<String, Object>> keyUnavailable() {
Map<String, Object> body = new HashMap<String, Object>();
Map<String, Object> body = new HashMap<>();
body.put("status", "NOT_FOUND");
body.put("description", "No public key available");
return new ResponseEntity<>(body, HttpStatus.NOT_FOUND);
@@ -112,7 +110,7 @@ public class EncryptionController {
@RequestMapping(value = "encrypt/status", method = RequestMethod.GET)
public Map<String, Object> status() {
checkEncryptorInstalled("application", "default");
return Collections.<String, Object>singletonMap("status", "OK");
return Collections.singletonMap("status", "OK");
}
@RequestMapping(value = "encrypt", method = RequestMethod.POST)
@@ -213,27 +211,24 @@ public class EncryptionController {
}
@ExceptionHandler(KeyNotInstalledException.class)
@ResponseBody
public ResponseEntity<Map<String, Object>> notInstalled() {
Map<String, Object> body = new HashMap<String, Object>();
Map<String, Object> body = new HashMap<>();
body.put("status", "NO_KEY");
body.put("description", "No key was installed for encryption service");
return new ResponseEntity<>(body, HttpStatus.NOT_FOUND);
}
@ExceptionHandler(EncryptionTooWeakException.class)
@ResponseBody
public ResponseEntity<Map<String, Object>> encryptionTooWeak() {
Map<String, Object> body = new HashMap<String, Object>();
Map<String, Object> body = new HashMap<>();
body.put("status", "INVALID");
body.put("description", "The encryption algorithm is not strong enough");
return new ResponseEntity<>(body, HttpStatus.NOT_FOUND);
}
@ExceptionHandler(InvalidCipherException.class)
@ResponseBody
public ResponseEntity<Map<String, Object>> invalidCipher() {
Map<String, Object> body = new HashMap<String, Object>();
Map<String, Object> body = new HashMap<>();
body.put("status", "INVALID");
body.put("description", "Text not encrypted with this key");
return new ResponseEntity<>(body, HttpStatus.BAD_REQUEST);