[Core] Use Gherkin 6+ and Cucumber messages

core/pom.xml

@@ -28,18 +28,11 @@
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-gherkin-vintage</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>gherkin</artifactId>
-            <version>${gherkin-vintage.version}</version>
+            <artifactId>cucumber-gherkin-messages</artifactId>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
-            <artifactId>gherkin-jvm-deps</artifactId>
-            <version>${gherkin-vintage-jvm-deps.version}</version>
+            <artifactId>messages</artifactId>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
@@ -61,6 +54,10 @@
             <groupId>io.cucumber</groupId>
             <artifactId>docstring</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>html-formatter</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apiguardian</groupId>
             <artifactId>apiguardian-api</artifactId>

core/src/main/java/io/cucumber/core/eventbus/AbstractEventBus.java

@@ -1,16 +1,14 @@
 package io.cucumber.core.eventbus;
 
-import io.cucumber.plugin.event.Event;
-
 public abstract class AbstractEventBus extends AbstractEventPublisher implements EventBus {
 
     @Override
-    public void send(Event event) {
+    public <T> void send(T event) {
         super.send(event);
     }
 
     @Override
-    public void sendAll(Iterable<Event> queue) {
+    public <T> void sendAll(Iterable<T> queue) {
         super.sendAll(queue);
     }
 }

core/src/main/java/io/cucumber/core/eventbus/AbstractEventPublisher.java

@@ -10,10 +10,10 @@
 import java.util.Map;
 
 public abstract class AbstractEventPublisher implements EventPublisher {
-    protected final Map<Class<? extends Event>, List<EventHandler>> handlers = new HashMap<>();
+    protected final Map<Class<?>, List<EventHandler>> handlers = new HashMap<>();
 
     @Override
-    public final <T extends Event> void registerHandlerFor(Class<T> eventType, EventHandler<T> handler) {
+    public final <T> void registerHandlerFor(Class<T> eventType, EventHandler<T> handler) {
         if (handlers.containsKey(eventType)) {
             handlers.get(eventType).add(handler);
         } else {
@@ -24,15 +24,15 @@ public final <T extends Event> void registerHandlerFor(Class<T> eventType, Event
     }
 
     @Override
-    public final <T extends Event> void removeHandlerFor(Class<T> eventType, EventHandler<T> handler) {
+    public final <T> void removeHandlerFor(Class<T> eventType, EventHandler<T> handler) {
         if (handlers.containsKey(eventType)) {
             handlers.get(eventType).remove(handler);
         }
     }
 
 
-    protected void send(Event event) {
-        if (handlers.containsKey(Event.class)) {
+    protected <T> void send(T event) {
+        if (handlers.containsKey(Event.class) && event instanceof Event) {
             for (EventHandler handler : handlers.get(Event.class)) {
                 //noinspection unchecked: protected by registerHandlerFor
                 handler.receive(event);
@@ -47,8 +47,8 @@ protected void send(Event event) {
         }
     }
 
-    protected void sendAll(Iterable<Event> events) {
-        for (Event event : events) {
+    protected <T> void sendAll(Iterable<T> events) {
+        for (T event : events) {
             send(event);
         }
     }

core/src/main/java/io/cucumber/core/eventbus/EventBus.java

@@ -3,7 +3,6 @@
 import java.time.Instant;
 import java.util.UUID;
 
-import io.cucumber.plugin.event.Event;
 import io.cucumber.plugin.event.EventPublisher;
 
 public interface EventBus extends EventPublisher {
@@ -12,8 +11,8 @@ public interface EventBus extends EventPublisher {
 
     UUID generateId();
 
-    void send(Event event);
+    <T> void send(T event);
 
-    void sendAll(Iterable<Event> queue);
+    <T> void sendAll(Iterable<T> queue);
 
 }

core/src/main/java/io/cucumber/core/options/PluginOption.java

@@ -4,9 +4,9 @@
 import io.cucumber.core.logging.Logger;
 import io.cucumber.core.logging.LoggerFactory;
 import io.cucumber.core.plugin.DefaultSummaryPrinter;
-import io.cucumber.core.plugin.HTMLFormatter;
-import io.cucumber.core.plugin.JSONFormatter;
+import io.cucumber.core.plugin.HtmlFormatter;
 import io.cucumber.core.plugin.JUnitFormatter;
+import io.cucumber.core.plugin.MessageFormatter;
 import io.cucumber.core.plugin.NullSummaryPrinter;
 import io.cucumber.core.plugin.Options;
 import io.cucumber.core.plugin.PrettyFormatter;
@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -33,23 +34,35 @@ public class PluginOption implements Options.Plugin {
     private static final Logger log = LoggerFactory.getLogger(PluginOption.class);
 
     private static final Pattern PLUGIN_WITH_ARGUMENT_PATTERN = Pattern.compile("([^:]+):(.*)");
-    private static final HashMap<String, Class<? extends Plugin>> PLUGIN_CLASSES = new HashMap<String, Class<? extends Plugin>>() {{
-        put("default_summary", DefaultSummaryPrinter.class);
-        put("html", HTMLFormatter.class);
-        put("json", JSONFormatter.class);
-        put("junit", JUnitFormatter.class);
-        put("null_summary", NullSummaryPrinter.class);
-        put("pretty", PrettyFormatter.class);
-        put("progress", ProgressFormatter.class);
-        put("rerun", RerunFormatter.class);
-        put("summary", DefaultSummaryPrinter.class);
-        put("testng", TestNGFormatter.class);
-        put("timeline", TimelineFormatter.class);
-        put("unused", UnusedStepsSummaryPrinter.class);
-        put("usage", UsageFormatter.class);
-        put("teamcity", TeamCityPlugin.class);
+    private static final HashMap<String, Supplier<Class<? extends Plugin>>> PLUGIN_CLASSES = new HashMap<String, Supplier<Class<? extends Plugin>>>() {{
+        put("default_summary", () -> DefaultSummaryPrinter.class);
+        put("html", () -> HtmlFormatter.class);
+        put("json", () -> loadClassFromGherkinVintage("io.cucumber.core.gherkin.vintage.JsonFormatter"));
+        put("junit", () -> JUnitFormatter.class);
+        put("null_summary", () -> NullSummaryPrinter.class);
+        put("pretty", () -> PrettyFormatter.class);
+        put("progress", () -> ProgressFormatter.class);
+        put("message", () -> MessageFormatter.class);
+        put("rerun", () -> RerunFormatter.class);
+        put("summary", () -> DefaultSummaryPrinter.class);
+        put("testng", () -> TestNGFormatter.class);
+        put("timeline", () -> TimelineFormatter.class);
+        put("unused", () -> UnusedStepsSummaryPrinter.class);
+        put("usage", () -> UsageFormatter.class);
+        put("teamcity", () -> TeamCityPlugin.class);
     }};
 
+    private static Class<? extends Plugin> loadClassFromGherkinVintage(String className) {
+        try {
+            Class<?> aClass = Thread.currentThread().getContextClassLoader().loadClass(className);
+            return (Class<? extends Plugin>) aClass;
+        } catch (ClassNotFoundException | NoClassDefFoundError e) {
+            throw new CucumberException("" +
+                "Couldn't load plugin class: " + className + "\n" +
+                "Make sure `cucumber-gherkin-vintage` is available on the classpath", e);
+        }
+    }
+
     // Replace IDEA plugin with TeamCity
     private static final Set<String> INCOMPATIBLE_INTELLIJ_IDEA_PLUGIN_CLASSES = new HashSet<String>() {{
         add("org.jetbrains.plugins.cucumber.java.run.CucumberJvmSMFormatter");
@@ -77,6 +90,29 @@ private PluginOption(String pluginString, Class<? extends Plugin> pluginClass, S
         this.argument = argument;
     }
 
+    @Override
+    public Class<? extends Plugin> pluginClass() {
+        return pluginClass;
+    }
+
+    @Override
+    public String argument() {
+        return argument;
+    }
+
+    @Override
+    public String pluginString() {
+        return pluginString;
+    }
+
+    boolean isFormatter() {
+        return EventListener.class.isAssignableFrom(pluginClass) || ConcurrentEventListener.class.isAssignableFrom(pluginClass);
+    }
+
+    boolean isSummaryPrinter() {
+        return SummaryPrinter.class.isAssignableFrom(pluginClass);
+    }
+
     public static PluginOption parse(String pluginArgumentPattern) {
         Matcher pluginWithFile = PLUGIN_WITH_ARGUMENT_PATTERN.matcher(pluginArgumentPattern);
         if (!pluginWithFile.matches()) {
@@ -97,7 +133,7 @@ private static Class<? extends Plugin> parsePluginName(String pluginName) {
             return TeamCityPlugin.class;
         }
 
-        Class<? extends Plugin> pluginClass = PLUGIN_CLASSES.get(pluginName);
+        Class<? extends Plugin> pluginClass = PLUGIN_CLASSES.get(pluginName).get();
         if (pluginClass == null) {
             pluginClass = loadClass(pluginName);
         }
@@ -118,28 +154,5 @@ private static Class<? extends Plugin> loadClass(String className) {
         }
     }
 
-    @Override
-    public Class<? extends Plugin> pluginClass() {
-        return pluginClass;
-    }
-
-    @Override
-    public String argument() {
-        return argument;
-    }
-
-    @Override
-    public String pluginString() {
-        return pluginString;
-    }
-
-    boolean isFormatter() {
-        return EventListener.class.isAssignableFrom(pluginClass) || ConcurrentEventListener.class.isAssignableFrom(pluginClass);
-    }
-
-    boolean isSummaryPrinter() {
-        return SummaryPrinter.class.isAssignableFrom(pluginClass);
-    }
-
 
 }

core/src/main/java/io/cucumber/core/options/RuntimeOptionsParser.java

@@ -1,12 +1,12 @@
 package io.cucumber.core.options;
 
-import gherkin.GherkinDialect;
-import gherkin.GherkinDialectProvider;
-import gherkin.IGherkinDialectProvider;
 import io.cucumber.core.exception.CucumberException;
 import io.cucumber.core.feature.FeatureWithLines;
 import io.cucumber.core.feature.GluePath;
 import io.cucumber.datatable.DataTable;
+import io.cucumber.gherkin.GherkinDialect;
+import io.cucumber.gherkin.GherkinDialectProvider;
+import io.cucumber.gherkin.IGherkinDialectProvider;
 
 import java.io.BufferedReader;
 import java.io.InputStream;