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

Start building against Spring Framework 7.1.0-M2 snapshots

Browse Source 
See gh-51712
This commit is contained in:
Stéphane Nicoll
2026-09-12 18:19:41 +02:00
parent f7beb3ad3e
commit 4bf6557076
6 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebPropertiesResourcesTests.java
+10 -2
View File
@@ -77,12 +77,20 @@ class WebPropertiesResourcesTests {
assertThat(cacheControl).isNull();
}
@Test
void cacheControlPublic() {
Cache.Cachecontrol properties = this.properties.getCache().getCachecontrol();
properties.setCachePublic(true);
CacheControl cacheControl = properties.toHttpCacheControl();
assertThat(cacheControl).isNotNull();
assertThat(cacheControl.getHeaderValue()).isEqualTo("public");
}
@Test
void cacheControlAllPropertiesSet() {
Cache.Cachecontrol properties = this.properties.getCache().getCachecontrol();
properties.setMaxAge(Duration.ofSeconds(4));
properties.setCachePrivate(true);
properties.setCachePublic(true);
properties.setMustRevalidate(true);
properties.setNoTransform(true);
properties.setProxyRevalidate(true);
@@ -92,7 +100,7 @@ class WebPropertiesResourcesTests {
CacheControl cacheControl = properties.toHttpCacheControl();
assertThat(cacheControl).isNotNull();
assertThat(cacheControl.getHeaderValue())
.isEqualTo("max-age=4, must-revalidate, no-transform, public, private, proxy-revalidate,"
.isEqualTo("max-age=4, must-revalidate, no-transform, private, proxy-revalidate,"
+ " s-maxage=5, stale-if-error=6, stale-while-revalidate=7");
}
gradle.properties
+1 -1
View File
@@ -22,7 +22,7 @@ nativeBuildToolsVersion=1.1.12
nullabilityPluginVersion=0.0.15
snakeYamlVersion=2.7
springGrpcVersion=1.1.1
springFrameworkVersion=7.1.0-M1
springFrameworkVersion=7.1.0-SNAPSHOT
springFramework60xVersion=6.0.23
tomcatVersion=11.0.25
protobufGradlePluginVersion=0.9.6
module/spring-boot-graphql/src/test/java/org/springframework/boot/graphql/autoconfigure/reactive/GraphQlWebFluxAutoConfigurationTests.java
+2 -2
View File
@@ -134,9 +134,9 @@ class GraphQlWebFluxAutoConfigurationTests {
.expectBody(String.class)
.returnResult();
assertThat(result.getResponseBody()).contains("event:next",
"data:{\"data\":{\"booksOnSale\":{\"id\":\"book-1\",\"name\":\"GraphQL for beginners\",\"pageCount\":100,\"author\":\"John GraphQL\"}}}",
"data: {\"data\":{\"booksOnSale\":{\"id\":\"book-1\",\"name\":\"GraphQL for beginners\",\"pageCount\":100,\"author\":\"John GraphQL\"}}}",
"event:next",
"data:{\"data\":{\"booksOnSale\":{\"id\":\"book-2\",\"name\":\"Harry Potter and the Philosopher's Stone\",\"pageCount\":223,\"author\":\"Joanne Rowling\"}}}",
"data: {\"data\":{\"booksOnSale\":{\"id\":\"book-2\",\"name\":\"Harry Potter and the Philosopher's Stone\",\"pageCount\":223,\"author\":\"Joanne Rowling\"}}}",
"event:complete");
});
}
module/spring-boot-graphql/src/test/java/org/springframework/boot/graphql/autoconfigure/servlet/GraphQlWebMvcAutoConfigurationTests.java
+2 -2
View File
@@ -148,9 +148,9 @@ class GraphQlWebMvcAutoConfigurationTests {
assertThat(result).hasStatusOk().hasContentTypeCompatibleWith(MediaType.TEXT_EVENT_STREAM);
assertThat(result).bodyText()
.containsSubsequence("event:next",
"data:{\"data\":{\"booksOnSale\":{\"id\":\"book-1\",\"name\":\"GraphQL for beginners\",\"pageCount\":100,\"author\":\"John GraphQL\"}}}",
"data: {\"data\":{\"booksOnSale\":{\"id\":\"book-1\",\"name\":\"GraphQL for beginners\",\"pageCount\":100,\"author\":\"John GraphQL\"}}}",
"event:next",
"data:{\"data\":{\"booksOnSale\":{\"id\":\"book-2\",\"name\":\"Harry Potter and the Philosopher's Stone\",\"pageCount\":223,\"author\":\"Joanne Rowling\"}}}");
"data: {\"data\":{\"booksOnSale\":{\"id\":\"book-2\",\"name\":\"Harry Potter and the Philosopher's Stone\",\"pageCount\":223,\"author\":\"Joanne Rowling\"}}}");
});
});
}
module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
+1
View File
@@ -100,6 +100,7 @@ public enum EmbeddedDatabaseConnection {
* Returns the {@link EmbeddedDatabaseType} for the connection.
* @return the database type
*/
@SuppressWarnings("removal")
public @Nullable EmbeddedDatabaseType getType() {
// See https://github.com/spring-projects/spring-boot/issues/32865
return switch (this) {
module/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnectionTests.java
+2
View File
@@ -111,6 +111,8 @@ class EmbeddedDatabaseConnectionTests {
}
@Test
@Deprecated(since = "4.2.0", forRemoval = true)
@SuppressWarnings("removal")
void isEmbeddedWithDerbyDataSource() {
testEmbeddedDatabase(new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY).build());
}