Fix code that was checked in too early

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java

@@ -85,7 +85,7 @@ public Integer visit(BinaryExpr n, Void arg) {
     }
 
     public Integer visit(BlockComment n, Void arg) {
-        return (n.getCommentedNode().isPresent() ? n.getCommentedNode().get().accept(this, arg) : 0) * 31 + (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(BlockStmt n, Void arg) {
@@ -217,7 +217,7 @@ public Integer visit(IntersectionType n, Void arg) {
     }
 
     public Integer visit(JavadocComment n, Void arg) {
-        return (n.getCommentedNode().isPresent() ? n.getCommentedNode().get().accept(this, arg) : 0) * 31 + (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(LabeledStmt n, Void arg) {
@@ -229,7 +229,7 @@ public Integer visit(LambdaExpr n, Void arg) {
     }
 
     public Integer visit(LineComment n, Void arg) {
-        return (n.getCommentedNode().isPresent() ? n.getCommentedNode().get().accept(this, arg) : 0) * 31 + (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContent().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(LocalClassDeclarationStmt n, Void arg) {
@@ -269,7 +269,11 @@ public Integer visit(Name n, Void arg) {
     }
 
     public Integer visit(NodeList n, Void arg) {
-        return 0;
+        int result = 0;
+        for (Object node : n) {
+            result += 31 * ((Visitable) node).accept(this, arg);
+        }
+        return result;
     }
 
     public Integer visit(NormalAnnotationExpr n, Void arg) {

javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java

@@ -259,6 +259,7 @@ private boolean fieldShouldBeIgnored(Field reflectionField) {
             case "data":
             case "range":
             case "childNodes":
+            case "commentedNode":
             case "orphanComments":
                 return true;
         }

javaparser-metamodel/src/main/java/com/github/javaparser/metamodel/CommentMetaModel.java

@@ -8,8 +8,6 @@ public class CommentMetaModel extends BaseNodeMetaModel {
         super(superBaseNodeMetaModel, parent, com.github.javaparser.ast.comments.Comment.class, "Comment", "com.github.javaparser.ast.comments", true, false);
     }
 
-    public PropertyMetaModel commentedNodePropertyMetaModel;
-
     public PropertyMetaModel contentPropertyMetaModel;
 }
 

javaparser-metamodel/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java

@@ -4,7 +4,6 @@
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.expr.Name;
-
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
@@ -123,13 +122,13 @@ private void initializeNodeMetaModels() {
     }
 
     private void initializeFieldMetaModels() {
-        nodeMetaModel.commentPropertyMetaModel = new PropertyMetaModel(nodeMetaModel, "comment", Comment.class, Optional.of(commentMetaModel), true, false, false, false);
+        nodeMetaModel.commentPropertyMetaModel = new PropertyMetaModel(nodeMetaModel, "comment", com.github.javaparser.ast.comments.Comment.class, Optional.of(commentMetaModel), true, false, false, false);
         nodeMetaModel.getPropertyMetaModels().add(nodeMetaModel.commentPropertyMetaModel);
-        bodyDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(bodyDeclarationMetaModel, "annotations", AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
+        bodyDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(bodyDeclarationMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
         bodyDeclarationMetaModel.getPropertyMetaModels().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        typeMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(typeMetaModel, "annotations", AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
+        typeMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(typeMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
         typeMetaModel.getPropertyMetaModels().add(typeMetaModel.annotationsPropertyMetaModel);
-        annotationExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(annotationExprMetaModel, "name", Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        annotationExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(annotationExprMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
         annotationExprMetaModel.getPropertyMetaModels().add(annotationExprMetaModel.namePropertyMetaModel);
         typeDeclarationMetaModel.membersPropertyMetaModel = new PropertyMetaModel(typeDeclarationMetaModel, "members", com.github.javaparser.ast.body.BodyDeclaration.class, Optional.of(bodyDeclarationMetaModel), false, true, false, true);
         typeDeclarationMetaModel.getPropertyMetaModels().add(typeDeclarationMetaModel.membersPropertyMetaModel);
@@ -139,7 +138,7 @@ private void initializeFieldMetaModels() {
         typeDeclarationMetaModel.getPropertyMetaModels().add(typeDeclarationMetaModel.namePropertyMetaModel);
         stringLiteralExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(stringLiteralExprMetaModel, "value", java.lang.String.class, Optional.empty(), false, false, false, false);
         stringLiteralExprMetaModel.getPropertyMetaModels().add(stringLiteralExprMetaModel.valuePropertyMetaModel);
-        arrayCreationLevelMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(arrayCreationLevelMetaModel, "annotations", AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
+        arrayCreationLevelMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(arrayCreationLevelMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
         arrayCreationLevelMetaModel.getPropertyMetaModels().add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel);
         arrayCreationLevelMetaModel.dimensionPropertyMetaModel = new PropertyMetaModel(arrayCreationLevelMetaModel, "dimension", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
         arrayCreationLevelMetaModel.getPropertyMetaModels().add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel);
@@ -149,9 +148,9 @@ private void initializeFieldMetaModels() {
         compilationUnitMetaModel.getPropertyMetaModels().add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel);
         compilationUnitMetaModel.typesPropertyMetaModel = new PropertyMetaModel(compilationUnitMetaModel, "types", com.github.javaparser.ast.body.TypeDeclaration.class, Optional.of(typeDeclarationMetaModel), false, true, false, true);
         compilationUnitMetaModel.getPropertyMetaModels().add(compilationUnitMetaModel.typesPropertyMetaModel);
-        packageDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(packageDeclarationMetaModel, "annotations", AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
+        packageDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(packageDeclarationMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
         packageDeclarationMetaModel.getPropertyMetaModels().add(packageDeclarationMetaModel.annotationsPropertyMetaModel);
-        packageDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(packageDeclarationMetaModel, "name", Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        packageDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(packageDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
         packageDeclarationMetaModel.getPropertyMetaModels().add(packageDeclarationMetaModel.namePropertyMetaModel);
         annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel = new PropertyMetaModel(annotationMemberDeclarationMetaModel, "defaultValue", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
         annotationMemberDeclarationMetaModel.getPropertyMetaModels().add(annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel);
@@ -215,7 +214,7 @@ private void initializeFieldMetaModels() {
         methodDeclarationMetaModel.getPropertyMetaModels().add(methodDeclarationMetaModel.typePropertyMetaModel);
         methodDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(methodDeclarationMetaModel, "typeParameters", com.github.javaparser.ast.type.TypeParameter.class, Optional.of(typeParameterMetaModel), false, true, false, false);
         methodDeclarationMetaModel.getPropertyMetaModels().add(methodDeclarationMetaModel.typeParametersPropertyMetaModel);
-        parameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "annotations", AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
+        parameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
         parameterMetaModel.getPropertyMetaModels().add(parameterMetaModel.annotationsPropertyMetaModel);
         parameterMetaModel.isVarArgsPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "isVarArgs", boolean.class, Optional.empty(), false, false, false, false);
         parameterMetaModel.getPropertyMetaModels().add(parameterMetaModel.isVarArgsPropertyMetaModel);
@@ -231,8 +230,6 @@ private void initializeFieldMetaModels() {
         variableDeclaratorMetaModel.getPropertyMetaModels().add(variableDeclaratorMetaModel.namePropertyMetaModel);
         variableDeclaratorMetaModel.typePropertyMetaModel = new PropertyMetaModel(variableDeclaratorMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
         variableDeclaratorMetaModel.getPropertyMetaModels().add(variableDeclaratorMetaModel.typePropertyMetaModel);
-        commentMetaModel.commentedNodePropertyMetaModel = new PropertyMetaModel(commentMetaModel, "commentedNode", com.github.javaparser.ast.Node.class, Optional.of(nodeMetaModel), true, false, false, false);
-        commentMetaModel.getPropertyMetaModels().add(commentMetaModel.commentedNodePropertyMetaModel);
         commentMetaModel.contentPropertyMetaModel = new PropertyMetaModel(commentMetaModel, "content", java.lang.String.class, Optional.empty(), false, false, false, false);
         commentMetaModel.getPropertyMetaModels().add(commentMetaModel.contentPropertyMetaModel);
         arrayAccessExprMetaModel.indexPropertyMetaModel = new PropertyMetaModel(arrayAccessExprMetaModel, "index", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
@@ -313,7 +310,7 @@ private void initializeFieldMetaModels() {
         nameExprMetaModel.getPropertyMetaModels().add(nameExprMetaModel.namePropertyMetaModel);
         nameMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(nameMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, false, false, false);
         nameMetaModel.getPropertyMetaModels().add(nameMetaModel.identifierPropertyMetaModel);
-        nameMetaModel.qualifierPropertyMetaModel = new PropertyMetaModel(nameMetaModel, "qualifier", Name.class, Optional.of(nameMetaModel), true, false, false, false);
+        nameMetaModel.qualifierPropertyMetaModel = new PropertyMetaModel(nameMetaModel, "qualifier", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false);
         nameMetaModel.getPropertyMetaModels().add(nameMetaModel.qualifierPropertyMetaModel);
         normalAnnotationExprMetaModel.pairsPropertyMetaModel = new PropertyMetaModel(normalAnnotationExprMetaModel, "pairs", com.github.javaparser.ast.expr.MemberValuePair.class, Optional.of(memberValuePairMetaModel), false, true, false, false);
         normalAnnotationExprMetaModel.getPropertyMetaModels().add(normalAnnotationExprMetaModel.pairsPropertyMetaModel);
@@ -341,7 +338,7 @@ private void initializeFieldMetaModels() {
         unaryExprMetaModel.getPropertyMetaModels().add(unaryExprMetaModel.expressionPropertyMetaModel);
         unaryExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "operator", com.github.javaparser.ast.expr.UnaryExpr.Operator.class, Optional.empty(), false, false, false, false);
         unaryExprMetaModel.getPropertyMetaModels().add(unaryExprMetaModel.operatorPropertyMetaModel);
-        variableDeclarationExprMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "annotations", AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
+        variableDeclarationExprMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, true, false, false);
         variableDeclarationExprMetaModel.getPropertyMetaModels().add(variableDeclarationExprMetaModel.annotationsPropertyMetaModel);
         variableDeclarationExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.empty(), false, false, true, false);
         variableDeclarationExprMetaModel.getPropertyMetaModels().add(variableDeclarationExprMetaModel.modifiersPropertyMetaModel);
@@ -351,7 +348,7 @@ private void initializeFieldMetaModels() {
         importDeclarationMetaModel.getPropertyMetaModels().add(importDeclarationMetaModel.isAsteriskPropertyMetaModel);
         importDeclarationMetaModel.isStaticPropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "isStatic", boolean.class, Optional.empty(), false, false, false, false);
         importDeclarationMetaModel.getPropertyMetaModels().add(importDeclarationMetaModel.isStaticPropertyMetaModel);
-        importDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "name", Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        importDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
         importDeclarationMetaModel.getPropertyMetaModels().add(importDeclarationMetaModel.namePropertyMetaModel);
         assertStmtMetaModel.checkPropertyMetaModel = new PropertyMetaModel(assertStmtMetaModel, "check", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         assertStmtMetaModel.getPropertyMetaModels().add(assertStmtMetaModel.checkPropertyMetaModel);

javaparser-testing/src/test/java/com/github/javaparser/ast/visitor/CloneVisitorTest.java

@@ -87,12 +87,12 @@ public void cloneJavaDocTest() {
         while (typeItr.hasNext()) {
             typeDeclaration = typeItr.next();
             if (typeDeclaration.getMembers() == null) {
-                assertEquals(typeDeclaration.getComment().getContent(), "javadoc");
+                assertEquals(typeDeclaration.getComment().get().getContent(), "javadoc");
             } else {
                 Iterator<BodyDeclaration<?>> bodyItr = typeDeclaration.getMembers().iterator();
                 while (bodyItr.hasNext()) {
                     BodyDeclaration<?> bodyDeclaration = bodyItr.next();
-                    assertEquals(bodyDeclaration.getComment().getContent(), "javadoc");
+                    assertEquals(bodyDeclaration.getComment().get().getContent(), "javadoc");
                 }
             }
         }

javaparser-testing/src/test/java/com/github/javaparser/ast/visitor/HashCodeVisitorTest.java

@@ -0,0 +1,24 @@
+package com.github.javaparser.ast.visitor;
+
+import com.github.javaparser.JavaParser;
+import com.github.javaparser.ast.CompilationUnit;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+public class HashCodeVisitorTest {
+    @Test
+    public void testEquals() {
+        CompilationUnit p1 = JavaParser.parse("class X { }");
+        CompilationUnit p2 = JavaParser.parse("class X { }");
+        assertEquals(p1.hashCode(), p2.hashCode());
+    }
+
+    @Test
+    public void testNotEquals() {
+        CompilationUnit p1 = JavaParser.parse("class X { }");
+        CompilationUnit p2 = JavaParser.parse("class Y { }");
+        assertNotEquals(p1.hashCode(), p2.hashCode());
+    }
+}