Module statements -> directives

javaparser · Aug 16, 2018 · 6d06ae9 · 6d06ae9
1 parent 999c27a
commit 6d06ae9
Show file tree

Hide file tree

Showing 50 changed files with 794 additions and 595 deletions.
diff --git a/...erators/src/main/java/com/github/javaparser/generator/core/node/TypeCastingGenerator.java b/...erators/src/main/java/com/github/javaparser/generator/core/node/TypeCastingGenerator.java
@@ -22,7 +22,7 @@ public class TypeCastingGenerator extends NodeGenerator {
             JavaParserMetaModel.statementMetaModel,
             JavaParserMetaModel.expressionMetaModel,
             JavaParserMetaModel.typeMetaModel,
-            JavaParserMetaModel.moduleStmtMetaModel,
+            JavaParserMetaModel.moduleDirectiveMetaModel,
             JavaParserMetaModel.bodyDeclarationMetaModel,
             JavaParserMetaModel.commentMetaModel
     );

diff --git a/...generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java b/...generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java
@@ -47,7 +47,7 @@ public class MetaModelGenerator {
         add(StringLiteralExpr.class);
 
         add(ModuleDeclaration.class);
-        add(ModuleStmt.class);
+        add(ModuleDirective.class);
 
         //
         add(ArrayCreationLevel.class);
@@ -142,11 +142,11 @@ public class MetaModelGenerator {
         add(WildcardType.class);
         add(VarType.class);
 
-        add(ModuleRequiresStmt.class);
+        add(ModuleRequiresDirective.class);
-        add(ModuleExportsStmt.class);
+        add(ModuleExportsDirective.class);
-        add(ModuleProvidesStmt.class);
+        add(ModuleProvidesDirective.class);
-        add(ModuleUsesStmt.class);
+        add(ModuleUsesDirective.class);
-        add(ModuleOpensStmt.class);
+        add(ModuleOpensDirective.class);
     }};
 
     static String METAMODEL_PACKAGE = "com.github.javaparser.metamodel";

diff --git a/...arser-core-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java b/...arser-core-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java
@@ -7,12 +7,10 @@
 import com.github.javaparser.ast.expr.Name;
 import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
 import com.github.javaparser.ast.modules.*;
-import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.printer.ConcreteSyntaxModel;
 import org.junit.Test;
 
 import static com.github.javaparser.GeneratedJavaParserConstants.IDENTIFIER;
-import static com.github.javaparser.JavaParser.parseClassOrInterfaceType;
 import static com.github.javaparser.JavaParser.parseName;
 import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9;
 import static com.github.javaparser.Providers.provider;
