Merge branch '2.0.x'

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryWebEndpointServletHandlerMapping.java

@@ -134,6 +134,7 @@ public Object handle(HttpServletRequest request, Map<String, String> body) {
 			}
 			return this.delegate.handle(request, body);
 		}
+
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java

@@ -31,7 +31,6 @@
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
- *
  * @since 2.0.0
  */
 @Configuration

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterRegistryConfigurer.java

@@ -28,11 +28,11 @@
 import org.springframework.boot.util.LambdaSafe;
 
 /**
- * Configurer to apply {@link MeterRegistryCustomizer customizers},
- * {@link MeterFilter filters}, {@link MeterBinder binders} and {@link Metrics#addRegistry
- * global registration} to {@link MeterRegistry meter registries}. This configurer
- * intentionally skips {@link CompositeMeterRegistry} with the assumptions that the
- * registries it contains are beans and will be customized directly.
+ * Configurer to apply {@link MeterRegistryCustomizer customizers}, {@link MeterFilter
+ * filters}, {@link MeterBinder binders} and {@link Metrics#addRegistry global
+ * registration} to {@link MeterRegistry meter registries}. This configurer intentionally
+ * skips {@link CompositeMeterRegistry} with the assumptions that the registries it
+ * contains are beans and will be customized directly.
  *
  * @author Jon Schneider
  * @author Phillip Webb

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/health/HealthEndpointAutoConfigurationTests.java

@@ -124,4 +124,5 @@ public ReactiveHealthIndicator reactiveHealthIndicator() {
 		}
 
 	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java

@@ -71,8 +71,7 @@ public void autoConfiguresWithAnAccessToken() {
 	@Test
 	public void autoConfigurationCanBeDisabled() {
 		this.contextRunner.withUserConfiguration(BaseConfiguration.class)
-				.withPropertyValues(
-						"management.metrics.export.signalfx.enabled=false")
+				.withPropertyValues("management.metrics.export.signalfx.enabled=false")
 				.run((context) -> assertThat(context)
 						.doesNotHaveBean(SignalFxMeterRegistry.class)
 						.doesNotHaveBean(SignalFxConfig.class));

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimplePropertiesTests.java

@@ -22,7 +22,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- *
  * @author Stephane Nicoll
  */
 public class SimplePropertiesTests {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java

@@ -75,10 +75,13 @@ public void toAnyEndpointShouldNotMatchOtherPath() {
 	@Test
 	public void toAnyEndpointWhenServletPathNotEmptyShouldMatch() {
 		RequestMatcher matcher = EndpointRequest.toAnyEndpoint();
-		assertMatcher(matcher, "/actuator", "/spring").matches("/spring", "/actuator/foo");
-		assertMatcher(matcher, "/actuator", "/spring").matches("/spring", "/actuator/bar");
+		assertMatcher(matcher, "/actuator", "/spring").matches("/spring",
+				"/actuator/foo");
+		assertMatcher(matcher, "/actuator", "/spring").matches("/spring",
+				"/actuator/bar");
 		assertMatcher(matcher, "/actuator", "/spring").matches("/spring", "/actuator");
-		assertMatcher(matcher, "/actuator", "/spring").doesNotMatch("/spring", "/actuator/baz");
+		assertMatcher(matcher, "/actuator", "/spring").doesNotMatch("/spring",
+				"/actuator/baz");
 		assertMatcher(matcher, "/actuator", "/spring").doesNotMatch("", "/actuator/foo");
 	}
 
@@ -128,7 +131,8 @@ public void toLinksWhenBasePathEmptyShouldNotMatch() {
 	@Test
 	public void toLinksWhenServletPathNotEmptyShouldNotMatch() {
 		RequestMatcher matcher = EndpointRequest.toLinks();
-		RequestMatcherAssert assertMatcher = assertMatcher(matcher, "/actuator", "/spring");
+		RequestMatcherAssert assertMatcher = assertMatcher(matcher, "/actuator",
+				"/spring");
 		assertMatcher.matches("/spring/actuator");
 	}
 
@@ -197,7 +201,8 @@ private RequestMatcherAssert assertMatcher(RequestMatcher matcher, String basePa
 		return assertMatcher(matcher, mockPathMappedEndpoints(basePath));
 	}
 
-	private RequestMatcherAssert assertMatcher(RequestMatcher matcher, String basePath, String servletPath) {
+	private RequestMatcherAssert assertMatcher(RequestMatcher matcher, String basePath,
+			String servletPath) {
 		return assertMatcher(matcher, mockPathMappedEndpoints(basePath), servletPath);
 	}
 
@@ -232,7 +237,8 @@ private RequestMatcherAssert assertMatcher(RequestMatcher matcher,
 				properties.setBasePath(pathMappedEndpoints.getBasePath());
 			}
 		}
-		context.registerBean(DispatcherServletPathProvider.class, () -> () -> servletPath);
+		DispatcherServletPathProvider pathProvider = () -> servletPath;
+		context.registerBean(DispatcherServletPathProvider.class, () -> pathProvider);
 		return assertThat(new RequestMatcherAssert(context, matcher));
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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-actuator/src/main/java/org/springframework/boot/actuate/beans/BeansEndpoint.java

@@ -44,7 +44,6 @@ public class BeansEndpoint {
 	/**
 	 * Creates a new {@code BeansEndpoint} that will describe the beans in the given
 	 * {@code context} and all of its ancestors.
-	 *
 	 * @param context the application context
 	 * @see ConfigurableApplicationContext#getParent()
 	 */

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java

@@ -335,6 +335,7 @@ public void serializeAsField(Object pojo, JsonGenerator jgen,
 			}
 			super.serializeAsField(pojo, jgen, provider, writer);
 		}
+
 	}
 
 	/**

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/MissingParametersException.java

@@ -51,4 +51,5 @@ public MissingParametersException(Set<OperationParameter> missingParameters) {
 	public Set<OperationParameter> getMissingParameters() {
 		return this.missingParameters;
 	}
+
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java

@@ -107,8 +107,8 @@ private Object invoke(JmxOperation operation, Object[] params)
 			return this.responseMapper.mapResponse(result);
 		}
 		catch (InvalidEndpointRequestException ex) {
-			throw new ReflectionException(new IllegalArgumentException(
-					ex.getMessage()), ex.getMessage());
+			throw new ReflectionException(new IllegalArgumentException(ex.getMessage()),
+					ex.getMessage());
 		}
 		catch (Exception ex) {
 			throw new MBeanException(translateIfNecessary(ex), ex.getMessage());

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/DiscoveredJmxOperation.java

@@ -210,4 +210,5 @@ public static Class<?> get(Class<?> source) {
 		}
 
 	}
+
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointMapping.java

@@ -30,7 +30,6 @@ public class EndpointMapping {
 
 	/**
 	 * Creates a new {@code EndpointMapping} using the given {@code path}.
-	 *
 	 * @param path the path
 	 */
 	public EndpointMapping(String path) {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/DiscoveredWebEndpoint.java

@@ -44,4 +44,5 @@ class DiscoveredWebEndpoint extends AbstractDiscoveredEndpoint<WebOperation>
 	public String getRootPath() {
 		return this.rootPath;
 	}
+
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java

@@ -251,6 +251,7 @@ protected interface ReactiveWebOperation {
 
 		Mono<ResponseEntity<Object>> handle(ServerWebExchange exchange,
 				Map<String, String> body);
+
 	}
 
 	/**

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LoggersEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java

@@ -173,6 +173,7 @@ public static final class ListNamesResponse {
 		public Set<String> getNames() {
 			return this.names;
 		}
+
 	}
 
 	/**
@@ -228,6 +229,7 @@ public String getTag() {
 		public Set<String> getValues() {
 			return this.values;
 		}
+
 	}
 
 	/**

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/DefaultRestTemplateExchangeTagsProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/MetricsWebFilter.java

@@ -61,18 +61,17 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
 	private Publisher<Void> filter(ServerWebExchange exchange, Mono<Void> call) {
 		long start = System.nanoTime();
 		ServerHttpResponse response = exchange.getResponse();
-		return call.doOnSuccess((done) -> success(exchange, start))
-				.doOnError((cause) -> {
-					if (response.isCommitted()) {
-						error(exchange, start, cause);
-					}
-					else {
-						response.beforeCommit(() -> {
-							error(exchange, start, cause);
-							return Mono.empty();
-						});
-					}
+		return call.doOnSuccess((done) -> success(exchange, start)).doOnError((cause) -> {
+			if (response.isCommitted()) {
+				error(exchange, start, cause);
+			}
+			else {
+				response.beforeCommit(() -> {
+					error(exchange, start, cause);
+					return Mono.empty();
 				});
+			}
+		});
 	}
 
 	private void success(ServerWebExchange exchange, long start) {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingDescriptionProvider.java

@@ -31,7 +31,6 @@ public interface MappingDescriptionProvider {
 
 	/**
 	 * Returns the name of the mappings described by this provider.
-	 *
 	 * @return the name of the mappings
 	 */
 	String getMappingName();

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/FilterRegistrationMappingDescription.java

@@ -40,7 +40,6 @@ public FilterRegistrationMappingDescription(FilterRegistration filterRegistratio
 
 	/**
 	 * Returns the servlet name mappings for the registered filter.
-	 *
 	 * @return the mappings
 	 */
 	public Collection<String> getServletNameMappings() {
@@ -49,7 +48,6 @@ public Collection<String> getServletNameMappings() {
 
 	/**
 	 * Returns the URL pattern mappings for the registered filter.
-	 *
 	 * @return the mappings
 	 */
 	public Collection<String> getUrlPatternMappings() {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/RegistrationMappingDescription.java

@@ -40,7 +40,6 @@ public RegistrationMappingDescription(T registration) {
 
 	/**
 	 * Returns the name of the registered Filter or Servlet.
-	 *
 	 * @return the name
 	 */
 	public String getName() {
@@ -49,7 +48,6 @@ public String getName() {
 
 	/**
 	 * Returns the class name of the registered Filter or Servlet.
-	 *
 	 * @return the class name
 	 */
 	public String getClassName() {