Skip to content

Commit 3b1d325

Browse files
committed
Consistent default order for composite ViewResolver
The MVC Java config and namespace now have a consistent default order or lowest precedence.
1 parent 27f58db commit 3b1d325

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ else if ("bean-name".equals(name)) {
126126
names = new String[] {"content-negotiation"};
127127
List<Element> contentnNegotiationElements = DomUtils.getChildElementsByTagName(element, names);
128128
if (contentnNegotiationElements.isEmpty()) {
129-
compositeResolverBeanDef.getPropertyValues().add("order", 0);
130129
compositeResolverBeanDef.getPropertyValues().add("viewResolvers", resolvers);
131130
}
132131
else if (contentnNegotiationElements.size() == 1) {

spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ public void testViewResolution() throws Exception {
679679
ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class);
680680
assertNotNull(compositeResolver);
681681
assertEquals("Actual: " + compositeResolver.getViewResolvers(), 8, compositeResolver.getViewResolvers().size());
682-
assertEquals(0, compositeResolver.getOrder());
682+
assertEquals(Ordered.LOWEST_PRECEDENCE, compositeResolver.getOrder());
683683

684684
List<ViewResolver> resolvers = compositeResolver.getViewResolvers();
685685
assertEquals(BeanNameViewResolver.class, resolvers.get(0).getClass());

0 commit comments

Comments
 (0)