From 2a9a7493290b93cab410044a1f6e803c4ee233dd Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 21 Nov 2014 13:27:19 -0800 Subject: [PATCH] Polish --- .../boot/autoconfigure/web/HttpMapperProperties.java | 3 +-- .../ConfigurationMetadataAnnotationProcessor.java | 4 ++-- .../ConfigurationMetadataAnnotationProcessorTests.java | 5 ++++- .../configurationsample/specific/InnerClassProperties.java | 5 ++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java index c25ba4a32d..107f162d79 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java @@ -27,11 +27,10 @@ import com.fasterxml.jackson.databind.SerializationFeature; /** * Configuration properties to configure {@link HttpMessageConverter}s. * - * @deprecated pleas use {@link JacksonProperties} instead - * * @author Dave Syer * @author Piotr Maj * @author Sebastien Deleuze + * @deprecated in favor of {@link JacksonProperties} */ @ConfigurationProperties(prefix = "http.mappers", ignoreUnknownFields = false) @Deprecated 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 11e0ce750b..065be929f7 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 @@ -208,8 +208,8 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor if (returnType != null && returnType instanceof TypeElement && annotation == null) { TypeElement returns = (TypeElement) returnType; - if ((this.typeUtils.isEnclosedIn(returnType, element) && returnType.getKind() != ElementKind.ENUM) - || isNested) { + if ((this.typeUtils.isEnclosedIn(returnType, element) && returnType + .getKind() != ElementKind.ENUM) || isNested) { String nestedPrefix = ConfigurationMetadata .nestedPrefix(prefix, name); this.metadata.add(ItemMetadata.newGroup(nestedPrefix, 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 05710cede6..dabc9359f7 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 @@ -243,7 +243,10 @@ public class ConfigurationMetadataAnnotationProcessorTests { assertThat(metadata, containsGroup("config.third").ofType(SimplePojo.class) .fromSource(InnerClassProperties.class)); assertThat(metadata, containsProperty("config.third.value")); - assertThat(metadata, containsProperty("config.fourth").ofType(InnerClassProperties.Fourth.class)); + assertThat( + metadata, + containsProperty("config.fourth").ofType( + InnerClassProperties.Fourth.class)); assertThat(metadata, not(containsGroup("config.fourth"))); } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java index 74d03f575c..9c163ae0a7 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java @@ -53,7 +53,7 @@ public class InnerClassProperties { } public Fourth getFourth() { - return fourth; + return this.fourth; } public void setFourth(Fourth fourth) { @@ -94,8 +94,7 @@ public class InnerClassProperties { } public static enum Fourth { - YES, - NO + YES, NO } }