提交 3b1d3257 编写于 作者: R Rossen Stoyanchev

Consistent default order for composite ViewResolver

The MVC Java config and namespace now have a consistent default order
or lowest precedence.
上级 27f58db3
...@@ -126,7 +126,6 @@ public class ViewResolversBeanDefinitionParser implements BeanDefinitionParser { ...@@ -126,7 +126,6 @@ public class ViewResolversBeanDefinitionParser implements BeanDefinitionParser {
names = new String[] {"content-negotiation"}; names = new String[] {"content-negotiation"};
List<Element> contentnNegotiationElements = DomUtils.getChildElementsByTagName(element, names); List<Element> contentnNegotiationElements = DomUtils.getChildElementsByTagName(element, names);
if (contentnNegotiationElements.isEmpty()) { if (contentnNegotiationElements.isEmpty()) {
compositeResolverBeanDef.getPropertyValues().add("order", 0);
compositeResolverBeanDef.getPropertyValues().add("viewResolvers", resolvers); compositeResolverBeanDef.getPropertyValues().add("viewResolvers", resolvers);
} }
else if (contentnNegotiationElements.size() == 1) { else if (contentnNegotiationElements.size() == 1) {
......
...@@ -679,7 +679,7 @@ public class MvcNamespaceTests { ...@@ -679,7 +679,7 @@ public class MvcNamespaceTests {
ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class); ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class);
assertNotNull(compositeResolver); assertNotNull(compositeResolver);
assertEquals("Actual: " + compositeResolver.getViewResolvers(), 8, compositeResolver.getViewResolvers().size()); assertEquals("Actual: " + compositeResolver.getViewResolvers(), 8, compositeResolver.getViewResolvers().size());
assertEquals(0, compositeResolver.getOrder()); assertEquals(Ordered.LOWEST_PRECEDENCE, compositeResolver.getOrder());
List<ViewResolver> resolvers = compositeResolver.getViewResolvers(); List<ViewResolver> resolvers = compositeResolver.getViewResolvers();
assertEquals(BeanNameViewResolver.class, resolvers.get(0).getClass()); assertEquals(BeanNameViewResolver.class, resolvers.get(0).getClass());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册