diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java index 1d925411653..2bf60b0b58c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticMetricsExportAutoConfigurationTests.java @@ -96,7 +96,7 @@ class ElasticMetricsExportAutoConfigurationTests { this.contextRunner.withUserConfiguration(BaseConfiguration.class) .withPropertyValues("management.elastic.metrics.export.api-key-credentials:secret", "management.elastic.metrics.export.user-name:alice") - .run((context) -> assertThat(context).hasFailed().getFailure().getRootCause() + .run((context) -> assertThat(context).hasFailed().getFailure().rootCause() .isInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class)); } @@ -105,7 +105,7 @@ class ElasticMetricsExportAutoConfigurationTests { this.contextRunner.withUserConfiguration(BaseConfiguration.class) .withPropertyValues("management.elastic.metrics.export.api-key-credentials:secret", "management.elastic.metrics.export.password:secret") - .run((context) -> assertThat(context).hasFailed().getFailure().getRootCause() + .run((context) -> assertThat(context).hasFailed().getFailure().rootCause() .isInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java index 7a02deae7dd..f8f9768924b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java @@ -433,7 +433,7 @@ class IntegrationAutoConfigurationTests { "spring.integration.poller.fixed-delay=1s") .run((context) -> assertThat(context).hasFailed().getFailure() .hasRootCauseExactlyInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class) - .getRootCause() + .rootCause() .asInstanceOf( InstanceOfAssertFactories.type(MutuallyExclusiveConfigurationPropertiesException.class)) .satisfies((ex) -> { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java index 2f4f7d3093d..dfb88fa49e5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java @@ -102,7 +102,7 @@ class R2dbcAutoConfigurationTests { this.contextRunner .withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName() + "?maxSize=12", "spring.r2dbc.pool.max-size=15") - .run((context) -> assertThat(context).getFailure().getRootCause() + .run((context) -> assertThat(context).getFailure().rootCause() .isInstanceOf(MultipleConnectionPoolConfigurationsException.class)); } @@ -111,7 +111,7 @@ class R2dbcAutoConfigurationTests { this.contextRunner .withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName() + "?maxSize=12", "spring.r2dbc.pool.enabled=false") - .run((context) -> assertThat(context).getFailure().getRootCause() + .run((context) -> assertThat(context).getFailure().rootCause() .isInstanceOf(MultipleConnectionPoolConfigurationsException.class)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationWithoutConnectionPoolTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationWithoutConnectionPoolTests.java index e9ef7bf0977..5508ad03f0f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationWithoutConnectionPoolTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationWithoutConnectionPoolTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ class R2dbcAutoConfigurationWithoutConnectionPoolTests { .withPropertyValues("spring.r2dbc.pool.enabled=true", "spring.r2dbc.url:r2dbc:h2:mem:///" + randomDatabaseName() + "?options=DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE") - .run((context) -> assertThat(context).getFailure().getRootCause() + .run((context) -> assertThat(context).getFailure().rootCause() .isInstanceOf(MissingR2dbcPoolDependencyException.class)); } @@ -72,7 +72,7 @@ class R2dbcAutoConfigurationWithoutConnectionPoolTests { this.contextRunner .withPropertyValues("spring.r2dbc.url:r2dbc:pool:h2:mem:///" + randomDatabaseName() + "?options=DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE") - .run((context) -> assertThat(context).getFailure().getRootCause() + .run((context) -> assertThat(context).getFailure().rootCause() .isInstanceOf(MissingR2dbcPoolDependencyException.class)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java index 24d09c8b4fb..8523a210209 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java @@ -863,7 +863,7 @@ class WebMvcAutoConfigurationTests { this.contextRunner .withPropertyValues("spring.mvc.pathmatch.matching-strategy:path_pattern_parser", "spring.mvc.pathmatch.use-suffix-pattern:true") - .run((context) -> assertThat(context.getStartupFailure()).getRootCause() + .run((context) -> assertThat(context.getStartupFailure()).rootCause() .isInstanceOf(IncompatibleConfigurationException.class)); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5ee5966383a..398910245b1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -51,7 +51,7 @@ bom { ] } } - library("AssertJ", "3.22.0") { + library("AssertJ", "3.23.1") { group("org.assertj") { modules = [ "assertj-core" diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java index 14e068e3b9a..dc5ac494aba 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.