From 9fd3b9103a9d0c905e7691585f80edad14f070c7 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 25 May 2018 21:47:22 -0700 Subject: [PATCH] Format code --- .../actuate/autoconfigure/metrics/MetricsProperties.java | 7 ++++--- .../security/reactive/EndpointRequestTests.java | 3 ++- .../security/servlet/EndpointRequestTests.java | 3 ++- .../boot/autoconfigure/kafka/KafkaProperties.java | 1 + .../reactive/error/DefaultErrorWebExceptionHandler.java | 7 +++---- .../servlet/DispatcherServletAutoConfigurationTests.java | 6 +++--- .../java/org/springframework/boot/SimpleMainTests.java | 8 ++++---- .../boot/context/properties/bind/BindConverterTests.java | 3 +-- ...nagementPortAndPathSampleActuatorApplicationTests.java | 4 ++-- .../src/test/java/sample/ant/SampleAntApplicationIT.java | 8 ++++---- 10 files changed, 26 insertions(+), 24 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java index fb6204dde0..281be71459 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java @@ -158,9 +158,10 @@ public class MetricsProperties { /** * Whether meter IDs starting with the specified name should publish percentile - * histograms. For monitoring systems that support aggregable percentile calculation - * based on a histogram, this can be set to true. For other systems, this has no effect. The - * longest match wins, the key `all` can also be used to configure all meters. + * histograms. For monitoring systems that support aggregable percentile + * calculation based on a histogram, this can be set to true. For other systems, + * this has no effect. The longest match wins, the key `all` can also be used to + * configure all meters. */ private Map percentilesHistogram = new LinkedHashMap<>(); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequestTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequestTests.java index 85ff64afa4..509298333b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequestTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequestTests.java @@ -123,7 +123,8 @@ public class EndpointRequestTests { endpoints.add(mockEndpoint("foo", "foo")); endpoints.add(mockEndpoint("bar", "bar")); endpoints.add(mockEndpoint("baz", "baz")); - PathMappedEndpoints pathMappedEndpoints = new PathMappedEndpoints("/actuator", () -> endpoints); + PathMappedEndpoints pathMappedEndpoints = new PathMappedEndpoints("/actuator", + () -> endpoints); assertMatcher(matcher, pathMappedEndpoints).doesNotMatch("/actuator/foo"); assertMatcher(matcher, pathMappedEndpoints).doesNotMatch("/actuator/baz"); assertMatcher(matcher).matches("/actuator/bar"); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java index e44eaf1a9d..2b59db9c28 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java @@ -145,7 +145,8 @@ public class EndpointRequestTests { endpoints.add(mockEndpoint("foo", "foo")); endpoints.add(mockEndpoint("bar", "bar")); endpoints.add(mockEndpoint("baz", "baz")); - PathMappedEndpoints pathMappedEndpoints = new PathMappedEndpoints("/actuator", () -> endpoints); + PathMappedEndpoints pathMappedEndpoints = new PathMappedEndpoints("/actuator", + () -> endpoints); assertMatcher(matcher, pathMappedEndpoints).doesNotMatch("/actuator/foo"); assertMatcher(matcher, pathMappedEndpoints).doesNotMatch("/actuator/baz"); assertMatcher(matcher).matches("/actuator/bar"); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java index 94fa463b44..9faa9400d3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java @@ -949,6 +949,7 @@ public class KafkaProperties { "Resource '" + resource + "' must be on a file system", ex); } } + } public static class Jaas { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java index 7e0dd33c5b..c1b217e10e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java @@ -125,10 +125,9 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa .just("error/" + errorStatus.toString(), "error/" + SERIES_VIEWS.get(errorStatus.series()), "error/error") .flatMap((viewName) -> renderErrorView(viewName, responseBody, error)) - .switchIfEmpty( - this.errorProperties.getWhitelabel().isEnabled() - ? renderDefaultErrorView(responseBody, error) - : Mono.error(getError(request))) + .switchIfEmpty(this.errorProperties.getWhitelabel().isEnabled() + ? renderDefaultErrorView(responseBody, error) + : Mono.error(getError(request))) .next().doOnNext((response) -> logError(request, errorStatus)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java index c66f98f199..8766d4996c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java @@ -72,7 +72,8 @@ public class DispatcherServletAutoConfigurationTests { // from the default one, we're registering one anyway @Test public void registrationOverrideWithDispatcherServletWrongName() { - this.contextRunner.withUserConfiguration(CustomDispatcherServletDifferentName.class) + this.contextRunner + .withUserConfiguration(CustomDispatcherServletDifferentName.class) .run((context) -> { ServletRegistrationBean registration = context .getBean(ServletRegistrationBean.class); @@ -89,8 +90,7 @@ public class DispatcherServletAutoConfigurationTests { .run((context) -> { ServletRegistrationBean registration = context .getBean(ServletRegistrationBean.class); - assertThat(registration.getUrlMappings()) - .containsExactly("/foo"); + assertThat(registration.getUrlMappings()).containsExactly("/foo"); assertThat(registration.getServletName()) .isEqualTo("customDispatcher"); assertThat(context).hasSingleBean(DispatcherServlet.class); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java index c60754dc71..7b09f0bb43 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java @@ -76,10 +76,10 @@ public class SimpleMainTests { } private String[] getArgs(String... args) { - List list = new ArrayList<>(Arrays.asList( - "--spring.main.web-application-type=none", - "--spring.main.show-banner=OFF", - "--spring.main.register-shutdownHook=false")); + List list = new ArrayList<>( + Arrays.asList("--spring.main.web-application-type=none", + "--spring.main.show-banner=OFF", + "--spring.main.register-shutdownHook=false")); if (args.length > 0) { list.add("--spring.main.sources=" + StringUtils.arrayToCommaDelimitedString(args)); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindConverterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindConverterTests.java index dc4d602196..bed2ccc515 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindConverterTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindConverterTests.java @@ -70,8 +70,7 @@ public class BindConverterTests { @Test public void createWhenPropertyEditorInitializerIsNullShouldCreate() { - new BindConverter( - ApplicationConversionService.getSharedInstance(), null); + new BindConverter(ApplicationConversionService.getSharedInstance(), null); } @Test diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java index 8d69e01e74..4d064a1f8d 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortAndPathSampleActuatorApplicationTests.java @@ -89,8 +89,8 @@ public class ManagementPortAndPathSampleActuatorApplicationTests { String unknownProperty = "test-does-not-exist"; assertThat(this.environment.containsProperty(unknownProperty)).isFalse(); ResponseEntity entity = new TestRestTemplate() - .withBasicAuth("user", getPassword()).getForEntity( - "http://localhost:" + this.managementPort + "/admin/env/" + unknownProperty, + .withBasicAuth("user", getPassword()).getForEntity("http://localhost:" + + this.managementPort + "/admin/env/" + unknownProperty, String.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); } diff --git a/spring-boot-samples/spring-boot-sample-ant/src/test/java/sample/ant/SampleAntApplicationIT.java b/spring-boot-samples/spring-boot-sample-ant/src/test/java/sample/ant/SampleAntApplicationIT.java index f98932029a..8fe33752ac 100644 --- a/spring-boot-samples/spring-boot-sample-ant/src/test/java/sample/ant/SampleAntApplicationIT.java +++ b/spring-boot-samples/spring-boot-sample-ant/src/test/java/sample/ant/SampleAntApplicationIT.java @@ -48,12 +48,12 @@ public class SampleAntApplicationIT { }); assertThat(jarFiles).hasSize(1); - Process process = new JavaExecutable().processBuilder("-jar", jarFiles[0] - .getName()).directory(target).start(); + Process process = new JavaExecutable() + .processBuilder("-jar", jarFiles[0].getName()).directory(target).start(); process.waitFor(5, TimeUnit.MINUTES); assertThat(process.exitValue()).isEqualTo(0); - String output = FileCopyUtils.copyToString(new InputStreamReader(process - .getInputStream())); + String output = FileCopyUtils + .copyToString(new InputStreamReader(process.getInputStream())); assertThat(output).contains("Spring Boot Ant Example"); }