From f2af8b30b0d6b4dbdfe4045dcc9bc4595f35700b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 16 Dec 2014 09:30:45 -0800 Subject: [PATCH] Code formatting --- .../pom.xml | 4 ++-- ...figurationMetadataAnnotationProcessor.java | 11 +++++----- ...ationMetadataAnnotationProcessorTests.java | 21 ++++++++----------- .../lombok/LombokExplicitProperties.java | 14 +++++++++---- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/spring-boot-tools/spring-boot-configuration-processor/pom.xml b/spring-boot-tools/spring-boot-configuration-processor/pom.xml index 3d2877d51d..b4bdbcbf7d 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/pom.xml +++ b/spring-boot-tools/spring-boot-configuration-processor/pom.xml @@ -18,12 +18,12 @@ ${basedir}/../.. - + org.json json - + org.projectlombok lombok 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 85d153247c..6af93282d9 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 @@ -207,8 +207,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor private void processLombokTypes(String prefix, TypeElement element, TypeElementMembers members, Map fieldValues) { - for (Map.Entry entry : members.getFields() - .entrySet()) { + for (Map.Entry entry : members.getFields().entrySet()) { String name = entry.getKey(); VariableElement field = entry.getValue(); if (!isLombokField(field, element)) { @@ -241,10 +240,10 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor } private boolean hasLombokSetter(VariableElement field, TypeElement element) { - return !field.getModifiers().contains(Modifier.FINAL) && ( - hasAnnotation(field, LOMBOK_SETTER_ANNOTATION) - || hasAnnotation(element, LOMBOK_SETTER_ANNOTATION) - || hasAnnotation(element, LOMBOK_DATA_ANNOTATION)); + return !field.getModifiers().contains(Modifier.FINAL) + && (hasAnnotation(field, LOMBOK_SETTER_ANNOTATION) + || hasAnnotation(element, LOMBOK_SETTER_ANNOTATION) || hasAnnotation( + element, LOMBOK_DATA_ANNOTATION)); } private void processNestedTypes(String prefix, TypeElement element, 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 8a136381eb..a63da50f01 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 @@ -17,6 +17,7 @@ package org.springframework.boot.configurationprocessor; import java.io.IOException; + import javax.annotation.processing.SupportedAnnotationTypes; import javax.annotation.processing.SupportedSourceVersion; import javax.lang.model.SourceVersion; @@ -24,10 +25,9 @@ import javax.lang.model.SourceVersion; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; - import org.springframework.boot.configurationprocessor.metadata.ConfigurationMetadata; -import org.springframework.boot.configurationsample.lombok.LombokSimpleDataProperties; import org.springframework.boot.configurationsample.lombok.LombokExplicitProperties; +import org.springframework.boot.configurationsample.lombok.LombokSimpleDataProperties; import org.springframework.boot.configurationsample.lombok.LombokSimpleProperties; import org.springframework.boot.configurationsample.method.EmptyTypeMethodConfig; import org.springframework.boot.configurationsample.method.InvalidMethodConfig; @@ -307,20 +307,17 @@ public class ConfigurationMetadataAnnotationProcessorTests { assertSimpleLombokProperties(metadata, LombokExplicitProperties.class, "explicit"); } - private void assertSimpleLombokProperties(ConfigurationMetadata metadata, Class source, String prefix) { + private void assertSimpleLombokProperties(ConfigurationMetadata metadata, + Class source, String prefix) { assertThat(metadata, containsGroup(prefix).fromSource(source)); assertThat(metadata, not(containsProperty(prefix + ".id"))); - assertThat( - metadata, - containsProperty(prefix + ".name", String.class) - .fromSource(source) + assertThat(metadata, + containsProperty(prefix + ".name", String.class).fromSource(source) .withDescription("Name description.")); assertThat(metadata, containsProperty(prefix + ".description")); assertThat(metadata, containsProperty(prefix + ".counter")); - assertThat(metadata, - containsProperty(prefix + ".number").fromSource(source) - .withDefaultValue(is(0)) - .withDeprecated()); + assertThat(metadata, containsProperty(prefix + ".number").fromSource(source) + .withDefaultValue(is(0)).withDeprecated()); assertThat(metadata, containsProperty(prefix + ".items")); assertThat(metadata, not(containsProperty(prefix + ".ignored"))); } @@ -331,7 +328,7 @@ public class ConfigurationMetadataAnnotationProcessorTests { return processor.getMetadata(); } - @SupportedAnnotationTypes({"*"}) + @SupportedAnnotationTypes({ "*" }) @SupportedSourceVersion(SourceVersion.RELEASE_6) private static class TestConfigurationMetadataAnnotationProcessor extends ConfigurationMetadataAnnotationProcessor { diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java index 8ae45e6984..b014016715 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java @@ -38,22 +38,28 @@ public class LombokExplicitProperties { /** * Name description. */ - @Getter @Setter + @Getter + @Setter private String name; - @Getter @Setter + @Getter + @Setter private String description; - @Getter @Setter + @Getter + @Setter private Integer counter; - @Deprecated @Getter @Setter + @Deprecated + @Getter + @Setter private Integer number = 0; @Getter private final List items = new ArrayList(); // Should be ignored if no annotation is set + @SuppressWarnings("unused") private String ignored; }