Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
fe4c8f95
Commit
fe4c8f95
authored
Feb 16, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename ReactiveWebServerAutoConfiguration
Closes gh-12086
parent
e72506c3
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
29 additions
and
29 deletions
+29
-29
ReactiveManagementContextFactory.java
...figure/web/reactive/ReactiveManagementContextFactory.java
+2
-2
TomcatMetricsAutoConfigurationTests.java
...trics/web/tomcat/TomcatMetricsAutoConfigurationTests.java
+2
-2
ReactiveManagementContextFactoryTests.java
...e/web/reactive/ReactiveManagementContextFactoryTests.java
+2
-2
ReactiveWebServerFactoryAutoConfiguration.java
...b/reactive/ReactiveWebServerFactoryAutoConfiguration.java
+6
-6
ReactiveWebServerFactoryConfiguration.java
...e/web/reactive/ReactiveWebServerFactoryConfiguration.java
+5
-5
WebFluxAutoConfiguration.java
.../autoconfigure/web/reactive/WebFluxAutoConfiguration.java
+1
-1
WebSocketReactiveAutoConfiguration.java
...ebsocket/reactive/WebSocketReactiveAutoConfiguration.java
+2
-2
spring.factories
...utoconfigure/src/main/resources/META-INF/spring.factories
+1
-1
MustacheAutoConfigurationReactiveIntegrationTests.java
...he/MustacheAutoConfigurationReactiveIntegrationTests.java
+2
-2
ReactiveWebServerFactoryAutoConfigurationTests.java
...ctive/ReactiveWebServerFactoryAutoConfigurationTests.java
+4
-4
DefaultErrorWebExceptionHandlerIntegrationTests.java
...rror/DefaultErrorWebExceptionHandlerIntegrationTests.java
+2
-2
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactory.java
View file @
fe4c8f95
...
...
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import
org.springframework.beans.factory.support.BeanDefinitionRegistry
;
import
org.springframework.beans.factory.support.RootBeanDefinition
;
import
org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServer
Factory
AutoConfiguration
;
import
org.springframework.boot.web.context.ConfigurableWebServerApplicationContext
;
import
org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext
;
import
org.springframework.boot.web.reactive.server.ReactiveWebServerFactory
;
...
...
@@ -44,7 +44,7 @@ class ReactiveManagementContextFactory implements ManagementContextFactory {
AnnotationConfigReactiveWebServerApplicationContext
child
=
new
AnnotationConfigReactiveWebServerApplicationContext
();
child
.
setParent
(
parent
);
Class
<?>[]
combinedClasses
=
ObjectUtils
.
addObjectToArray
(
configClasses
,
ReactiveWebServerAutoConfiguration
.
class
);
ReactiveWebServer
Factory
AutoConfiguration
.
class
);
child
.
register
(
combinedClasses
);
registerReactiveWebServerFactory
(
parent
,
child
);
return
child
;
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java
View file @
fe4c8f95
...
...
@@ -24,7 +24,7 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import
org.junit.Test
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServer
Factory
AutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration
;
import
org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
...
...
@@ -95,7 +95,7 @@ public class TomcatMetricsAutoConfigurationTests {
AnnotationConfigReactiveWebServerApplicationContext:
:
new
)
.
withConfiguration
(
AutoConfigurations
.
of
(
TomcatMetricsAutoConfiguration
.
class
,
ReactiveWebServerAutoConfiguration
.
class
))
ReactiveWebServer
Factory
AutoConfiguration
.
class
))
.
withUserConfiguration
(
ReactiveWebServerConfiguration
.
class
)
.
run
((
context
)
->
{
assertThat
(
context
).
hasSingleBean
(
TomcatMetrics
.
class
);
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java
View file @
fe4c8f95
...
...
@@ -18,7 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.web.reactive;
import
org.junit.Test
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServer
Factory
AutoConfiguration
;
import
org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext
;
import
org.springframework.boot.web.reactive.server.ReactiveWebServerFactory
;
import
org.springframework.context.ApplicationContext
;
...
...
@@ -50,7 +50,7 @@ public class ReactiveManagementContextFactoryTests {
childContext
.
refresh
();
assertThat
(
childContext
.
getBean
(
TestConfiguration1
.
class
)).
isNotNull
();
assertThat
(
childContext
.
getBean
(
TestConfiguration2
.
class
)).
isNotNull
();
assertThat
(
childContext
.
getBean
(
ReactiveWebServerAutoConfiguration
.
class
))
assertThat
(
childContext
.
getBean
(
ReactiveWebServer
Factory
AutoConfiguration
.
class
))
.
isNotNull
();
childContext
.
close
();
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerAutoConfiguration.java
→
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServer
Factory
AutoConfiguration.java
View file @
fe4c8f95
...
...
@@ -50,12 +50,12 @@ import org.springframework.util.ObjectUtils;
@ConditionalOnClass
(
ReactiveHttpInputMessage
.
class
)
@ConditionalOnWebApplication
(
type
=
ConditionalOnWebApplication
.
Type
.
REACTIVE
)
@EnableConfigurationProperties
(
ServerProperties
.
class
)
@Import
({
ReactiveWebServerAutoConfiguration
.
BeanPostProcessorsRegistrar
.
class
,
ReactiveWebServer
Configuration
.
TomcatAuto
Configuration
.
class
,
ReactiveWebServer
Configuration
.
JettyAuto
Configuration
.
class
,
ReactiveWebServer
Configuration
.
UndertowAuto
Configuration
.
class
,
ReactiveWebServer
Configuration
.
ReactorNettyAuto
Configuration
.
class
})
public
class
ReactiveWebServerAutoConfiguration
{
@Import
({
ReactiveWebServer
Factory
AutoConfiguration
.
BeanPostProcessorsRegistrar
.
class
,
ReactiveWebServer
FactoryConfiguration
.
Tomcat
Configuration
.
class
,
ReactiveWebServer
FactoryConfiguration
.
Jetty
Configuration
.
class
,
ReactiveWebServer
FactoryConfiguration
.
Undertow
Configuration
.
class
,
ReactiveWebServer
FactoryConfiguration
.
ReactorNetty
Configuration
.
class
})
public
class
ReactiveWebServer
Factory
AutoConfiguration
{
@ConditionalOnMissingBean
@Bean
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerConfiguration.java
→
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServer
Factory
Configuration.java
View file @
fe4c8f95
...
...
@@ -36,11 +36,11 @@ import org.springframework.context.annotation.Bean;
*
* @author Brian Clozel
*/
abstract
class
ReactiveWebServerConfiguration
{
abstract
class
ReactiveWebServer
Factory
Configuration
{
@ConditionalOnMissingBean
(
ReactiveWebServerFactory
.
class
)
@ConditionalOnClass
({
HttpServer
.
class
})
static
class
ReactorNetty
Auto
Configuration
{
static
class
ReactorNettyConfiguration
{
@Bean
public
NettyReactiveWebServerFactory
NettyReactiveWebServerFactory
()
{
...
...
@@ -51,7 +51,7 @@ abstract class ReactiveWebServerConfiguration {
@ConditionalOnMissingBean
(
ReactiveWebServerFactory
.
class
)
@ConditionalOnClass
({
org
.
apache
.
catalina
.
startup
.
Tomcat
.
class
})
static
class
Tomcat
Auto
Configuration
{
static
class
TomcatConfiguration
{
@Bean
public
TomcatReactiveWebServerFactory
tomcatReactiveWebServerFactory
()
{
...
...
@@ -62,7 +62,7 @@ abstract class ReactiveWebServerConfiguration {
@ConditionalOnMissingBean
(
ReactiveWebServerFactory
.
class
)
@ConditionalOnClass
({
org
.
eclipse
.
jetty
.
server
.
Server
.
class
})
static
class
Jetty
Auto
Configuration
{
static
class
JettyConfiguration
{
@Bean
public
JettyReactiveWebServerFactory
jettyReactiveWebServerFactory
()
{
...
...
@@ -73,7 +73,7 @@ abstract class ReactiveWebServerConfiguration {
@ConditionalOnMissingBean
(
ReactiveWebServerFactory
.
class
)
@ConditionalOnClass
({
Undertow
.
class
})
static
class
Undertow
Auto
Configuration
{
static
class
UndertowConfiguration
{
@Bean
public
UndertowReactiveWebServerFactory
undertowReactiveWebServerFactory
()
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java
View file @
fe4c8f95
...
...
@@ -86,7 +86,7 @@ import org.springframework.web.reactive.result.view.ViewResolver;
@ConditionalOnWebApplication
(
type
=
ConditionalOnWebApplication
.
Type
.
REACTIVE
)
@ConditionalOnClass
(
WebFluxConfigurer
.
class
)
@ConditionalOnMissingBean
({
WebFluxConfigurationSupport
.
class
})
@AutoConfigureAfter
({
ReactiveWebServerAutoConfiguration
.
class
,
@AutoConfigureAfter
({
ReactiveWebServer
Factory
AutoConfiguration
.
class
,
CodecsAutoConfiguration
.
class
,
ValidationAutoConfiguration
.
class
})
@AutoConfigureOrder
(
Ordered
.
HIGHEST_PRECEDENCE
+
10
)
public
class
WebFluxAutoConfiguration
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java
View file @
fe4c8f95
...
...
@@ -26,7 +26,7 @@ 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.condition.ConditionalOnWebApplication.Type
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServer
Factory
AutoConfiguration
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ConditionalOnClass
({
Servlet
.
class
,
ServerContainer
.
class
})
@ConditionalOnWebApplication
(
type
=
Type
.
REACTIVE
)
@AutoConfigureBefore
(
ReactiveWebServerAutoConfiguration
.
class
)
@AutoConfigureBefore
(
ReactiveWebServer
Factory
AutoConfiguration
.
class
)
public
class
WebSocketReactiveAutoConfiguration
{
@Configuration
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
View file @
fe4c8f95
...
...
@@ -111,7 +111,7 @@ org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration,\
org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration,\
org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServer
Factory
AutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.error.ErrorWebFluxAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration,\
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java
View file @
fe4c8f95
...
...
@@ -27,7 +27,7 @@ import org.springframework.boot.SpringApplication;
import
org.springframework.boot.WebApplicationType
;
import
org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServer
Factory
AutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest.WebEnvironment
;
...
...
@@ -72,7 +72,7 @@ public class MustacheAutoConfigurationReactiveIntegrationTests {
}
@Configuration
@Import
({
ReactiveWebServerAutoConfiguration
.
class
,
WebFluxAutoConfiguration
.
class
,
@Import
({
ReactiveWebServer
Factory
AutoConfiguration
.
class
,
WebFluxAutoConfiguration
.
class
,
HttpHandlerAutoConfiguration
.
class
,
PropertyPlaceholderAutoConfiguration
.
class
})
@Controller
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerAutoConfigurationTests.java
→
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServer
Factory
AutoConfigurationTests.java
View file @
fe4c8f95
...
...
@@ -35,11 +35,11 @@ import org.springframework.http.server.reactive.HttpHandler;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
* Tests for {@link ReactiveWebServerAutoConfiguration}.
* Tests for {@link ReactiveWebServer
Factory
AutoConfiguration}.
*
* @author Brian Clozel
*/
public
class
ReactiveWebServerAutoConfigurationTests
{
public
class
ReactiveWebServer
Factory
AutoConfigurationTests
{
private
AnnotationConfigReactiveWebServerApplicationContext
context
;
...
...
@@ -87,7 +87,7 @@ public class ReactiveWebServerAutoConfigurationTests {
@Configuration
@Import
({
MockWebServerAutoConfiguration
.
class
,
ReactiveWebServerAutoConfiguration
.
class
})
ReactiveWebServer
Factory
AutoConfiguration
.
class
})
protected
static
class
BaseConfiguration
{
@Bean
...
...
@@ -99,7 +99,7 @@ public class ReactiveWebServerAutoConfigurationTests {
@Configuration
@Import
({
MockWebServerAutoConfiguration
.
class
,
ReactiveWebServerAutoConfiguration
.
class
})
ReactiveWebServer
Factory
AutoConfiguration
.
class
})
protected
static
class
MissingHttpHandlerConfiguration
{
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java
View file @
fe4c8f95
...
...
@@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration
;
import
org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServer
Factory
AutoConfiguration
;
import
org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration
;
import
org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner
;
import
org.springframework.boot.test.rule.OutputCapture
;
...
...
@@ -58,7 +58,7 @@ public class DefaultErrorWebExceptionHandlerIntegrationTests {
private
ReactiveWebApplicationContextRunner
contextRunner
=
new
ReactiveWebApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
ReactiveWebServerAutoConfiguration
.
class
,
ReactiveWebServer
Factory
AutoConfiguration
.
class
,
HttpHandlerAutoConfiguration
.
class
,
WebFluxAutoConfiguration
.
class
,
ErrorWebFluxAutoConfiguration
.
class
,
PropertyPlaceholderAutoConfiguration
.
class
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment