Skip to content

Commit b5aaa2c

Browse files
cbrethesChristophe Brethes
andauthored
Javadoc generation : use field's javadoc as a default when no javadoc is (#552)
found on getter/setter Co-authored-by: Christophe Brethes <[email protected]>
1 parent 4cc24ac commit b5aaa2c

File tree

1 file changed

+5
-3
lines changed
  • typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser

1 file changed

+5
-3
lines changed

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Javadoc.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ private BeanModel enrichBean(BeanModel bean, String beanComment, List<TagInfo> t
9090
}
9191

9292
private PropertyModel enrichProperty(PropertyModel property, List<Field> dFields, List<Method> dMethods) {
93-
final String propertyComment;
94-
final List<TagInfo> tags;
93+
String propertyComment = null;
94+
List<TagInfo> tags = null;
9595
if (property.getOriginalMember() instanceof java.lang.reflect.Method) {
9696
final Method dMethod = findJavadocMethod(property.getOriginalMember().getName(), dMethods);
9797
propertyComment = dMethod != null ? dMethod.getComment() : null;
@@ -100,7 +100,9 @@ private PropertyModel enrichProperty(PropertyModel property, List<Field> dFields
100100
final Field dField = findJavadocField(property.getOriginalMember().getName(), dFields);
101101
propertyComment = dField != null ? dField.getComment() : null;
102102
tags = dField != null ? dField.getTag() : null;
103-
} else {
103+
}
104+
if (propertyComment == null ) {
105+
//give a chance for comments on fields but not on getter setters
104106
final Field dField = findJavadocField(property.getName(), dFields);
105107
propertyComment = dField != null ? dField.getComment() : null;
106108
tags = dField != null ? dField.getTag() : null;

0 commit comments

Comments
 (0)