Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Phillip Webb
2019-04-02 13:42:51 -07:00
parent 4e337f7466 47c6bf741d
commit 2376f973f4
174 changed files with 550 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java
View File

@@ -61,7 +61,8 @@ public class LocalDevToolsAutoConfiguration {
* Local LiveReload configuration.
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled",
matchIfMissing = true)
static class LiveReloadConfiguration {
@Bean
@@ -90,7 +91,8 @@ public class LocalDevToolsAutoConfiguration {
* Local Restart Configuration.
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true)
@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled",
matchIfMissing = true)
static class RestartConfiguration {
private final DevToolsProperties properties;
@@ -140,7 +142,8 @@ public class LocalDevToolsAutoConfiguration {
}
@Bean
@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "log-condition-evaluation-delta", matchIfMissing = true)
@ConditionalOnProperty(prefix = "spring.devtools.restart",
name = "log-condition-evaluation-delta", matchIfMissing = true)
public ConditionEvaluationDeltaLoggingListener conditionEvaluationDeltaLoggingListener() {
return new ConditionEvaluationDeltaLoggingListener();
}

3
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java
View File

@@ -101,7 +101,8 @@ public class RemoteDevToolsAutoConfiguration {
* Configuration for remote update and restarts.
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true)
@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled",
matchIfMissing = true)
static class RemoteRestartConfiguration {
@Bean

6
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java
View File

@@ -130,7 +130,8 @@ public class RemoteClientConfiguration implements InitializingBean {
* LiveReload configuration.
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled",
matchIfMissing = true)
static class LiveReloadConfiguration {
@Autowired
@@ -181,7 +182,8 @@ public class RemoteClientConfiguration implements InitializingBean {
* Client configuration for remote update and restarts.
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true)
@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled",
matchIfMissing = true)
static class RemoteRestartClientConfiguration {
@Autowired