Skip to content

Commit 4e1756d

Browse files
committed
Polishing
1 parent 5c1ab7e commit 4e1756d

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ private Model initModel() {
8484

8585
@Override
8686
public DefaultRenderingBuilder status(HttpStatusCode status) {
87-
if (this.view instanceof RedirectView) {
88-
((RedirectView) this.view).setStatusCode(status);
87+
if (this.view instanceof RedirectView redirectView) {
88+
redirectView.setStatusCode(status);
8989
}
9090
else {
9191
this.status = status;

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

+10-9
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,17 @@ void defaultValuesForRedirect() {
4949
Rendering rendering = Rendering.redirectTo("abc").build();
5050

5151
Object view = rendering.view();
52-
assertThat(view.getClass()).isEqualTo(RedirectView.class);
53-
assertThat(((RedirectView) view).getUrl()).isEqualTo("abc");
54-
assertThat(((RedirectView) view).isContextRelative()).isTrue();
55-
assertThat(((RedirectView) view).isPropagateQuery()).isFalse();
52+
assertThat(view).isExactlyInstanceOf(RedirectView.class);
53+
RedirectView redirectView = (RedirectView) view;
54+
assertThat(redirectView.getUrl()).isEqualTo("abc");
55+
assertThat(redirectView.isContextRelative()).isTrue();
56+
assertThat(redirectView.isPropagateQuery()).isFalse();
5657
}
5758

58-
5959
@Test
6060
void viewName() {
6161
Rendering rendering = Rendering.view("foo").build();
62+
6263
assertThat(rendering.view()).isEqualTo("foo");
6364
}
6465

@@ -114,7 +115,7 @@ void redirectWithAbsoluteUrl() {
114115
Rendering rendering = Rendering.redirectTo("foo").contextRelative(false).build();
115116

116117
Object view = rendering.view();
117-
assertThat(view.getClass()).isEqualTo(RedirectView.class);
118+
assertThat(view).isExactlyInstanceOf(RedirectView.class);
118119
assertThat(((RedirectView) view).isContextRelative()).isFalse();
119120
}
120121

@@ -123,17 +124,17 @@ void redirectWithPropagateQuery() {
123124
Rendering rendering = Rendering.redirectTo("foo").propagateQuery(true).build();
124125

125126
Object view = rendering.view();
126-
assertThat(view.getClass()).isEqualTo(RedirectView.class);
127+
assertThat(view).isExactlyInstanceOf(RedirectView.class);
127128
assertThat(((RedirectView) view).isPropagateQuery()).isTrue();
128129
}
129130

130-
@Test // gh-33498
131+
@Test // gh-33498
131132
void redirectWithCustomStatus() {
132133
HttpStatus status = HttpStatus.MOVED_PERMANENTLY;
133134
Rendering rendering = Rendering.redirectTo("foo").status(status).build();
134135

135136
Object view = rendering.view();
136-
assertThat(view.getClass()).isEqualTo(RedirectView.class);
137+
assertThat(view).isExactlyInstanceOf(RedirectView.class);
137138
assertThat(((RedirectView) view).getStatusCode()).isEqualTo(status);
138139
}
139140

0 commit comments

Comments
 (0)