From 445344211d76289651b261fc5f27cd3bffb26fd8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 12 May 2017 16:44:22 +0100 Subject: [PATCH] Remove use of deprecated API in TomcatServletWebServerFactory --- .../tomcat/TomcatServletWebServerFactory.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java index 493e94c985..8b3732fe03 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java @@ -252,7 +252,7 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto // Otherwise the default location of a Spring DispatcherServlet cannot be set defaultServlet.setOverridable(true); context.addChild(defaultServlet); - addServletMapping(context, "/", "default"); + context.addServletMappingDecoded("/", "default"); } private void addJspServlet(Context context) { @@ -266,13 +266,8 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto } jspServlet.setLoadOnStartup(3); context.addChild(jspServlet); - addServletMapping(context, "*.jsp", "jsp"); - addServletMapping(context, "*.jspx", "jsp"); - } - - @SuppressWarnings("deprecation") - private void addServletMapping(Context context, String pattern, String name) { - context.addServletMapping(pattern, name); + context.addServletMappingDecoded("*.jsp", "jsp"); + context.addServletMappingDecoded("*.jspx", "jsp"); } private void addJasperInitializer(TomcatEmbeddedContext context) {