Detect default values defined in the parent
Closes gh-5434
This commit is contained in:
committed by
Stephane Nicoll
parent
b618c70e52
commit
b3220985bb
@@ -47,6 +47,7 @@ import org.springframework.boot.configurationsample.method.EmptyTypeMethodConfig
|
||||
import org.springframework.boot.configurationsample.method.InvalidMethodConfig;
|
||||
import org.springframework.boot.configurationsample.method.MethodAndClassConfig;
|
||||
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.HierarchicalProperties;
|
||||
import org.springframework.boot.configurationsample.simple.NotAnnotated;
|
||||
@@ -767,6 +768,17 @@ 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 {
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user