Spring MVC ResponseBodyAdvice to return HTTP 404 if Response Body is an empty Optional

EmptyOptionalResponseBodyControllerAdvice.java

@ControllerAdvice
public class EmptyOptionalResponseBodyControllerAdvice implements ResponseBodyAdvice<Optional<?>> {
    @Override
    public boolean supports(MethodParameter returnType, @Nullable Class<? extends HttpMessageConverter<?>> converterType) {
        return Optional.class.isAssignableFrom(returnType.getParameterType());
    }

    @Override
    public Optional<?> beforeBodyWrite(Optional<?> body, @Nullable MethodParameter returnType, @Nullable MediaType selectedContentType,
                                       @Nullable Class<? extends HttpMessageConverter<?>> selectedConverterType,
                                       @Nullable ServerHttpRequest request, @Nullable ServerHttpResponse response) {
        if (body.isEmpty()) {
            throw new ResponseStatusException(HttpStatus.NOT_FOUND);
        }

        return body;
    }
}