diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java index ecc6cdd886..09148fe7c8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java @@ -37,6 +37,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; /** * In new int[1][2]; there are two ArrayCreationLevel objects, @@ -45,6 +46,7 @@ */ public final class ArrayCreationLevel extends Node implements NodeWithAnnotations { + @OptionalProperty private Expression dimension; private NodeList annotations = new NodeList<>(); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java index bae270b9dc..2a6fd928fb 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java @@ -40,6 +40,7 @@ import com.github.javaparser.metamodel.CompilationUnitMetaModel; import com.github.javaparser.metamodel.InternalProperty; import com.github.javaparser.metamodel.JavaParserMetaModel; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.printer.PrettyPrinter; import com.github.javaparser.utils.ClassUtils; import com.github.javaparser.utils.CodeGenerationUtils; @@ -77,12 +78,14 @@ */ public final class CompilationUnit extends Node { + @OptionalProperty private PackageDeclaration packageDeclaration; private NodeList imports; private NodeList> types; + @OptionalProperty private ModuleDeclaration module; @InternalProperty diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java index 423f8978cb..400777dd98 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java @@ -35,10 +35,7 @@ import com.github.javaparser.ast.visitor.EqualsVisitor; import com.github.javaparser.ast.visitor.HashCodeVisitor; import com.github.javaparser.ast.visitor.Visitable; -import com.github.javaparser.metamodel.InternalProperty; -import com.github.javaparser.metamodel.JavaParserMetaModel; -import com.github.javaparser.metamodel.NodeMetaModel; -import com.github.javaparser.metamodel.PropertyMetaModel; +import com.github.javaparser.metamodel.*; import com.github.javaparser.printer.PrettyPrinter; import com.github.javaparser.printer.PrettyPrinterConfiguration; import com.github.javaparser.resolution.SymbolResolver; @@ -55,6 +52,8 @@ import static java.util.Spliterator.DISTINCT; import static java.util.Spliterator.NONNULL; import com.github.javaparser.ast.Node; +import com.github.javaparser.metamodel.NodeMetaModel; +import com.github.javaparser.metamodel.JavaParserMetaModel; /** * Base class for all nodes of the abstract syntax tree. @@ -164,6 +163,7 @@ public enum Parsedness { @InternalProperty private IdentityHashMap, Object> data = null; + @OptionalProperty private Comment comment; @InternalProperty diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java index 1404d57d6c..aa793efb96 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java @@ -135,6 +135,7 @@ public ResolvedAnnotationDeclaration resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toAnnotationDeclaration() { return Optional.of(this); } 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 e8311b6e55..48b6db6f5f 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 @@ -41,6 +41,7 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.AnnotationMemberDeclarationMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedAnnotationMemberDeclaration; import com.github.javaparser.resolution.declarations.ResolvedConstructorDeclaration; @@ -66,6 +67,7 @@ public final class AnnotationMemberDeclaration extends BodyDeclaration toAnnotationMemberDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java index 575b000158..96585811f7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java @@ -284,46 +284,57 @@ public void ifMethodDeclaration(Consumer action) { public void ifTypeDeclaration(Consumer action) { } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toAnnotationDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toAnnotationMemberDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toCallableDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toClassOrInterfaceDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toConstructorDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toEnumConstantDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toEnumDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toFieldDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toInitializerDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toMethodDeclaration() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toTypeDeclaration() { return Optional.empty(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java index 0eb7848cdb..e2e41fe150 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java @@ -37,6 +37,7 @@ import com.github.javaparser.ast.visitor.CloneVisitor; import com.github.javaparser.metamodel.CallableDeclarationMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; +import com.github.javaparser.metamodel.OptionalProperty; import javax.annotation.Generated; import java.util.EnumSet; import java.util.List; @@ -61,6 +62,7 @@ public abstract class CallableDeclaration> exte private NodeList thrownExceptions; + @OptionalProperty private ReceiverParameter receiverParameter; @AllFieldsConstructor @@ -419,6 +421,7 @@ public CallableDeclaration removeReceiverParameter() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toCallableDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java index 4fadbf218a..a275066adc 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java @@ -279,6 +279,7 @@ public ResolvedReferenceTypeDeclaration resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toClassOrInterfaceDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java index 27367ee366..3658d14f91 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java @@ -241,6 +241,7 @@ public ResolvedConstructorDeclaration resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toConstructorDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java index 9c7fe6d3c0..5a331e4a60 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java @@ -232,6 +232,7 @@ public ResolvedEnumConstantDeclaration resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toEnumConstantDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java index fc7699ba05..44fb1e4112 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java @@ -226,6 +226,7 @@ public ResolvedEnumDeclaration resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toEnumDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java index 7bef048ee8..547e95ab9f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java @@ -300,6 +300,7 @@ public ResolvedFieldDeclaration resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toFieldDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java index 15277e8a18..06fe78e859 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java @@ -167,6 +167,7 @@ public void ifInitializerDeclaration(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toInitializerDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java index 4b5cd6de55..4a71a50417 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java @@ -46,6 +46,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.resolution.Resolvable; import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration; import java.util.function.Consumer; @@ -63,6 +64,7 @@ public final class MethodDeclaration extends CallableDeclaration toMethodDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java index 3411c75684..06f9753b13 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java @@ -239,6 +239,7 @@ public void ifTypeDeclaration(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toTypeDeclaration() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java index 9c24e0b1ff..45b4959455 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java @@ -37,6 +37,7 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; import com.github.javaparser.metamodel.NonEmptyProperty; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.metamodel.VariableDeclaratorMetaModel; import java.util.LinkedList; import java.util.List; @@ -58,6 +59,7 @@ public final class VariableDeclarator extends Node implements NodeWithType action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBlockComment() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java index 3743bd37ff..0c5f6b4a37 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java @@ -203,14 +203,17 @@ public void ifJavadocComment(Consumer action) { public void ifLineComment(Consumer action) { } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBlockComment() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toJavadocComment() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLineComment() { return Optional.empty(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java index 0c96e6a5b3..d795997bd7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java @@ -121,6 +121,7 @@ public void ifJavadocComment(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toJavadocComment() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java index dc27035cad..ddbce8024b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java @@ -118,6 +118,7 @@ public void ifLineComment(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLineComment() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java index e64767e1c2..31c70fb5ad 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java @@ -130,6 +130,7 @@ public void ifAnnotationExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toAnnotationExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java index 4f439ea055..6945dd9aef 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java @@ -170,6 +170,7 @@ public void ifArrayAccessExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toArrayAccessExpr() { return Optional.of(this); } 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 6f3a73a4ba..509925803d 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 @@ -40,6 +40,7 @@ import javax.annotation.Generated; import com.github.javaparser.TokenRange; import com.github.javaparser.ast.Node; +import com.github.javaparser.metamodel.OptionalProperty; import java.util.function.Consumer; /** @@ -57,6 +58,7 @@ public final class ArrayCreationExpr extends Expression { private Type elementType; + @OptionalProperty private ArrayInitializerExpr initializer; public ArrayCreationExpr() { @@ -272,6 +274,7 @@ public void ifArrayCreationExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toArrayCreationExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java index 6f6ae261ae..d585a1833f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java @@ -157,6 +157,7 @@ public void ifArrayInitializerExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toArrayInitializerExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java index 23423575a3..8946e84bc2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java @@ -206,6 +206,7 @@ public void ifAssignExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toAssignExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java index 96fc727188..793315635a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java @@ -207,6 +207,7 @@ public void ifBinaryExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBinaryExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java index 35073223a6..4be43b2982 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java @@ -136,6 +136,7 @@ public void ifBooleanLiteralExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBooleanLiteralExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java index 94e921e7b9..174d24cadf 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java @@ -173,6 +173,7 @@ public void ifCastExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toCastExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java index 3200bca3b8..bc2db0023c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java @@ -156,6 +156,7 @@ public void ifCharLiteralExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toCharLiteralExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java index 65f4cc6bbc..729bd4ff2a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java @@ -147,6 +147,7 @@ public void ifClassExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toClassExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java index 333cc96045..bdc50a0613 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java @@ -197,6 +197,7 @@ public void ifConditionalExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toConditionalExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java index 0447735ac6..007fdf3202 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java @@ -134,6 +134,7 @@ public void ifDoubleLiteralExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toDoubleLiteralExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java index 5fbe738b9b..c3d56d8873 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java @@ -155,6 +155,7 @@ public void ifEnclosedExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toEnclosedExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java index 3b134833c1..de9e52b4c8 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java @@ -561,138 +561,172 @@ public ResolvedType calculateResolvedType() { return getSymbolResolver().calculateType(this); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toAnnotationExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toArrayAccessExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toArrayCreationExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toArrayInitializerExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toAssignExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBinaryExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBooleanLiteralExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toCastExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toCharLiteralExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toClassExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toConditionalExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toDoubleLiteralExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toEnclosedExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toFieldAccessExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toInstanceOfExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toIntegerLiteralExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLambdaExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLiteralExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLiteralStringValueExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLongLiteralExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toMarkerAnnotationExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toMethodCallExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toMethodReferenceExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toNameExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toNormalAnnotationExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toNullLiteralExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toObjectCreationExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSingleMemberAnnotationExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toStringLiteralExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSuperExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toThisExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toTypeExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toUnaryExpr() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toVariableDeclarationExpr() { return Optional.empty(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java index 5668a22753..5989a684a9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java @@ -37,6 +37,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import java.util.function.Consumer; /** @@ -49,6 +50,7 @@ public final class FieldAccessExpr extends Expression implements NodeWithSimpleN private Expression scope; + @OptionalProperty private NodeList typeArguments; private SimpleName name; @@ -253,6 +255,7 @@ public void ifFieldAccessExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toFieldAccessExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java index 6b672e294d..69a505b7c5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java @@ -174,6 +174,7 @@ public void ifInstanceOfExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toInstanceOfExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java index 88ca7370fb..a0d3949865 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java @@ -146,6 +146,7 @@ public void ifIntegerLiteralExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toIntegerLiteralExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java index 172c6625d3..a69176f2ab 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java @@ -229,6 +229,7 @@ public void ifLambdaExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLambdaExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java index 8bb07da4bc..2c81560c62 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java @@ -97,6 +97,7 @@ public void ifLiteralExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLiteralExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java index dbb7afde40..49561469e3 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java @@ -116,6 +116,7 @@ public void ifLiteralStringValueExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLiteralStringValueExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java index 6be61dd9de..d15442fbc2 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java @@ -150,6 +150,7 @@ public void ifLongLiteralExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLongLiteralExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java index e2526521e4..e9ab8941da 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java @@ -121,6 +121,7 @@ public void ifMarkerAnnotationExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toMarkerAnnotationExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java index efaf448769..dc914c9d43 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java @@ -38,6 +38,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.resolution.SymbolResolver; import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration; import java.util.function.Consumer; @@ -50,8 +51,10 @@ */ public final class MethodCallExpr extends Expression implements NodeWithTypeArguments, NodeWithArguments, NodeWithSimpleName, NodeWithOptionalScope { + @OptionalProperty private Expression scope; + @OptionalProperty private NodeList typeArguments; private SimpleName name; @@ -291,6 +294,7 @@ public ResolvedMethodDeclaration resolveInvokedMethod() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toMethodCallExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java index 1f45dcf3d1..8ddaac00d7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java @@ -40,6 +40,7 @@ import com.github.javaparser.metamodel.NonEmptyProperty; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import java.util.function.Consumer; /** @@ -57,6 +58,7 @@ public final class MethodReferenceExpr extends Expression implements NodeWithTyp private Expression scope; + @OptionalProperty private NodeList typeArguments; @NonEmptyProperty @@ -220,6 +222,7 @@ public void ifMethodReferenceExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toMethodReferenceExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java index 8adccf8731..0eeabd3ced 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java @@ -40,6 +40,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; /** * A name that may consist of multiple identifiers. @@ -58,6 +59,7 @@ public final class Name extends Node implements NodeWithIdentifier, NodeWi @NonEmptyProperty private String identifier; + @OptionalProperty private Name qualifier; private NodeList annotations; diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java index 22b8d2ee77..d871589839 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java @@ -158,6 +158,7 @@ public ResolvedValueDeclaration resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toNameExpr() { return Optional.of(this); } 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 18ae0a94b5..dd0fce54f2 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 @@ -173,6 +173,7 @@ public void ifNormalAnnotationExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toNormalAnnotationExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java index d62a5866e5..b71ed5b80c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java @@ -112,6 +112,7 @@ public void ifNullLiteralExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toNullLiteralExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java index 3bd95ab0d2..7b702c581a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java @@ -42,6 +42,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.resolution.declarations.ResolvedConstructorDeclaration; import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration; import java.util.function.Consumer; @@ -58,14 +59,17 @@ */ public final class ObjectCreationExpr extends Expression implements NodeWithTypeArguments, NodeWithType, NodeWithArguments, NodeWithOptionalScope { + @OptionalProperty private Expression scope; private ClassOrInterfaceType type; + @OptionalProperty private NodeList typeArguments; private NodeList arguments; + @OptionalProperty private NodeList> anonymousClassBody; public ObjectCreationExpr() { @@ -347,6 +351,7 @@ public ResolvedConstructorDeclaration resolveInvokedConstructor() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toObjectCreationExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java index b9825f35ef..679c714756 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java @@ -143,6 +143,7 @@ public void ifSingleMemberAnnotationExpr(Consumer ac } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSingleMemberAnnotationExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java index a71985b51c..a7b4dd5419 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java @@ -166,6 +166,7 @@ public void ifStringLiteralExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toStringLiteralExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java index fe38a2693d..2de37fb258 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java @@ -27,6 +27,7 @@ import java.util.Optional; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.visitor.CloneVisitor; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.metamodel.SuperExprMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; @@ -44,6 +45,7 @@ */ public final class SuperExpr extends Expression { + @OptionalProperty private Expression classExpr; public SuperExpr() { @@ -164,6 +166,7 @@ public void ifSuperExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSuperExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java index 9c133770cc..dc9981d826 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java @@ -28,6 +28,7 @@ import java.util.Optional; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.visitor.CloneVisitor; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.metamodel.ThisExprMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; @@ -48,6 +49,7 @@ */ public final class ThisExpr extends Expression implements Resolvable { + @OptionalProperty private Expression classExpr; public ThisExpr() { @@ -167,6 +169,7 @@ public ResolvedTypeDeclaration resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toThisExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java index cd3bd880ec..3d74b6eeaa 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java @@ -148,6 +148,7 @@ public void ifTypeExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toTypeExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java index 8bd9e78c2c..aacae6c4ac 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java @@ -206,6 +206,7 @@ public void ifUnaryExpr(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toUnaryExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java index e455967ad6..8745ce72b5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java @@ -254,6 +254,7 @@ public void ifVariableDeclarationExpr(Consumer action) } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toVariableDeclarationExpr() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsStmt.java index 8f59ee4c4a..61440b1a7f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsStmt.java @@ -157,6 +157,7 @@ public void ifModuleExportsStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleExportsStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensStmt.java index 03b9862cae..25565daddd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensStmt.java @@ -157,6 +157,7 @@ public void ifModuleOpensStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleOpensStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesStmt.java index 48c3fb82dc..4ddbced06d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesStmt.java @@ -158,6 +158,7 @@ public void ifModuleProvidesStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleProvidesStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresStmt.java index 2c6dd4b105..cede81c2dd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresStmt.java @@ -154,6 +154,7 @@ public void ifModuleRequiresStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleRequiresStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleStmt.java index e75fe7b0fc..176c791b8d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleStmt.java @@ -125,22 +125,27 @@ public void ifModuleRequiresStmt(Consumer action) { public void ifModuleUsesStmt(Consumer action) { } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleExportsStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleOpensStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleProvidesStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleRequiresStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleUsesStmt() { return Optional.empty(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesStmt.java index a30e880fec..2bf9856017 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesStmt.java @@ -120,6 +120,7 @@ public void ifModuleUsesStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toModuleUsesStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java index 8e8cb796da..a6eb59fe33 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java @@ -34,6 +34,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import java.util.function.Consumer; /** @@ -45,6 +46,7 @@ public final class AssertStmt extends Statement { private Expression check; + @OptionalProperty private Expression message; public AssertStmt() { @@ -193,6 +195,7 @@ public void ifAssertStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toAssertStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java index 4e63fb9522..3e25b9647f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java @@ -155,6 +155,7 @@ public void ifBlockStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBlockStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java index 1192b43865..4a0b411c41 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java @@ -32,6 +32,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import java.util.function.Consumer; /** @@ -42,6 +43,7 @@ */ public final class BreakStmt extends Statement { + @OptionalProperty private SimpleName label; public BreakStmt() { @@ -166,6 +168,7 @@ public void ifBreakStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBreakStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java index 639c7dbc00..b829950842 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java @@ -33,6 +33,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import java.util.function.Consumer; /** @@ -44,6 +45,7 @@ */ public final class ContinueStmt extends Statement implements NodeWithOptionalLabel { + @OptionalProperty private SimpleName label; public ContinueStmt() { @@ -168,6 +170,7 @@ public void ifContinueStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toContinueStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java index a40ac489fc..7c161ff8da 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java @@ -174,6 +174,7 @@ public void ifDoStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toDoStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java index 5fc9897b09..d73ede61bc 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java @@ -110,6 +110,7 @@ public void ifEmptyStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toEmptyStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java index 105fb2d149..2b9b9c2009 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java @@ -38,6 +38,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.resolution.declarations.ResolvedConstructorDeclaration; import java.util.function.Consumer; @@ -52,10 +53,12 @@ */ public final class ExplicitConstructorInvocationStmt extends Statement implements NodeWithTypeArguments { + @OptionalProperty private NodeList typeArguments; private boolean isThis; + @OptionalProperty private Expression expression; private NodeList arguments; @@ -289,6 +292,7 @@ public ResolvedConstructorDeclaration resolveInvokedConstructor() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toExplicitConstructorInvocationStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java index d8e35fc644..483c45dee1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java @@ -146,6 +146,7 @@ public void ifExpressionStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toExpressionStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java index 9751113370..d288991df5 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java @@ -33,11 +33,10 @@ import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.ForStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; - +import com.github.javaparser.metamodel.OptionalProperty; import javax.annotation.Generated; import java.util.Optional; import java.util.function.Consumer; - import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -71,6 +70,7 @@ public final class ForStmt extends Statement implements NodeWithBody { private NodeList initialization; + @OptionalProperty private Expression compare; private NodeList update; @@ -283,6 +283,7 @@ public void ifForStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toForStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java index b8158f6964..7a04e5bcb0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java @@ -204,6 +204,7 @@ public void ifForeachStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toForeachStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java index bb80cadda0..f873ff89ab 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java @@ -36,6 +36,7 @@ import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import java.util.function.Consumer; /** @@ -51,6 +52,7 @@ public final class IfStmt extends Statement implements NodeWithCondition private Statement thenStmt; + @OptionalProperty private Statement elseStmt; public IfStmt() { @@ -251,6 +253,7 @@ public void ifIfStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toIfStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java index 355dc5bc83..7906d0c6a7 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java @@ -174,6 +174,7 @@ public void ifLabeledStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLabeledStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java index ee1de7b57d..f78eebc3d4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java @@ -150,6 +150,7 @@ public void ifLocalClassDeclarationStmt(Consumer acti } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLocalClassDeclarationStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java index b6538d4d23..c9bdb45834 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java @@ -29,6 +29,7 @@ import java.util.Optional; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.visitor.CloneVisitor; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.metamodel.ReturnStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; @@ -42,6 +43,7 @@ */ public final class ReturnStmt extends Statement { + @OptionalProperty private Expression expression; public ReturnStmt() { @@ -169,6 +171,7 @@ public void ifReturnStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toReturnStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java index 5a6e8462c0..75100e829a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java @@ -374,86 +374,107 @@ public void ifUnparsableStmt(Consumer action) { public void ifWhileStmt(Consumer action) { } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toAssertStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBlockStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toBreakStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toContinueStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toDoStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toEmptyStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toExplicitConstructorInvocationStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toExpressionStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toForStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toForeachStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toIfStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLabeledStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toLocalClassDeclarationStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toReturnStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSwitchEntryStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSwitchStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSynchronizedStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toThrowStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toTryStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toUnparsableStmt() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toWhileStmt() { return Optional.empty(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java index c32a1b4761..afa8fcecbb 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java @@ -33,6 +33,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.visitor.CloneVisitor; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.metamodel.SwitchEntryStmtMetaModel; import com.github.javaparser.metamodel.JavaParserMetaModel; import javax.annotation.Generated; @@ -61,6 +62,7 @@ */ public final class SwitchEntryStmt extends Statement implements NodeWithStatements { + @OptionalProperty private Expression label; private NodeList statements; @@ -215,6 +217,7 @@ public void ifSwitchEntryStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSwitchEntryStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java index 778bbb14ed..81677c5cad 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java @@ -199,6 +199,7 @@ public void ifSwitchStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSwitchStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java index 2b36fc2814..376d525b77 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java @@ -174,6 +174,7 @@ public void ifSynchronizedStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toSynchronizedStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java index a9e8432383..736b8351e4 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java @@ -147,6 +147,7 @@ public void ifThrowStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toThrowStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java index 9f0c7db3da..6e4a81a42c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java @@ -30,6 +30,7 @@ import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.metamodel.TryStmtMetaModel; import javax.annotation.Generated; import java.util.Arrays; @@ -101,6 +102,7 @@ public final class TryStmt extends Statement { private NodeList catchClauses; + @OptionalProperty private BlockStmt finallyBlock; public TryStmt() { @@ -312,6 +314,7 @@ public void ifTryStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toTryStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java index 08fcf3b6ee..2a7fc011bf 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java @@ -96,6 +96,7 @@ public void ifUnparsableStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toUnparsableStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java index 4c7d1a8cb4..5fb1f99716 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java @@ -174,6 +174,7 @@ public void ifWhileStmt(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toWhileStmt() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java index d5d8e26a83..05452bdc8b 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java @@ -285,6 +285,7 @@ public void ifArrayType(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toArrayType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java index 3ea6e145df..f3b6846c65 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java @@ -41,6 +41,7 @@ import static java.util.stream.Collectors.joining; import javax.annotation.Generated; import com.github.javaparser.TokenRange; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.resolution.types.ResolvedReferenceType; import java.util.function.Consumer; @@ -58,10 +59,12 @@ */ public final class ClassOrInterfaceType extends ReferenceType implements NodeWithSimpleName, NodeWithAnnotations, NodeWithTypeArguments { + @OptionalProperty private ClassOrInterfaceType scope; private SimpleName name; + @OptionalProperty private NodeList typeArguments; public ClassOrInterfaceType() { @@ -292,6 +295,7 @@ public ResolvedReferenceType resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toClassOrInterfaceType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java index d672dd76a8..6b1056bf2d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java @@ -179,6 +179,7 @@ public ResolvedIntersectionType resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toIntersectionType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java index 5fc257bb7c..f3e209dc6c 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java @@ -233,6 +233,7 @@ public ResolvedPrimitiveType resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toPrimitiveType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java index 9ca8c363ce..f39ee0e4ab 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java @@ -103,6 +103,7 @@ public void ifReferenceType(Consumer action) { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toReferenceType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java index f20e926685..b28db1db4f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java @@ -300,42 +300,52 @@ public void ifWildcardType(Consumer action) { @Override public abstract ResolvedType resolve(); + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toArrayType() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toClassOrInterfaceType() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toIntersectionType() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toPrimitiveType() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toReferenceType() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toTypeParameter() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toUnionType() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toUnknownType() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toVoidType() { return Optional.empty(); } + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toWildcardType() { return Optional.empty(); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java index b2a63a4376..c3f8cedab1 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java @@ -239,6 +239,7 @@ public ResolvedTypeVariable resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toTypeParameter() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java index 8c77df024e..5fa78f10a0 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java @@ -188,6 +188,7 @@ public ResolvedUnionType resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toUnionType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java index 260ccbbcaa..d415214f77 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java @@ -140,6 +140,7 @@ public ResolvedType resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toUnknownType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java index 49cc6a9e36..860a9d6751 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java @@ -135,6 +135,7 @@ public ResolvedVoidType resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toVoidType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java index 6060dcf802..870e5ec219 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java @@ -30,6 +30,7 @@ import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; import com.github.javaparser.metamodel.JavaParserMetaModel; +import com.github.javaparser.metamodel.OptionalProperty; import com.github.javaparser.metamodel.WildcardTypeMetaModel; import java.util.Arrays; import java.util.List; @@ -50,8 +51,10 @@ */ public final class WildcardType extends Type implements NodeWithAnnotations { + @OptionalProperty private ReferenceType extendedType; + @OptionalProperty private ReferenceType superType; public WildcardType() { @@ -291,6 +294,7 @@ public ResolvedWildcard resolve() { } @Override + @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator") public Optional toWildcardType() { return Optional.of(this); } diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java new file mode 100644 index 0000000000..5052e3bcf5 --- /dev/null +++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java @@ -0,0 +1,16 @@ +package com.github.javaparser.metamodel; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Indicate an optional property of a Node. + * (Used during generation of the meta model.) + */ +@Retention(RUNTIME) +@Target(FIELD) +public @interface OptionalProperty { +} diff --git a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/AstTypeAnalysis.java b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/AstTypeAnalysis.java index b199c9f310..1801f2d71a 100644 --- a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/AstTypeAnalysis.java +++ b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/AstTypeAnalysis.java @@ -22,7 +22,7 @@ public class AstTypeAnalysis { public boolean isSelfType = false; public Class innerType; - public AstTypeAnalysis(Type type) { + AstTypeAnalysis(Type type) { if (type instanceof Class) { TypeVariable>[] typeParameters = ((Class) type).getTypeParameters(); if (typeParameters.length > 0) { diff --git a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/InitializeConstructorParametersStatementsGenerator.java b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/InitializeConstructorParametersStatementsGenerator.java index 1ef09da3bc..d50c0ed2d1 100644 --- a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/InitializeConstructorParametersStatementsGenerator.java +++ b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/InitializeConstructorParametersStatementsGenerator.java @@ -14,8 +14,8 @@ import static com.github.javaparser.generator.metamodel.MetaModelGenerator.propertyMetaModelFieldName; import static com.github.javaparser.utils.CodeGenerationUtils.f; -public class InitializeConstructorParametersStatementsGenerator { - public void generate(Class nodeClass, NodeList initializeConstructorParametersStatements) { +class InitializeConstructorParametersStatementsGenerator { + void generate(Class nodeClass, NodeList initializeConstructorParametersStatements) { if (nodeClass == Node.class) { return; } diff --git a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/InitializePropertyMetaModelsStatementsGenerator.java b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/InitializePropertyMetaModelsStatementsGenerator.java index 1f1c8dbb1a..be1ff545f6 100644 --- a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/InitializePropertyMetaModelsStatementsGenerator.java +++ b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/InitializePropertyMetaModelsStatementsGenerator.java @@ -4,6 +4,7 @@ import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.metamodel.NonEmptyProperty; +import com.github.javaparser.metamodel.OptionalProperty; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -15,12 +16,11 @@ import static com.github.javaparser.utils.CodeGenerationUtils.*; import static com.github.javaparser.utils.Utils.decapitalize; -public class InitializePropertyMetaModelsStatementsGenerator { - public void generate(Class nodeClass, Field field, ClassOrInterfaceDeclaration nodeMetaModelClass, String nodeMetaModelFieldName, NodeList initializePropertyMetaModelsStatements) throws NoSuchMethodException { +class InitializePropertyMetaModelsStatementsGenerator { + void generate(Field field, ClassOrInterfaceDeclaration nodeMetaModelClass, String nodeMetaModelFieldName, NodeList initializePropertyMetaModelsStatements) throws NoSuchMethodException { + final AstTypeAnalysis fieldTypeAnalysis = new AstTypeAnalysis(field.getGenericType()); - final AstTypeAnalysis fieldAnalysis = new AstTypeAnalysis(nodeClass.getMethod(getter(field)).getGenericReturnType()); - - final Class fieldType = fieldAnalysis.innerType; + final Class fieldType = fieldTypeAnalysis.innerType; final String typeName = fieldType.getTypeName().replace('$', '.'); final String propertyMetaModelFieldName = field.getName() + "PropertyMetaModel"; nodeMetaModelClass.addField("PropertyMetaModel", propertyMetaModelFieldName, PUBLIC); @@ -29,11 +29,11 @@ public void generate(Class nodeClass, Field field, ClassOrInterfaceDeclaratio field.getName(), typeName, optionalOf(decapitalize(nodeMetaModelName(fieldType)), isNode(fieldType)), - fieldAnalysis.isOptional, + isOptional(field), isNonEmpty(field), - fieldAnalysis.isNodeList, - fieldAnalysis.isEnumSet, - fieldAnalysis.isSelfType); + fieldTypeAnalysis.isNodeList, + fieldTypeAnalysis.isEnumSet, + fieldTypeAnalysis.isSelfType); final String fieldSetting = f("%s.%s=%s;", nodeMetaModelFieldName, propertyMetaModelFieldName, propertyInitializer); final String fieldAddition = f("%s.getDeclaredPropertyMetaModels().add(%s.%s);", nodeMetaModelFieldName, nodeMetaModelFieldName, propertyMetaModelFieldName); @@ -41,23 +41,23 @@ public void generate(Class nodeClass, Field field, ClassOrInterfaceDeclaratio initializePropertyMetaModelsStatements.add(parseStatement(fieldAddition)); } - public void generateDerivedProperty(Method method, ClassOrInterfaceDeclaration nodeMetaModelClass, String nodeMetaModelFieldName, NodeList initializePropertyMetaModelsStatements) { - final AstTypeAnalysis fieldAnalysis = new AstTypeAnalysis(method.getGenericReturnType()); + void generateDerivedProperty(Method method, ClassOrInterfaceDeclaration nodeMetaModelClass, String nodeMetaModelFieldName, NodeList initializePropertyMetaModelsStatements) { + final AstTypeAnalysis returnTypeAnalysis = new AstTypeAnalysis(method.getGenericReturnType()); - final Class fieldType = fieldAnalysis.innerType; - final String typeName = fieldType.getTypeName().replace('$', '.'); + final Class innermostReturnType = returnTypeAnalysis.innerType; + final String typeName = innermostReturnType.getTypeName().replace('$', '.'); final String propertyMetaModelFieldName = getterToPropertyName(method.getName()) + "PropertyMetaModel"; nodeMetaModelClass.addField("PropertyMetaModel", propertyMetaModelFieldName, PUBLIC); final String propertyInitializer = f("new PropertyMetaModel(%s, \"%s\", %s.class, %s, %s, %s, %s, %s, %s)", nodeMetaModelFieldName, getterToPropertyName(method.getName()), typeName, - optionalOf(decapitalize(nodeMetaModelName(fieldType)), isNode(fieldType)), - fieldAnalysis.isOptional, + optionalOf(decapitalize(nodeMetaModelName(innermostReturnType)), isNode(innermostReturnType)), + returnTypeAnalysis.isOptional, isNonEmpty(method), - fieldAnalysis.isNodeList, - fieldAnalysis.isEnumSet, - fieldAnalysis.isSelfType); + returnTypeAnalysis.isNodeList, + returnTypeAnalysis.isEnumSet, + returnTypeAnalysis.isSelfType); final String fieldSetting = f("%s.%s=%s;", nodeMetaModelFieldName, propertyMetaModelFieldName, propertyInitializer); final String fieldAddition = f("%s.getDerivedPropertyMetaModels().add(%s.%s);", nodeMetaModelFieldName, nodeMetaModelFieldName, propertyMetaModelFieldName); @@ -73,8 +73,7 @@ private boolean isNonEmpty(Method method) { return method.isAnnotationPresent(NonEmptyProperty.class); } - private String getter(Field field) { - return getterName(field.getType(), field.getName()); + private boolean isOptional(Field field) { + return field.isAnnotationPresent(OptionalProperty.class); } - } diff --git a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java index 53a4380664..15772b3e56 100644 --- a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java +++ b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java @@ -164,7 +164,7 @@ public static void main(String[] args) throws IOException, NoSuchMethodException } private void run(SourceRoot sourceRoot) throws IOException, NoSuchMethodException { - final CompilationUnit javaParserMetaModel = sourceRoot.tryToParse(METAMODEL_PACKAGE, "JavaParserMetaModel.java").getResult().get(); + final CompilationUnit javaParserMetaModel = sourceRoot.parse(METAMODEL_PACKAGE, "JavaParserMetaModel.java"); generateNodeMetaModels(javaParserMetaModel, sourceRoot); } diff --git a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java index db17d2318d..96f92ab796 100644 --- a/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java +++ b/javaparser-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java @@ -85,7 +85,7 @@ public void generate(Class nodeClass, ClassOrInterfaceDeclaratio continue; } - initializePropertyMetaModelsStatementsGenerator.generate(nodeClass, field, nodeMetaModelClass, nodeMetaModelFieldName, initializePropertyMetaModelsStatements); + initializePropertyMetaModelsStatementsGenerator.generate(field, nodeMetaModelClass, nodeMetaModelFieldName, initializePropertyMetaModelsStatements); } final List methods = new ArrayList<>(Arrays.asList(nodeClass.getMethods())); methods.sort(Comparator.comparing(Method::getName));