From febea4711ecb74a33584aa6da175c63500ac0f49 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 7 Apr 2022 18:20:38 +0100 Subject: [PATCH] Make Reactive and ServletWebServerFactory extend marker interface Closes gh-30579 --- .../boot/web/reactive/server/ReactiveWebServerFactory.java | 5 +++-- .../boot/web/servlet/server/ServletWebServerFactory.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/server/ReactiveWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/server/ReactiveWebServerFactory.java index 94f1b701aa8..101137d0649 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/server/ReactiveWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/server/ReactiveWebServerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 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. @@ -17,6 +17,7 @@ package org.springframework.boot.web.reactive.server; import org.springframework.boot.web.server.WebServer; +import org.springframework.boot.web.server.WebServerFactory; import org.springframework.http.server.reactive.HttpHandler; /** @@ -27,7 +28,7 @@ import org.springframework.http.server.reactive.HttpHandler; * @see WebServer */ @FunctionalInterface -public interface ReactiveWebServerFactory { +public interface ReactiveWebServerFactory extends WebServerFactory { /** * Gets a new fully configured but paused {@link WebServer} instance. Clients should diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/ServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/ServletWebServerFactory.java index b1bea96c44f..062148af6a9 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/ServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/ServletWebServerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 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. @@ -17,6 +17,7 @@ package org.springframework.boot.web.servlet.server; import org.springframework.boot.web.server.WebServer; +import org.springframework.boot.web.server.WebServerFactory; import org.springframework.boot.web.servlet.ServletContextInitializer; /** @@ -27,7 +28,7 @@ import org.springframework.boot.web.servlet.ServletContextInitializer; * @see WebServer */ @FunctionalInterface -public interface ServletWebServerFactory { +public interface ServletWebServerFactory extends WebServerFactory { /** * Gets a new fully configured but paused {@link WebServer} instance. Clients should