Merge branch '1.5.x'
This commit is contained in:
commit
4da5245e69
|
@ -20,7 +20,6 @@ import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -192,23 +191,15 @@ 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, element);
|
TypeElementMembers members = new TypeElementMembers(this.processingEnv,
|
||||||
Map<String, Object> fieldValues = getFieldValues(element);
|
this.fieldValuesParser, element);
|
||||||
|
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);
|
||||||
processNestedTypes(prefix, element, source, members);
|
processNestedTypes(prefix, element, source, members);
|
||||||
processNestedLombokTypes(prefix, element, source, members);
|
processNestedLombokTypes(prefix, element, source, members);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Object> getFieldValues(TypeElement element) {
|
|
||||||
try {
|
|
||||||
return this.fieldValuesParser.getFieldValues(element);
|
|
||||||
}
|
|
||||||
catch (Exception ex) {
|
|
||||||
return Collections.emptyMap();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void processSimpleTypes(String prefix, TypeElement element,
|
private void processSimpleTypes(String prefix, TypeElement element,
|
||||||
ExecutableElement source, TypeElementMembers members,
|
ExecutableElement source, TypeElementMembers members,
|
||||||
Map<String, Object> fieldValues) {
|
Map<String, Object> fieldValues) {
|
||||||
|
|
|
@ -32,6 +32,8 @@ 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 org.springframework.boot.configurationprocessor.fieldvalues.FieldValuesParser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides access to relevant {@link TypeElement} members.
|
* Provides access to relevant {@link TypeElement} members.
|
||||||
*
|
*
|
||||||
|
@ -53,9 +55,14 @@ class TypeElementMembers {
|
||||||
|
|
||||||
private final Map<String, List<ExecutableElement>> publicSetters = new LinkedHashMap<String, List<ExecutableElement>>();
|
private final Map<String, List<ExecutableElement>> publicSetters = new LinkedHashMap<String, List<ExecutableElement>>();
|
||||||
|
|
||||||
TypeElementMembers(ProcessingEnvironment env, TypeElement element) {
|
private final Map<String, Object> fieldValues = new LinkedHashMap<String, Object>();
|
||||||
|
|
||||||
|
private final FieldValuesParser fieldValuesParser;
|
||||||
|
|
||||||
|
TypeElementMembers(ProcessingEnvironment env, FieldValuesParser fieldValuesParser, TypeElement element) {
|
||||||
this.env = env;
|
this.env = env;
|
||||||
this.typeUtils = new TypeUtils(this.env);
|
this.typeUtils = new TypeUtils(this.env);
|
||||||
|
this.fieldValuesParser = fieldValuesParser;
|
||||||
process(element);
|
process(element);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,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())) {
|
||||||
|
@ -165,4 +185,8 @@ class TypeElementMembers {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Map<String, Object> getFieldValues() {
|
||||||
|
return Collections.unmodifiableMap(this.fieldValues);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,6 +47,7 @@ import org.springframework.boot.configurationsample.method.EmptyTypeMethodConfig
|
||||||
import org.springframework.boot.configurationsample.method.InvalidMethodConfig;
|
import org.springframework.boot.configurationsample.method.InvalidMethodConfig;
|
||||||
import org.springframework.boot.configurationsample.method.MethodAndClassConfig;
|
import org.springframework.boot.configurationsample.method.MethodAndClassConfig;
|
||||||
import org.springframework.boot.configurationsample.method.SimpleMethodConfig;
|
import org.springframework.boot.configurationsample.method.SimpleMethodConfig;
|
||||||
|
import org.springframework.boot.configurationsample.simple.ClassWithNestedProperties;
|
||||||
import org.springframework.boot.configurationsample.simple.DeprecatedSingleProperty;
|
import org.springframework.boot.configurationsample.simple.DeprecatedSingleProperty;
|
||||||
import org.springframework.boot.configurationsample.simple.HierarchicalProperties;
|
import org.springframework.boot.configurationsample.simple.HierarchicalProperties;
|
||||||
import org.springframework.boot.configurationsample.simple.NotAnnotated;
|
import org.springframework.boot.configurationsample.simple.NotAnnotated;
|
||||||
|
@ -351,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);
|
||||||
|
|
|
@ -0,0 +1,54 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012-2014 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.boot.configurationsample.simple;
|
||||||
|
|
||||||
|
import org.springframework.boot.configurationsample.ConfigurationProperties;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class with nested configuration properties.
|
||||||
|
*
|
||||||
|
* @author Hrishikesh Joshi
|
||||||
|
*/
|
||||||
|
public class ClassWithNestedProperties {
|
||||||
|
|
||||||
|
public static class NestedParentClass {
|
||||||
|
|
||||||
|
private int parentClassProperty = 10;
|
||||||
|
|
||||||
|
public int getParentClassProperty() {
|
||||||
|
return this.parentClassProperty;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setParentClassProperty(int parentClassProperty) {
|
||||||
|
this.parentClassProperty = parentClassProperty;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@ConfigurationProperties(prefix = "nestedChildProps")
|
||||||
|
public static class NestedChildClass extends NestedParentClass {
|
||||||
|
|
||||||
|
private int childClassProperty = 20;
|
||||||
|
|
||||||
|
public int getChildClassProperty() {
|
||||||
|
return this.childClassProperty;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setChildClassProperty(int childClassProperty) {
|
||||||
|
this.childClassProperty = childClassProperty;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue