From 3b1d3257d5fc921fe1841ed2e4868c95e3e1ff66 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 30 Sep 2014 10:08:09 -0400 Subject: [PATCH] Consistent default order for composite ViewResolver The MVC Java config and namespace now have a consistent default order or lowest precedence. --- .../web/servlet/config/ViewResolversBeanDefinitionParser.java | 1 - .../springframework/web/servlet/config/MvcNamespaceTests.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java index ed569dda4d..fcce66e29b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java @@ -126,7 +126,6 @@ public class ViewResolversBeanDefinitionParser implements BeanDefinitionParser { names = new String[] {"content-negotiation"}; List contentnNegotiationElements = DomUtils.getChildElementsByTagName(element, names); if (contentnNegotiationElements.isEmpty()) { - compositeResolverBeanDef.getPropertyValues().add("order", 0); compositeResolverBeanDef.getPropertyValues().add("viewResolvers", resolvers); } else if (contentnNegotiationElements.size() == 1) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index d1bc899594..d712d62123 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -679,7 +679,7 @@ public class MvcNamespaceTests { ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class); assertNotNull(compositeResolver); assertEquals("Actual: " + compositeResolver.getViewResolvers(), 8, compositeResolver.getViewResolvers().size()); - assertEquals(0, compositeResolver.getOrder()); + assertEquals(Ordered.LOWEST_PRECEDENCE, compositeResolver.getOrder()); List resolvers = compositeResolver.getViewResolvers(); assertEquals(BeanNameViewResolver.class, resolvers.get(0).getClass());