From 24fc94461b0625bfd2fb534d59821f807dd19dfd Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 11 Jun 2015 10:44:52 -0700 Subject: [PATCH] Polish --- .../security/oauth2/client/OAuth2SsoProperties.java | 4 ++-- .../oauth2/resource/UserInfoTokenServices.java | 6 +++--- .../devtools/autoconfigure/DevToolsProperties.java | 2 +- .../asciidoc/appendix-application-properties.adoc | 13 ++++++++----- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java index 560efb8c7df..cba49985870 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java @@ -36,8 +36,8 @@ public class OAuth2SsoProperties { private String loginPath = DEFAULT_LOGIN_PATH; /** - * Filter order to apply if not providing an explicit WebSecurityConfigurerAdapter - * (in which case the order can be provided there instead). + * Filter order to apply if not providing an explicit WebSecurityConfigurerAdapter (in + * which case the order can be provided there instead). */ private Integer filterOrder; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServices.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServices.java index f0798cd3f38..5eef1771ce3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServices.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServices.java @@ -122,9 +122,9 @@ public class UserInfoTokenServices implements ResourceServerTokenServices { restTemplate.getOAuth2ClientContext().setAccessToken(token); return restTemplate.getForEntity(path, Map.class).getBody(); } - catch (Exception e) { - this.logger.info("Could not fetch user details: " + e.getClass() + ", " - + e.getMessage()); + catch (Exception ex) { + this.logger.info("Could not fetch user details: " + ex.getClass() + ", " + + ex.getMessage()); return Collections. singletonMap("error", "Could not fetch user details"); } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java index a9002512566..408e78943b6 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java @@ -81,7 +81,7 @@ public class DevToolsProperties { private long quietPeriod = DEFAULT_RESTART_QUIET_PERIOD; /** - * Name of a specific file that when changed will trigger the restart. If + * Name of a specific file that when changed will trigger the restart check. If * not specified any classpath file change will trigger the restart. */ private String triggerFile; diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index c2c3701448b..c95ecf896d3 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -563,19 +563,22 @@ content into your application; rather pick only the properties that you need. # DEVTOOLS PROPERTIES # ---------------------------------------- + # DEVTOOLS ({sc-spring-boot-devtools}/autoconfigure/DevToolsProperties.{sc-ext}[DevToolsProperties]) + spring.devtools.restart.enabled=true # enable automatic restart + spring.devtools.restart.exclude= # patterns that should be excluding for triggering a full restart + spring.devtools.restart.poll-interval= # amount of time (in milliseconds) to wait between polling for classpath changes + spring.devtools.restart.quiet-period= # amount of quiet time (in milliseconds) requited without any classpath changes before a restart is triggered + spring.devtools.restart.trigger-file= # name of a specific file that when changed will trigger the restart spring.devtools.livereload.enabled=true # enable a livereload.com compatible server spring.devtools.livereload.port=35729 # server port. + + # REMOTE DEVTOOLS ({sc-spring-boot-devtools}/autoconfigure/RemoteDevToolsProperties.{sc-ext}[RemoteDevToolsProperties]) spring.devtools.remote.context-path=/.~~spring-boot!~ # context path used to handle the remote connection spring.devtools.remote.debug.enabled=true # enable remote debug support spring.devtools.remote.debug.local-port=8000 # local remote debug server port spring.devtools.remote.restart.enabled=true # enable remote restart spring.devtools.remote.secret= # a shared secret required to establish a connection spring.devtools.remote.secret-header-name=X-AUTH-TOKEN # HTTP header used to transfer the shared secret - spring.devtools.restart.enabled=true # enable automatic restart - spring.devtools.restart.exclude= # patterns that should be excluding for triggering a full restart - spring.devtools.restart.poll-interval= # amount of time (in milliseconds) to wait between polling for classpath changes - spring.devtools.restart.quiet-period= # amount of quiet time (in milliseconds) requited without any classpath changes before a restart is triggered - spring.devtools.restart.trigger-file= # name of a specific file that when changed will trigger the restart # ---------------------------------------- # ACTUATOR PROPERTIES