Skip to content

Refactor: ResponseExtractor nullability for better inference #36543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ivictors wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

Refactor: ResponseExtractor nullability for better inference #36543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* @param <T> the data type
* @see RestTemplate
*/
public class HttpMessageConverterExtractor<T> implements ResponseExtractor<T> {
public class HttpMessageConverterExtractor<T extends @Nullable Object> implements ResponseExtractor<T> {

private final Type responseType;

Expand Down Expand Up @@ -85,10 +85,10 @@ public HttpMessageConverterExtractor(Type responseType, List<HttpMessageConverte

@Override
@SuppressWarnings({"rawtypes", "unchecked", "resource"})
public @Nullable T extractData(ClientHttpResponse response) throws IOException {
public T extractData(ClientHttpResponse response) throws IOException {
IntrospectingClientHttpResponse responseWrapper = new IntrospectingClientHttpResponse(response);
if (!responseWrapper.hasMessageBody() || responseWrapper.hasEmptyMessageBody()) {
return null;
throw new RestClientException("No response body");
}
MediaType contentType = getContentType(responseWrapper);

Expand Down
4 changes: 2 additions & 2 deletions spring-web/src/main/java/org/springframework/web/client/ResponseExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
* @see RestTemplate#execute
*/
@FunctionalInterface
public interface ResponseExtractor<T> {
public interface ResponseExtractor<T extends @Nullable Object> {

/**
* Extract data from the given {@code ClientHttpResponse} and return it.
* @param response the HTTP response
* @return the extracted data
* @throws IOException in case of I/O errors
*/
@Nullable T extractData(ClientHttpResponse response) throws IOException;
T extractData(ClientHttpResponse response) throws IOException;

}