spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-09 10:59:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1.x'

Browse Source 
Closes gh-52091
This commit is contained in:
Stéphane Nicoll
2026-10-07 16:54:34 +02:00
parent 993362e934 f825d04234
commit 9be97e6b81
7 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-elasticsearch/src/test/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfigurationTests.java
+4 -4
View File
@@ -203,8 +203,8 @@ class ElasticsearchRestClientAutoConfigurationTests {
Rest5Client client = context.getBean(Rest5Client.class);
assertThat(client).extracting("defaultHeaders", InstanceOfAssertFactories.list(Header.class))
.satisfiesOnlyOnce((header) -> {
assertThat(header.getName().equals("Authorization"));
assertThat(header.getValue().equals("ApiKey some-api-key"));
assertThat(header.getName()).isEqualTo("Authorization");
assertThat(header.getValue()).isEqualTo("ApiKey some-api-key");
});
});
}
@@ -218,8 +218,8 @@ class ElasticsearchRestClientAutoConfigurationTests {
Rest5Client client = context.getBean(Rest5Client.class);
assertThat(client).extracting("defaultHeaders", InstanceOfAssertFactories.list(Header.class))
.satisfiesOnlyOnce((header) -> {
assertThat(header.getName().equals("Authorization"));
assertThat(header.getValue().equals("ApiKey some-api-key"));
assertThat(header.getName()).isEqualTo("Authorization");
assertThat(header.getValue()).isEqualTo("ApiKey some-api-key");
});
assertThat(client)
.extracting("client.credentialsProvider", InstanceOfAssertFactories.type(CredentialsProvider.class))
module/spring-boot-rsocket/src/test/java/org/springframework/boot/rsocket/autoconfigure/RSocketServerAutoConfigurationTests.java
+1 -1
View File
@@ -174,7 +174,7 @@ class RSocketServerAutoConfigurationTests {
.run((context) -> {
assertThat(context).hasFailed();
assertThat(context.getStartupFailure()).hasRootCauseInstanceOf(NoSuchSslBundleException.class)
.withFailMessage("SSL bundle name 'test-bundle' is not valid");
.hasRootCauseMessage("SSL bundle name 'test-bundle' cannot be found");
});
}
module/spring-boot-security-saml2/src/test/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyAutoConfigurationTests.java
+1 -2
View File
@@ -340,8 +340,7 @@ class Saml2RelyingPartyAutoConfigurationTests {
void causesManagementWebSecurityAutoConfigurationToBackOff() {
WebApplicationContextRunner contextRunner = this.contextRunner.withConfiguration(
AutoConfigurations.of(ManagementWebSecurityAutoConfiguration.class, WebMvcAutoConfiguration.class));
assertThat(contextRunner
.run((context) -> assertThat(context).hasSingleBean(ManagementWebSecurityAutoConfiguration.class)));
contextRunner.run((context) -> assertThat(context).hasSingleBean(ManagementWebSecurityAutoConfiguration.class));
contextRunner.withPropertyValues(PREFIX
+ ".simplesamlphp.assertingparty.single-sign-on.url=https://simplesaml-for-spring-saml/SSOService.php",
PREFIX + ".simplesamlphp.assertingparty.single-sign-on.sign-request=false",
module/spring-boot-web-server/src/testFixtures/java/org/springframework/boot/web/server/autoconfigure/reactive/AbstractReactiveWebServerAutoConfigurationTests.java
+1 -1
View File
@@ -107,7 +107,7 @@ public abstract class AbstractReactiveWebServerAutoConfigurationTests {
.run((context) -> {
assertThat(context).hasFailed();
assertThat(context.getStartupFailure().getCause()).isInstanceOf(NoSuchSslBundleException.class)
.withFailMessage("test");
.hasMessage("SSL bundle name 'test-bundle' cannot be found");
});
}