Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Arjen Poutsma
2022-08-30 15:15:57 +02:00
parent 3eaf259f2d f91943977c
commit 4b18cc94ea
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseBuilder.java
View File

@@ -40,6 +40,8 @@ import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.reactive.result.view.RedirectView;
import org.springframework.web.reactive.result.view.View;
import org.springframework.web.reactive.result.view.ViewResolver;
import org.springframework.web.server.ServerWebExchange;
@@ -194,6 +196,7 @@ final class DefaultRenderingResponseBuilder implements RenderingResponse.Builder
.switchIfEmpty(Mono.error(() ->
new IllegalArgumentException("Could not resolve view with name '" + name() + "'")))
.flatMap(view -> {
setStatus(view);
List<MediaType> mediaTypes = view.getSupportedMediaTypes();
return view.render(model(),
contentType == null && !mediaTypes.isEmpty() ? mediaTypes.get(0) : contentType,
@@ -201,6 +204,16 @@ final class DefaultRenderingResponseBuilder implements RenderingResponse.Builder
});
}
private void setStatus(View view) {
if (view instanceof RedirectView) {
HttpStatus httpStatus = HttpStatus.resolve(rawStatusCode());
if (httpStatus != null && httpStatus.is3xxRedirection()) {
RedirectView redirectView = (RedirectView) view;
redirectView.setStatusCode(httpStatus);
}
}
}
}
}