From 7d30bc55d00cc730559c5ab348e3b929ada88283 Mon Sep 17 00:00:00 2001 From: Jakob Wanger Date: Tue, 12 Mar 2024 19:53:57 -0400 Subject: [PATCH 1/2] Add getUndertow method to UndertowWebServer getUndertow() to UndertowWebServer returns null until the server has been started. Issue #3016 would enable getUndertow() to behave in a similar way to getTomcat() on TomcatWebServer. Signed-off-by: Jakob Wanger See gh-39916 --- .../boot/web/embedded/undertow/UndertowWebServer.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java index 20a34d020eb..b6ad684d5f5 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java @@ -298,6 +298,15 @@ public class UndertowWebServer implements WebServer { return ports.get(0).getNumber(); } + /** + * Returns the undertow of the WebServer. Note, the return value will be null until + * the server has been started. + * @return undertow of the WebServer. + */ + public Undertow getUndertow() { + return this.undertow; + } + @Override public void shutDownGracefully(GracefulShutdownCallback callback) { if (this.gracefulShutdown == null) { From c2be81540a0881c423a70ce223d2a7329661bd92 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 13 Mar 2024 11:27:29 +0100 Subject: [PATCH 2/2] Polish "Add getUndertow method to UndertowWebServer" See gh-39916 --- .../boot/web/embedded/undertow/UndertowWebServer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java index b6ad684d5f5..3eb1ac1ea17 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java @@ -299,9 +299,10 @@ public class UndertowWebServer implements WebServer { } /** - * Returns the undertow of the WebServer. Note, the return value will be null until - * the server has been started. - * @return undertow of the WebServer. + * Returns the {@link Undertow Undertow server}. Returns {@code null} until the server + * has been started. + * @return the Undertow server or {@code null} if the server hasn't been started yet + * @since 3.3.0 */ public Undertow getUndertow() { return this.undertow;