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

Create spring-boot-undertow module

Browse Source
This commit is contained in:
Andy Wilkinson
2025-03-13 14:35:24 +00:00
committed by Phillip Webb
parent 0f405e979e
commit 0a72db4676
71 changed files with 172 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
settings.gradle
View File

@@ -71,6 +71,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin"
include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator"
include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
include "spring-boot-project:spring-boot-undertow"
include "spring-boot-system-tests:spring-boot-deployment-tests"
include "spring-boot-system-tests:spring-boot-image-tests"
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"

1
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
View File

@@ -18,6 +18,7 @@ dependencies {
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
optional(project(":spring-boot-project:spring-boot-tomcat"))
optional(project(":spring-boot-project:spring-boot-undertow"))
optional("ch.qos.logback:logback-classic")
optional("org.apache.cassandra:java-driver-core") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowAccessLogCustomizer.java
View File

@@ -19,7 +19,7 @@ package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
import java.util.function.Function;
import org.springframework.boot.actuate.autoconfigure.web.server.AccessLogCustomizer;
import org.springframework.boot.web.server.undertow.ConfigurableUndertowWebServerFactory;
import org.springframework.boot.undertow.ConfigurableUndertowWebServerFactory;
/**
* {@link AccessLogCustomizer} for Undertow.

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowReactiveManagementChildContextConfiguration.java
View File

@@ -25,10 +25,10 @@ import org.springframework.boot.actuate.autoconfigure.web.ManagementContextType;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.autoconfigure.web.server.reactive.undertow.UndertowReactiveWebServerAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.undertow.autoconfigure.reactive.UndertowReactiveWebServerAutoConfiguration;
import org.springframework.boot.undertow.reactive.UndertowReactiveWebServerFactory;
import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
import org.springframework.boot.web.server.reactive.undertow.UndertowReactiveWebServerFactory;
import org.springframework.context.annotation.Bean;
/**

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowReactiveManagementContextAutoConfiguration.java
View File

@@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.autoconfigure.web.server.reactive.undertow.UndertowReactiveWebServerAutoConfiguration;
import org.springframework.boot.undertow.autoconfigure.reactive.UndertowReactiveWebServerAutoConfiguration;
import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
import org.springframework.context.annotation.Bean;

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowServletManagementChildContextConfiguration.java
View File

@@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.context.annotation.Bean;
/**

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowServletManagementContextAutoConfiguration.java
View File

@@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.autoconfigure.web.server.servlet.undertow.UndertowServletWebServerAutoConfiguration;
import org.springframework.boot.undertow.autoconfigure.servlet.UndertowServletWebServerAutoConfiguration;
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
import org.springframework.context.annotation.Bean;

1
spring-boot-project/spring-boot-actuator/build.gradle
View File

@@ -24,6 +24,7 @@ dependencies {
dockerTestImplementation("org.testcontainers:testcontainers")
optional(project(":spring-boot-project:spring-boot-tomcat"))
optional(project(":spring-boot-project:spring-boot-undertow"))
optional("org.apache.cassandra:java-driver-core") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}

8
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java
View File

@@ -27,8 +27,8 @@ import org.apache.catalina.Context;
import org.apache.catalina.core.StandardWrapper;
import org.springframework.boot.tomcat.TomcatWebServer;
import org.springframework.boot.undertow.servlet.UndertowServletWebServer;
import org.springframework.boot.web.server.WebServer;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServer;
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
import org.springframework.util.ClassUtils;
import org.springframework.web.context.WebApplicationContext;
@@ -47,6 +47,10 @@ final class DispatcherServletHandlerMappings {
private static final boolean TOMCAT_WEB_SERVER_PRESENT = ClassUtils.isPresent(
"org.springframework.boot.tomcat.TomcatWebServer", DispatcherServletHandlerMappings.class.getClassLoader());
private static final boolean UNDERTOW_WEB_SERVER_PRESENT = ClassUtils.isPresent(
"org.springframework.boot.undertow.UndertowWebServer",
DispatcherServletHandlerMappings.class.getClassLoader());
private final String name;
private final DispatcherServlet dispatcherServlet;
@@ -74,7 +78,7 @@ final class DispatcherServletHandlerMappings {
return;
}
WebServer webServer = webServerApplicationContext.getWebServer();
if (webServer instanceof UndertowServletWebServer undertowServletWebServer) {
if (UNDERTOW_WEB_SERVER_PRESENT && webServer instanceof UndertowServletWebServer undertowServletWebServer) {
new UndertowServletInitializer(undertowServletWebServer).initializeServlet(this.name);
}
else if (TOMCAT_WEB_SERVER_PRESENT && webServer instanceof TomcatWebServer tomcatWebServer) {

1
spring-boot-project/spring-boot-all-integration-tests/build.gradle
View File

@@ -8,6 +8,7 @@ dependencies {
testImplementation(project(":spring-boot-project:spring-boot-all"))
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-undertow"))
testImplementation("io.projectreactor.netty:reactor-netty-http")
testImplementation("org.apache.httpcomponents.client5:httpclient5")
testImplementation("org.apache.httpcomponents.core5:httpcore5-reactive")

2
spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
View File

@@ -24,10 +24,10 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.testsupport.classpath.resources.WithResource;
import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.WebServer;
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

3
spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories
View File

@@ -1,7 +1,6 @@
org.springframework.aot.hint.RuntimeHintsRegistrar=\
org.springframework.boot.http.client.ClientHttpRequestFactoryRuntimeHints,\
org.springframework.boot.jdbc.DataSourceBuilderRuntimeHints,\
org.springframework.boot.web.server.undertow.UndertowWebServer$UndertowWebServerRuntimeHints
org.springframework.boot.jdbc.DataSourceBuilderRuntimeHints
org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\
org.springframework.boot.jackson.JsonComponentModule$JsonComponentBeanFactoryInitializationAotProcessor

1
spring-boot-project/spring-boot-autoconfigure-all/build.gradle
View File

@@ -219,6 +219,7 @@ dependencies {
testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-undertow"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
testImplementation("ch.qos.logback:logback-classic")

8
spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -65,14 +65,6 @@
"level": "error"
}
},
{
"name": "server.undertow.buffers-per-region",
"type": "java.lang.Integer",
"description": "Number of buffer per region.",
"deprecation": {
"level": "error"
}
},
{
"name": "spring.activemq.pool.create-connection-on-startup",
"type": "java.lang.Boolean",

2
spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -134,9 +134,7 @@ org.springframework.boot.autoconfigure.web.reactive.function.client.ClientHttpCo
org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration
org.springframework.boot.autoconfigure.web.server.reactive.jetty.JettyReactiveWebServerAutoConfiguration
org.springframework.boot.autoconfigure.web.server.reactive.netty.NettyReactiveWebServerAutoConfiguration
org.springframework.boot.autoconfigure.web.server.reactive.undertow.UndertowReactiveWebServerAutoConfiguration
org.springframework.boot.autoconfigure.web.server.servlet.jetty.JettyServletWebServerAutoConfiguration
org.springframework.boot.autoconfigure.web.server.servlet.undertow.UndertowServletWebServerAutoConfiguration
org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration
org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
org.springframework.boot.autoconfigure.web.servlet.HttpEncodingAutoConfiguration

2
spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java
View File

@@ -33,8 +33,8 @@ import org.springframework.boot.testsupport.classpath.ForkedClassPath;
import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

3
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -2046,7 +2046,8 @@ bom {
"spring-boot-test",
"spring-boot-test-autoconfigure",
"spring-boot-testcontainers",
"spring-boot-tomcat"
"spring-boot-tomcat",
"spring-boot-undertow"
]
plugins = [
"spring-boot-maven-plugin"

3
spring-boot-project/spring-boot-docs/build.gradle
View File

@@ -65,6 +65,7 @@ dependencies {
autoConfiguration(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "autoConfigurationMetadata"))
autoConfiguration(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "autoConfigurationMetadata"))
autoConfiguration(project(path: ":spring-boot-project:spring-boot-tomcat", configuration: "autoConfigurationMetadata"))
autoConfiguration(project(path: ":spring-boot-project:spring-boot-undertow", configuration: "autoConfigurationMetadata"))
configurationProperties(project(path: ":spring-boot-project:spring-boot", configuration: "configurationPropertiesMetadata"))
configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator", configuration: "configurationPropertiesMetadata"))
@@ -76,6 +77,7 @@ dependencies {
configurationProperties(project(path: ":spring-boot-project:spring-boot-test-autoconfigure", configuration: "configurationPropertiesMetadata"))
configurationProperties(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "configurationPropertiesMetadata"))
configurationProperties(project(path: ":spring-boot-project:spring-boot-tomcat", configuration: "configurationPropertiesMetadata"))
configurationProperties(project(path: ":spring-boot-project:spring-boot-undertow", configuration: "configurationPropertiesMetadata"))
dokkatoo(project(path: ":spring-boot-project:spring-boot-all"))
dokkatoo(project(path: ":spring-boot-project:spring-boot-test"))
@@ -91,6 +93,7 @@ dependencies {
implementation(project(path: ":spring-boot-project:spring-boot-tomcat"))
implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
implementation(project(path: ":spring-boot-project:spring-boot-undertow"))
implementation("ch.qos.logback:logback-classic")
implementation("com.redis:testcontainers-redis")
implementation("com.zaxxer:HikariCP")

2
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultiplelistenersinundertow/MyUndertowConfiguration.java
View File

@@ -18,8 +18,8 @@ package org.springframework.boot.docs.howto.webserver.enablemultiplelistenersinu
import io.undertow.Undertow.Builder;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

4
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/webserver/enablemultiplelistenersinundertow/MyUndertowConfiguration.kt
View File

@@ -18,8 +18,8 @@ package org.springframework.boot.docs.howto.webserver.enablemultiplelistenersinu
import io.undertow.Undertow
import org.springframework.boot.web.server.WebServerFactoryCustomizer
import org.springframework.boot.web.server.undertow.UndertowBuilderCustomizer
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory
import org.springframework.boot.undertow.UndertowBuilderCustomizer
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration

2
spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle
View File

@@ -5,7 +5,7 @@ plugins {
description = "Starter for using Undertow as the embedded servlet container. An alternative to spring-boot-starter-tomcat"
dependencies {
api("io.undertow:undertow-core")
api(project(":spring-boot-project:spring-boot-undertow"))
api("io.undertow:undertow-servlet")
api("io.undertow:undertow-websockets-jsr")
api("org.apache.tomcat.embed:tomcat-embed-el")

36
spring-boot-project/spring-boot-undertow/build.gradle Normal file
View File

@@ -0,0 +1,36 @@
plugins {
id "java-library"
id "org.springframework.boot.auto-configuration"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.deployed"
id "org.springframework.boot.optional-dependencies"
}
description = "Spring Boot Undertow"
dependencies {
api(project(":spring-boot-project:spring-boot"))
api("io.undertow:undertow-servlet")
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
optional("io.undertow:undertow-websockets-jsr")
optional("org.springframework:spring-webflux")
testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
testImplementation("org.apache.httpcomponents.client5:httpclient5")
testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")
testRuntimeOnly("ch.qos.logback:logback-classic")
testRuntimeOnly("io.projectreactor:reactor-test")
testRuntimeOnly("io.projectreactor.netty:reactor-netty-http")
testRuntimeOnly("org.eclipse.jetty:jetty-client")
testRuntimeOnly("org.eclipse.jetty.http2:jetty-http2-client")
testRuntimeOnly("org.eclipse.jetty.http2:jetty-http2-client-transport")
}
test {
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
}

4
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/AccessLogHttpHandlerFactory.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/AccessLogHttpHandlerFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2025 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
import java.io.Closeable;
import java.io.File;

4
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/CompressionHttpHandlerFactory.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/CompressionHttpHandlerFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2025 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
import java.util.ArrayList;
import java.util.List;

2
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/ConfigurableUndertowWebServerFactory.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/ConfigurableUndertowWebServerFactory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
import java.io.File;
import java.util.Collection;

4
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/HttpHandlerFactory.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/HttpHandlerFactory.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
import java.io.Closeable;
import io.undertow.server.HttpHandler;
import io.undertow.server.handlers.GracefulShutdownHandler;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServer;
import org.springframework.boot.undertow.servlet.UndertowServletWebServer;
/**
* Factory used by {@link UndertowServletWebServer} to add {@link HttpHandler

4
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/SslBuilderCustomizer.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/SslBuilderCustomizer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
import java.net.InetAddress;
import java.util.Map;

4
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowBuilderCustomizer.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/UndertowBuilderCustomizer.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
import io.undertow.Undertow.Builder;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
/**
* Callback interface that can be used to customize an Undertow {@link Builder}.

2
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServer.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/UndertowWebServer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
import java.io.Closeable;
import java.io.IOException;

2
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServerFactory.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/UndertowWebServerFactory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
import java.io.File;
import java.net.InetAddress;

2
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/undertow/UndertowServerProperties.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/UndertowServerProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.undertow;
package org.springframework.boot.undertow.autoconfigure;
import java.io.File;
import java.nio.charset.Charset;

4
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/undertow/UndertowWebServerConfiguration.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/UndertowWebServerConfiguration.java
View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.undertow;
package org.springframework.boot.undertow.autoconfigure;
import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWarDeployment;
import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
import org.springframework.boot.autoconfigure.thread.Threading;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.web.server.servlet.undertow.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.undertow.servlet.UndertowDeploymentInfoCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

6
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/undertow/UndertowWebServerFactoryCustomizer.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/UndertowWebServerFactoryCustomizer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.undertow;
package org.springframework.boot.undertow.autoconfigure;
import java.lang.reflect.Modifier;
import java.nio.charset.Charset;
@@ -30,11 +30,11 @@ import org.xnio.Option;
import org.xnio.Options;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.autoconfigure.web.server.undertow.UndertowServerProperties.Accesslog;
import org.springframework.boot.cloud.CloudPlatform;
import org.springframework.boot.context.properties.PropertyMapper;
import org.springframework.boot.undertow.ConfigurableUndertowWebServerFactory;
import org.springframework.boot.undertow.autoconfigure.UndertowServerProperties.Accesslog;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.server.undertow.ConfigurableUndertowWebServerFactory;
import org.springframework.core.Ordered;
import org.springframework.core.env.Environment;
import org.springframework.util.Assert;

2
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/undertow/package-info.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/package-info.java
View File

@@ -18,4 +18,4 @@
* Classes related to the auto-configuration of a servlet or reactive web server using
* Undertow.
*/
package org.springframework.boot.autoconfigure.web.server.undertow;
package org.springframework.boot.undertow.autoconfigure;

10
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/reactive/undertow/UndertowReactiveWebServerAutoConfiguration.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/reactive/UndertowReactiveWebServerAutoConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.reactive.undertow;
package org.springframework.boot.undertow.autoconfigure.reactive;
import io.undertow.Undertow;
@@ -25,12 +25,12 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.web.server.reactive.ReactiveWebServerConfiguration;
import org.springframework.boot.autoconfigure.web.server.undertow.UndertowServerProperties;
import org.springframework.boot.autoconfigure.web.server.undertow.UndertowWebServerConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.undertow.UndertowBuilderCustomizer;
import org.springframework.boot.undertow.autoconfigure.UndertowServerProperties;
import org.springframework.boot.undertow.autoconfigure.UndertowWebServerConfiguration;
import org.springframework.boot.undertow.reactive.UndertowReactiveWebServerFactory;
import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
import org.springframework.boot.web.server.reactive.undertow.UndertowReactiveWebServerFactory;
import org.springframework.boot.web.server.undertow.UndertowBuilderCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.http.ReactiveHttpInputMessage;

2
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/reactive/undertow/package-info.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/reactive/package-info.java
View File

@@ -17,4 +17,4 @@
/**
* Classes related to the auto-configuration of a reactive web server using Undertow.
*/
package org.springframework.boot.autoconfigure.web.server.reactive.undertow;
package org.springframework.boot.undertow.autoconfigure.reactive;

12
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/servlet/undertow/UndertowServletWebServerAutoConfiguration.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/UndertowServletWebServerAutoConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.servlet.undertow;
package org.springframework.boot.undertow.autoconfigure.servlet;
import io.undertow.Undertow;
import io.undertow.websockets.jsr.Bootstrap;
@@ -30,13 +30,13 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.autoconfigure.condition.SearchStrategy;
import org.springframework.boot.autoconfigure.web.server.servlet.ServletWebServerConfiguration;
import org.springframework.boot.autoconfigure.web.server.undertow.UndertowServerProperties;
import org.springframework.boot.autoconfigure.web.server.undertow.UndertowWebServerConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.undertow.UndertowBuilderCustomizer;
import org.springframework.boot.undertow.autoconfigure.UndertowServerProperties;
import org.springframework.boot.undertow.autoconfigure.UndertowWebServerConfiguration;
import org.springframework.boot.undertow.servlet.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
import org.springframework.boot.web.server.servlet.undertow.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.undertow.UndertowBuilderCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;

6
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/servlet/undertow/UndertowServletWebServerFactoryCustomizer.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/UndertowServletWebServerFactoryCustomizer.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.servlet.undertow;
package org.springframework.boot.undertow.autoconfigure.servlet;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.autoconfigure.web.server.undertow.UndertowServerProperties;
import org.springframework.boot.undertow.autoconfigure.UndertowServerProperties;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
/**
* {@link WebServerFactoryCustomizer} to apply {@link ServerProperties} to Undertow

6
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/servlet/undertow/WebSocketUndertowServletWebServerFactoryCustomizer.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/WebSocketUndertowServletWebServerFactoryCustomizer.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.servlet.undertow;
package org.springframework.boot.undertow.autoconfigure.servlet;
import io.undertow.servlet.api.DeploymentInfo;
import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
import org.springframework.boot.undertow.servlet.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.server.servlet.undertow.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.core.Ordered;
/**

2
spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/servlet/undertow/package-info.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/package-info.java
View File

@@ -17,4 +17,4 @@
/**
* Classes related to the auto-configuration of a servlet web server using Undertow.
*/
package org.springframework.boot.autoconfigure.web.server.servlet.undertow;
package org.springframework.boot.undertow.autoconfigure.servlet;

6
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/package-info.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/package-info.java
View File

@@ -17,7 +17,7 @@
/**
* Reactive and servlet web server implementations backed by Undertow.
*
* @see org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory
* @see org.springframework.boot.web.server.reactive.undertow.UndertowReactiveWebServerFactory
* @see org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory
* @see org.springframework.boot.undertow.reactive.UndertowReactiveWebServerFactory
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;

10
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactory.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/reactive/UndertowReactiveWebServerFactory.java
View File

@@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.reactive.undertow;
package org.springframework.boot.undertow.reactive;
import java.util.List;
import io.undertow.Undertow;
import org.springframework.boot.undertow.ConfigurableUndertowWebServerFactory;
import org.springframework.boot.undertow.HttpHandlerFactory;
import org.springframework.boot.undertow.UndertowWebServer;
import org.springframework.boot.undertow.UndertowWebServerFactory;
import org.springframework.boot.web.server.WebServer;
import org.springframework.boot.web.server.reactive.ConfigurableReactiveWebServerFactory;
import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
import org.springframework.boot.web.server.undertow.ConfigurableUndertowWebServerFactory;
import org.springframework.boot.web.server.undertow.HttpHandlerFactory;
import org.springframework.boot.web.server.undertow.UndertowWebServer;
import org.springframework.boot.web.server.undertow.UndertowWebServerFactory;
import org.springframework.http.server.reactive.UndertowHttpHandlerAdapter;
/**

2
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/reactive/undertow/package-info.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/reactive/package-info.java
View File

@@ -17,4 +17,4 @@
/**
* Reactive web server implementation backed by Undertow.
*/
package org.springframework.boot.web.server.reactive.undertow;
package org.springframework.boot.undertow.reactive;

2
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/CompositeResourceManager.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/CompositeResourceManager.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import java.io.IOException;
import java.util.Arrays;

4
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/DeploymentManagerHttpHandlerFactory.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/DeploymentManagerHttpHandlerFactory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import java.io.Closeable;
import java.io.IOException;
@@ -24,7 +24,7 @@ import io.undertow.server.HttpServerExchange;
import io.undertow.servlet.api.DeploymentManager;
import jakarta.servlet.ServletException;
import org.springframework.boot.web.server.undertow.HttpHandlerFactory;
import org.springframework.boot.undertow.HttpHandlerFactory;
import org.springframework.util.Assert;
/**

2
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistence.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/FileSessionPersistence.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import java.io.File;
import java.io.FileInputStream;

2
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManager.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/JarResourceManager.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import java.io.File;
import java.io.IOException;

2
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowDeploymentInfoCustomizer.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/UndertowDeploymentInfoCustomizer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import io.undertow.servlet.api.DeploymentInfo;

6
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServer.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/UndertowServletWebServer.java
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import io.undertow.Handlers;
import io.undertow.Undertow.Builder;
import io.undertow.server.HttpHandler;
import io.undertow.servlet.api.DeploymentManager;
import org.springframework.boot.undertow.HttpHandlerFactory;
import org.springframework.boot.undertow.UndertowWebServer;
import org.springframework.boot.web.server.WebServer;
import org.springframework.boot.web.server.undertow.HttpHandlerFactory;
import org.springframework.boot.web.server.undertow.UndertowWebServer;
import org.springframework.util.StringUtils;
/**

6
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactory.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/UndertowServletWebServerFactory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import java.io.File;
import java.io.IOException;
@@ -63,6 +63,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.context.properties.PropertyMapper;
import org.springframework.boot.undertow.HttpHandlerFactory;
import org.springframework.boot.undertow.UndertowWebServerFactory;
import org.springframework.boot.web.server.Cookie.SameSite;
import org.springframework.boot.web.server.ErrorPage;
import org.springframework.boot.web.server.MimeMappings.Mapping;
@@ -75,8 +77,6 @@ import org.springframework.boot.web.server.servlet.ServletContextInitializer;
import org.springframework.boot.web.server.servlet.ServletContextInitializers;
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
import org.springframework.boot.web.server.servlet.ServletWebServerSettings;
import org.springframework.boot.web.server.undertow.HttpHandlerFactory;
import org.springframework.boot.web.server.undertow.UndertowWebServerFactory;
import org.springframework.context.ResourceLoaderAware;
import org.springframework.core.io.ResourceLoader;
import org.springframework.util.Assert;

2
spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/servlet/undertow/package-info.java → spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/package-info.java
View File

@@ -17,4 +17,4 @@
/**
* Servlet web server implementation backed by Undertow.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;

0
spring-boot-project/spring-boot-undertow/src/main/resources/META-INF/META-INF/spring.factories Normal file
View File

13
spring-boot-project/spring-boot-undertow/src/main/resources/META-INF/additional-spring-configuration-metadata.json Normal file
View File

@@ -0,0 +1,13 @@
{
"groups": [],
"properties": [
{
"name": "server.undertow.buffers-per-region",
"type": "java.lang.Integer",
"description": "Number of buffer per region.",
"deprecation": {
"level": "error"
}
}
]
}

2
spring-boot-project/spring-boot-undertow/src/main/resources/META-INF/spring/aot.factories Normal file
View File

@@ -0,0 +1,2 @@
org.springframework.aot.hint.RuntimeHintsRegistrar=\
org.springframework.boot.undertow.UndertowWebServer$UndertowWebServerRuntimeHints

2
spring-boot-project/spring-boot-undertow/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports Normal file
View File

@@ -0,0 +1,2 @@
org.springframework.boot.undertow.autoconfigure.reactive.UndertowReactiveWebServerAutoConfiguration
org.springframework.boot.undertow.autoconfigure.servlet.UndertowServletWebServerAutoConfiguration

2
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/undertow/UndertowAccess.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/UndertowAccess.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
/**
* Helper class to provide public access to package-private methods for testing purposes.

4
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/undertow/UndertowWebServerRuntimeHintsTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/UndertowWebServerRuntimeHintsTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.undertow;
package org.springframework.boot.undertow;
import java.util.function.Predicate;
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
import org.springframework.boot.web.server.undertow.UndertowWebServer.UndertowWebServerRuntimeHints;
import org.springframework.boot.undertow.UndertowWebServer.UndertowWebServerRuntimeHints;
import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/server/undertow/UndertowServerPropertiesTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/autoconfigure/UndertowServerPropertiesTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.undertow;
package org.springframework.boot.undertow.autoconfigure;
import java.util.Collections;
import java.util.Map;

6
spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/server/undertow/UndertowWebServerFactoryCustomizerTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/autoconfigure/UndertowWebServerFactoryCustomizerTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.undertow;
package org.springframework.boot.undertow.autoconfigure;
import java.io.File;
import java.nio.charset.StandardCharsets;
@@ -33,8 +33,8 @@ import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.context.properties.bind.Bindable;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
import org.springframework.boot.web.server.undertow.ConfigurableUndertowWebServerFactory;
import org.springframework.boot.web.server.undertow.UndertowBuilderCustomizer;
import org.springframework.boot.undertow.ConfigurableUndertowWebServerFactory;
import org.springframework.boot.undertow.UndertowBuilderCustomizer;
import org.springframework.mock.env.MockEnvironment;
import org.springframework.test.context.support.TestPropertySourceUtils;
import org.springframework.test.util.ReflectionTestUtils;

8
spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/server/reactive/undertow/UndertowReactiveWebServerAutoConfigurationTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/autoconfigure/reactive/UndertowReactiveWebServerAutoConfigurationTests.java
View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.reactive.undertow;
package org.springframework.boot.undertow.autoconfigure.reactive;
import io.undertow.Undertow.Builder;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.web.server.reactive.AbstractReactiveWebServerAutoConfigurationTests;
import org.springframework.boot.undertow.UndertowBuilderCustomizer;
import org.springframework.boot.undertow.reactive.UndertowReactiveWebServerFactory;
import org.springframework.boot.undertow.servlet.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.server.reactive.undertow.UndertowReactiveWebServerFactory;
import org.springframework.boot.web.server.servlet.undertow.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.web.server.undertow.UndertowBuilderCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

9
spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/server/servlet/undertow/UndertowServletWebServerAutoConfigurationTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/autoconfigure/servlet/UndertowServletWebServerAutoConfigurationTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.servlet.undertow;
package org.springframework.boot.undertow.autoconfigure.servlet;
import io.undertow.Undertow.Builder;
import io.undertow.servlet.api.DeploymentInfo;
@@ -22,10 +22,10 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.server.servlet.AbstractServletWebServerAutoConfigurationTests;
import org.springframework.boot.undertow.UndertowBuilderCustomizer;
import org.springframework.boot.undertow.servlet.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.server.servlet.undertow.UndertowDeploymentInfoCustomizer;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.undertow.UndertowBuilderCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -43,7 +43,6 @@ import static org.mockito.Mockito.mock;
* @author Raheela Aslam
* @author Madhura Bhave
*/
// @DirtiesUrlFactories
class UndertowServletWebServerAutoConfigurationTests extends AbstractServletWebServerAutoConfigurationTests {
UndertowServletWebServerAutoConfigurationTests() {

6
spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/server/servlet/undertow/UndertowServletWebServerFactoryCustomizerTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/autoconfigure/servlet/UndertowServletWebServerFactoryCustomizerTests.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.servlet.undertow;
package org.springframework.boot.undertow.autoconfigure.servlet;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.web.server.undertow.UndertowServerProperties;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.boot.undertow.autoconfigure.UndertowServerProperties;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import static org.assertj.core.api.Assertions.assertThat;

4
spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/server/servlet/undertow/UndertowServletWebServerServletContextListenerTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/autoconfigure/servlet/UndertowServletWebServerServletContextListenerTests.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.web.server.servlet.undertow;
package org.springframework.boot.undertow.autoconfigure.servlet;
import jakarta.servlet.ServletContextListener;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.servlet.AbstractServletWebServerServletContextListenerTests;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

8
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/reactive/undertow/UndertowReactiveWebServerFactoryTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/reactive/UndertowReactiveWebServerFactoryTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.reactive.undertow;
package org.springframework.boot.undertow.reactive;
import java.io.File;
import java.time.Duration;
@@ -27,12 +27,12 @@ import org.junit.jupiter.api.io.TempDir;
import org.mockito.InOrder;
import reactor.core.publisher.Mono;
import org.springframework.boot.undertow.UndertowAccess;
import org.springframework.boot.undertow.UndertowBuilderCustomizer;
import org.springframework.boot.undertow.UndertowWebServer;
import org.springframework.boot.web.server.Shutdown;
import org.springframework.boot.web.server.reactive.AbstractReactiveWebServerFactoryTests;
import org.springframework.boot.web.server.reactive.ConfigurableReactiveWebServerFactory;
import org.springframework.boot.web.server.undertow.UndertowAccess;
import org.springframework.boot.web.server.undertow.UndertowBuilderCustomizer;
import org.springframework.boot.web.server.undertow.UndertowWebServer;
import org.springframework.http.MediaType;
import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.web.reactive.function.BodyInserters;

2
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/undertow/FileSessionPersistenceTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/servlet/FileSessionPersistenceTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import java.io.File;
import java.util.Date;

2
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/undertow/JarResourceManagerTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/servlet/JarResourceManagerTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import java.io.File;
import java.io.FileOutputStream;

4
spring-boot-project/spring-boot-all/src/test/java/org/springframework/boot/web/server/servlet/undertow/UndertowServletWebServerFactoryTests.java → spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/servlet/UndertowServletWebServerFactoryTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.web.server.servlet.undertow;
package org.springframework.boot.undertow.servlet;
import java.io.File;
import java.io.IOException;
@@ -50,13 +50,13 @@ import org.mockito.InOrder;
import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
import org.springframework.boot.testsupport.web.servlet.ExampleServlet;
import org.springframework.boot.undertow.UndertowBuilderCustomizer;
import org.springframework.boot.web.server.ErrorPage;
import org.springframework.boot.web.server.GracefulShutdownResult;
import org.springframework.boot.web.server.PortInUseException;
import org.springframework.boot.web.server.Shutdown;
import org.springframework.boot.web.server.servlet.AbstractServletWebServerFactoryTests;
import org.springframework.boot.web.server.servlet.ConfigurableServletWebServerFactory;
import org.springframework.boot.web.server.undertow.UndertowBuilderCustomizer;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.http.HttpStatus;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;

0
spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/undertow/restricted.jks → spring-boot-project/spring-boot-undertow/src/test/resources/org/springframework/boot/undertow/servlet/restricted.jks
View File

0
spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/servlet/undertow/test.jks → spring-boot-project/spring-boot-undertow/src/test/resources/org/springframework/boot/undertow/servlet/test.jks
View File

0
spring-boot-project/spring-boot-all/src/test/resources/org/springframework/boot/web/server/undertow/test.jks → spring-boot-project/spring-boot-undertow/src/test/resources/org/springframework/boot/undertow/test.jks
View File

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/src/test/java/smoketest/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java
View File

@@ -36,8 +36,8 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;