root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2024-09-09 15:34:00 +02:00
parent 5c1ab7ecd5
commit 4e1756d738
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webflux/src/main/java/org/springframework/web/reactive/result/view/DefaultRenderingBuilder.java
View File

@ -84,8 +84,8 @@ class DefaultRenderingBuilder implements Rendering.RedirectBuilder {
@Override
public DefaultRenderingBuilder status(HttpStatusCode status) {
if (this.view instanceof RedirectView) {
((RedirectView) this.view).setStatusCode(status);
if (this.view instanceof RedirectView redirectView) {
redirectView.setStatusCode(status);
}
else {
this.status = status;

19
spring-webflux/src/test/java/org/springframework/web/reactive/result/view/DefaultRenderingBuilderTests.java
View File

@ -49,16 +49,17 @@ class DefaultRenderingBuilderTests {
Rendering rendering = Rendering.redirectTo("abc").build();
Object view = rendering.view();
assertThat(view.getClass()).isEqualTo(RedirectView.class);
assertThat(((RedirectView) view).getUrl()).isEqualTo("abc");
assertThat(((RedirectView) view).isContextRelative()).isTrue();
assertThat(((RedirectView) view).isPropagateQuery()).isFalse();
assertThat(view).isExactlyInstanceOf(RedirectView.class);
RedirectView redirectView = (RedirectView) view;
assertThat(redirectView.getUrl()).isEqualTo("abc");
assertThat(redirectView.isContextRelative()).isTrue();
assertThat(redirectView.isPropagateQuery()).isFalse();
}
@Test
void viewName() {
Rendering rendering = Rendering.view("foo").build();
assertThat(rendering.view()).isEqualTo("foo");
}
@ -114,7 +115,7 @@ class DefaultRenderingBuilderTests {
Rendering rendering = Rendering.redirectTo("foo").contextRelative(false).build();
Object view = rendering.view();
assertThat(view.getClass()).isEqualTo(RedirectView.class);
assertThat(view).isExactlyInstanceOf(RedirectView.class);
assertThat(((RedirectView) view).isContextRelative()).isFalse();
}
@ -123,17 +124,17 @@ class DefaultRenderingBuilderTests {
Rendering rendering = Rendering.redirectTo("foo").propagateQuery(true).build();
Object view = rendering.view();
assertThat(view.getClass()).isEqualTo(RedirectView.class);
assertThat(view).isExactlyInstanceOf(RedirectView.class);
assertThat(((RedirectView) view).isPropagateQuery()).isTrue();
}
@Test // gh-33498
@Test // gh-33498
void redirectWithCustomStatus() {
HttpStatus status = HttpStatus.MOVED_PERMANENTLY;
Rendering rendering = Rendering.redirectTo("foo").status(status).build();
Object view = rendering.view();
assertThat(view.getClass()).isEqualTo(RedirectView.class);
assertThat(view).isExactlyInstanceOf(RedirectView.class);
assertThat(((RedirectView) view).getStatusCode()).isEqualTo(status);
}