From a6cefc5ba097db87277985ff5a85f8001eb8ba74 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 17 Nov 2017 14:18:31 -0800 Subject: [PATCH] Polish --- .../endpoint/web/WebEndpointPropertiesTests.java | 1 + .../client/OAuth2WebSecurityConfiguration.java | 3 +-- ...th2ClientPropertiesRegistrationAdapterTests.java | 13 ++++++++----- .../client/OAuth2WebSecurityConfigurationTests.java | 9 ++++----- .../spring-boot-maven-plugin/pom.xml | 6 +++--- .../ConfigurationPropertiesBindingException.java | 3 +-- .../ConfigurationPropertiesBinderBuilderTests.java | 6 +++--- .../ConfigurationPropertiesBinderTests.java | 4 ++-- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointPropertiesTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointPropertiesTests.java index 6a6010ec3c..f17f62295d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointPropertiesTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointPropertiesTests.java @@ -39,4 +39,5 @@ public class WebEndpointPropertiesTests { properties.setBasePath("/"); assertThat(properties.getBasePath()).isEqualTo(""); } + } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfiguration.java index eadf2d4a34..60e9494b7b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfiguration.java @@ -46,8 +46,7 @@ class OAuth2WebSecurityConfiguration { @Configuration @ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class) - static class OAuth2WebSecurityConfigurerAdapter - extends WebSecurityConfigurerAdapter { + static class OAuth2WebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java index 7fbcfa39a3..65bdf43b8d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java @@ -78,7 +78,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests { org.springframework.security.oauth2.core.ClientAuthenticationMethod.POST); assertThat(adapted.getAuthorizationGrantType()).isEqualTo( org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); - assertThat(adapted.getRedirectUriTemplate()).isEqualTo("http://example.com/redirect"); + assertThat(adapted.getRedirectUriTemplate()) + .isEqualTo("http://example.com/redirect"); assertThat(adapted.getScopes()).containsExactly("scope"); assertThat(adapted.getClientName()).isEqualTo("clientName"); } @@ -111,8 +112,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests { org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC); assertThat(adapted.getAuthorizationGrantType()).isEqualTo( org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); - assertThat(adapted.getRedirectUriTemplate()).isEqualTo( - "{baseUrl}/login/oauth2/code/{registrationId}"); + assertThat(adapted.getRedirectUriTemplate()) + .isEqualTo("{baseUrl}/login/oauth2/code/{registrationId}"); assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email", "address", "phone"); assertThat(adapted.getClientName()).isEqualTo("Google"); @@ -151,7 +152,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests { org.springframework.security.oauth2.core.ClientAuthenticationMethod.POST); assertThat(adapted.getAuthorizationGrantType()).isEqualTo( org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); - assertThat(adapted.getRedirectUriTemplate()).isEqualTo("http://example.com/redirect"); + assertThat(adapted.getRedirectUriTemplate()) + .isEqualTo("http://example.com/redirect"); assertThat(adapted.getScopes()).containsExactly("scope"); assertThat(adapted.getClientName()).isEqualTo("clientName"); } @@ -195,7 +197,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests { org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC); assertThat(adapted.getAuthorizationGrantType()).isEqualTo( org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); - assertThat(adapted.getRedirectUriTemplate()).isEqualTo("{baseUrl}/login/oauth2/code/{registrationId}"); + assertThat(adapted.getRedirectUriTemplate()) + .isEqualTo("{baseUrl}/login/oauth2/code/{registrationId}"); assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email", "address", "phone"); assertThat(adapted.getClientName()).isEqualTo("Google"); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java index 8ed49c2651..5c61e96f60 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java @@ -97,12 +97,11 @@ public class OAuth2WebSecurityConfigurationTests { @Test public void securityConfigurerBacksOffWhenOtherWebSecurityAdapterPresent() throws Exception { - this.contextRunner - .withUserConfiguration(TestWebSecurityConfigurerConfig.class, - OAuth2WebSecurityConfiguration.class) - .run((context) -> { + this.contextRunner.withUserConfiguration(TestWebSecurityConfigurerConfig.class, + OAuth2WebSecurityConfiguration.class).run((context) -> { assertThat(getAuthCodeFilters(context)).isEmpty(); - assertThat(context).getBean(OAuth2AuthorizedClientService.class).isNotNull(); + assertThat(context).getBean(OAuth2AuthorizedClientService.class) + .isNotNull(); }); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml index b8ed9a403e..d54b568a38 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml @@ -241,10 +241,10 @@ + flags="g" byline="true"> + dir="${project.build.directory}/local-repo/org/springframework/boot/" + includes="**/*.pom" /> diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingException.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingException.java index c5c2b33fa0..b5d02dc390 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingException.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingException.java @@ -26,8 +26,7 @@ import org.springframework.core.NestedExceptionUtils; */ class ConfigurationPropertiesBindingException extends RuntimeException { - ConfigurationPropertiesBindingException(String message, - Throwable cause) { + ConfigurationPropertiesBindingException(String message, Throwable cause) { super(message, cause); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderBuilderTests.java index d678cca161..abc0216958 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderBuilderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderBuilderTests.java @@ -123,7 +123,7 @@ public class ConfigurationPropertiesBinderBuilderTests { .withEnvironment(this.environment).build(); assertThat( bindWithValidationErrors(binder, new PropertyWithJSR303()).getAllErrors()) - .hasSize(2); + .hasSize(2); } @Test @@ -152,8 +152,8 @@ public class ConfigurationPropertiesBinderBuilderTests { } private void bind(ConfigurationPropertiesBinder binder, Object target) { - binder.bind(target, AnnotationUtils - .findAnnotation(target.getClass(), ConfigurationProperties.class)); + binder.bind(target, AnnotationUtils.findAnnotation(target.getClass(), + ConfigurationProperties.class)); } @ConfigurationProperties(prefix = "test") diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderTests.java index 0ff89389dc..453ad98a82 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderTests.java @@ -268,8 +268,8 @@ public class ConfigurationPropertiesBinderTests { } private void bind(ConfigurationPropertiesBinder binder, Object target) { - binder.bind(target, AnnotationUtils - .findAnnotation(target.getClass(), ConfigurationProperties.class)); + binder.bind(target, AnnotationUtils.findAnnotation(target.getClass(), + ConfigurationProperties.class)); } @ConfigurationProperties(value = "person", ignoreUnknownFields = false)