Merge branch '2.0.x'

2022-01-12 12:36:42 +00:00
parent 2bac639fa3 87e9b58201
commit 0a8c2b1b1f
22 changed files with 665 additions and 208 deletions
--- a/samples/rest-notes-spring-data-rest/src/main/java/com/example/notes/ErrorController.java
+++ b/samples/rest-notes-spring-data-rest/src/main/java/com/example/notes/ErrorController.java
@@ -36,7 +36,6 @@ class ErrorController {
 		Map<String, Object> body = Map.of("status", httpStatus.value(),
 				"error", httpStatus.getReasonPhrase(),
 				"path", request.getAttribute(RequestDispatcher.ERROR_REQUEST_URI),
-				"message", request.getAttribute(RequestDispatcher.ERROR_MESSAGE),
 				"timestamp", Instant.now().toEpochMilli());
 		ResponseEntity<Map<String, Object>> response = new ResponseEntity<>(body, httpStatus);
 		return response;