Tidy up implementation of DispatcherServletAutoConfiguration

also adds another test.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfiguration.java

@@ -113,7 +113,10 @@ public class DispatcherServletAutoConfiguration {
 			return checkServletRegistrations(beanFactory);
 		}
 
-		private ConditionOutcome checkServlets(ConfigurableListableBeanFactory beanFactory) {
+	}
+
+	private static ConditionOutcome checkServlets(
+			ConfigurableListableBeanFactory beanFactory) {
 		List<String> servlets = Arrays.asList(beanFactory.getBeanNamesForType(
 				DispatcherServlet.class, false, false));
 		boolean containsDispatcherBean = beanFactory
@@ -141,9 +144,7 @@ public class DispatcherServletAutoConfiguration {
 
 	}
 
-		/**
-		 */
-		protected ConditionOutcome checkServletRegistrations(
+	private static ConditionOutcome checkServletRegistrations(
 			ConfigurableListableBeanFactory beanFactory) {
 
 		List<String> registrations = Arrays.asList(beanFactory.getBeanNamesForType(
@@ -165,8 +166,7 @@ public class DispatcherServletAutoConfiguration {
 					+ DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME);
 		}
 		if (containsDispatcherRegistrationBean) {
-				return ConditionOutcome
-						.noMatch("found non-ServletRegistrationBean named "
+			return ConditionOutcome.noMatch("found non-ServletRegistrationBean named "
 					+ DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME);
 		}
 
@@ -175,7 +175,4 @@ public class DispatcherServletAutoConfiguration {
 						+ DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME);
 
 	}
-
-	}
-
 }

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java

@@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.web;
 import javax.servlet.MultipartConfigElement;
 
 import org.junit.Test;
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.boot.context.embedded.MultiPartConfigFactory;
 import org.springframework.boot.context.embedded.ServletRegistrationBean;
 import org.springframework.boot.test.EnvironmentTestUtils;
@@ -69,6 +70,23 @@ public class DispatcherServletAutoConfigurationTests {
 		assertEquals(0, this.context.getBeanNamesForType(DispatcherServlet.class).length);
 	}
 
+	// If you override either the dispatcherServlet or its registration you have to
+	// provide both...
+	@Test(expected = UnsatisfiedDependencyException.class)
+	public void registrationOverrideWithAutowiredServlet() throws Exception {
+		this.context = new AnnotationConfigWebApplicationContext();
+		this.context.register(CustomAutowiredRegistration.class,
+				ServerPropertiesAutoConfiguration.class,
+				DispatcherServletAutoConfiguration.class);
+		this.context.setServletContext(new MockServletContext());
+		this.context.refresh();
+		ServletRegistrationBean registration = this.context
+				.getBean(ServletRegistrationBean.class);
+		assertEquals("[/foo]", registration.getUrlMappings().toString());
+		assertEquals("customDispatcher", registration.getServletName());
+		assertEquals(1, this.context.getBeanNamesForType(DispatcherServlet.class).length);
+	}
+
 	@Test
 	public void servletPath() throws Exception {
 		this.context = new AnnotationConfigWebApplicationContext();
@@ -121,4 +139,16 @@ public class DispatcherServletAutoConfigurationTests {
 		}
 	}
 
+	@Configuration
+	protected static class CustomAutowiredRegistration {
+		@Bean
+		public ServletRegistrationBean dispatcherServletRegistration(
+				DispatcherServlet dispatcherServlet) {
+			ServletRegistrationBean registration = new ServletRegistrationBean(
+					dispatcherServlet, "/foo");
+			registration.setName("customDispatcher");
+			return registration;
+		}
+	}
+
 }