@@ -42,7 +40,7 @@ public void moduleInfoKeywordsAreSeenAsIdentifiers() {
     @Test
     public void issue988RequireTransitiveShouldRequireAModuleCalledTransitive() {
         CompilationUnit cu = parse("module X { requires transitive; }");
-        ModuleRequiresStmt requiresTransitive = (ModuleRequiresStmt) cu.getModule().get().getModuleStmts().get(0);
+        ModuleRequiresDirective requiresTransitive = (ModuleRequiresDirective) cu.getModule().get().getDirectives().get(0);
         assertEquals("transitive", requiresTransitive.getNameAsString());
         assertEquals(IDENTIFIER, requiresTransitive.getName().getTokenRange().get().getBegin().getKind());
     }
@@ -75,22 +73,22 @@ public void jlsExample1() {
                 new SingleMemberAnnotationExpr(new Name("Foo"), new IntegerLiteralExpr("2")),
                 new MarkerAnnotationExpr(new Name("Bar")));
 
-        ModuleRequiresStmt moduleRequiresStmt = module.getModuleStmts().get(0).asModuleRequiresStmt();
+        ModuleRequiresDirective moduleRequiresStmt = module.getDirectives().get(0).asModuleRequiresStmt();
         assertThat(moduleRequiresStmt.getNameAsString()).isEqualTo("A.B");
         assertThat(moduleRequiresStmt.getModifiers()).isEmpty();
 
-        ModuleExportsStmt moduleExportsStmt = module.getModuleStmts().get(5).asModuleExportsStmt();
+        ModuleExportsDirective moduleExportsStmt = module.getDirectives().get(5).asModuleExportsStmt();
         assertThat(moduleExportsStmt.getNameAsString()).isEqualTo("R.S");
         assertThat(moduleExportsStmt.getModuleNames()).containsExactly(parseName("T1.U1"), parseName("T2.U2"));
 
-        ModuleOpensStmt moduleOpensStmt = module.getModuleStmts().get(7).asModuleOpensStmt();
+        ModuleOpensDirective moduleOpensStmt = module.getDirectives().get(7).asModuleOpensStmt();
         assertThat(moduleOpensStmt.getNameAsString()).isEqualTo("R.S");
         assertThat(moduleOpensStmt.getModuleNames()).containsExactly(parseName("T1.U1"), parseName("T2.U2"));
 
-        ModuleUsesStmt moduleUsesStmt = module.getModuleStmts().get(8).asModuleUsesStmt();
+        ModuleUsesDirective moduleUsesStmt = module.getDirectives().get(8).asModuleUsesStmt();
         assertThat(moduleUsesStmt.getNameAsString()).isEqualTo("V.W");
 
-        ModuleProvidesStmt moduleProvidesStmt = module.getModuleStmts().get(9).asModuleProvidesStmt();
+        ModuleProvidesDirective moduleProvidesStmt = module.getDirectives().get(9).asModuleProvidesStmt();
         assertThat(moduleProvidesStmt.getNameAsString()).isEqualTo("X.Y");
         assertThat(moduleProvidesStmt.getWith()).containsExactly(
                 parseName("Z1.Z2"),
@@ -195,15 +193,15 @@ public void fluentInterface() {
                 .addDirective("exports com.laamella.base.entity.channel.internal to com.laamella.core;")
                 .addDirective("uses com.laamella.base.util.internal.FactoryDelegate;");
 
-        moduleDeclaration.getModuleStmts()
+        moduleDeclaration.getDirectives()
-                .addLast(new ModuleExportsStmt()
+                .addLast(new ModuleExportsDirective()
                         .setName("foo.bar")
                         .addModuleName("other.foo")
                         .addModuleName("other.bar")
                 );
 
         moduleDeclaration
-                .addDirective(new ModuleExportsStmt()
+                .addDirective(new ModuleExportsDirective()
                         .setName("foo.bar.x")
                         .addModuleName("other.foo")
                         .addModuleName("other.bar")

diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
@@ -30,7 +30,7 @@
 import com.github.javaparser.ast.body.TypeDeclaration;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.modules.ModuleDeclaration;
-import com.github.javaparser.ast.modules.ModuleStmt;
+import com.github.javaparser.ast.modules.ModuleDirective;
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt;
 import com.github.javaparser.ast.stmt.Statement;
@@ -547,14 +547,14 @@ public static ModuleDeclaration parseModuleDeclaration(String moduleDeclaration)
     }
 
     /**
-     * Parses a module directive and returns it as a ModuleStmt.
+     * Parses a module directive and returns it as a ModuleDirective.
      *
      * @param moduleDirective a directive like "opens C;"
      * @return the AST for the module directive
      * @throws ParseProblemException if the source code has parser errors
-     * @see ModuleStmt
+     * @see ModuleDirective
      */
-    public static ModuleStmt parseModuleDirective(String moduleDirective) {
+    public static ModuleDirective parseModuleDirective(String moduleDirective) {
         return simplifiedParse(MODULE_DIRECTIVE, provider(moduleDirective));
     }
 

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java b/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java
@@ -29,7 +29,7 @@
 import com.github.javaparser.ast.body.TypeDeclaration;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.modules.ModuleDeclaration;
-import com.github.javaparser.ast.modules.ModuleStmt;
+import com.github.javaparser.ast.modules.ModuleDirective;
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt;
 import com.github.javaparser.ast.stmt.Statement;
@@ -67,7 +67,7 @@ public interface ParseStart<R> {
     ParseStart<PackageDeclaration> PACKAGE_DECLARATION = GeneratedJavaParser::PackageDeclarationParseStart;
     ParseStart<TypeDeclaration<?>> TYPE_DECLARATION = GeneratedJavaParser::TypeDeclarationParseStart;
     ParseStart<ModuleDeclaration> MODULE_DECLARATION = GeneratedJavaParser::ModuleDeclarationParseStart;
-    ParseStart<ModuleStmt> MODULE_DIRECTIVE = GeneratedJavaParser::ModuleDirectiveParseStart;
+    ParseStart<ModuleDirective> MODULE_DIRECTIVE = GeneratedJavaParser::ModuleDirectiveParseStart;
 
     R parse(GeneratedJavaParser parser) throws ParseException;
 }
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
@@ -35,10 +35,8 @@
 import com.github.javaparser.metamodel.NameMetaModel;
 import com.github.javaparser.metamodel.NonEmptyProperty;
 import com.github.javaparser.metamodel.OptionalProperty;
-
 import javax.annotation.Generated;
 import java.util.Optional;
-
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
 import static com.github.javaparser.utils.Utils.assertNotNull;
 
@@ -250,8 +248,6 @@ public boolean isTopLevel() {
      * An internal name is a name that constitutes a part of a larger Name instance.
      */
     public boolean isInternal() {
-        return getParentNode()
+        return getParentNode().filter(parent -> parent instanceof Name).isPresent();
-                .filter(parent -> parent instanceof Name)
-                .isPresent();
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java
@@ -14,8 +14,6 @@
 import com.github.javaparser.ast.visitor.VoidVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
 import com.github.javaparser.metamodel.ModuleDeclarationMetaModel;
-import java.util.Arrays;
-import java.util.List;
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import javax.annotation.Generated;
 import com.github.javaparser.TokenRange;
@@ -31,7 +29,7 @@ public final class ModuleDeclaration extends Node implements NodeWithName<Module
 
     private boolean isOpen;
 
-    private NodeList<ModuleStmt> moduleStmts;
+    private NodeList<ModuleDirective> directives;
 
     public ModuleDeclaration() {
         this(null, new NodeList<>(), new Name(), false, new NodeList<>());
@@ -42,20 +40,20 @@ public ModuleDeclaration(Name name, boolean isOpen) {
     }
 
     @AllFieldsConstructor
-    public ModuleDeclaration(NodeList<AnnotationExpr> annotations, Name name, boolean isOpen, NodeList<ModuleStmt> moduleStmts) {
+    public ModuleDeclaration(NodeList<AnnotationExpr> annotations, Name name, boolean isOpen, NodeList<ModuleDirective> directives) {
-        this(null, annotations, name, isOpen, moduleStmts);
+        this(null, annotations, name, isOpen, directives);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ModuleDeclaration(TokenRange tokenRange, NodeList<AnnotationExpr> annotations, Name name, boolean isOpen, NodeList<ModuleStmt> moduleStmts) {
+    public ModuleDeclaration(TokenRange tokenRange, NodeList<AnnotationExpr> annotations, Name name, boolean isOpen, NodeList<ModuleDirective> directives) {
         super(tokenRange);
         setAnnotations(annotations);
         setName(name);
         setOpen(isOpen);
-        setModuleStmts(moduleStmts);
+        setDirectives(directives);
         customInitialization();
     }
 
@@ -120,9 +118,9 @@ public boolean remove(Node node) {
                 return true;
             }
         }
-        for (int i = 0; i < moduleStmts.size(); i++) {
+        for (int i = 0; i < directives.size(); i++) {
-            if (moduleStmts.get(i) == node) {
+            if (directives.get(i) == node) {
-                moduleStmts.remove(i);
+                directives.remove(i);
                 return true;
             }
         }
@@ -145,21 +143,21 @@ public ModuleDeclaration setOpen(final boolean isOpen) {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public NodeList<ModuleStmt> getModuleStmts() {
+    public NodeList<ModuleDirective> getDirectives() {
-        return moduleStmts;
+        return directives;
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public ModuleDeclaration setModuleStmts(final NodeList<ModuleStmt> moduleStmts) {
+    public ModuleDeclaration setDirectives(final NodeList<ModuleDirective> directives) {
-        assertNotNull(moduleStmts);
+        assertNotNull(directives);
-        if (moduleStmts == this.moduleStmts) {
+        if (directives == this.directives) {
             return (ModuleDeclaration) this;
         }
-        notifyPropertyChange(ObservableProperty.MODULE_STMTS, this.moduleStmts, moduleStmts);
+        notifyPropertyChange(ObservableProperty.DIRECTIVES, this.directives, directives);
-        if (this.moduleStmts != null)
+        if (this.directives != null)
-            this.moduleStmts.setParentNode(null);
+            this.directives.setParentNode(null);
-        this.moduleStmts = moduleStmts;
+        this.directives = directives;
-        setAsParentNodeOf(moduleStmts);
+        setAsParentNodeOf(directives);
         return this;
     }
 
@@ -186,9 +184,9 @@ public boolean replace(Node node, Node replacementNode) {
                 return true;
             }
         }
-        for (int i = 0; i < moduleStmts.size(); i++) {
+        for (int i = 0; i < directives.size(); i++) {
-            if (moduleStmts.get(i) == node) {
+            if (directives.get(i) == node) {
-                moduleStmts.set(i, (ModuleStmt) replacementNode);
+                directives.set(i, (ModuleDirective) replacementNode);
                 return true;
             }
         }
@@ -206,8 +204,8 @@ public ModuleDeclaration addDirective(String directive) {
         return addDirective(JavaParser.parseModuleDirective(directive));
     }
 
-    public ModuleDeclaration addDirective(ModuleStmt directive) {
+    public ModuleDeclaration addDirective(ModuleDirective directive) {
-        getModuleStmts().add(directive);
+        getDirectives().add(directive);
         return this;
     }
 }