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

Add request path based default view name support

Browse Source
This commit is contained in:
Rossen Stoyanchev
2016-05-26 18:08:18 -04:00
parent 793638e610
commit f0c8c4e7a4
2 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
View File

@@ -30,9 +30,11 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.ConversionService;
import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.web.reactive.HandlerResult; import org.springframework.web.reactive.HandlerResult;
import org.springframework.web.reactive.HandlerResultHandler; import org.springframework.web.reactive.HandlerResultHandler;
import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.util.HttpRequestPathHelper;
/** /**
@@ -54,6 +56,8 @@ public class ViewResolutionResultHandler implements HandlerResultHandler, Ordere
private int order = Ordered.LOWEST_PRECEDENCE; private int order = Ordered.LOWEST_PRECEDENCE;
private final HttpRequestPathHelper pathHelper = new HttpRequestPathHelper();
/** /**
* Constructor with {@code ViewResolver}s tand a {@code ConversionService}. * Constructor with {@code ViewResolver}s tand a {@code ConversionService}.
@@ -180,7 +184,14 @@ public class ViewResolutionResultHandler implements HandlerResultHandler, Ordere
} }
protected String getDefaultViewName(ServerWebExchange exchange, HandlerResult result) { protected String getDefaultViewName(ServerWebExchange exchange, HandlerResult result) {
return null; String path = this.pathHelper.getLookupPathForRequest(exchange);
if (path.startsWith("/")) {
path = path.substring(1);
}
if (path.endsWith("/")) {
path = path.substring(0, path.length() - 1);
}
return StringUtils.stripFilenameExtension(path);
} }
} }

63
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java
View File

@@ -17,6 +17,7 @@ package org.springframework.web.reactive.result.view;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.time.Duration; import java.time.Duration;
@@ -54,10 +55,8 @@ import org.springframework.web.server.adapter.DefaultServerWebExchange;
import org.springframework.web.server.session.DefaultWebSessionManager; import org.springframework.web.server.session.DefaultWebSessionManager;
import org.springframework.web.server.session.WebSessionManager; import org.springframework.web.server.session.WebSessionManager;
import static org.hamcrest.CoreMatchers.endsWith;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -82,10 +81,7 @@ public class ViewResolutionResultHandlerTests {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, new URI("/path")); this.exchange = createExchange("/path");
this.response = new MockServerHttpResponse();
WebSessionManager sessionManager = new DefaultWebSessionManager();
this.exchange = new DefaultServerWebExchange(request, this.response, sessionManager);
this.model = new ExtendedModelMap().addAttribute("id", "123"); this.model = new ExtendedModelMap().addAttribute("id", "123");
this.conversionService = new DefaultConversionService(); this.conversionService = new DefaultConversionService();
this.conversionService.addConverter(new ReactiveStreamsToRxJava1Converter()); this.conversionService.addConverter(new ReactiveStreamsToRxJava1Converter());
@@ -116,7 +112,7 @@ public class ViewResolutionResultHandlerTests {
TestView view = new TestView("account"); TestView view = new TestView("account");
List<ViewResolver> resolvers = Collections.singletonList(mock(ViewResolver.class)); List<ViewResolver> resolvers = Collections.singletonList(mock(ViewResolver.class));
ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService); ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService);
handle(handler, view, ResolvableType.forClass(View.class)); handle(this.exchange, handler, view, ResolvableType.forClass(View.class));
new TestSubscriber<DataBuffer>().bindTo(this.response.getBody()) new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
.assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf))); .assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf)));
@@ -127,7 +123,7 @@ public class ViewResolutionResultHandlerTests {
TestView view = new TestView("account"); TestView view = new TestView("account");
List<ViewResolver> resolvers = Collections.singletonList(mock(ViewResolver.class)); List<ViewResolver> resolvers = Collections.singletonList(mock(ViewResolver.class));
ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService); ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService);
handle(handler, Mono.just(view), methodReturnType("handleMonoView")); handle(this.exchange, handler, Mono.just(view), methodReturnType("handleMonoView"));
new TestSubscriber<DataBuffer>().bindTo(this.response.getBody()) new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
.assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf))); .assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf)));
@@ -139,7 +135,7 @@ public class ViewResolutionResultHandlerTests {
TestViewResolver resolver = new TestViewResolver().addView(view); TestViewResolver resolver = new TestViewResolver().addView(view);
List<ViewResolver> resolvers = Collections.singletonList(resolver); List<ViewResolver> resolvers = Collections.singletonList(resolver);
ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService); ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService);
handle(handler, "account", ResolvableType.forClass(String.class)); handle(this.exchange, handler, "account", ResolvableType.forClass(String.class));
TestSubscriber<DataBuffer> subscriber = new TestSubscriber<>(); TestSubscriber<DataBuffer> subscriber = new TestSubscriber<>();
subscriber.bindTo(this.response.getBody()) subscriber.bindTo(this.response.getBody())
@@ -152,7 +148,7 @@ public class ViewResolutionResultHandlerTests {
TestViewResolver resolver = new TestViewResolver().addView(view); TestViewResolver resolver = new TestViewResolver().addView(view);
List<ViewResolver> resolvers = Collections.singletonList(resolver); List<ViewResolver> resolvers = Collections.singletonList(resolver);
ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService); ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService);
handle(handler, Mono.just("account"), methodReturnType("handleMonoString")); handle(this.exchange, handler, Mono.just("account"), methodReturnType("handleMonoString"));
new TestSubscriber<DataBuffer>().bindTo(this.response.getBody()) new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
.assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf))); .assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf)));
@@ -166,7 +162,7 @@ public class ViewResolutionResultHandlerTests {
TestViewResolver resolver2 = new TestViewResolver().addView(view2); TestViewResolver resolver2 = new TestViewResolver().addView(view2);
List<ViewResolver> resolvers = Arrays.asList(resolver1, resolver2); List<ViewResolver> resolvers = Arrays.asList(resolver1, resolver2);
ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService); ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService);
handle(handler, "profile", ResolvableType.forClass(String.class)); handle(this.exchange, handler, "profile", ResolvableType.forClass(String.class));
new TestSubscriber<DataBuffer>().bindTo(this.response.getBody()) new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
.assertValuesWith(buf -> assertEquals("profile: {id=123}", asString(buf))); .assertValuesWith(buf -> assertEquals("profile: {id=123}", asString(buf)));
@@ -176,19 +172,32 @@ public class ViewResolutionResultHandlerTests {
public void viewNameWithNoMatch() throws Exception { public void viewNameWithNoMatch() throws Exception {
List<ViewResolver> resolvers = Collections.singletonList(mock(ViewResolver.class)); List<ViewResolver> resolvers = Collections.singletonList(mock(ViewResolver.class));
ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService); ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService);
TestSubscriber<Void> subscriber = handle(handler, "account", ResolvableType.forClass(String.class)); TestSubscriber<Void> subscriber = handle(this.exchange, handler, "account", ResolvableType.forClass(String.class));
subscriber.assertNoValues(); subscriber.assertNoValues();
} }
@Test @Test
public void viewNameNotSpecified() throws Exception { public void viewNameNotSpecified() throws Exception {
List<ViewResolver> resolvers = Collections.singletonList(mock(ViewResolver.class)); TestView view = new TestView("account");
TestViewResolver resolver = new TestViewResolver().addView(view);
List<ViewResolver> resolvers = Collections.singletonList(resolver);
ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService); ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService);
TestSubscriber<Void> subscriber = handle(handler, null, ResolvableType.forClass(String.class));
subscriber.assertErrorWith(ex -> ServerWebExchange exchange = createExchange("/account");
assertThat(ex.getMessage(), endsWith("neither returned a view name nor a View object"))); handle(exchange, handler, null, ResolvableType.forClass(String.class));
new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
.assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf)));
exchange = createExchange("/account/");
handle(exchange, handler, null, ResolvableType.forClass(String.class));
new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
.assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf)));
exchange = createExchange("/account.123");
handle(exchange, handler, null, ResolvableType.forClass(String.class));
new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
.assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf)));
} }
@Test @Test
@@ -196,13 +205,9 @@ public class ViewResolutionResultHandlerTests {
TestView view = new TestView("account"); TestView view = new TestView("account");
TestViewResolver resolver = new TestViewResolver().addView(view); TestViewResolver resolver = new TestViewResolver().addView(view);
List<ViewResolver> resolvers = Collections.singletonList(resolver); List<ViewResolver> resolvers = Collections.singletonList(resolver);
HandlerResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService) { HandlerResultHandler handler = new ViewResolutionResultHandler(resolvers, this.conversionService);
@Override ServerWebExchange exchange = createExchange("/account");
protected String getDefaultViewName(ServerWebExchange exchange, HandlerResult result) { handle(exchange, handler, Mono.empty(), methodReturnType("handleMonoString"));
return "account";
}
};
handle(handler, Mono.empty(), methodReturnType("handleMonoString"));
new TestSubscriber<DataBuffer>().bindTo(this.response.getBody()) new TestSubscriber<DataBuffer>().bindTo(this.response.getBody())
.assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf))); .assertValuesWith(buf -> assertEquals("account: {id=123}", asString(buf)));
@@ -225,10 +230,18 @@ public class ViewResolutionResultHandlerTests {
} }
private ServerWebExchange createExchange(String path) throws URISyntaxException {
ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, new URI(path));
this.response = new MockServerHttpResponse();
WebSessionManager sessionManager = new DefaultWebSessionManager();
return new DefaultServerWebExchange(request, this.response, sessionManager);
}
private TestSubscriber<Void> handle(ServerWebExchange exchange, HandlerResultHandler handler,
Object value, ResolvableType type) {
private TestSubscriber<Void> handle(HandlerResultHandler handler, Object value, ResolvableType type) {
HandlerResult result = new HandlerResult(new Object(), value, type, this.model); HandlerResult result = new HandlerResult(new Object(), value, type, this.model);
Mono<Void> mono = handler.handleResult(this.exchange, result); Mono<Void> mono = handler.handleResult(exchange, result);
TestSubscriber<Void> subscriber = new TestSubscriber<>(); TestSubscriber<Void> subscriber = new TestSubscriber<>();
return subscriber.bindTo(mono).await(Duration.ofSeconds(1)); return subscriber.bindTo(mono).await(Duration.ofSeconds(1));
} }