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

Merge branch '4.1.x'

Browse Source 
Closes gh-51646
This commit is contained in:
Andy Wilkinson
2026-09-09 10:37:59 +01:00
parent b91e126655 d601081bd5
commit 677efea937
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationIntegrationTests.java
+1 -1
View File
@@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat;
CREATE TABLE CITY (
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
name VARCHAR(30),
country VARCHAR(30)
country VARCHAR(30)
);
""")
class DataRepositoryMetricsAutoConfigurationIntegrationTests {
module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationTests.java
+3 -3
View File
@@ -67,9 +67,9 @@ import static org.mockito.Mockito.mock;
CREATE TABLE CITY (
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
name VARCHAR(30),
state VARCHAR(30),
country VARCHAR(30),
map VARCHAR(30)
state VARCHAR(30),
country VARCHAR(30),
map VARCHAR(30)
);
""")
@WithResource(name = "data.sql",
module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigurationTests.java
+3 -3
View File
@@ -53,9 +53,9 @@ import static org.assertj.core.api.Assertions.assertThat;
CREATE TABLE CITY (
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
name VARCHAR(30),
state VARCHAR(30),
country VARCHAR(30),
map VARCHAR(30)
state VARCHAR(30),
country VARCHAR(30),
map VARCHAR(30)
);
""")
@WithResource(name = "data.sql",
module/spring-boot-hazelcast/src/main/java/org/springframework/boot/hazelcast/autoconfigure/HazelcastClientConfigAvailableCondition.java
+1 -1
View File
@@ -78,7 +78,7 @@ class HazelcastClientConfigAvailableCondition extends HazelcastConfigResourceCon
private static String existingConfigurationOutcome(Resource resource, boolean client) throws IOException {
URL location = resource.getURL();
return client ? "Hazelcast client configuration detected at '" + location + "'"
: "Hazelcast server configuration detected at '" + location + "'";
: "Hazelcast server configuration detected at '" + location + "'";
}
}
module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfigurationTests.java
+3 -3
View File
@@ -145,9 +145,9 @@ class HibernateMetricsAutoConfigurationTests {
CREATE TABLE CITY (
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
name VARCHAR(30),
state VARCHAR(30),
country VARCHAR(30),
map VARCHAR(30)
state VARCHAR(30),
country VARCHAR(30),
map VARCHAR(30)
);
""")
@WithResource(name = "city-data.sql",
module/spring-boot-security-saml2/src/main/java/org/springframework/boot/security/saml2/autoconfigure/Saml2RelyingPartyRegistrationConfiguration.java
+1 -1
View File
@@ -194,7 +194,7 @@ class Saml2RelyingPartyRegistrationConfiguration {
private X509Certificate readCertificate(@Nullable Resource location) {
Assert.state(location != null, "No certificate location specified");
Assert.state(location.exists(), () -> "Certificate location '" + location + "' does not exist");
Assert.state(location.exists(), () -> "Certificate location '" + location + "' does not exist");
try (InputStream inputStream = location.getInputStream()) {
PemContent pemContent = PemContent.load(inputStream);
List<X509Certificate> certificates = pemContent.getCertificates();