Skip to content

Commit a256602

Browse files
committed
Polish
1 parent 7065a41 commit a256602

File tree

23 files changed

+78
-62
lines changed

23 files changed

+78
-62
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public CloudFoundryWebEndpointServletHandlerMapping cloudFoundryWebEndpointServl
8585
endpointMediaTypes);
8686
return new CloudFoundryWebEndpointServletHandlerMapping(
8787
new EndpointMapping("/cloudfoundryapplication"),
88-
endpointDiscoverer.discoverEndpoints(), endpointMediaTypes, getCorsConfiguration(),
89-
getSecurityInterceptor(builder, environment));
88+
endpointDiscoverer.discoverEndpoints(), endpointMediaTypes,
89+
getCorsConfiguration(), getSecurityInterceptor(builder, environment));
9090
}
9191

9292
private CloudFoundrySecurityInterceptor getSecurityInterceptor(

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,13 @@ public void cloudFoundryManagementEndpointsDisabled() throws Exception {
208208
}
209209

210210
@Test
211-
public void allEndpointsAvailableUnderCloudFoundryWithoutEnablingWeb() throws Exception {
211+
public void allEndpointsAvailableUnderCloudFoundryWithoutEnablingWeb()
212+
throws Exception {
212213
this.context.register(TestConfiguration.class);
213214
this.context.refresh();
214215
CloudFoundryWebEndpointServletHandlerMapping handlerMapping = getHandlerMapping();
215-
List<EndpointInfo<WebEndpointOperation>> endpoints = (List<EndpointInfo<WebEndpointOperation>>) handlerMapping.getEndpoints();
216+
List<EndpointInfo<WebEndpointOperation>> endpoints = (List<EndpointInfo<WebEndpointOperation>>) handlerMapping
217+
.getEndpoints();
216218
assertThat(endpoints.size()).isEqualTo(1);
217219
assertThat(endpoints.get(0).getId()).isEqualTo("test");
218220
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ private Map<Class<?>, EndpointExtensionInfo<T>> discoverExtensions(
163163
private EndpointInfo<T> getEndpointInfo(Map<Class<?>, EndpointInfo<T>> endpoints,
164164
Class<?> beanType, Class<?> endpointClass) {
165165
EndpointInfo<T> endpoint = endpoints.get(endpointClass);
166-
Assert.state(endpoint != null, () -> "Invalid extension '" + beanType.getName()
167-
+ "': no endpoint found with type '" + endpointClass.getName() + "'");
166+
Assert.state(endpoint != null,
167+
() -> "Invalid extension '" + beanType.getName()
168+
+ "': no endpoint found with type '" + endpointClass.getName()
169+
+ "'");
168170
return endpoint;
169171
}
170172

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public DefaultClientResources lettuceClientResources() {
7575
@ConditionalOnMissingBean(RedisConnectionFactory.class)
7676
public LettuceConnectionFactory redisConnectionFactory(
7777
ClientResources clientResources) throws UnknownHostException {
78-
LettuceClientConfiguration clientConfig = getLettuceClientConfiguration(clientResources,
79-
this.properties.getLettuce().getPool());
78+
LettuceClientConfiguration clientConfig = getLettuceClientConfiguration(
79+
clientResources, this.properties.getLettuce().getPool());
8080
return createLettuceConnectionFactory(clientConfig);
8181
}
8282

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
* @author Madhura Bhave
4242
*/
4343
@Configuration
44-
@ConditionalOnClass({ AuthenticationManager.class,
45-
EnableWebSecurity.class })
44+
@ConditionalOnClass({ AuthenticationManager.class, EnableWebSecurity.class })
4645
@EnableConfigurationProperties(SecurityProperties.class)
4746
@Import({ SpringBootWebSecurityConfiguration.class, WebSecurityEnablerConfiguration.class,
4847
AuthenticationManagerConfiguration.class, SecurityDataConfiguration.class })

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,12 @@ private static ClientRegistration getClientRegistration(String registrationId,
7070

7171
private static Builder getBuilder(String registrationId, String configuredProviderId,
7272
Map<String, Provider> providers) {
73-
String providerId = (configuredProviderId == null ? registrationId : configuredProviderId);
73+
String providerId = (configuredProviderId == null ? registrationId
74+
: configuredProviderId);
7475
CommonOAuth2Provider provider = getCommonProvider(providerId);
7576
if (provider == null && !providers.containsKey(providerId)) {
76-
throw new IllegalStateException(getErrorMessage(configuredProviderId, registrationId));
77+
throw new IllegalStateException(
78+
getErrorMessage(configuredProviderId, registrationId));
7779
}
7880
Builder builder = (provider != null ? provider.getBuilder(registrationId)
7981
: ClientRegistration.withRegistrationId(registrationId));
@@ -83,9 +85,12 @@ private static Builder getBuilder(String registrationId, String configuredProvid
8385
return builder;
8486
}
8587

86-
private static String getErrorMessage(String configuredProviderId, String registrationId) {
87-
return (configuredProviderId == null ? "Provider ID must be specified for client registration '" + registrationId + "'" :
88-
"Unknown provider ID '" + configuredProviderId + "'");
88+
private static String getErrorMessage(String configuredProviderId,
89+
String registrationId) {
90+
return (configuredProviderId == null
91+
? "Provider ID must be specified for client registration '"
92+
+ registrationId + "'"
93+
: "Unknown provider ID '" + configuredProviderId + "'");
8994
}
9095

9196
private static Builder getBuilder(Builder builder, Provider provider) {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,31 +55,31 @@ public class CustomHibernateJpaAutoConfigurationTests {
5555
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class,
5656
HibernateJpaAutoConfiguration.class));
5757

58-
5958
@Test
6059
public void namingStrategyDelegatorTakesPrecedence() {
6160
this.contextRunner
6261
.withPropertyValues(
6362
"spring.jpa.properties.hibernate.ejb.naming_strategy_delegator:"
64-
+ "org.hibernate.cfg.naming.ImprovedNamingStrategyDelegator"
65-
).run((context) -> {
66-
JpaProperties bean = context.getBean(JpaProperties.class);
67-
Map<String, String> hibernateProperties = bean
68-
.getHibernateProperties("create-drop");
69-
assertThat(hibernateProperties.get("hibernate.ejb.naming_strategy")).isNull();
70-
});
63+
+ "org.hibernate.cfg.naming.ImprovedNamingStrategyDelegator")
64+
.run((context) -> {
65+
JpaProperties bean = context.getBean(JpaProperties.class);
66+
Map<String, String> hibernateProperties = bean
67+
.getHibernateProperties("create-drop");
68+
assertThat(hibernateProperties.get("hibernate.ejb.naming_strategy"))
69+
.isNull();
70+
});
7171
}
7272

7373
@Test
7474
public void defaultDatabaseForH2() {
75-
this.contextRunner.withPropertyValues(
76-
"spring.datasource.url:jdbc:h2:mem:testdb",
75+
this.contextRunner.withPropertyValues("spring.datasource.url:jdbc:h2:mem:testdb",
7776
"spring.datasource.initialize:false").run((context) -> {
78-
HibernateJpaVendorAdapter bean = context
79-
.getBean(HibernateJpaVendorAdapter.class);
80-
Database database = (Database) ReflectionTestUtils.getField(bean, "database");
81-
assertThat(database).isEqualTo(Database.H2);
82-
});
77+
HibernateJpaVendorAdapter bean = context
78+
.getBean(HibernateJpaVendorAdapter.class);
79+
Database database = (Database) ReflectionTestUtils.getField(bean,
80+
"database");
81+
assertThat(database).isEqualTo(Database.H2);
82+
});
8383
}
8484

8585
@Configuration

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,7 @@ public void providerDisablesAutoCommitIsNotConfiguredWithJta() {
258258

259259
@Test
260260
public void customResourceMapping() {
261-
contextRunner()
262-
.withClassLoader(new HideDataScriptClassLoader())
261+
contextRunner().withClassLoader(new HideDataScriptClassLoader())
263262
.withPropertyValues(
264263
"spring.datasource.data:classpath:/db/non-annotated-data.sql",
265264
"spring.jpa.mapping-resources=META-INF/mappings/non-annotated.xml")

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ public void getClientRegistrationsWhenProviderNotSpecifiedAndUnknownProviderShou
208208
Registration registration = new Registration();
209209
properties.getRegistration().put("missing", registration);
210210
this.thrown.expect(IllegalStateException.class);
211-
this.thrown.expectMessage("Provider ID must be specified for client registration 'missing'");
211+
this.thrown.expectMessage(
212+
"Provider ID must be specified for client registration 'missing'");
212213
OAuth2ClientPropertiesRegistrationAdapter.getClientRegistrations(properties);
213214
}
214215

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ public ClientRegistrationRepository clientRegistrationRepository() {
154154
}
155155

156156
private ClientRegistration getClientRegistration(String id, String userInfoUri) {
157-
ClientRegistration.Builder builder = ClientRegistration.withRegistrationId(id);
157+
ClientRegistration.Builder builder = ClientRegistration
158+
.withRegistrationId(id);
158159
builder.clientName("foo").clientId("foo")
159160
.clientAuthenticationMethod(
160161
org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC)

0 commit comments

Comments
 (0)