Polish

Author: philwebb

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java

@@ -21,6 +21,7 @@
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
+import org.apache.tomcat.util.buf.UDecoder;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.junit.ClassRule;
@@ -104,7 +105,8 @@ protected void postProcessContext(Context context) {
 					jerseyServlet.setServlet(new ServletContainer());
 					jerseyServlet.setOverridable(false);
 					context.addChild(jerseyServlet);
-					context.addServletMapping("/*", servletName);
+					String pattern = UDecoder.URLDecode("/*", "UTF-8");
+					context.addServletMappingDecoded(pattern, servletName);
 				}
 
 			};

spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java

@@ -254,7 +254,7 @@ private void addDefaultServlet(Context context) {
 		// Otherwise the default location of a Spring DispatcherServlet cannot be set
 		defaultServlet.setOverridable(true);
 		context.addChild(defaultServlet);
-		context.addServletMapping("/", "default");
+		addServletMapping(context, "/", "default");
 	}
 
 	private void addJspServlet(Context context) {
@@ -268,8 +268,13 @@ private void addJspServlet(Context context) {
 		}
 		jspServlet.setLoadOnStartup(3);
 		context.addChild(jspServlet);
-		context.addServletMapping("*.jsp", "jsp");
-		context.addServletMapping("*.jspx", "jsp");
+		addServletMapping(context, "*.jsp", "jsp");
+		addServletMapping(context, "*.jspx", "jsp");
+	}
+
+	@SuppressWarnings("deprecation")
+	private void addServletMapping(Context context, String pattern, String name) {
+		context.addServletMapping(pattern, name);
 	}
 
 	private void addJasperInitializer(TomcatEmbeddedContext context) {