From a08deff0ce2ee1c44a13292c83604f0595dcf3d9 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 14 Mar 2018 23:36:03 +0100 Subject: [PATCH] Fix WelcomePageHandlerMapping order This commit fixes 220f8cd and moves the order for `WelcomePageHandlerMapping` to `2` since the previous order was conflicting with the resource mapping. Closes gh-12335 --- .../autoconfigure/web/servlet/WelcomePageHandlerMapping.java | 3 +-- .../web/servlet/WelcomePageHandlerMappingTests.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMapping.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMapping.java index 368cc0187c..9c9c378666 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMapping.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMapping.java @@ -27,7 +27,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProviders; import org.springframework.context.ApplicationContext; -import org.springframework.core.Ordered; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -75,7 +74,7 @@ final class WelcomePageHandlerMapping extends AbstractUrlHandlerMapping { ParameterizableViewController controller = new ParameterizableViewController(); controller.setViewName(viewName); setRootHandler(controller); - setOrder(Ordered.LOWEST_PRECEDENCE - 1); + setOrder(2); } @Override diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java index c99b9ccf23..9c485106a2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java @@ -35,7 +35,6 @@ import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; @@ -70,7 +69,7 @@ public class WelcomePageHandlerMappingTests { WelcomePageHandlerMapping handler = context .getBean(WelcomePageHandlerMapping.class); assertThat(handler.getOrder()) - .isEqualTo(Ordered.LOWEST_PRECEDENCE - 1); + .isEqualTo(2); }); }