Skip to content

Improve nullability in DefaultResponseCreator #36969

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
bjmi wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −9
Open

Improve nullability in DefaultResponseCreator #36969

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 ...st/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ public DefaultResponseCreator body(Resource resource) {
/**
* Set the {@code Content-Type} header.
*/
public DefaultResponseCreator contentType(MediaType mediaType) {
public DefaultResponseCreator contentType(@Nullable MediaType mediaType) {
this.headers.setContentType(mediaType);
return this;
}

/**
* Set the {@code Location} header.
*/
public DefaultResponseCreator location(URI location) {
public DefaultResponseCreator location(@Nullable URI location) {
this.headers.setLocation(location);
return this;
}
Expand All @@ -123,7 +123,7 @@ public DefaultResponseCreator location(URI location) {
* Add a response header with one or more values.
* @since 6.0
*/
public DefaultResponseCreator header(String name, String ... headerValues) {
public DefaultResponseCreator header(String name, @Nullable String... headerValues) {
for (String headerValue : headerValues) {
this.headers.add(name, headerValue);
}
Expand Down
9 changes: 3 additions & 6 deletions .../src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ public static DefaultResponseCreator withSuccess() {
* @param contentType the type of the content (may be {@code null})
*/
public static DefaultResponseCreator withSuccess(String body, @Nullable MediaType contentType) {
DefaultResponseCreator creator = new DefaultResponseCreator(HttpStatus.OK).body(body);
return (contentType != null ? creator.contentType(contentType) : creator);
return new DefaultResponseCreator(HttpStatus.OK).body(body).contentType(contentType);
}

/**
Expand All @@ -64,8 +63,7 @@ public static DefaultResponseCreator withSuccess(String body, @Nullable MediaTyp
* @param contentType the type of the content (may be {@code null})
*/
public static DefaultResponseCreator withSuccess(byte[] body, @Nullable MediaType contentType) {
DefaultResponseCreator creator = new DefaultResponseCreator(HttpStatus.OK).body(body);
return (contentType != null ? creator.contentType(contentType) : creator);
return new DefaultResponseCreator(HttpStatus.OK).body(body).contentType(contentType);
}

/**
Expand All @@ -74,8 +72,7 @@ public static DefaultResponseCreator withSuccess(byte[] body, @Nullable MediaTyp
* @param contentType the type of the content (may be {@code null})
*/
public static DefaultResponseCreator withSuccess(Resource body, @Nullable MediaType contentType) {
DefaultResponseCreator creator = new DefaultResponseCreator(HttpStatus.OK).body(body);
return (contentType != null ? creator.contentType(contentType) : creator);
return new DefaultResponseCreator(HttpStatus.OK).body(body).contentType(contentType);
}

/**
Expand Down