Evaluate getter for optional annotation if field exists (references l…

…ightbend#659)
derKrischan · Dec 8, 2019 · b41efdf · b41efdf
1 parent 530151d
commit b41efdf
Showing 1 changed file with 4 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,10 @@ 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 : beanProp.getReadMethod().getAnnotationsByType(Optional.class).length > 0;
+        return field != null
+                ? field.getAnnotationsByType(Optional.class).length > 0
+                        || beanProp.getReadMethod().getAnnotationsByType(Optional.class).length > 0
+                : beanProp.getReadMethod().getAnnotationsByType(Optional.class).length > 0;
     }
 
     private static Field getField(Class beanClass, String fieldName) {