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

Merge branch '2.2.x'

Browse Source 
Closes gh-21344
This commit is contained in:
Madhura Bhave
2020-05-06 16:37:25 -07:00
parent 01404aa27b 5583f64b1f
commit 8e7f816f48
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
View File

@@ -40,6 +40,8 @@ import org.apache.catalina.valves.RemoteIpValve;
import org.apache.coyote.AbstractProtocol;
import org.eclipse.jetty.server.HttpChannel;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.thread.ThreadPool;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat.Accesslog;
@@ -55,6 +57,7 @@ import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.unit.DataSize;
@@ -450,6 +453,20 @@ class ServerPropertiesTests {
assertThat(this.properties.getTomcat().getUseRelativeRedirects()).isFalse();
}
@Test
void jettyThreadPoolPropertyDefaultsShouldMatchServerDefault() {
JettyServletWebServerFactory jettyFactory = new JettyServletWebServerFactory(0);
JettyWebServer jetty = (JettyWebServer) jettyFactory.getWebServer();
Server server = (Server) ReflectionTestUtils.getField(jetty, "server");
ThreadPool threadPool = (ThreadPool) ReflectionTestUtils.getField(server, "_threadPool");
int idleTimeout = (int) ReflectionTestUtils.getField(threadPool, "_idleTimeout");
int maxThreads = (int) ReflectionTestUtils.getField(threadPool, "_maxThreads");
int minThreads = (int) ReflectionTestUtils.getField(threadPool, "_minThreads");
assertThat(this.properties.getJetty().getThreads().getIdleTimeout().toMillis()).isEqualTo(idleTimeout);
assertThat(this.properties.getJetty().getThreads().getMax()).isEqualTo(maxThreads);
assertThat(this.properties.getJetty().getThreads().getMin()).isEqualTo(minThreads);
}
@Test
void jettyMaxHttpFormPostSizeMatchesDefault() throws Exception {
JettyServletWebServerFactory jettyFactory = new JettyServletWebServerFactory(0);