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

Revert "Configure virtual threads on Undertow if enabled"

Browse Source 
This reverts commit cff1b33f8e.

See gh-38819

Closes gh-39812
This commit is contained in:
Moritz Halbritter
2024-03-04 09:45:09 +01:00
parent 40a7027707
commit 2f99c19f11
3 changed files with 3 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/EmbeddedWebServerFactoryCustomizerAutoConfiguration.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -34,18 +34,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
import org.springframework.boot.autoconfigure.thread.Threading; import org.springframework.boot.autoconfigure.thread.Threading;
import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.embedded.undertow.UndertowDeploymentInfoCustomizer;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.core.task.VirtualThreadTaskExecutor;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for embedded servlet and reactive * {@link EnableAutoConfiguration Auto-configuration} for embedded servlet and reactive
* web servers customizations. * web servers customizations.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Moritz Halbritter
* @since 2.0.0 * @since 2.0.0
*/ */
@AutoConfiguration @AutoConfiguration
@@ -110,12 +107,6 @@ public class EmbeddedWebServerFactoryCustomizerAutoConfiguration {
return new UndertowWebServerFactoryCustomizer(environment, serverProperties); return new UndertowWebServerFactoryCustomizer(environment, serverProperties);
} }
@Bean
@ConditionalOnThreading(Threading.VIRTUAL)
UndertowDeploymentInfoCustomizer virtualThreadsUndertowDeploymentInfoCustomizer() {
return (deploymentInfo) -> deploymentInfo.setExecutor(new VirtualThreadTaskExecutor("undertow-"));
}
} }
/** /**

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java
View File

@@ -77,7 +77,8 @@ public class UndertowWebServerFactoryCustomizer
public void customize(ConfigurableUndertowWebServerFactory factory) { public void customize(ConfigurableUndertowWebServerFactory factory) {
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
ServerOptions options = new ServerOptions(factory); ServerOptions options = new ServerOptions(factory);
map.from(this.serverProperties::getMaxHttpRequestHeaderSize) ServerProperties properties = this.serverProperties;
map.from(properties::getMaxHttpRequestHeaderSize)
.asInt(DataSize::toBytes) .asInt(DataSize::toBytes)
.when(this::isPositive) .when(this::isPositive)
.to(options.option(UndertowOptions.MAX_HEADER_SIZE)); .to(options.option(UndertowOptions.MAX_HEADER_SIZE));

57
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerConfigurationTests.java
View File

@@ -1,57 +0,0 @@
/*
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.embedded;
import io.undertow.servlet.api.DeploymentInfo;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.embedded.EmbeddedWebServerFactoryCustomizerAutoConfiguration.UndertowWebServerFactoryCustomizerConfiguration;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.web.embedded.undertow.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
import org.springframework.core.task.VirtualThreadTaskExecutor;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link UndertowWebServerFactoryCustomizerConfiguration}.
*
* @author Moritz Halbritter
*/
class UndertowWebServerFactoryCustomizerConfigurationTests {
private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner(
AnnotationConfigServletWebApplicationContext::new)
.withConfiguration(AutoConfigurations.of(EmbeddedWebServerFactoryCustomizerAutoConfiguration.class));
@EnabledForJreRange(min = JRE.JAVA_21)
@Test
void shouldUseVirtualThreadsIfEnabled() {
this.contextRunner.withPropertyValues("spring.threads.virtual.enabled=true").run((context) -> {
assertThat(context).hasSingleBean(UndertowDeploymentInfoCustomizer.class);
assertThat(context).hasBean("virtualThreadsUndertowDeploymentInfoCustomizer");
UndertowDeploymentInfoCustomizer customizer = context.getBean(UndertowDeploymentInfoCustomizer.class);
DeploymentInfo deploymentInfo = new DeploymentInfo();
customizer.customize(deploymentInfo);
assertThat(deploymentInfo.getExecutor()).isInstanceOf(VirtualThreadTaskExecutor.class);
});
}
}