#516 some optionals (#536)

* #516 some optionals

1 files changed, 12 insertions, 5 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
index 029ecb63f..2c0574734 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
@@ -21,6 +21,10 @@
  
 package com.github.javaparser.ast.expr;
 
+import static com.github.javaparser.utils.Utils.assertNotNull;
+
+import java.util.Optional;
+
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.ArrayCreationLevel;
 import com.github.javaparser.ast.CompilationUnit;
@@ -31,8 +35,6 @@ import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 
-import static com.github.javaparser.utils.Utils.assertNotNull;
-
 /**
  * <code>new int[5][4][][]</code> or <code>new int[][]{{1},{2,3}}</code>
  * 
@@ -46,7 +48,6 @@ public final class ArrayCreationExpr extends Expression {
 
     private Type<?> elementType;
 
-    // TODO nullable
     private ArrayInitializerExpr initializer;
 
     public ArrayCreationExpr() {
@@ -94,14 +95,20 @@ public final class ArrayCreationExpr extends Expression {
         v.visit(this, arg);
     }
 
-    public ArrayInitializerExpr getInitializer() {
-        return initializer;
+    public Optional<ArrayInitializerExpr> getInitializer() {
+        return Optional.ofNullable(initializer);
     }
 
     public Type<?> getElementType() {
         return elementType;
     }
 
+    /**
+     * Sets the initializer
+     * 
+     * @param initializer the initializer, can be null
+     * @return this, the ArrayCreationExpr
+     */
     public ArrayCreationExpr setInitializer(ArrayInitializerExpr initializer) {
         this.initializer = initializer;
 		setAsParentNodeOf(this.initializer);