root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Polish contribution 

Closes gh-7491
This commit is contained in:
Stephane Nicoll 2016-11-29 15:19:54 +01:00
parent b3220985bb
commit f84fd19eaa
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
View File

@ -191,7 +191,8 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
private void processTypeElement(String prefix, TypeElement element, private void processTypeElement(String prefix, TypeElement element,
ExecutableElement source) { ExecutableElement source) {
TypeElementMembers members = new TypeElementMembers(this.processingEnv, this.fieldValuesParser, element); TypeElementMembers members = new TypeElementMembers(this.processingEnv,
this.fieldValuesParser, element);
Map<String, Object> fieldValues = members.getFieldValues(); Map<String, Object> fieldValues = members.getFieldValues();
processSimpleTypes(prefix, element, source, members, fieldValues); processSimpleTypes(prefix, element, source, members, fieldValues);
processSimpleLombokTypes(prefix, element, source, members, fieldValues); processSimpleLombokTypes(prefix, element, source, members, fieldValues);

33
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java
View File

@ -31,7 +31,6 @@ import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.ElementFilter; import javax.lang.model.util.ElementFilter;
import javax.tools.Diagnostic;
import org.springframework.boot.configurationprocessor.fieldvalues.FieldValuesParser; import org.springframework.boot.configurationprocessor.fieldvalues.FieldValuesParser;
@ -65,7 +64,6 @@ class TypeElementMembers {
this.typeUtils = new TypeUtils(this.env); this.typeUtils = new TypeUtils(this.env);
this.fieldValuesParser = fieldValuesParser; this.fieldValuesParser = fieldValuesParser;
process(element); process(element);
processFieldValues(element);
} }
private void process(TypeElement element) { private void process(TypeElement element) {
@ -77,6 +75,19 @@ class TypeElementMembers {
.fieldsIn(element.getEnclosedElements())) { .fieldsIn(element.getEnclosedElements())) {
processField(field); processField(field);
} }
try {
Map<String, Object> fieldValues = this.fieldValuesParser
.getFieldValues(element);
for (Map.Entry<String, Object> entry : fieldValues.entrySet()) {
if (!this.fieldValues.containsKey(entry.getKey())) {
this.fieldValues.put(entry.getKey(), entry.getValue());
}
}
}
catch (Exception ex) {
// continue
}
Element superType = this.env.getTypeUtils().asElement(element.getSuperclass()); Element superType = this.env.getTypeUtils().asElement(element.getSuperclass());
if (superType != null && superType instanceof TypeElement if (superType != null && superType instanceof TypeElement
&& !OBJECT_CLASS_NAME.equals(superType.toString())) { && !OBJECT_CLASS_NAME.equals(superType.toString())) {
@ -174,24 +185,6 @@ class TypeElementMembers {
return null; return null;
} }
private void processFieldValues(TypeElement element) {
try {
this.fieldValues.putAll(this.fieldValuesParser.getFieldValues(element));
}
catch (Exception ex) {
logWarning("Could not get values for type :" + element.getSimpleName().toString());
}
Element superType = this.env.getTypeUtils().asElement(element.getSuperclass());
if (superType != null && superType instanceof TypeElement && !Object.class.getName().equals(superType.toString())) {
processFieldValues((TypeElement) superType);
}
}
private void logWarning(String message) {
this.env.getMessager().printMessage(Diagnostic.Kind.WARNING, message);
}
public Map<String, Object> getFieldValues() { public Map<String, Object> getFieldValues() {
return Collections.unmodifiableMap(this.fieldValues); return Collections.unmodifiableMap(this.fieldValues);
} }

22
spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
View File

@ -352,6 +352,17 @@ public class ConfigurationMetadataAnnotationProcessorTests {
assertThat(metadata).isNotEqualTo(Metadata.withProperty("specific.foo")); assertThat(metadata).isNotEqualTo(Metadata.withProperty("specific.foo"));
} }
@Test
public void nestedClassChildProperties() throws Exception {
ConfigurationMetadata metadata = compile(ClassWithNestedProperties.class);
assertThat(metadata).has(Metadata.withGroup("nestedChildProps")
.fromSource(ClassWithNestedProperties.NestedChildClass.class));
assertThat(metadata).has(Metadata.withProperty("nestedChildProps.child-class-property", Integer.class)
.fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(20));
assertThat(metadata).has(Metadata.withProperty("nestedChildProps.parent-class-property", Integer.class)
.fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(10));
}
@Test @Test
public void builderPojo() throws IOException { public void builderPojo() throws IOException {
ConfigurationMetadata metadata = compile(BuilderPojo.class); ConfigurationMetadata metadata = compile(BuilderPojo.class);
@ -768,17 +779,6 @@ public class ConfigurationMetadataAnnotationProcessorTests {
} }
} }
@Test
public void nestedClassChildProperties() throws Exception {
ConfigurationMetadata metadata = compile(ClassWithNestedProperties.class);
assertThat(metadata).has(Metadata.withGroup("nestedChildProps")
.fromSource(ClassWithNestedProperties.NestedChildClass.class));
assertThat(metadata).has(Metadata.withProperty("nestedChildProps.child-class-property", Integer.class)
.fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(20));
assertThat(metadata).has(Metadata.withProperty("nestedChildProps.parent-class-property", Integer.class)
.fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(10));
}
private static class AdditionalMetadata { private static class AdditionalMetadata {
} }