From aac80e0b02308c9d6ebaff992e547c1d8906ba4a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 22 Jun 2017 09:32:38 +0200 Subject: [PATCH] Polish Closes gh-9570 --- .../security/oauth2/resource/ResourceServerProperties.java | 2 +- .../boot/autoconfigure/sendgrid/SendGridProperties.java | 2 +- .../boot/cli/command/run/SpringApplicationRunner.java | 2 +- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java index 952fbdde35..081bc74791 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java @@ -234,7 +234,7 @@ public class ResourceServerProperties implements BeanFactoryAware { "Missing tokenInfoUri and userInfoUri and there is no " + "JWT verifier key"); } - if (StringUtils.hasText(this.tokenInfoUri) && this.isPreferTokenInfo()) { + if (StringUtils.hasText(this.tokenInfoUri) && isPreferTokenInfo()) { if (!StringUtils.hasText(this.clientSecret)) { errors.rejectValue("clientSecret", "missing.clientSecret", "Missing client secret"); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java index 7f35565d9a..d1492c31a2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java @@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class SendGridProperties { /** - * SendGrid api key. Alternative to username/password. + * SendGrid API key. */ private String apiKey; diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java index 470675d217..205c5cf4e8 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java @@ -160,7 +160,7 @@ public class SpringApplicationRunner { super("runner-" + (runnerCounter++)); this.compiledSources = compiledSources; if (compiledSources.length != 0) { - setContextClassLoader(((Class) compiledSources[0]).getClassLoader()); + setContextClassLoader(compiledSources[0].getClassLoader()); } setDaemon(true); } 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 d312fda38f..7b4f2c8db1 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -139,7 +139,7 @@ content into your application; rather pick only the properties that you need. spring.reactor.stacktrace-mode.enabled=false # Set whether Reactor should collect stacktrace information at runtime. # SENDGRID ({sc-spring-boot-autoconfigure}/sendgrid/SendGridAutoConfiguration.{sc-ext}[SendGridAutoConfiguration]) - spring.sendgrid.api-key= # SendGrid api key (alternative to username/password) + spring.sendgrid.api-key= # SendGrid API key. spring.sendgrid.proxy.host= # SendGrid proxy host. spring.sendgrid.proxy.port= # SendGrid proxy port.