Skip to content

Commit a6cefc5

Browse files
committed
Polish
1 parent 551c08e commit a6cefc5

File tree

8 files changed

+23
-22
lines changed

8 files changed

+23
-22
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ public void basePathShouldBeCleaned() throws Exception {
3939
properties.setBasePath("/");
4040
assertThat(properties.getBasePath()).isEqualTo("");
4141
}
42+
4243
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ public OAuth2AuthorizedClientService authorizedClientService(
4646

4747
@Configuration
4848
@ConditionalOnMissingBean(WebSecurityConfigurerAdapter.class)
49-
static class OAuth2WebSecurityConfigurerAdapter
50-
extends WebSecurityConfigurerAdapter {
49+
static class OAuth2WebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
5150

5251
@Override
5352
protected void configure(HttpSecurity http) throws Exception {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public void getClientRegistrationsWhenUsingDefinedProviderShouldAdapt()
7878
org.springframework.security.oauth2.core.ClientAuthenticationMethod.POST);
7979
assertThat(adapted.getAuthorizationGrantType()).isEqualTo(
8080
org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
81-
assertThat(adapted.getRedirectUriTemplate()).isEqualTo("http://example.com/redirect");
81+
assertThat(adapted.getRedirectUriTemplate())
82+
.isEqualTo("http://example.com/redirect");
8283
assertThat(adapted.getScopes()).containsExactly("scope");
8384
assertThat(adapted.getClientName()).isEqualTo("clientName");
8485
}
@@ -111,8 +112,8 @@ public void getClientRegistrationsWhenUsingCommonProviderShouldAdapt()
111112
org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC);
112113
assertThat(adapted.getAuthorizationGrantType()).isEqualTo(
113114
org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
114-
assertThat(adapted.getRedirectUriTemplate()).isEqualTo(
115-
"{baseUrl}/login/oauth2/code/{registrationId}");
115+
assertThat(adapted.getRedirectUriTemplate())
116+
.isEqualTo("{baseUrl}/login/oauth2/code/{registrationId}");
116117
assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email",
117118
"address", "phone");
118119
assertThat(adapted.getClientName()).isEqualTo("Google");
@@ -151,7 +152,8 @@ public void getClientRegistrationsWhenUsingCommonProviderWithOverrideShouldAdapt
151152
org.springframework.security.oauth2.core.ClientAuthenticationMethod.POST);
152153
assertThat(adapted.getAuthorizationGrantType()).isEqualTo(
153154
org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
154-
assertThat(adapted.getRedirectUriTemplate()).isEqualTo("http://example.com/redirect");
155+
assertThat(adapted.getRedirectUriTemplate())
156+
.isEqualTo("http://example.com/redirect");
155157
assertThat(adapted.getScopes()).containsExactly("scope");
156158
assertThat(adapted.getClientName()).isEqualTo("clientName");
157159
}
@@ -195,7 +197,8 @@ public void getClientRegistrationsWhenProviderNotSpecifiedShouldUseRegistrationI
195197
org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC);
196198
assertThat(adapted.getAuthorizationGrantType()).isEqualTo(
197199
org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
198-
assertThat(adapted.getRedirectUriTemplate()).isEqualTo("{baseUrl}/login/oauth2/code/{registrationId}");
200+
assertThat(adapted.getRedirectUriTemplate())
201+
.isEqualTo("{baseUrl}/login/oauth2/code/{registrationId}");
199202
assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email",
200203
"address", "phone");
201204
assertThat(adapted.getClientName()).isEqualTo("Google");

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,11 @@ public void configurationRegistersAuthorizedClientServiceBean() throws Exception
9797
@Test
9898
public void securityConfigurerBacksOffWhenOtherWebSecurityAdapterPresent()
9999
throws Exception {
100-
this.contextRunner
101-
.withUserConfiguration(TestWebSecurityConfigurerConfig.class,
102-
OAuth2WebSecurityConfiguration.class)
103-
.run((context) -> {
100+
this.contextRunner.withUserConfiguration(TestWebSecurityConfigurerConfig.class,
101+
OAuth2WebSecurityConfiguration.class).run((context) -> {
104102
assertThat(getAuthCodeFilters(context)).isEmpty();
105-
assertThat(context).getBean(OAuth2AuthorizedClientService.class).isNotNull();
103+
assertThat(context).getBean(OAuth2AuthorizedClientService.class)
104+
.isNotNull();
106105
});
107106
}
108107

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,10 @@
241241
<configuration>
242242
<target>
243243
<replaceregexp match="\$\{revision\}" replace="${project.version}"
244-
flags="g" byline="true">
244+
flags="g" byline="true">
245245
<fileset
246-
dir="${project.build.directory}/local-repo/org/springframework/boot/"
247-
includes="**/*.pom" />
246+
dir="${project.build.directory}/local-repo/org/springframework/boot/"
247+
includes="**/*.pom" />
248248
</replaceregexp>
249249
</target>
250250
</configuration>

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingException.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
*/
2727
class ConfigurationPropertiesBindingException extends RuntimeException {
2828

29-
ConfigurationPropertiesBindingException(String message,
30-
Throwable cause) {
29+
ConfigurationPropertiesBindingException(String message, Throwable cause) {
3130
super(message, cause);
3231
}
3332

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderBuilderTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void validationWithJsr303() {
123123
.withEnvironment(this.environment).build();
124124
assertThat(
125125
bindWithValidationErrors(binder, new PropertyWithJSR303()).getAllErrors())
126-
.hasSize(2);
126+
.hasSize(2);
127127
}
128128

129129
@Test
@@ -152,8 +152,8 @@ private ValidationErrors bindWithValidationErrors(
152152
}
153153

154154
private void bind(ConfigurationPropertiesBinder binder, Object target) {
155-
binder.bind(target, AnnotationUtils
156-
.findAnnotation(target.getClass(), ConfigurationProperties.class));
155+
binder.bind(target, AnnotationUtils.findAnnotation(target.getClass(),
156+
ConfigurationProperties.class));
157157
}
158158

159159
@ConfigurationProperties(prefix = "test")

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinderTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ private ValidationErrors bindWithValidationErrors(
268268
}
269269

270270
private void bind(ConfigurationPropertiesBinder binder, Object target) {
271-
binder.bind(target, AnnotationUtils
272-
.findAnnotation(target.getClass(), ConfigurationProperties.class));
271+
binder.bind(target, AnnotationUtils.findAnnotation(target.getClass(),
272+
ConfigurationProperties.class));
273273
}
274274

275275
@ConfigurationProperties(value = "person", ignoreUnknownFields = false)

0 commit comments

Comments
 (0)