Use constant Predicate for exception wrapping. Use ResponseEntity constructor instead of builder. See gh-26069