root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

This commit is contained in:
Andy Wilkinson 2022-04-07 18:50:13 +01:00
parent e6b485b317 febea4711e
commit 95c8d7f79d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/server/ReactiveWebServerFactory.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; package org.springframework.boot.web.reactive.server;
import org.springframework.boot.web.server.WebServer; import org.springframework.boot.web.server.WebServer;
import org.springframework.boot.web.server.WebServerFactory;
import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.HttpHandler;
/** /**
@ -27,7 +28,7 @@ import org.springframework.http.server.reactive.HttpHandler;
* @see WebServer * @see WebServer
*/ */
@FunctionalInterface @FunctionalInterface
public interface ReactiveWebServerFactory { public interface ReactiveWebServerFactory extends WebServerFactory {
/** /**
* Gets a new fully configured but paused {@link WebServer} instance. Clients should * Gets a new fully configured but paused {@link WebServer} instance. Clients should

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/ServletWebServerFactory.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; package org.springframework.boot.web.servlet.server;
import org.springframework.boot.web.server.WebServer; import org.springframework.boot.web.server.WebServer;
import org.springframework.boot.web.server.WebServerFactory;
import org.springframework.boot.web.servlet.ServletContextInitializer; import org.springframework.boot.web.servlet.ServletContextInitializer;
/** /**
@ -27,7 +28,7 @@ import org.springframework.boot.web.servlet.ServletContextInitializer;
* @see WebServer * @see WebServer
*/ */
@FunctionalInterface @FunctionalInterface
public interface ServletWebServerFactory { public interface ServletWebServerFactory extends WebServerFactory {
/** /**
* Gets a new fully configured but paused {@link WebServer} instance. Clients should * Gets a new fully configured but paused {@link WebServer} instance. Clients should