Skip to content

Commit 9192444

Browse files
philwebbphilwebb
committed
Polish
1 parent 99101ba commit 9192444

File tree

31 files changed

+524
-426
lines changed

31 files changed

+524
-426
lines changed

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/AbstractWebEndpointIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
*/
6464
public abstract class AbstractWebEndpointIntegrationTests<T extends ConfigurableApplicationContext> {
6565

66-
private static final Duration TIMEOUT = Duration.ofSeconds(30);
66+
private static final Duration TIMEOUT = Duration.ofMinutes(2);
6767

6868
private final Class<?> exporterConfiguration;
6969

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
* @author Stephane Nicoll
3131
*/
3232
@Configuration
33-
@Import({ DataSourceInitializerInvoker.class, DataSourceInitializationConfiguration.Registrar.class })
33+
@Import({ DataSourceInitializerInvoker.class,
34+
DataSourceInitializationConfiguration.Registrar.class })
3435
class DataSourceInitializationConfiguration {
3536

3637
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ public void initSchema() {
119119
String username = this.properties.getDataUsername();
120120
String password = this.properties.getDataPassword();
121121
runScripts(scripts, username, password);
122-
123122
}
124123
}
125124

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvoker.java

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
class DataSourceInitializerInvoker
3838
implements ApplicationListener<DataSourceSchemaCreatedEvent>, InitializingBean {
3939

40-
private static final Log logger = LogFactory.getLog(DataSourceInitializerInvoker.class);
40+
private static final Log logger = LogFactory
41+
.getLog(DataSourceInitializerInvoker.class);
4142

4243
private final ObjectProvider<DataSource> dataSource;
4344

@@ -50,8 +51,7 @@ class DataSourceInitializerInvoker
5051
private boolean initialized;
5152

5253
DataSourceInitializerInvoker(ObjectProvider<DataSource> dataSource,
53-
DataSourceProperties properties,
54-
ApplicationContext applicationContext) {
54+
DataSourceProperties properties, ApplicationContext applicationContext) {
5555
this.dataSource = dataSource;
5656
this.properties = properties;
5757
this.applicationContext = applicationContext;
@@ -63,24 +63,27 @@ public void afterPropertiesSet() {
6363
if (initializer != null) {
6464
boolean schemaCreated = this.dataSourceInitializer.createSchema();
6565
if (schemaCreated) {
66-
try {
67-
this.applicationContext
68-
.publishEvent(new DataSourceSchemaCreatedEvent(
69-
initializer.getDataSource()));
70-
// The listener might not be registered yet, so don't rely on it.
71-
if (!this.initialized) {
72-
this.dataSourceInitializer.initSchema();
73-
this.initialized = true;
74-
}
75-
}
76-
catch (IllegalStateException ex) {
77-
logger.warn("Could not send event to complete DataSource initialization ("
78-
+ ex.getMessage() + ")");
79-
}
66+
initialize(initializer);
8067
}
8168
}
8269
}
8370

71+
private void initialize(DataSourceInitializer initializer) {
72+
try {
73+
this.applicationContext.publishEvent(
74+
new DataSourceSchemaCreatedEvent(initializer.getDataSource()));
75+
// The listener might not be registered yet, so don't rely on it.
76+
if (!this.initialized) {
77+
this.dataSourceInitializer.initSchema();
78+
this.initialized = true;
79+
}
80+
}
81+
catch (IllegalStateException ex) {
82+
logger.warn("Could not send event to complete DataSource initialization ("
83+
+ ex.getMessage() + ")");
84+
}
85+
}
86+
8487
@Override
8588
public void onApplicationEvent(DataSourceSchemaCreatedEvent event) {
8689
// NOTE the event can happen more than once and

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceSchemaCreatedEvent.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
* are executed or when Hibernate initializes the database.
2727
*
2828
* @author Dave Syer
29-
* @since 1.1.0
29+
* @author Stephane Nicoll
30+
* @since 2.0.0
3031
*/
3132
@SuppressWarnings("serial")
3233
public class DataSourceSchemaCreatedEvent extends ApplicationEvent {

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
@Conditional(HibernateEntityManagerCondition.class)
5454
@EnableConfigurationProperties(JpaProperties.class)
5555
@AutoConfigureAfter({ DataSourceAutoConfiguration.class })
56-
@Import(JpaHibernateConfiguration.class)
56+
@Import(HibernateJpaConfiguration.class)
5757
public class HibernateJpaAutoConfiguration {
5858

5959
@Order(Ordered.HIGHEST_PRECEDENCE + 20)

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaHibernateConfiguration.java renamed to ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@
5050
*/
5151
@Configuration
5252
@ConditionalOnSingleCandidate(DataSource.class)
53-
public class JpaHibernateConfiguration extends JpaBaseConfiguration {
53+
class HibernateJpaConfiguration extends JpaBaseConfiguration {
5454

55-
private static final Log logger = LogFactory
56-
.getLog(JpaHibernateConfiguration.class);
55+
private static final Log logger = LogFactory.getLog(HibernateJpaConfiguration.class);
5756

5857
private static final String JTA_PLATFORM = "hibernate.transaction.jta.platform";
5958

@@ -74,8 +73,7 @@ public class JpaHibernateConfiguration extends JpaBaseConfiguration {
7473

7574
private final HibernateDefaultDdlAutoProvider defaultDdlAutoProvider;
7675

77-
public JpaHibernateConfiguration(DataSource dataSource,
78-
JpaProperties jpaProperties,
76+
HibernateJpaConfiguration(DataSource dataSource, JpaProperties jpaProperties,
7977
ObjectProvider<JtaTransactionManager> jtaTransactionManager,
8078
ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers,
8179
ObjectProvider<List<SchemaManagementProvider>> providers) {

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/CommonOAuth2Provider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ public Builder getBuilder(String registrationId) {
9999

100100
protected final ClientRegistration.Builder getBuilder(String registrationId,
101101
ClientAuthenticationMethod method, String redirectUri) {
102-
ClientRegistration.Builder builder = new ClientRegistration.Builder(registrationId);
102+
ClientRegistration.Builder builder = new ClientRegistration.Builder(
103+
registrationId);
103104
builder.clientAuthenticationMethod(method);
104105
builder.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE);
105106
builder.redirectUri(redirectUri);

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientAutoConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,3 @@
4242
public class OAuth2ClientAutoConfiguration {
4343

4444
}
45-

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ public static class Registration {
9898
private ClientAuthenticationMethod clientAuthenticationMethod;
9999

100100
/**
101-
* Authorization grant type. May be left bank then using a pre-defined
102-
* provider.
101+
* Authorization grant type. May be left bank then using a pre-defined provider.
103102
*/
104103
private AuthorizationGrantType authorizationGrantType;
105104

@@ -204,8 +203,8 @@ public static class Provider {
204203
private String userInfoUri;
205204

206205
/**
207-
* Name of the attribute that will be used to extract the username from the
208-
* call to 'userInfoUri'.
206+
* Name of the attribute that will be used to extract the username from the call
207+
* to 'userInfoUri'.
209208
*/
210209
private String userNameAttribute;
211210

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,9 @@ public static Map<String, ClientRegistration> getClientRegistrations(
5151
return clientRegistrations;
5252
}
5353

54-
private static ClientRegistration getClientRegistration(String registrationId, Registration properties,
55-
Map<String, Provider> providers) {
56-
Builder builder = getBuilder(registrationId, properties.getProvider(),
57-
providers);
54+
private static ClientRegistration getClientRegistration(String registrationId,
55+
Registration properties, Map<String, Provider> providers) {
56+
Builder builder = getBuilder(registrationId, properties.getProvider(), providers);
5857
copyIfNotNull(properties::getClientId, builder::clientId);
5958
copyIfNotNull(properties::getClientSecret, builder::clientSecret);
6059
copyIfNotNull(properties::getClientAuthenticationMethod,
@@ -75,7 +74,8 @@ private static Builder getBuilder(String registrationId, String providerId,
7574
if (provider == null && !providers.containsKey(providerId)) {
7675
throw new IllegalStateException("Unknown provider ID '" + providerId + "'");
7776
}
78-
Builder builder = (provider != null ? provider.getBuilder(registrationId) : new Builder(registrationId));
77+
Builder builder = (provider != null ? provider.getBuilder(registrationId)
78+
: new Builder(registrationId));
7979
if (providers.containsKey(providerId)) {
8080
return getBuilder(builder, providers.get(providerId));
8181
}

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientRegistrationRepositoryConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ class OAuth2ClientRegistrationRepositoryConfiguration {
5454

5555
private final OAuth2ClientProperties properties;
5656

57-
OAuth2ClientRegistrationRepositoryConfiguration(
58-
OAuth2ClientProperties properties) {
57+
OAuth2ClientRegistrationRepositoryConfiguration(OAuth2ClientProperties properties) {
5958
this.properties = properties;
6059
}
6160

@@ -103,4 +102,3 @@ private Map<String, Registration> getRegistrations(Environment environment) {
103102
}
104103

105104
}
106-

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
class OAuth2WebSecurityConfiguration {
3737

3838
@Configuration
39-
static class OAuth2WebSecurityConfigurationAdapter extends WebSecurityConfigurerAdapter {
39+
static class OAuth2WebSecurityConfigurationAdapter
40+
extends WebSecurityConfigurerAdapter {
4041

4142
private final ClientRegistrationRepository clientRegistrationRepository;
4243

@@ -47,15 +48,10 @@ static class OAuth2WebSecurityConfigurationAdapter extends WebSecurityConfigurer
4748

4849
@Override
4950
protected void configure(HttpSecurity http) throws Exception {
50-
http
51-
.authorizeRequests()
52-
.anyRequest()
53-
.authenticated().and()
54-
.oauth2Login()
51+
http.authorizeRequests().anyRequest().authenticated().and().oauth2Login()
5552
.clients(this.clientRegistrationRepository);
5653
}
5754

5855
}
5956

6057
}
61-

0 commit comments

Comments
 (0)