Fix parsing of module-info requires static (#1030)

helidon-io · Mar 12, 2024 · 45a0511 · 45a0511
1 parent 281f52f
commit 45a0511
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 19 deletions.
diff --git a/maven-plugins/javadoc-maven-plugin/src/main/java/io/helidon/build/javadoc/JavaParser.java b/maven-plugins/javadoc-maven-plugin/src/main/java/io/helidon/build/javadoc/JavaParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,12 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import io.helidon.build.javadoc.JavaTokenizer.Keyword;
 import io.helidon.build.javadoc.JavaTokenizer.Symbol;
@@ -44,8 +44,6 @@
 class JavaParser {
 
     private static final Symbol TO = Symbol.keyword(Keyword.TO);
-    private static final Symbol STATIC = Symbol.keyword(Keyword.STATIC);
-    private static final Symbol TRANSITIVE = Symbol.keyword(Keyword.TRANSITIVE);
     private static final Symbol WITH = Symbol.keyword(Keyword.WITH);
     private static final Symbol SEMI_COLON = Symbol.token(Token.SEMI_COLON);
     private static final Symbol COMMA = Symbol.token(Token.COMMA);
@@ -168,6 +166,23 @@ private Symbol nextSymbol(Predicate<Symbol> predicate) {
         throw new IllegalStateException("Unexpected EOF");
     }
 
+    private List<Symbol> nextSymbols(Predicate<Symbol> predicate) {
+        List<Symbol> symbols = new ArrayList<>();
+        while (tokenizer.hasNext()) {
+            Symbol symbol = tokenizer.peek();
+            if (symbol.isConcrete()) {
+                if (predicate.test(symbol)) {
+                    tokenizer.skip();
+                    symbols.add(symbol);
+                } else {
+                    return symbols;
+                }
+            }
+            tokenizer.skip();
+        }
+        throw new IllegalStateException("Unexpected EOF");
+    }
+
     private String parseName() {
         StringBuilder sb = new StringBuilder();
         Symbol previous = WHITESPACE;
@@ -204,20 +219,16 @@ private List<String> parseNames() {
     }
 
     private void parseModuleRequires(ModuleDescriptor.Builder builder) {
-        Symbol symbol = nextSymbol(Symbol::isKeyword);
-        if (symbol == null || symbol == STATIC || symbol == TRANSITIVE) {
-            String source = parseName();
-            Set<Requires.Modifier> modifiers = new HashSet<>();
-            if (symbol == STATIC) {
-                modifiers.add(Requires.Modifier.STATIC);
-            } else if (symbol == TRANSITIVE) {
-                modifiers.add(Requires.Modifier.TRANSITIVE);
-            }
-            builder.requires(modifiers, source);
-        } else {
-            throw new IllegalStateException(String.format(
-                    "Invalid directive at %s", tokenizer.cursor()));
-        }
+        List<Symbol> symbols = nextSymbols(Symbol::isKeyword);
+        Set<Requires.Modifier> modifiers = symbols.stream()
+                .map(symbol -> switch (symbol.keyword()) {
+                    case STATIC -> Requires.Modifier.STATIC;
+                    case TRANSITIVE -> Requires.Modifier.TRANSITIVE;
+                    default -> throw new IllegalStateException(String.format(
+                            "Invalid directive at %s", tokenizer.cursor()));
+                }).collect(Collectors.toSet());
+        String source = parseName();
+        builder.requires(modifiers, source);
     }
 
     private void parseModuleExports(ModuleDescriptor.Builder builder) {

diff --git a/...ins/javadoc-maven-plugin/src/test/java/io/helidon/build/javadoc/JavaParserModuleTest.java b/...ins/javadoc-maven-plugin/src/test/java/io/helidon/build/javadoc/JavaParserModuleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -164,6 +164,27 @@ void testRequiresTransitive() {
         assertThat(requires[1].modifiers(), is(empty()));
     }
 
+    @Test
+    void testRequiresTransitiveStatic() {
+        String src = """
+                module com.acme1 {
+                    requires transitive static com.acme2;
+                    requires static transitive com.acme3;
+                }
+                """;
+        ModuleDescriptor module = parse(src);
+        Requires[] requires = module.requires()
+                .stream()
+                .sorted(Comparator.comparing(Requires::name))
+                .filter(r -> !r.modifiers().contains(Requires.Modifier.MANDATED))
+                .toArray(Requires[]::new);
+        assertThat(requires.length, is(2));
+        assertThat(requires[0].name(), is("com.acme2"));
+        assertThat(requires[0].modifiers(), containsInAnyOrder(Requires.Modifier.TRANSITIVE, Requires.Modifier.STATIC));
+        assertThat(requires[1].name(), is("com.acme3"));
+        assertThat(requires[1].modifiers(), containsInAnyOrder(Requires.Modifier.TRANSITIVE, Requires.Modifier.STATIC));
+    }
+
     @Test
     void testUses1() {
         String src = """