Skip to content

Commit 2dc30d9

Browse files
mhalbrittermhalbritter
committed
Merge pull request #40034 from izeye
* pr/40034: Polish Closes gh-40034
2 parents 8e6c685 + 12b4353 commit 2dc30d9

File tree

14 files changed

+21
-43
lines changed

14 files changed

+21
-43
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Failure Analyzers
22
org.springframework.boot.diagnostics.FailureAnalyzer=\
3-
org.springframework.boot.actuate.autoconfigure.metrics.ValidationFailureAnalyzer,\
4-
org.springframework.boot.actuate.autoconfigure.health.NoSuchHealthContributorFailureAnalyzer
3+
org.springframework.boot.actuate.autoconfigure.health.NoSuchHealthContributorFailureAnalyzer,\
4+
org.springframework.boot.actuate.autoconfigure.metrics.ValidationFailureAnalyzer
55

66
# Environment Post Processors
77
org.springframework.boot.env.EnvironmentPostProcessor=\

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public class LiquibaseProperties {
151151
/**
152152
* Which UIService to use.
153153
*/
154-
private UIService uiService;
154+
private UiService uiService;
155155

156156
public String getChangeLog() {
157157
return this.changeLog;
@@ -322,11 +322,11 @@ public void setShowSummaryOutput(ShowSummaryOutput showSummaryOutput) {
322322
this.showSummaryOutput = showSummaryOutput;
323323
}
324324

325-
public UIService getUiService() {
325+
public UiService getUiService() {
326326
return this.uiService;
327327
}
328328

329-
public void setUiService(UIService uiService) {
329+
public void setUiService(UiService uiService) {
330330
this.uiService = uiService;
331331
}
332332

@@ -386,10 +386,8 @@ public enum ShowSummaryOutput {
386386
* Enumeration of types of UIService. Values are the same as those on
387387
* {@link UIServiceEnum}. To maximize backwards compatibility, the Liquibase enum is
388388
* not used directly.
389-
*
390-
* @since 3.3.0
391389
*/
392-
public enum UIService {
390+
public enum UiService {
393391

394392
/**
395393
* Console-based UIService.

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.boot.context.properties.ConfigurationProperties;
2727
import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
2828
import org.springframework.core.io.Resource;
29-
import org.springframework.security.core.GrantedAuthority;
3029
import org.springframework.util.Assert;
3130
import org.springframework.util.StreamUtils;
3231

@@ -83,19 +82,17 @@ public static class Jwt {
8382
private List<String> audiences = new ArrayList<>();
8483

8584
/**
86-
* Prefix to use for {@link GrantedAuthority authorities} mapped from JWT.
85+
* Prefix to use for authorities mapped from JWT.
8786
*/
8887
private String authorityPrefix;
8988

9089
/**
91-
* Regex to use for splitting the value of the authorities claim into
92-
* {@link GrantedAuthority authorities}.
90+
* Regex to use for splitting the value of the authorities claim into authorities.
9391
*/
9492
private String authoritiesClaimDelimiter;
9593

9694
/**
97-
* Name of token claim to use for mapping {@link GrantedAuthority authorities}
98-
* from JWT.
95+
* Name of token claim to use for mapping authorities from JWT.
9996
*/
10097
private String authoritiesClaimName;
10198

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/Oauth2ResourceServerConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ class Oauth2ResourceServerConfiguration {
3131

3232
@Configuration(proxyBeanMethods = false)
3333
@ConditionalOnClass(JwtDecoder.class)
34-
@Import({ OAuth2ResourceServerJwtConfiguration.JwtDecoderConfiguration.class,
35-
OAuth2ResourceServerJwtConfiguration.OAuth2SecurityFilterChainConfiguration.class,
36-
OAuth2ResourceServerJwtConfiguration.JwtConverterConfiguration.class })
34+
@Import({ OAuth2ResourceServerJwtConfiguration.JwtConverterConfiguration.class,
35+
OAuth2ResourceServerJwtConfiguration.JwtDecoderConfiguration.class,
36+
OAuth2ResourceServerJwtConfiguration.OAuth2SecurityFilterChainConfiguration.class })
3737
static class JwtConfiguration {
3838

3939
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public static class Session {
345345
private Duration timeout = Duration.ofMinutes(30);
346346

347347
/**
348-
* The maximum number of sessions that can be stored.
348+
* Maximum number of sessions that can be stored.
349349
*/
350350
private int maxSessions = 10000;
351351

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,12 @@
6161
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
6262
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
6363
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
64-
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
6564
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
6665
import org.springframework.boot.autoconfigure.orm.jpa.test.City;
6766
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
6867
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration;
6968
import org.springframework.boot.jdbc.DataSourceBuilder;
7069
import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
71-
import org.springframework.boot.logging.LogLevel;
7270
import org.springframework.boot.sql.init.DatabaseInitializationMode;
7371
import org.springframework.boot.sql.init.DatabaseInitializationSettings;
7472
import org.springframework.boot.test.context.FilteredClassLoader;
@@ -117,8 +115,7 @@ class BatchAutoConfigurationTests {
117115

118116
@Test
119117
void testDefaultContext() {
120-
this.contextRunner.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO))
121-
.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class)
118+
this.contextRunner.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class)
122119
.run((context) -> {
123120
assertThat(context).hasSingleBean(JobRepository.class);
124121
assertThat(context).hasSingleBean(JobLauncher.class);

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@
2929
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration.SpringBootBatchConfiguration;
3030
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
3131
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
32-
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
3332
import org.springframework.boot.autoconfigure.orm.jpa.test.City;
3433
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
35-
import org.springframework.boot.logging.LogLevel;
3634
import org.springframework.boot.sql.init.DatabaseInitializationMode;
3735
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3836
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
@@ -57,7 +55,6 @@ class BatchAutoConfigurationWithoutJpaTests {
5755
void jdbcWithDefaultSettings() {
5856
this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class)
5957
.withPropertyValues("spring.datasource.generate-unique-name=true")
60-
.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO))
6158
.run((context) -> {
6259
assertThat(context).hasSingleBean(JobLauncher.class);
6360
assertThat(context).hasSingleBean(JobExplorer.class);

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchClientAutoConfiguration;
3333
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.elasticsearch.ReactiveElasticsearchClientAutoConfiguration;
35-
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
36-
import org.springframework.boot.logging.LogLevel;
3735
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3836
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
3937
import org.springframework.context.annotation.Configuration;
@@ -67,8 +65,7 @@ class ReactiveElasticsearchRepositoriesAutoConfigurationTests {
6765
ReactiveElasticsearchClientAutoConfiguration.class))
6866
.withPropertyValues(
6967
"spring.elasticsearch.uris=" + elasticsearch.getHost() + ":" + elasticsearch.getFirstMappedPort(),
70-
"spring.elasticsearch.socket-timeout=30s")
71-
.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO));
68+
"spring.elasticsearch.socket-timeout=30s");
7269

7370
@Test
7471
void testDefaultRepositoryConfiguration() {

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,8 @@ void overrideShowSummaryOutput() {
417417
void overrideUiService() {
418418
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
419419
.withPropertyValues("spring.liquibase.ui-service=console")
420-
.run(assertLiquibase((liquibase) -> {
421-
UIServiceEnum uiService = (UIServiceEnum) ReflectionTestUtils.getField(liquibase, "uiService");
422-
assertThat(uiService).isEqualTo(UIServiceEnum.CONSOLE);
423-
}));
420+
.run(assertLiquibase(
421+
(liquibase) -> assertThat(liquibase).extracting("uiService").isEqualTo(UIServiceEnum.CONSOLE)));
424422
}
425423

426424
@Test

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibasePropertiesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties.ShowSummary;
2828
import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties.ShowSummaryOutput;
29-
import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties.UIService;
29+
import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties.UiService;
3030

3131
import static org.assertj.core.api.Assertions.assertThat;
3232

@@ -49,7 +49,7 @@ void valuesOfShowSummaryOutputMatchValuesOfUpdateSummaryOutputEnum() {
4949

5050
@Test
5151
void valuesOfUiServiceMatchValuesOfUiServiceEnum() {
52-
assertThat(namesOf(UIService.values())).isEqualTo(namesOf(UIServiceEnum.values()));
52+
assertThat(namesOf(UiService.values())).isEqualTo(namesOf(UIServiceEnum.values()));
5353
}
5454

5555
private List<String> namesOf(Enum<?>[] input) {

0 commit comments

Comments
 (0)