Fix cucumber.publish.enabled=false (#2751)

Also disables the advertisement banner in light of https://mattwynne.net/new-beginning

Fixes: #2747

Author: mpkorstanje

CHANGELOG.md

@@ -10,6 +10,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- [Core] Fixed `cucumber.publish.enabled=false` ([#2747](https://github.com/cucumber/cucumber-jvm/pull/2747) M.P. Korstanje)
+- [JUnit Platform Engine] Fixed `cucumber.publish.enabled=false` ([#2747](https://github.com/cucumber/cucumber-jvm/pull/2747) M.P. Korstanje)
 
 ## [7.12.0] - 2023-04-29
 ### Added

cucumber-core/src/main/java/io/cucumber/core/options/RuntimeOptions.java

@@ -24,6 +24,8 @@
 import java.util.stream.Collectors;
 
 import static io.cucumber.core.resource.ClasspathSupport.rootPackageUri;
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.unmodifiableList;
@@ -52,7 +54,12 @@ public final class RuntimeOptions implements
     private Class<? extends ObjectFactory> objectFactoryClass;
     private Class<? extends UuidGenerator> uuidGeneratorClass;
     private String publishToken;
-    private boolean publish;
+    private Boolean publish;
+    // Disable the banner advertising the hosted cucumber reports by default
+    // until the uncertainty around the projects future is resolved. It would
+    // not be proper to advertise a service that may be discontinued to new
+    // users.
+    // For context see: https://mattwynne.net/new-beginning
     private boolean publishQuiet = true;
     private boolean enablePublishPlugin;
 
@@ -108,10 +115,11 @@ private List<Plugin> getPublishPlugin() {
         if (!enablePublishPlugin) {
             return emptyList();
         }
-        if (publishToken != null) {
+        // Implicitly enabled by the token if not explicitly disabled
+        if (!FALSE.equals(publish) && publishToken != null) {
             return singletonList(PluginOption.forClass(PublishFormatter.class, publishToken));
         }
-        if (publish) {
+        if (TRUE.equals(publish)) {
             return singletonList(PluginOption.forClass(PublishFormatter.class));
         }
         if (publishQuiet) {
@@ -257,7 +265,7 @@ void setPublishToken(String token) {
         this.publishToken = token;
     }
 
-    void setPublish(boolean publish) {
+    void setPublish(Boolean publish) {
         this.publish = publish;
     }
 

cucumber-core/src/test/java/io/cucumber/core/options/CucumberPropertiesParserTest.java

@@ -185,6 +185,17 @@ void should_parse_plugin_publish_enabled() {
         assertThat(options.plugins().get(0).pluginString(), equalTo("io.cucumber.core.plugin.PublishFormatter"));
     }
 
+    @Test
+    void should_parse_plugin_publish_disabled_and_publish_token() {
+        properties.put(Constants.PLUGIN_PUBLISH_ENABLED_PROPERTY_NAME, "false");
+        properties.put(Constants.PLUGIN_PUBLISH_TOKEN_PROPERTY_NAME, "some/value");
+        RuntimeOptions options = cucumberPropertiesParser
+                .parse(properties)
+                .enablePublishPlugin()
+                .build();
+        assertThat(options.plugins(), empty());
+    }
+
     @Test
     void should_parse_plugin_publish_token() {
         properties.put(Constants.PLUGIN_PUBLISH_TOKEN_PROPERTY_NAME, "some/value");

cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/CucumberEngineOptions.java

@@ -24,7 +24,6 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static io.cucumber.core.resource.ClasspathSupport.CLASSPATH_SCHEME_PREFIX;
 import static io.cucumber.junit.platform.engine.Constants.ANSI_COLORS_DISABLED_PROPERTY_NAME;
@@ -71,41 +70,39 @@ public List<Plugin> plugins() {
     }
 
     private Optional<PluginOption> getPublishPlugin() {
-        Optional<PluginOption> fromToken = getPublishTokenPlugin();
-        Optional<PluginOption> fromEnabled = getPublishEnabledPlugin();
-
-        Optional<PluginOption> plugin = Stream.of(fromToken, fromEnabled)
-                .flatMap(pluginOption -> pluginOption.map(Stream::of).orElseGet(Stream::empty))
-                .findFirst();
-
-        // With higher java version use ifPresentOrElse in plugins()
-        if (plugin.isPresent()) {
-            return plugin;
+        if (isPublishPluginEnabled()) {
+            return createPublishPlugin();
         }
-        return getPublishQuietPlugin();
+        return createCucumberReportsAdvertisingPlugin();
     }
 
-    private Optional<PluginOption> getPublishQuietPlugin() {
+    private Optional<PluginOption> createCucumberReportsAdvertisingPlugin() {
         Optional<PluginOption> noPublishOption = Optional.of(PluginOption.forClass(NoPublishFormatter.class));
         Optional<PluginOption> quiteOption = Optional.empty();
         return configurationParameters
                 .getBoolean(PLUGIN_PUBLISH_QUIET_PROPERTY_NAME)
                 .map(quite -> quite ? quiteOption : noPublishOption)
-                .orElse(noPublishOption);
+                // Disable the banner advertising the hosted cucumber reports
+                // by default until the uncertainty around the projects future
+                // is resolved. It would not be proper to advertise a service
+                // that may be discontinued to new users.
+                // For context see: https://mattwynne.net/new-beginning
+                .orElse(quiteOption);
+
     }
 
-    private Optional<PluginOption> getPublishTokenPlugin() {
-        return configurationParameters
+    private Optional<PluginOption> createPublishPlugin() {
+        PluginOption publishPlugin = configurationParameters
                 .get(PLUGIN_PUBLISH_TOKEN_PROPERTY_NAME)
-                .map(token -> PluginOption.forClass(PublishFormatter.class, token));
+                .map(token -> PluginOption.forClass(PublishFormatter.class, token))
+                .orElse(PluginOption.forClass(PublishFormatter.class));
+        return Optional.of(publishPlugin);
     }
 
-    private Optional<PluginOption> getPublishEnabledPlugin() {
-        Optional<PluginOption> enabledOption = Optional.of(PluginOption.forClass(PublishFormatter.class));
-        Optional<PluginOption> disabledOption = Optional.empty();
-        return configurationParameters
-                .getBoolean(PLUGIN_PUBLISH_ENABLED_PROPERTY_NAME)
-                .flatMap(enabled -> enabled ? enabledOption : disabledOption);
+    private boolean isPublishPluginEnabled() {
+        return configurationParameters.getBoolean(PLUGIN_PUBLISH_ENABLED_PROPERTY_NAME)
+                // Implicitly enabled by the token if not explicitly disabled
+                .orElse(configurationParameters.get(PLUGIN_PUBLISH_TOKEN_PROPERTY_NAME).isPresent());
     }
 
     @Override

cucumber-junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/CucumberEngineOptionsTest.java

@@ -8,6 +8,7 @@
 import org.junit.platform.engine.ConfigurationParameters;
 
 import java.net.URI;
+import java.util.Map;
 
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.is;
@@ -60,7 +61,7 @@ void getPluginNamesWithNothingEnabled() {
         assertThat(new CucumberEngineOptions(config).plugins().stream()
                 .map(Options.Plugin::pluginString)
                 .collect(toList()),
-            hasItem("io.cucumber.core.plugin.NoPublishFormatter"));
+            empty());
     }
 
     @Test
@@ -85,6 +86,18 @@ void getPluginNamesWithPublishEnabled() {
             hasItem("io.cucumber.core.plugin.PublishFormatter"));
     }
 
+    @Test
+    void getPluginNamesWithPublishDisabledAndPublishToken() {
+        ConfigurationParameters config = new MapConfigurationParameters(Map.of(
+            Constants.PLUGIN_PUBLISH_ENABLED_PROPERTY_NAME, "false",
+            Constants.PLUGIN_PUBLISH_TOKEN_PROPERTY_NAME, "some/token"));
+
+        assertThat(new CucumberEngineOptions(config).plugins().stream()
+                .map(Options.Plugin::pluginString)
+                .collect(toList()),
+            empty());
+    }
+
     @Test
     void isMonochrome() {
         MapConfigurationParameters ansiColors = new MapConfigurationParameters(