Merge remote-tracking branch 'j0ach1mmall3/master'

# Conflicts:
#	javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java
#	javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java

1 files changed, 6 insertions, 1 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
index 21d4254ab..502b11dbd 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
@@ -30,6 +30,10 @@ import com.github.javaparser.Range;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 
+import java.util.List;
+
+import static com.github.javaparser.utils.Utils.ensureNotNull;
+
 /**
  * @author Julio Vilmar Gesser
  */
@@ -66,9 +70,10 @@ public final class NormalAnnotationExpr extends AnnotationExpr {
         return pairs;
     }
 
-    public void setPairs(final List<MemberValuePair> pairs) {
+    public NormalAnnotationExpr setPairs(final List<MemberValuePair> pairs) {
         this.pairs = pairs;
         setAsParentNodeOf(this.pairs);
+        return this;
     }
 
     /**