1 files changed, 8 insertions, 3 deletions
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
index 9864cc0a8..3b0bf2685 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
@@ -38,6 +38,7 @@ import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 
 import java.util.EnumSet;
+import java.util.Optional;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
 
@@ -56,7 +57,6 @@ public final class AnnotationMemberDeclaration extends BodyDeclaration<Annotatio
 
     private SimpleName name;
 
-    // TODO nullable
     private Expression defaultValue;
 
     public AnnotationMemberDeclaration() {
@@ -106,8 +106,8 @@ public final class AnnotationMemberDeclaration extends BodyDeclaration<Annotatio
         v.visit(this, arg);
     }
 
-    public Expression getDefaultValue() {
-        return defaultValue;
+    public Optional<Expression> getDefaultValue() {
+        return Optional.ofNullable(defaultValue);
     }
 
     /**
@@ -131,6 +131,11 @@ public final class AnnotationMemberDeclaration extends BodyDeclaration<Annotatio
         return type;
     }
 
+    /**
+     * Sets the default value
+     * @param defaultValue the default value, can be null
+     * @return this, the AnnotationMemberDeclaration
+     */
     public AnnotationMemberDeclaration setDefaultValue(Expression defaultValue) {
         this.defaultValue = defaultValue;
         setAsParentNodeOf(defaultValue);