Polish

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java

@@ -165,35 +165,40 @@ public EndpointRequestMatcher excludingLinks() {
 		}
 
 		@Override
-		protected void initialized(Supplier<WebApplicationContext> webApplicationContext) {
+		protected void initialized(
+				Supplier<WebApplicationContext> webApplicationContext) {
 			this.delegate = createDelegate(webApplicationContext);
 		}
 
 		private RequestMatcher createDelegate(
 				Supplier<WebApplicationContext> webApplicationContext) {
 			try {
 				WebApplicationContext context = webApplicationContext.get();
-				PathMappedEndpoints pathMappedEndpoints = context.getBean(PathMappedEndpoints.class);
-				DispatcherServletPathProvider pathProvider = context.getBean(DispatcherServletPathProvider.class);
+				PathMappedEndpoints pathMappedEndpoints = context
+						.getBean(PathMappedEndpoints.class);
+				DispatcherServletPathProvider pathProvider = context
+						.getBean(DispatcherServletPathProvider.class);
 				return createDelegate(pathMappedEndpoints, pathProvider.getServletPath());
 			}
 			catch (NoSuchBeanDefinitionException ex) {
 				return EMPTY_MATCHER;
 			}
 		}
 
-		private RequestMatcher createDelegate(PathMappedEndpoints pathMappedEndpoints, String servletPath) {
+		private RequestMatcher createDelegate(PathMappedEndpoints pathMappedEndpoints,
+				String servletPath) {
 			Set<String> paths = new LinkedHashSet<>();
 			if (this.includes.isEmpty()) {
 				paths.addAll(pathMappedEndpoints.getAllPaths());
 			}
 			streamPaths(this.includes, pathMappedEndpoints).forEach(paths::add);
 			streamPaths(this.excludes, pathMappedEndpoints).forEach(paths::remove);
-			List<RequestMatcher> delegateMatchers = getDelegateMatchers(servletPath, paths);
+			List<RequestMatcher> delegateMatchers = getDelegateMatchers(servletPath,
+					paths);
 			if (this.includeLinks
 					&& StringUtils.hasText(pathMappedEndpoints.getBasePath())) {
-				delegateMatchers.add(
-						new AntPathRequestMatcher(servletPath + pathMappedEndpoints.getBasePath()));
+				delegateMatchers.add(new AntPathRequestMatcher(
+						servletPath + pathMappedEndpoints.getBasePath()));
 			}
 			return new OrRequestMatcher(delegateMatchers);
 		}
@@ -221,8 +226,10 @@ private String getEndpointId(Class<?> source) {
 			return annotation.id();
 		}
 
-		private List<RequestMatcher> getDelegateMatchers(String servletPath, Set<String> paths) {
-			return paths.stream().map((path) -> new AntPathRequestMatcher(servletPath + path + "/**"))
+		private List<RequestMatcher> getDelegateMatchers(String servletPath,
+				Set<String> paths) {
+			return paths.stream()
+					.map((path) -> new AntPathRequestMatcher(servletPath + path + "/**"))
 					.collect(Collectors.toList());
 		}
 
@@ -247,19 +254,23 @@ private LinksRequestMatcher() {
 		}
 
 		@Override
-		protected void initialized(Supplier<WebApplicationContext> webApplicationContext) {
+		protected void initialized(
+				Supplier<WebApplicationContext> webApplicationContext) {
 			try {
 				WebApplicationContext context = webApplicationContext.get();
-				WebEndpointProperties properties = context.getBean(WebEndpointProperties.class);
-				DispatcherServletPathProvider pathProvider = context.getBean(DispatcherServletPathProvider.class);
+				WebEndpointProperties properties = context
+						.getBean(WebEndpointProperties.class);
+				DispatcherServletPathProvider pathProvider = context
+						.getBean(DispatcherServletPathProvider.class);
 				this.delegate = createDelegate(pathProvider.getServletPath(), properties);
 			}
 			catch (NoSuchBeanDefinitionException ex) {
 				this.delegate = EMPTY_MATCHER;
 			}
 		}
 
-		private RequestMatcher createDelegate(String path, WebEndpointProperties properties) {
+		private RequestMatcher createDelegate(String path,
+				WebEndpointProperties properties) {
 			if (StringUtils.hasText(properties.getBasePath())) {
 				return new AntPathRequestMatcher(path + properties.getBasePath());
 			}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java

@@ -65,9 +65,11 @@ public void contextShouldNotConfigureRequestContextFilterWhenRequestContextListe
 
 	@Test
 	public void contextShouldConfigureDispatcherServletPathProviderWithEmptyPath() {
-		this.contextRunner.withUserConfiguration(WebMvcEndpointChildContextConfiguration.class)
-				.run((context) -> assertThat(context.getBean(DispatcherServletPathProvider.class)
-						.getServletPath()).isEmpty());
+		this.contextRunner
+				.withUserConfiguration(WebMvcEndpointChildContextConfiguration.class)
+				.run((context) -> assertThat(context
+						.getBean(DispatcherServletPathProvider.class).getServletPath())
+								.isEmpty());
 	}
 
 	static class ExistingConfig {

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

@@ -90,7 +90,8 @@ protected static class DispatcherServletConfiguration {
 
 		private final ServerProperties serverProperties;
 
-		public DispatcherServletConfiguration(WebMvcProperties webMvcProperties, ServerProperties serverProperties) {
+		public DispatcherServletConfiguration(WebMvcProperties webMvcProperties,
+				ServerProperties serverProperties) {
 			this.webMvcProperties = webMvcProperties;
 			this.serverProperties = serverProperties;
 		}
@@ -117,7 +118,8 @@ public MultipartResolver multipartResolver(MultipartResolver resolver) {
 
 		@Bean
 		public DispatcherServletPathProvider mainDispatcherServletPathProvider() {
-			return () -> DispatcherServletConfiguration.this.serverProperties.getServlet().getPath();
+			return () -> DispatcherServletConfiguration.this.serverProperties.getServlet()
+					.getPath();
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletPathProvider.java

@@ -19,8 +19,8 @@
 import org.springframework.web.servlet.DispatcherServlet;
 
 /**
- * Interface that provides the path of the {@link DispatcherServlet} in
- * an application context.
+ * Interface that provides the path of the {@link DispatcherServlet} in an application
+ * context.
  *
  * @author Madhura Bhave
  * @since 2.0.2
@@ -31,4 +31,3 @@ public interface DispatcherServletPathProvider {
 	String getServletPath();
 
 }
-