Skip to content

Commit dd2ad00

Browse files
wilkinsonaphilwebb
wilkinsona
authored and
philwebb
committed
Create spring-boot-jetty module
1 parent 8f1ee73 commit dd2ad00

File tree

68 files changed

+224
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+224
-171
lines changed

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ include "spring-boot-project:spring-boot-all-integration-tests"
6666
include "spring-boot-project:spring-boot-docker-compose"
6767
include "spring-boot-project:spring-boot-devtools"
6868
include "spring-boot-project:spring-boot-docs"
69+
include "spring-boot-project:spring-boot-jetty"
6970
include "spring-boot-project:spring-boot-test"
7071
include "spring-boot-project:spring-boot-testcontainers"
7172
include "spring-boot-project:spring-boot-test-autoconfigure"

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ dependencies {
1717
implementation("com.fasterxml.jackson.core:jackson-databind")
1818
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
1919

20+
optional(project(":spring-boot-project:spring-boot-jetty"))
2021
optional(project(":spring-boot-project:spring-boot-tomcat"))
2122
optional(project(":spring-boot-project:spring-boot-undertow"))
2223
optional("ch.qos.logback:logback-classic")

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyAccessLogCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.eclipse.jetty.server.Server;
2525

2626
import org.springframework.boot.actuate.autoconfigure.web.server.AccessLogCustomizer;
27+
import org.springframework.boot.jetty.ConfigurableJettyWebServerFactory;
2728
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
28-
import org.springframework.boot.web.server.jetty.ConfigurableJettyWebServerFactory;
2929
import org.springframework.util.StringUtils;
3030

3131
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyReactiveManagementContextAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
29-
import org.springframework.boot.autoconfigure.web.server.reactive.jetty.JettyReactiveWebServerAutoConfiguration;
29+
import org.springframework.boot.jetty.reactive.autoconfigure.JettyReactiveWebServerAutoConfiguration;
3030
import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
3131
import org.springframework.context.annotation.Bean;
3232

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyServletManagementContextAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
29-
import org.springframework.boot.autoconfigure.web.server.servlet.jetty.JettyServletWebServerAutoConfiguration;
29+
import org.springframework.boot.jetty.servlet.autoconfigure.JettyServletWebServerAutoConfiguration;
3030
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
3131
import org.springframework.context.annotation.Bean;
3232

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
import org.springframework.boot.actuate.metrics.web.jetty.JettyServerThreadPoolMetricsBinder;
2727
import org.springframework.boot.actuate.metrics.web.jetty.JettySslHandshakeMetricsBinder;
2828
import org.springframework.boot.autoconfigure.AutoConfigurations;
29-
import org.springframework.boot.autoconfigure.web.server.reactive.jetty.JettyReactiveWebServerAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.web.server.servlet.jetty.JettyServletWebServerAutoConfiguration;
3129
import org.springframework.boot.context.event.ApplicationStartedEvent;
30+
import org.springframework.boot.jetty.reactive.JettyReactiveWebServerFactory;
31+
import org.springframework.boot.jetty.reactive.autoconfigure.JettyReactiveWebServerAutoConfiguration;
32+
import org.springframework.boot.jetty.servlet.JettyServletWebServerFactory;
33+
import org.springframework.boot.jetty.servlet.autoconfigure.JettyServletWebServerAutoConfiguration;
3234
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3335
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3436
import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
3537
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
36-
import org.springframework.boot.web.server.reactive.jetty.JettyReactiveWebServerFactory;
37-
import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
3838
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
3939
import org.springframework.context.ConfigurableApplicationContext;
4040
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-actuator/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies {
2323
dockerTestImplementation("org.testcontainers:neo4j")
2424
dockerTestImplementation("org.testcontainers:testcontainers")
2525

26+
optional(project(":spring-boot-project:spring-boot-jetty"))
2627
optional(project(":spring-boot-project:spring-boot-tomcat"))
2728
optional(project(":spring-boot-project:spring-boot-undertow"))
2829
optional("org.apache.cassandra:java-driver-core") {

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/jetty/AbstractJettyMetricsBinder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.eclipse.jetty.server.Server;
2020

2121
import org.springframework.boot.context.event.ApplicationStartedEvent;
22+
import org.springframework.boot.jetty.JettyWebServer;
2223
import org.springframework.boot.web.context.WebServerApplicationContext;
2324
import org.springframework.boot.web.server.WebServer;
24-
import org.springframework.boot.web.server.jetty.JettyWebServer;
2525
import org.springframework.context.ApplicationContext;
2626
import org.springframework.context.ApplicationListener;
2727

‎spring-boot-project/spring-boot-all-integration-tests/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ description = "Spring Boot Integration Tests"
66

77
dependencies {
88
testImplementation(project(":spring-boot-project:spring-boot-all"))
9+
testImplementation(project(":spring-boot-project:spring-boot-jetty"))
910
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
1011
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
1112
testImplementation(project(":spring-boot-project:spring-boot-undertow"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
import org.junit.jupiter.api.AfterEach;
2222
import org.junit.jupiter.api.Test;
2323

24+
import org.springframework.boot.jetty.servlet.JettyServletWebServerFactory;
2425
import org.springframework.boot.testsupport.classpath.resources.WithResource;
2526
import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
2627
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
2728
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
2829
import org.springframework.boot.web.server.WebServer;
2930
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
30-
import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
3131
import org.springframework.boot.web.servlet.ServletRegistrationBean;
3232
import org.springframework.context.annotation.Bean;
3333
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-all/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,7 @@ dependencies {
4747
optional("org.apache.groovy:groovy")
4848
optional("org.apache.groovy:groovy-xml")
4949
optional("org.crac:crac")
50-
optional("org.eclipse.jetty:jetty-alpn-conscrypt-server")
5150
optional("org.eclipse.jetty:jetty-client")
52-
optional("org.eclipse.jetty:jetty-util")
53-
optional("org.eclipse.jetty.ee10:jetty-ee10-servlets")
54-
optional("org.eclipse.jetty.ee10:jetty-ee10-webapp")
55-
optional("org.eclipse.jetty.http2:jetty-http2-server")
5651
optional("org.flywaydb:flyway-core")
5752
optional("org.hamcrest:hamcrest-library")
5853
optional("org.hibernate.orm:hibernate-core")

‎spring-boot-project/spring-boot-autoconfigure-all/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ dependencies {
236236
optional("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
237237
optional("redis.clients:jedis")
238238

239+
testImplementation(project(":spring-boot-project:spring-boot-jetty"))
239240
testImplementation(project(":spring-boot-project:spring-boot-test"))
240241
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
241242
testImplementation(project(":spring-boot-project:spring-boot-undertow"))

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

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,6 @@
11
{
22
"groups": [],
33
"properties": [
4-
{
5-
"name": "server.jetty.accesslog.date-format",
6-
"deprecation": {
7-
"replacement": "server.jetty.accesslog.custom-format",
8-
"level": "error"
9-
}
10-
},
11-
{
12-
"name": "server.jetty.accesslog.extended-format",
13-
"deprecation": {
14-
"replacement": "server.jetty.accesslog.format",
15-
"level": "error"
16-
}
17-
},
18-
{
19-
"name": "server.jetty.accesslog.locale",
20-
"deprecation": {
21-
"replacement": "server.jetty.accesslog.custom-format",
22-
"level": "error"
23-
}
24-
},
25-
{
26-
"name": "server.jetty.accesslog.log-cookies",
27-
"deprecation": {
28-
"replacement": "server.jetty.accesslog.custom-format",
29-
"level": "error"
30-
}
31-
},
32-
{
33-
"name": "server.jetty.accesslog.log-latency",
34-
"deprecation": {
35-
"replacement": "server.jetty.accesslog.custom-format",
36-
"level": "error"
37-
}
38-
},
39-
{
40-
"name": "server.jetty.accesslog.log-server",
41-
"deprecation": {
42-
"replacement": "server.jetty.accesslog.custom-format",
43-
"level": "error"
44-
}
45-
},
46-
{
47-
"name": "server.jetty.accesslog.time-zone",
48-
"deprecation": {
49-
"replacement": "server.jetty.accesslog.custom-format",
50-
"level": "error"
51-
}
52-
},
53-
{
54-
"name": "server.jetty.max-http-post-size",
55-
"type": "org.springframework.util.unit.DataSize",
56-
"deprecation": {
57-
"replacement": "server.jetty.max-http-form-post-size",
58-
"level": "error"
59-
}
60-
},
614
{
625
"name": "server.netty.max-chunk-size",
636
"deprecation": {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@ org.springframework.boot.autoconfigure.web.reactive.WebSessionIdResolverAutoConf
127127
org.springframework.boot.autoconfigure.web.reactive.error.ErrorWebFluxAutoConfiguration
128128
org.springframework.boot.autoconfigure.web.reactive.function.client.ClientHttpConnectorAutoConfiguration
129129
org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration
130-
org.springframework.boot.autoconfigure.web.server.reactive.jetty.JettyReactiveWebServerAutoConfiguration
131130
org.springframework.boot.autoconfigure.web.server.reactive.netty.NettyReactiveWebServerAutoConfiguration
132-
org.springframework.boot.autoconfigure.web.server.servlet.jetty.JettyServletWebServerAutoConfiguration
133131
org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration
134132
org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
135133
org.springframework.boot.autoconfigure.web.servlet.HttpEncodingAutoConfiguration

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828

2929
import org.springframework.boot.autoconfigure.web.ServerProperties;
3030
import org.springframework.boot.context.properties.EnableConfigurationProperties;
31+
import org.springframework.boot.jetty.servlet.JettyServletWebServerFactory;
3132
import org.springframework.boot.test.util.TestPropertyValues;
3233
import org.springframework.boot.testsupport.classpath.ForkedClassPath;
3334
import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
3435
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
3536
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
3637
import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
37-
import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
3838
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
3939
import org.springframework.context.annotation.Bean;
4040
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,6 +2035,7 @@ bom {
20352035
"spring-boot-devtools",
20362036
"spring-boot-docker-compose",
20372037
"spring-boot-jarmode-tools",
2038+
"spring-boot-jetty",
20382039
"spring-boot-loader",
20392040
"spring-boot-loader-classic",
20402041
"spring-boot-loader-tools",

‎spring-boot-project/spring-boot-docs/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ dependencies {
5454
autoConfiguration(project(path: ":spring-boot-project:spring-boot-autoconfigure-all", configuration: "autoConfigurationMetadata"))
5555
autoConfiguration(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "autoConfigurationMetadata"))
5656
autoConfiguration(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "autoConfigurationMetadata"))
57+
autoConfiguration(project(path: ":spring-boot-project:spring-boot-jetty", configuration: "autoConfigurationMetadata"))
5758
autoConfiguration(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "autoConfigurationMetadata"))
5859
autoConfiguration(project(path: ":spring-boot-project:spring-boot-tomcat", configuration: "autoConfigurationMetadata"))
5960
autoConfiguration(project(path: ":spring-boot-project:spring-boot-undertow", configuration: "autoConfigurationMetadata"))
@@ -65,6 +66,7 @@ dependencies {
6566
configurationProperties(project(path: ":spring-boot-project:spring-boot-autoconfigure-all", configuration: "configurationPropertiesMetadata"))
6667
configurationProperties(project(path: ":spring-boot-project:spring-boot-docker-compose", configuration: "configurationPropertiesMetadata"))
6768
configurationProperties(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "configurationPropertiesMetadata"))
69+
configurationProperties(project(path: ":spring-boot-project:spring-boot-jetty", configuration: "configurationPropertiesMetadata"))
6870
configurationProperties(project(path: ":spring-boot-project:spring-boot-test-autoconfigure", configuration: "configurationPropertiesMetadata"))
6971
configurationProperties(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "configurationPropertiesMetadata"))
7072
configurationProperties(project(path: ":spring-boot-project:spring-boot-tomcat", configuration: "configurationPropertiesMetadata"))

‎spring-boot-project/spring-boot-jetty/build.gradle

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
plugins {
2+
id "java-library"
3+
id "org.springframework.boot.auto-configuration"
4+
id "org.springframework.boot.configuration-properties"
5+
id "org.springframework.boot.deployed"
6+
id "org.springframework.boot.optional-dependencies"
7+
}
8+
9+
description = "Spring Boot Jetty"
10+
11+
dependencies {
12+
api(project(":spring-boot-project:spring-boot"))
13+
api("org.eclipse.jetty.ee10:jetty-ee10-servlets")
14+
api("org.eclipse.jetty.ee10:jetty-ee10-webapp")
15+
16+
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
17+
optional("org.apache.tomcat.embed:tomcat-embed-jasper")
18+
optional("org.eclipse.jetty:jetty-alpn-conscrypt-server")
19+
optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server")
20+
optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server")
21+
optional("org.eclipse.jetty.http2:jetty-http2-server")
22+
optional("org.springframework:spring-webflux")
23+
24+
testImplementation(project(":spring-boot-project:spring-boot-test"))
25+
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
26+
testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
27+
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
28+
testImplementation("org.apache.httpcomponents.client5:httpclient5")
29+
testImplementation("org.assertj:assertj-core")
30+
testImplementation("org.awaitility:awaitility")
31+
testImplementation("org.junit.jupiter:junit-jupiter")
32+
testImplementation("org.mockito:mockito-core")
33+
testImplementation("org.mockito:mockito-junit-jupiter")
34+
35+
testRuntimeOnly("ch.qos.logback:logback-classic")
36+
testRuntimeOnly("io.projectreactor:reactor-test")
37+
testRuntimeOnly("io.projectreactor.netty:reactor-netty-http")
38+
testRuntimeOnly("org.eclipse.jetty:jetty-client")
39+
testRuntimeOnly("org.eclipse.jetty.http2:jetty-http2-client")
40+
testRuntimeOnly("org.eclipse.jetty.http2:jetty-http2-client-transport")
41+
}
42+
43+
test {
44+
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
45+
}
46+

‎spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/ConfigurableJettyWebServerFactory.java renamed to ‎spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/ConfigurableJettyWebServerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.web.server.jetty;
17+
package org.springframework.boot.jetty;
1818

1919
import org.eclipse.jetty.server.Server;
2020
import org.eclipse.jetty.util.thread.ThreadPool;

‎spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/ForwardHeadersCustomizer.java renamed to ‎spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/ForwardHeadersCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.web.server.jetty;
17+
package org.springframework.boot.jetty;
1818

1919
import org.eclipse.jetty.server.ConnectionFactory;
2020
import org.eclipse.jetty.server.Connector;

‎spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/GracefulShutdown.java renamed to ‎spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/GracefulShutdown.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.web.server.jetty;
17+
package org.springframework.boot.jetty;
1818

1919
import java.lang.reflect.Method;
2020
import java.util.concurrent.CompletableFuture;

‎spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyHandlerWrappers.java renamed to ‎spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyHandlerWrappers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.web.server.jetty;
17+
package org.springframework.boot.jetty;
1818

1919
import org.eclipse.jetty.http.HttpFields.Mutable;
2020
import org.eclipse.jetty.http.HttpMethod;

‎spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyServerCustomizer.java renamed to ‎spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyServerCustomizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.web.server.jetty;
17+
package org.springframework.boot.jetty;
1818

1919
import org.eclipse.jetty.server.Server;
2020

21-
import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
21+
import org.springframework.boot.jetty.servlet.JettyServletWebServerFactory;
2222

2323
/**
2424
* Callback interface that can be used to customize a Jetty {@link Server}.

‎spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServer.java renamed to ‎spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.web.server.jetty;
17+
package org.springframework.boot.jetty;
1818

1919
import java.io.IOException;
2020
import java.util.Collection;
@@ -33,12 +33,12 @@
3333
import org.eclipse.jetty.server.handler.ContextHandler;
3434
import org.eclipse.jetty.server.handler.StatisticsHandler;
3535

36+
import org.springframework.boot.jetty.reactive.JettyReactiveWebServerFactory;
3637
import org.springframework.boot.web.server.GracefulShutdownCallback;
3738
import org.springframework.boot.web.server.GracefulShutdownResult;
3839
import org.springframework.boot.web.server.PortInUseException;
3940
import org.springframework.boot.web.server.WebServer;
4041
import org.springframework.boot.web.server.WebServerException;
41-
import org.springframework.boot.web.server.reactive.jetty.JettyReactiveWebServerFactory;
4242
import org.springframework.http.server.reactive.JettyHttpHandlerAdapter;
4343
import org.springframework.util.Assert;
4444
import org.springframework.util.StringUtils;

‎spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/JettyWebServerFactory.java renamed to ‎spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.web.server.jetty;
17+
package org.springframework.boot.jetty;
1818

1919
import java.net.InetSocketAddress;
2020
import java.util.ArrayList;

‎spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/jetty/SslServerCustomizer.java renamed to ‎spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/SslServerCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.web.server.jetty;
17+
package org.springframework.boot.jetty;
1818

1919
import java.net.InetSocketAddress;
2020

‎spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/web/server/jetty/JettyServerProperties.java renamed to ‎spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyServerProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.autoconfigure.web.server.jetty;
17+
package org.springframework.boot.jetty.autoconfigure;
1818

1919
import java.time.Duration;
2020
import java.util.List;

0 commit comments

Comments
 (0)