mirror of
https://github.com/spring-projects/spring-boot.git
synced 2026-09-17 12:09:16 +00:00
Start building against Spring Framework 7.1.0-M1 snapshots
See gh-51123
This commit is contained in:
+1
-1
@@ -22,7 +22,7 @@ nativeBuildToolsVersion=1.1.5
|
||||
nullabilityPluginVersion=0.0.14
|
||||
snakeYamlVersion=2.6
|
||||
springGrpcVersion=1.1.0
|
||||
springFrameworkVersion=7.0.8
|
||||
springFrameworkVersion=7.1.0-SNAPSHOT
|
||||
springFramework60xVersion=6.0.23
|
||||
tomcatVersion=11.0.24
|
||||
protobufGradlePluginVersion=0.9.6
|
||||
|
||||
+1
@@ -40,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT,
|
||||
properties = { "spring.main.web-application-type=reactive", "value=123" })
|
||||
@Deprecated(since = "4.2.0", forRemoval = true)
|
||||
@SuppressWarnings("removal")
|
||||
class SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests
|
||||
extends AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests {
|
||||
|
||||
|
||||
+1
@@ -40,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
@DirtiesContext
|
||||
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "value=123" })
|
||||
@Deprecated(since = "4.2.0", forRemoval = true)
|
||||
@SuppressWarnings("removal")
|
||||
class SpringBootTestUserDefinedTestRestTemplateTests extends AbstractSpringBootTestWebServerWebEnvironmentTests {
|
||||
|
||||
@Test
|
||||
|
||||
+2
-2
@@ -66,8 +66,8 @@ public class ProducibleOperationArgumentResolver implements OperationArgumentRes
|
||||
}
|
||||
Enum<? extends Producible<?>> result = null;
|
||||
for (String accept : accepts) {
|
||||
for (String mimeType : MimeTypeUtils.tokenize(accept)) {
|
||||
result = mostRecent(result, forMimeType(values, MimeTypeUtils.parseMimeType(mimeType)));
|
||||
for (MimeType mimeType : MimeTypeUtils.parseMimeTypes(accept)) {
|
||||
result = mostRecent(result, forMimeType(values, mimeType));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
||||
+2
-2
@@ -18,7 +18,7 @@ package org.springframework.boot.http.converter.autoconfigure;
|
||||
|
||||
import org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializer;
|
||||
import org.springframework.http.converter.HttpMessageConverter;
|
||||
import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
|
||||
import org.springframework.http.converter.multipart.MultipartHttpMessageConverter;
|
||||
|
||||
/**
|
||||
* {@link BackgroundPreinitializer} Spring's {@link HttpMessageConverter} implementations.
|
||||
@@ -29,7 +29,7 @@ final class MessageConverterBackgroundPreinitializer implements BackgroundPreini
|
||||
|
||||
@Override
|
||||
public void preinitialize() throws Exception {
|
||||
new AllEncompassingFormHttpMessageConverter();
|
||||
new MultipartHttpMessageConverter();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+1
@@ -60,6 +60,7 @@ public class ReactiveWebServerConfiguration {
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
@ConditionalOnProperty(name = "server.forward-headers-strategy", havingValue = "framework")
|
||||
@SuppressWarnings("removal") // gh-51030
|
||||
ForwardedHeaderTransformer forwardedHeaderTransformer() {
|
||||
return new ForwardedHeaderTransformer();
|
||||
}
|
||||
|
||||
+1
@@ -72,6 +72,7 @@ public class ServletWebServerConfiguration {
|
||||
@Bean
|
||||
@ConditionalOnProperty(name = "server.forward-headers-strategy", havingValue = "framework")
|
||||
@ConditionalOnMissingFilterBean(ForwardedHeaderFilter.class)
|
||||
@SuppressWarnings("removal") // gh-51030
|
||||
FilterRegistrationBean<ForwardedHeaderFilter> forwardedHeaderFilter(
|
||||
ObjectProvider<ForwardedHeaderFilterCustomizer> customizerProvider) {
|
||||
ForwardedHeaderFilter filter = new ForwardedHeaderFilter();
|
||||
|
||||
+1
@@ -178,6 +178,7 @@ public abstract class AbstractReactiveWebServerAutoConfigurationTests {
|
||||
static class ForwardedHeaderTransformerConfiguration {
|
||||
|
||||
@Bean
|
||||
@SuppressWarnings("removal") // gh-51030
|
||||
ForwardedHeaderTransformer testForwardedHeaderTransformer() {
|
||||
return new ForwardedHeaderTransformer();
|
||||
}
|
||||
|
||||
+1
@@ -212,6 +212,7 @@ public abstract class AbstractServletWebServerAutoConfigurationTests {
|
||||
static class ForwardedHeaderFilterConfiguration {
|
||||
|
||||
@Bean
|
||||
@SuppressWarnings("removal") // gh-51030
|
||||
FilterRegistrationBean<ForwardedHeaderFilter> testForwardedHeaderFilter() {
|
||||
ForwardedHeaderFilter filter = new ForwardedHeaderFilter();
|
||||
return new FilterRegistrationBean<>(filter);
|
||||
|
||||
Reference in New Issue
Block a user