github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-02-23 17:50:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #570 from radist-nt/issue_567

Browse Source 
@Optional in getters for properties without field
This commit is contained in:
Havoc Pennington 2018-07-24 22:39:40 -04:00 committed by GitHub
commit 4edef986f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/java/com/typesafe/config/impl/ConfigBeanImpl.java
View File

@ -285,7 +285,7 @@ public class ConfigBeanImpl {
private static boolean isOptionalProperty(Class beanClass, PropertyDescriptor beanProp) { private static boolean isOptionalProperty(Class beanClass, PropertyDescriptor beanProp) {
Field field = getField(beanClass, beanProp.getName()); Field field = getField(beanClass, beanProp.getName());
return field != null && (field.getAnnotationsByType(Optional.class).length > 0); return field != null ? field.getAnnotationsByType(Optional.class).length > 0 : beanProp.getReadMethod().getAnnotationsByType(Optional.class).length > 0;
} }
private static Field getField(Class beanClass, String fieldName) { private static Field getField(Class beanClass, String fieldName) {

10
config/src/test/java/beanconfig/ObjectsConfig.java
View File

@ -8,6 +8,7 @@ public class ObjectsConfig {
@Optional @Optional
private String optionalValue; private String optionalValue;
private String mandatoryValue; private String mandatoryValue;
private String Default;
public String getMandatoryValue() { public String getMandatoryValue() {
return mandatoryValue; return mandatoryValue;
@ -24,6 +25,15 @@ public class ObjectsConfig {
public void setOptionalValue(String optionalValue) { public void setOptionalValue(String optionalValue) {
this.optionalValue = optionalValue; this.optionalValue = optionalValue;
} }
@Optional
public String getDefault() {
return Default;
}
public void setDefault(String Default) {
this.Default = Default;
}
} }
private ValueObject valueObject; private ValueObject valueObject;

1
config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala
View File

@ -211,6 +211,7 @@ class ConfigBeanFactoryTest extends TestUtils {
assertNotNull(beanConfig) assertNotNull(beanConfig)
assertNotNull(beanConfig.getValueObject) assertNotNull(beanConfig.getValueObject)
assertNull(beanConfig.getValueObject.getOptionalValue) assertNull(beanConfig.getValueObject.getOptionalValue)
assertNull(beanConfig.getValueObject.getDefault)
assertEquals("notNull", beanConfig.getValueObject.getMandatoryValue) assertEquals("notNull", beanConfig.getValueObject.getMandatoryValue)
} }