Java optional codegen with final fields

.templates/java/.gitignore

@@ -12,5 +12,6 @@ dependency-reduced-pom.xml
 .tested*
 .compared
 .built
+.codegen
 # Approval tests
 acceptance/

.templates/java/default.mk

@@ -12,13 +12,16 @@ rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(su
 default: .tested
 .PHONY: default
 
+.codegen:
+	touch $@
+
 .tested: .tested-jar-check
 
 .tested-jar-check: .deps .built
 	./scripts/check-jar.sh $(JAR)
 	touch $@
 
-.built: pom.xml $(JAVA_SOURCE_FILES)
+.built: pom.xml $(JAVA_SOURCE_FILES) .codegen
 	mvn install
 	touch $@
 
@@ -59,7 +62,7 @@ clean: clean-java
 .PHONY: clean
 
 clean-java:
-	rm -rf target .deps .tested* .built acceptance
+	rm -rf target .deps .tested* .built acceptance .codegen
 	mvn clean
 .PHONY: clean-java
 

config/java/.gitignore

@@ -12,5 +12,6 @@ dependency-reduced-pom.xml
 .tested*
 .compared
 .built
+.codegen
 # Approval tests
 acceptance/

config/java/default.mk

@@ -12,13 +12,16 @@ rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(su
 default: .tested
 .PHONY: default
 
+.codegen:
+	touch $@
+
 .tested: .tested-jar-check
 
 .tested-jar-check: .deps .built
 	./scripts/check-jar.sh $(JAR)
 	touch $@
 
-.built: pom.xml $(JAVA_SOURCE_FILES)
+.built: pom.xml $(JAVA_SOURCE_FILES) .codegen
 	mvn install
 	touch $@
 
@@ -59,7 +62,7 @@ clean: clean-java
 .PHONY: clean
 
 clean-java:
-	rm -rf target .deps .tested* .built acceptance
+	rm -rf target .deps .tested* .built acceptance .codegen
 	mvn clean
 .PHONY: clean-java
 

gherkin/CHANGELOG.md

@@ -13,10 +13,15 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 
 ### Changed
 
+* [Java] Replaced `Gherkin` with a `GherkinParser` that uses a builder to construct.
+* [Java] Made all internal classes package private
+
 ### Deprecated
 
 ### Removed
 
+- [Java] the `io.cucumber.gherkin.Main` class is no longer part of the jar.
+
 ### Fixed
 
 ## [22.0.0] - 2021-09-23

gherkin/java/.gitignore

@@ -12,5 +12,6 @@ dependency-reduced-pom.xml
 .tested*
 .compared
 .built
+.codegen
 # Approval tests
 acceptance/

gherkin/java/bin/gherkin

@@ -12,5 +12,5 @@ if [ ! -f "${DIR}/classpath.txt" ] || [ "${DIR}/../pom.xml" -nt "${DIR}/classpat
 fi
 
 java \
-  -classpath "$(cat "${DIR}/classpath.txt"):${DIR}/../target/classes" \
+  -classpath "$(cat "${DIR}/classpath.txt"):${DIR}/../target/test-classes:${DIR}/../target/classes" \
   io.cucumber.gherkin.Main $*

gherkin/java/bin/gherkin-generate-tokens

@@ -12,5 +12,5 @@ if [ ! -f "${DIR}/classpath.txt" ] || [ "${DIR}/../pom.xml" -nt "${DIR}/classpat
 fi
 
 java \
-  -classpath "$(cat "${DIR}/classpath.txt"):${DIR}/../target/classes" \
+  -classpath "$(cat "${DIR}/classpath.txt"):${DIR}/../target/classes:${DIR}/../target/test-classes" \
   io.cucumber.gherkin.GenerateTokens $*

gherkin/java/default.mk

@@ -12,13 +12,16 @@ rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(su
 default: .tested
 .PHONY: default
 
+.codegen:
+	touch $@
+
 .tested: .tested-jar-check
 
 .tested-jar-check: .deps .built
 	./scripts/check-jar.sh $(JAR)
 	touch $@
 
-.built: pom.xml $(JAVA_SOURCE_FILES)
+.built: pom.xml $(JAVA_SOURCE_FILES) .codegen
 	mvn install
 	touch $@
 
@@ -59,7 +62,7 @@ clean: clean-java
 .PHONY: clean
 
 clean-java:
-	rm -rf target .deps .tested* .built acceptance
+	rm -rf target .deps .tested* .built acceptance .codegen
 	mvn clean
 .PHONY: clean-java
 

gherkin/java/gherkin-java.razor

@@ -47,34 +47,34 @@ import java.util.Queue;
 
 import static java.util.Arrays.asList;
 
-public class @Model.ParserClassName<T> {
-    public enum TokenType {
+class @Model.ParserClassName<T> {
+    enum TokenType {
         None,
         @foreach(var rule in Model.RuleSet.TokenRules)
         {<text>        @rule.Name.Replace("#", ""),
 </text>}        ;
     }
 
-    public enum RuleType {
+    enum RuleType {
         None,
         @foreach(var rule in Model.RuleSet.Where(r => !r.TempRule))
         {<text>        @rule.Name.Replace("#", "_"), // @rule.ToString(true)
 </text>}        ;
 
-        public static RuleType cast(TokenType tokenType) {
+        static RuleType cast(TokenType tokenType) {
             return RuleType.values()[tokenType.ordinal()];
         }
     }
 
     private final Builder<T> builder;
 
-    public boolean stopAtFirstError;
+    private boolean stopAtFirstError;
 
-    class ParserContext {
-        public final ITokenScanner tokenScanner;
-        public final ITokenMatcher tokenMatcher;
-        public final Queue<Token> tokenQueue;
-        public final List<ParserException> errors;
+    static class ParserContext {
+        final ITokenScanner tokenScanner;
+        final ITokenMatcher tokenMatcher;
+        final Queue<Token> tokenQueue;
+        final List<ParserException> errors;
 
         ParserContext(ITokenScanner tokenScanner, ITokenMatcher tokenMatcher, Queue<Token> tokenQueue, List<ParserException> errors) {
             this.tokenScanner = tokenScanner;
@@ -84,39 +84,39 @@ public class @Model.ParserClassName<T> {
         }
     }
 
-    public Parser(Builder<T> builder) {
+    Parser(Builder<T> builder) {
         this.builder = builder;
     }
 
-    public T parse(String source) {
-        return parse(new StringReader(source));
+    T parse(String source, String uri) {
+        return parse(new StringReader(source), uri);
     }
 
-    public T parse(Reader source) {
-        return parse(new TokenScanner(source));
+    T parse(Reader source, String uri) {
+        return parse(new TokenScanner(source), uri);
     }
 
-    public T parse(ITokenScanner tokenScanner) {
-        return parse(tokenScanner, new TokenMatcher());
+    T parse(ITokenScanner tokenScanner, String uri) {
+        return parse(tokenScanner, new TokenMatcher(), uri);
     }
 
-    public T parse(String source, ITokenMatcher tokenMatcher) {
-        return parse(new StringReader(source), tokenMatcher);
+    T parse(String source, ITokenMatcher tokenMatcher, String uri) {
+        return parse(new StringReader(source), tokenMatcher, uri);
     }
 
-    public T parse(Reader source, ITokenMatcher tokenMatcher) {
-        return parse(new TokenScanner(source), tokenMatcher);
+    T parse(Reader source, ITokenMatcher tokenMatcher, String uri) {
+        return parse(new TokenScanner(source), tokenMatcher, uri);
     }
 
-    public T parse(ITokenScanner tokenScanner, ITokenMatcher tokenMatcher) {
-        builder.reset();
+    T parse(ITokenScanner tokenScanner, ITokenMatcher tokenMatcher, String uri) {
+        builder.reset(uri);
         tokenMatcher.reset();
 
         ParserContext context = new ParserContext(
                 tokenScanner,
                 tokenMatcher,
-                new LinkedList<Token>(),
-                new ArrayList<ParserException>()
+                new LinkedList<>(),
+                new ArrayList<>()
         );
 
         startRule(context, [email protected]);
@@ -298,19 +298,19 @@ public class @Model.ParserClassName<T> {
 </text>
 }
 
-    public interface Builder<T> {
+    interface Builder<T> {
         void build(Token token);
         void startRule(RuleType ruleType);
         void endRule(RuleType ruleType);
         T getResult();
-        void reset();
+        void reset(String uri);
     }
 
-    public interface ITokenScanner {
+    interface ITokenScanner {
         Token read();
     }
 
-    public interface ITokenMatcher {
+    interface ITokenMatcher {
         @foreach(var rule in Model.RuleSet.TokenRules)
         {
         @:boolean match_@(rule.Name.Replace("#", ""))(Token token);

gherkin/java/pom.xml

@@ -25,11 +25,23 @@
         <tag>HEAD</tag>
     </scm>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>2.13.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>messages</artifactId>
-            <version>[17.1.1,18.0.0)</version>
+            <version>[17.1.2-SNAPSHOT,18.0.0)</version>
         </dependency>
 
         <dependency>
@@ -38,6 +50,24 @@
             <version>0.9.5</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-parameter-names</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -48,18 +78,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>io.cucumber.gherkin.Main</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

gherkin/java/src/main/java/io/cucumber/gherkin/AstNode.java

@@ -9,7 +9,7 @@
 import static io.cucumber.gherkin.Parser.RuleType;
 import static io.cucumber.gherkin.Parser.TokenType;
 
-public class AstNode {
+class AstNode {
     private final Map<RuleType, List<Object>> subItems = new HashMap<RuleType, List<Object>>();
     public final RuleType ruleType;
 
@@ -18,11 +18,7 @@ public AstNode(RuleType ruleType) {
     }
 
     public void add(RuleType ruleType, Object obj) {
-        List<Object> items = subItems.get(ruleType);
-        if (items == null) {
-            items = new ArrayList<Object>();
-            subItems.put(ruleType, items);
-        }
+        List<Object> items = subItems.computeIfAbsent(ruleType, k -> new ArrayList<>());
         items.add(obj);
     }
 

gherkin/java/src/main/java/io/cucumber/gherkin/Func.java

@@ -1,5 +1,5 @@
 package io.cucumber.gherkin;
 
-public interface Func<V> {
+interface Func<V> {
     V call();
 }