@optional in getters for properties without field

lightbend · Jul 14, 2018 · 4c63190 · 4c63190
1 parent c6d1ed4
commit 4c63190
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigBeanImpl.java b/config/src/main/java/com/typesafe/config/impl/ConfigBeanImpl.java
@@ -285,7 +285,7 @@ private static boolean hasAtLeastOneBeanProperty(Class<?> clazz) {
 
     private static boolean isOptionalProperty(Class beanClass, PropertyDescriptor beanProp) {
         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) {

diff --git a/config/src/test/java/beanconfig/ObjectsConfig.java b/config/src/test/java/beanconfig/ObjectsConfig.java
@@ -8,6 +8,7 @@ public static class ValueObject {
         @Optional
         private String optionalValue;
         private String mandatoryValue;
+        private String Default;
 
         public String getMandatoryValue() {
           return mandatoryValue;
@@ -24,6 +25,15 @@ public String getOptionalValue() {
         public void setOptionalValue(String optionalValue) {
           this.optionalValue = optionalValue;
         }
+
+        @Optional
+        public String getDefault() {
+          return Default;
+        }
+
+        public void setDefault(String Default) {
+          this.Default = Default;
+        }
     }
 
     private ValueObject valueObject;

diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigBeanFactoryTest.scala
@@ -211,6 +211,7 @@ class ConfigBeanFactoryTest extends TestUtils {
         assertNotNull(beanConfig)
         assertNotNull(beanConfig.getValueObject)
         assertNull(beanConfig.getValueObject.getOptionalValue)
+        assertNull(beanConfig.getValueObject.getDefault)
         assertEquals("notNull", beanConfig.getValueObject.getMandatoryValue)
     }