From 0cf6efca4f4acc4cd2f7c28131be0ff1d0e59c68 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 6 Jul 2015 13:04:59 -0700 Subject: [PATCH] Polish --- .../boot/autoconfigure/mail/MailProperties.java | 1 + .../autoconfigure/mail/MailSenderAutoConfiguration.java | 6 ++++-- .../mail/MailSenderAutoConfigurationTests.java | 2 +- ...urationTests.java => OAuth2AutoConfigurationTests.java} | 2 +- .../src/main/asciidoc/appendix-configuration-metadata.adoc | 3 ++- .../ConfigurationMetadataAnnotationProcessor.java | 4 ++-- .../boot/configurationprocessor/MetadataStore.java | 7 ++++--- .../metadata/InvalidConfigurationMetadataException.java | 6 +++--- .../ConfigurationMetadataAnnotationProcessorTests.java | 4 ++-- .../java/org/springframework/boot/maven/RepackageMojo.java | 3 +-- 10 files changed, 21 insertions(+), 17 deletions(-) rename spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/{SpringSecurityOAuth2AutoConfigurationTests.java => OAuth2AutoConfigurationTests.java} (99%) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java index f07e758f2a6..34404af6e3b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java @@ -131,4 +131,5 @@ public class MailProperties { public void setTestConnection(boolean testConnection) { this.testConnection = testConnection; } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java index 0deecc5133f..62e566a1c43 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java @@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.mail; import java.util.Map; import java.util.Properties; + import javax.activation.MimeType; import javax.annotation.PostConstruct; import javax.mail.MessagingException; @@ -120,8 +121,8 @@ public class MailSenderAutoConfiguration { } /** - * Condition to trigger the creation of a {@link JavaMailSenderImpl}. This kicks in if - * either the host or jndi name property is set. + * Condition to trigger the creation of a {@link JavaMailSenderImpl}. This kicks + * in if either the host or jndi name property is set. */ static class MailSenderCondition extends AnyNestedCondition { @@ -161,6 +162,7 @@ public class MailSenderAutoConfiguration { } } } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java index c471ac80dbb..086f12954b6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java @@ -17,6 +17,7 @@ package org.springframework.boot.autoconfigure.mail; import java.util.Properties; + import javax.mail.MessagingException; import javax.mail.Session; import javax.naming.Context; @@ -237,5 +238,4 @@ public class MailSenderAutoConfigurationTests { } - } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/SpringSecurityOAuth2AutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java similarity index 99% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/SpringSecurityOAuth2AutoConfigurationTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java index 7bab5c2d499..0b275acaec4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/SpringSecurityOAuth2AutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java @@ -100,7 +100,7 @@ import static org.hamcrest.MatcherAssert.assertThat; * @author Greg Turnquist * @author Dave Syer */ -public class SpringSecurityOAuth2AutoConfigurationTests { +public class OAuth2AutoConfigurationTests { private static final Class RESOURCE_SERVER_CONFIG = OAuth2ResourceServerConfiguration.class; diff --git a/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc b/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc index 9fb2177e884..d45d9951e4e 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc @@ -367,7 +367,6 @@ The table below summarizes the list of supported providers: |=== - TIP: No more than one provider can be active for a given property but you can specify several providers if they can all manage the property _in some ways_. Make sure to place the most powerful provider first as the IDE must use the first one in the JSON section it @@ -600,6 +599,8 @@ NOTE: The binder is not aware of the meta-data so if you provide that hint, you will still need to transform the bean name into an actual Bean reference using the `ApplicationContext`. + + ===== Spring profile name The **spring-profile-name** provider auto-completes the Spring profiles that are defined in the configuration of the current project. diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java index b7178fc789c..8c3adb82632 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java @@ -356,8 +356,8 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor catch (FileNotFoundException ex) { // No additional metadata } - catch (InvalidConfigurationMetadataException e) { - log(e.getKind(), e.getMessage()); + catch (InvalidConfigurationMetadataException ex) { + log(ex.getKind(), ex.getMessage()); } catch (Exception ex) { logWarning("Unable to merge additional metadata"); diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java index c5df20d6220..3244c0891a9 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java @@ -21,13 +21,13 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import javax.annotation.processing.ProcessingEnvironment; import javax.tools.Diagnostic; import javax.tools.FileObject; import javax.tools.StandardLocation; import org.json.JSONException; - import org.springframework.boot.configurationprocessor.metadata.ConfigurationMetadata; import org.springframework.boot.configurationprocessor.metadata.InvalidConfigurationMetadataException; import org.springframework.boot.configurationprocessor.metadata.JsonMarshaller; @@ -87,8 +87,9 @@ public class MetadataStore { return null; } catch (JSONException ex) { - throw new InvalidConfigurationMetadataException("Invalid additional meta-data in '" + - METADATA_PATH + "': " + ex.getMessage(), Diagnostic.Kind.ERROR); + throw new InvalidConfigurationMetadataException( + "Invalid additional meta-data in '" + METADATA_PATH + "': " + + ex.getMessage(), Diagnostic.Kind.ERROR); } finally { in.close(); diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/InvalidConfigurationMetadataException.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/InvalidConfigurationMetadataException.java index a2c1ece9617..0894feb2714 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/InvalidConfigurationMetadataException.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/InvalidConfigurationMetadataException.java @@ -19,8 +19,8 @@ package org.springframework.boot.configurationprocessor.metadata; import javax.tools.Diagnostic; /** - * Thrown to indicate that some meta-data is invalid. Define the - * severity to determine whether it has to fail the build. + * Thrown to indicate that some meta-data is invalid. Define the severity to determine + * whether it has to fail the build. * * @author Stephane Nicoll * @since 1.3.0 @@ -36,7 +36,7 @@ public class InvalidConfigurationMetadataException extends RuntimeException { } public Diagnostic.Kind getKind() { - return kind; + return this.kind; } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index fa202e1ce3d..8b791a117b7 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -356,8 +356,8 @@ public class ConfigurationMetadataAnnotationProcessorTests { File additionalMetadataFile = createAdditionalMetadataFile(); FileCopyUtils.copy("Hello World", new FileWriter(additionalMetadataFile)); - thrown.expect(IllegalStateException.class); - thrown.expectMessage("Compilation failed"); + this.thrown.expect(IllegalStateException.class); + this.thrown.expectMessage("Compilation failed"); compile(SimpleProperties.class); } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index a055abac6aa..8108f44f130 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -208,8 +208,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { } else if (!source.equals(target)) { this.project.getArtifact().setFile(target); - getLog().info( - "Replacing main artifact " + source + " to " +target); + getLog().info("Replacing main artifact " + source + " to " + target); } }