Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 4.0.x

Browse Source
This commit is contained in:
Stéphane Nicoll
2025-05-18 09:28:49 +02:00
parent f5ac6d3ea1 921b9fd6ac
commit 00e4ca2201
18 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition.java
View File

@@ -43,7 +43,7 @@ class NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition extends
@ConditionalOnThreading(Threading.VIRTUAL)
@ConditionalOnBean(name = TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME)
private static final class VirtualThreadsEnabled {
private static final class VirtualThreadsExecutorEnabled {
}

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java
View File

@@ -113,11 +113,10 @@ class JerseyAutoConfigurationTests {
.stream()
.filter(JakartaXmlBindAnnotationIntrospector.class::isInstance)).isEmpty();
});
}
@Test
void webApplicationIntializerDisablesJerseysWebApplicationInitializer() throws ServletException {
void webApplicationInitializerDisablesJerseyWebApplicationInitializer() throws ServletException {
ServletContext context = new MockServletContext();
new JerseyWebApplicationInitializer().onStartup(context);
assertThat(context.getInitParameter("contextConfigLocation")).isEqualTo("<NONE>");