Polish

Author: wilkinsona

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

@@ -38,9 +38,7 @@ public String getBasePath() {
 	}
 
 	public void setBasePath(String basePath) {
-			this.basePath = basePath;
+		this.basePath = basePath;
 	}
 
 }
-
-

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

@@ -57,12 +57,12 @@ public class WebMvcEndpointManagementContextConfiguration {
 	@ConditionalOnMissingBean
 	public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping(
 			EndpointProvider<WebEndpointOperation> provider,
-			EndpointMediaTypes endpointMediaTypes,
-			CorsEndpointProperties corsProperties,
+			EndpointMediaTypes endpointMediaTypes, CorsEndpointProperties corsProperties,
 			WebEndpointProperties webEndpointProperties) {
 		WebMvcEndpointHandlerMapping handlerMapping = new WebMvcEndpointHandlerMapping(
 				new EndpointMapping(webEndpointProperties.getBasePath()),
-				provider.getEndpoints(), endpointMediaTypes, getCorsConfiguration(corsProperties));
+				provider.getEndpoints(), endpointMediaTypes,
+				getCorsConfiguration(corsProperties));
 		return handlerMapping;
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java

@@ -43,17 +43,18 @@
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for the management context. If the
- * {@code management.server.port} is the same as the {@code server.port} the management context
- * will be the same as the main application context. If the {@code management.server.port} is
- * different to the {@code server.port} the management context will be a separate context
- * that has the main application context as its parent.
+ * {@code management.server.port} is the same as the {@code server.port} the management
+ * context will be the same as the main application context. If the
+ * {@code management.server.port} is different to the {@code server.port} the management
+ * context will be a separate context that has the main application context as its parent.
  *
  * @author Andy Wilkinson
  * @since 2.0.0
  */
 @Configuration
 @AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
-@EnableConfigurationProperties({ WebEndpointProperties.class, ManagementServerProperties.class })
+@EnableConfigurationProperties({ WebEndpointProperties.class,
+		ManagementServerProperties.class })
 public class ManagementContextAutoConfiguration {
 
 	@Configuration
@@ -77,8 +78,8 @@ public void afterSingletonsInstantiated() {
 		}
 
 		private void verifySslConfiguration() {
-			Boolean enabled = this.environment.getProperty("management.server.ssl.enabled",
-					Boolean.class, false);
+			Boolean enabled = this.environment
+					.getProperty("management.server.ssl.enabled", Boolean.class, false);
 			Assert.state(!enabled,
 					"Management-specific SSL cannot be configured as the management "
 							+ "server is not listening on a separate port");

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointPropertiesTests.java

@@ -34,4 +34,3 @@ public void defaultBasePathShouldBeApplication() throws Exception {
 	}
 
 }
-

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointIntegrationTests.java

@@ -85,8 +85,7 @@ public void endpointsAreSecureByDefaultWithCustomBasePath() throws Exception {
 	}
 
 	@Test
-	public void endpointsAreSecureWithActuatorRoleWithCustomBasePath()
-			throws Exception {
+	public void endpointsAreSecureWithActuatorRoleWithCustomBasePath() throws Exception {
 		TestSecurityContextHolder.getContext().setAuthentication(
 				new TestingAuthenticationToken("user", "N/A", "ROLE_ACTUATOR"));
 		this.context = new AnnotationConfigWebApplicationContext();

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/ShutdownEndpointTests.java

@@ -74,8 +74,8 @@ public void shutdownChild() throws Exception {
 				EmptyConfig.class).child(EndpointConfig.class)
 						.web(WebApplicationType.NONE).run();
 		CountDownLatch latch = context.getBean(EndpointConfig.class).latch;
-		assertThat(context.getBean(ShutdownEndpoint.class).shutdown()
-				.get("message")).startsWith("Shutting down");
+		assertThat(context.getBean(ShutdownEndpoint.class).shutdown().get("message"))
+				.startsWith("Shutting down");
 		assertThat(context.isActive()).isTrue();
 		assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
 	}
@@ -87,8 +87,8 @@ public void shutdownParent() throws Exception {
 						.web(WebApplicationType.NONE).run();
 		CountDownLatch parentLatch = context.getBean(EndpointConfig.class).latch;
 		CountDownLatch childLatch = context.getBean(EmptyConfig.class).latch;
-		assertThat(context.getBean(ShutdownEndpoint.class).shutdown()
-				.get("message")).startsWith("Shutting down");
+		assertThat(context.getBean(ShutdownEndpoint.class).shutdown().get("message"))
+				.startsWith("Shutting down");
 		assertThat(context.isActive()).isTrue();
 		assertThat(parentLatch.await(10, TimeUnit.SECONDS)).isTrue();
 		assertThat(childLatch.await(10, TimeUnit.SECONDS)).isTrue();

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java

@@ -138,7 +138,8 @@ private void configureJtaPlatform(Map<String, Object> vendorProperties)
 		}
 	}
 
-	private void configureProviderDisablesAutocommit(Map<String, Object> vendorProperties) {
+	private void configureProviderDisablesAutocommit(
+			Map<String, Object> vendorProperties) {
 		if (isDataSourceAutoCommitDisabled() && !isJta()) {
 			vendorProperties.put(PROVIDER_DISABLES_AUTOCOMMIT, "true");
 		}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java

@@ -145,17 +145,15 @@ public String getClientAuthenticationMethod() {
 			return this.clientAuthenticationMethod;
 		}
 
-		public void setClientAuthenticationMethod(
-				String clientAuthenticationMethod) {
+		public void setClientAuthenticationMethod(String clientAuthenticationMethod) {
 			this.clientAuthenticationMethod = clientAuthenticationMethod;
 		}
 
 		public String getAuthorizationGrantType() {
 			return this.authorizationGrantType;
 		}
 
-		public void setAuthorizationGrantType(
-				String authorizationGrantType) {
+		public void setAuthorizationGrantType(String authorizationGrantType) {
 			this.authorizationGrantType = authorizationGrantType;
 		}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java

@@ -47,10 +47,8 @@ private OAuth2ClientPropertiesRegistrationAdapter() {
 	public static Map<String, ClientRegistration> getClientRegistrations(
 			OAuth2ClientProperties properties) {
 		Map<String, ClientRegistration> clientRegistrations = new HashMap<>();
-		properties.getRegistration().forEach((key, value) -> {
-			clientRegistrations.put(key,
-					getClientRegistration(key, value, properties.getProvider()));
-		});
+		properties.getRegistration().forEach((key, value) -> clientRegistrations.put(key,
+				getClientRegistration(key, value, properties.getProvider())));
 		return clientRegistrations;
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java

@@ -46,7 +46,8 @@
  * @since 2.0.0
  * @see ErrorAttributes
  */
-public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExceptionHandler, InitializingBean {
+public abstract class AbstractErrorWebExceptionHandler
+		implements ErrorWebExceptionHandler, InitializingBean {
 
 	private final ApplicationContext applicationContext;
 
@@ -71,7 +72,8 @@ public AbstractErrorWebExceptionHandler(ErrorAttributes errorAttributes,
 		this.errorAttributes = errorAttributes;
 		this.resourceProperties = resourceProperties;
 		this.applicationContext = applicationContext;
-		this.templateAvailabilityProviders = new TemplateAvailabilityProviders(applicationContext);
+		this.templateAvailabilityProviders = new TemplateAvailabilityProviders(
+				applicationContext);
 	}
 
 	/**
@@ -101,13 +103,14 @@ public void setViewResolvers(List<ViewResolver> viewResolvers) {
 	}
 
 	/**
-	 * Extract the error attributes from the current request, to be used
-	 * to populate error views or JSON payloads.
+	 * Extract the error attributes from the current request, to be used to populate error
+	 * views or JSON payloads.
 	 * @param request the source request
 	 * @param includeStackTrace whether to include the error stacktrace information
 	 * @return the error attributes as a Map.
 	 */
-	protected Map<String, Object> getErrorAttributes(ServerRequest request, boolean includeStackTrace) {
+	protected Map<String, Object> getErrorAttributes(ServerRequest request,
+			boolean includeStackTrace) {
 		return this.errorAttributes.getErrorAttributes(request, includeStackTrace);
 	}
 
@@ -117,16 +120,16 @@ protected boolean isTraceEnabled(ServerRequest request) {
 	}
 
 	/**
-	 * Render the given error data as a view, using a template view if available
-	 * or a static HTML file if available otherwise. This will return an empty
+	 * Render the given error data as a view, using a template view if available or a
+	 * static HTML file if available otherwise. This will return an empty
 	 * {@code Publisher} if none of the above are available.
 	 * @param viewName the view name
 	 * @param responseBody the error response being built
 	 * @param error the error data as a map
 	 * @return a Publisher of the {@link ServerResponse}
 	 */
-	protected Mono<ServerResponse> renderErrorView(String viewName, ServerResponse.BodyBuilder responseBody,
-			Map<String, Object> error) {
+	protected Mono<ServerResponse> renderErrorView(String viewName,
+			ServerResponse.BodyBuilder responseBody, Map<String, Object> error) {
 		if (isTemplateAvailable(viewName)) {
 			return responseBody.render(viewName, error);
 		}
@@ -138,7 +141,8 @@ protected Mono<ServerResponse> renderErrorView(String viewName, ServerResponse.B
 	}
 
 	private boolean isTemplateAvailable(String viewName) {
-		return this.templateAvailabilityProviders.getProvider(viewName, this.applicationContext) != null;
+		return this.templateAvailabilityProviders.getProvider(viewName,
+				this.applicationContext) != null;
 	}
 
 	private Resource resolveResource(String viewName) {
@@ -158,23 +162,23 @@ private Resource resolveResource(String viewName) {
 
 	/**
 	 * Render a default HTML "Whitelabel Error Page".
-	 * <p>Useful when no other error view is available in the application.
+	 * <p>
+	 * Useful when no other error view is available in the application.
 	 * @param responseBody the error response being built
 	 * @param error the error data as a map
 	 * @return a Publisher of the {@link ServerResponse}
 	 */
-	protected Mono<ServerResponse> renderDefaultErrorView(ServerResponse.BodyBuilder responseBody,
-			Map<String, Object> error) {
+	protected Mono<ServerResponse> renderDefaultErrorView(
+			ServerResponse.BodyBuilder responseBody, Map<String, Object> error) {
 		StringBuilder builder = new StringBuilder();
 		Date timestamp = (Date) error.get("timestamp");
 		builder.append("<html><body><h1>Whitelabel Error Page</h1>")
 				.append("<p>This application has no configured error view, so you are seeing this as a fallback.</p>")
-				.append("<div id='created'>").append(timestamp.toString()).append("</div>")
-				.append("<div>There was an unexpected error (type=")
-				.append(error.get("error")).append(", status=").append(error.get("status"))
-				.append(").</div>")
-				.append("<div>").append(error.get("message")).append("</div>")
-				.append("</body></html>");
+				.append("<div id='created'>").append(timestamp.toString())
+				.append("</div>").append("<div>There was an unexpected error (type=")
+				.append(error.get("error")).append(", status=")
+				.append(error.get("status")).append(").</div>").append("<div>")
+				.append(error.get("message")).append("</div>").append("</body></html>");
 		return responseBody.syncBody(builder.toString());
 	}
 
@@ -188,27 +192,31 @@ public void afterPropertiesSet() throws Exception {
 	/**
 	 * Create a {@link RouterFunction} that can route and handle errors as JSON responses
 	 * or HTML views.
-	 * <p>If the returned {@link RouterFunction} doesn't route to a {@code HandlerFunction},
+	 * <p>
+	 * If the returned {@link RouterFunction} doesn't route to a {@code HandlerFunction},
 	 * the original exception is propagated in the pipeline and can be processed by other
 	 * {@link org.springframework.web.server.WebExceptionHandler}s.
-	 * @param errorAttributes the {@code ErrorAttributes} instance to use to extract error information
+	 * @param errorAttributes the {@code ErrorAttributes} instance to use to extract error
+	 * information
 	 * @return a {@link RouterFunction} that routes and handles errors
 	 */
-	protected abstract RouterFunction<ServerResponse> getRoutingFunction(ErrorAttributes errorAttributes);
+	protected abstract RouterFunction<ServerResponse> getRoutingFunction(
+			ErrorAttributes errorAttributes);
 
 	@Override
 	public Mono<Void> handle(ServerWebExchange exchange, Throwable throwable) {
 
 		this.errorAttributes.storeErrorInformation(throwable, exchange);
 		ServerRequest request = ServerRequest.create(exchange, this.messageReaders);
-		return getRoutingFunction(this.errorAttributes)
-				.route(request)
+		return getRoutingFunction(this.errorAttributes).route(request)
 				.switchIfEmpty(Mono.error(throwable))
-				.flatMap(handler -> handler.handle(request))
-				.flatMap(response -> {
-					// force content-type since writeTo won't overwrite response header values
-					exchange.getResponse().getHeaders().setContentType(response.headers().getContentType());
+				.flatMap((handler) -> handler.handle(request)).flatMap((response) -> {
+					// force content-type since writeTo won't overwrite response header
+					// values
+					exchange.getResponse().getHeaders()
+							.setContentType(response.headers().getContentType());
 					return response.writeTo(exchange, new ServerResponse.Context() {
+
 						@Override
 						public List<HttpMessageWriter<?>> messageWriters() {
 							return AbstractErrorWebExceptionHandler.this.messageWriters;
@@ -218,7 +226,9 @@ public List<HttpMessageWriter<?>> messageWriters() {
 						public List<ViewResolver> viewResolvers() {
 							return AbstractErrorWebExceptionHandler.this.viewResolvers;
 						}
+
 					});
 				});
 	}
+
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorAttributes.java

@@ -71,7 +71,8 @@ public DefaultErrorAttributes(boolean includeException) {
 	}
 
 	@Override
-	public Map<String, Object> getErrorAttributes(ServerRequest request, boolean includeStackTrace) {
+	public Map<String, Object> getErrorAttributes(ServerRequest request,
+			boolean includeStackTrace) {
 		Map<String, Object> errorAttributes = new LinkedHashMap<>();
 		errorAttributes.put("timestamp", new Date());
 		errorAttributes.put("path", request.path());
@@ -90,7 +91,8 @@ public Map<String, Object> getErrorAttributes(ServerRequest request, boolean inc
 		}
 		else {
 			errorAttributes.put("status", HttpStatus.INTERNAL_SERVER_ERROR.value());
-			errorAttributes.put("error", HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase());
+			errorAttributes.put("error",
+					HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase());
 		}
 		return errorAttributes;
 	}
@@ -115,7 +117,8 @@ private void addErrorMessage(Map<String, Object> errorAttributes, Throwable erro
 	@Override
 	public Throwable getError(ServerRequest request) {
 		return (Throwable) request.attribute(ERROR_ATTRIBUTE)
-				.orElseThrow(() -> new IllegalStateException("Missing exception attribute in ServerWebExchange"));
+				.orElseThrow(() -> new IllegalStateException(
+						"Missing exception attribute in ServerWebExchange"));
 	}
 
 	@Override