Merge 9c26c05 into dde1d4c

Author: raulmiraoliver

.revapi/api-changes.json

@@ -43,6 +43,16 @@
             "old": "interface io.cucumber.messages.internal.com.google.protobuf.MutabilityOracle",
             "new": "interface io.cucumber.messages.internal.com.google.protobuf.MutabilityOracle",
             "justification": "Internal API"
+          },
+          {
+            "code": "java.method.addedToInterface",
+            "new": "method java.lang.Class<? extends java.util.function.Predicate<io.cucumber.core.gherkin.Pickle>> io.cucumber.core.filter.Options::getCustomPredicateClass()",
+            "justification": "New configuration"
+          },
+          {
+            "code": "java.method.addedToInterface",
+            "new": "method java.lang.Class<? extends java.util.function.Predicate<io.cucumber.core.gherkin.Pickle>> io.cucumber.core.options.CucumberOptionsAnnotationParser.CucumberOptions::customPredicateClass()",
+            "justification": "New configuration"
           }
         ]
       }

core/src/main/java/io/cucumber/core/cli/CommandlineOptions.java

@@ -35,6 +35,9 @@ public final class CommandlineOptions {
     public static final String TAGS = "--tags";
     public static final String TAGS_SHORT = "-t";
 
+    public static final String CUSTOM_PREDICATE_CLASS = "--custompredicateclass";
+    public static final String CUSTOM_PREDICATE_CLASS_SHORT = "-cpc";
+
     public static final String PUBLISH = "--publish";
 
     public static final String PLUGIN = "--plugin";

core/src/main/java/io/cucumber/core/filter/Filters.java

@@ -3,6 +3,7 @@
 import io.cucumber.core.gherkin.Pickle;
 import io.cucumber.tagexpressions.Expression;
 
+import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
@@ -27,6 +28,18 @@ public Filters(Options options) {
         if (!lineFilters.isEmpty()) {
             this.filter = this.filter.and(new LinePredicate(lineFilters));
         }
+        Class<? extends Predicate<Pickle>> customPicklePredicateClass = options.getCustomPredicateClass();
+        if (customPicklePredicateClass != null) {
+            Predicate<Pickle> customPicklePredicate;
+            try {
+                customPicklePredicate = customPicklePredicateClass.getConstructor().newInstance();
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException
+                    | NoSuchMethodException e) {
+                throw new IllegalArgumentException(
+                    "The customPredicateClass does not have a public default constructor", e);
+            }
+            this.filter = this.filter.and(customPicklePredicate);
+        }
     }
 
     @Override

core/src/main/java/io/cucumber/core/filter/Options.java

@@ -1,11 +1,13 @@
 package io.cucumber.core.filter;
 
+import io.cucumber.core.gherkin.Pickle;
 import io.cucumber.tagexpressions.Expression;
 
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 public interface Options {
@@ -16,6 +18,8 @@ public interface Options {
 
     Map<URI, Set<Integer>> getLineFilters();
 
+    Class<? extends Predicate<Pickle>> getCustomPredicateClass();
+
     int getLimitCount();
 
 }

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

@@ -29,6 +29,8 @@
 import java.util.stream.Collectors;
 
 import static io.cucumber.core.cli.CommandlineOptions.COUNT;
+import static io.cucumber.core.cli.CommandlineOptions.CUSTOM_PREDICATE_CLASS;
+import static io.cucumber.core.cli.CommandlineOptions.CUSTOM_PREDICATE_CLASS_SHORT;
 import static io.cucumber.core.cli.CommandlineOptions.DRY_RUN;
 import static io.cucumber.core.cli.CommandlineOptions.DRY_RUN_SHORT;
 import static io.cucumber.core.cli.CommandlineOptions.GLUE;
@@ -60,6 +62,7 @@
 import static io.cucumber.core.cli.CommandlineOptions.WIP_SHORT;
 import static io.cucumber.core.options.ObjectFactoryParser.parseObjectFactory;
 import static io.cucumber.core.options.OptionsFileParser.parseFeatureWithLinesFile;
+import static io.cucumber.core.options.PicklePredicateParser.parsePicklePredicateClass;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.joining;
@@ -121,6 +124,8 @@ private RuntimeOptionsBuilder parse(List<String> args) {
                 parsedOptions.addGlue(parse);
             } else if (arg.equals(TAGS) || arg.equals(TAGS_SHORT)) {
                 parsedOptions.addTagFilter(TagExpressionParser.parse(removeArgFor(arg, args)));
+            } else if (arg.equals(CUSTOM_PREDICATE_CLASS) || arg.equals(CUSTOM_PREDICATE_CLASS_SHORT)) {
+                parsedOptions.setCustomPredicateClass(parsePicklePredicateClass(removeArgFor(arg, args)));
             } else if (arg.equals(PUBLISH)) {
                 parsedOptions.setPublish(true);
             } else if (arg.equals(PLUGIN) || arg.equals(PLUGIN_SHORT)) {

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

@@ -88,6 +88,13 @@ public final class Constants {
      */
     public static final String FEATURES_PROPERTY_NAME = "cucumber.features";
 
+    /**
+     * Property name used to set custom predicate class: {@value}
+     * <p>
+     * The fully qualified class name of the custom predicate
+     */
+    public static final String CUSTOM_PREDICATE_CLASS_PROPERTY_NAME = "cucumber.custompredicateclass";
+
     /**
      * Property name used to set name filter: {@value}
      * <p>

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

@@ -4,12 +4,14 @@
 import io.cucumber.core.exception.CucumberException;
 import io.cucumber.core.feature.FeatureWithLines;
 import io.cucumber.core.feature.GluePath;
+import io.cucumber.core.gherkin.Pickle;
 import io.cucumber.core.snippets.SnippetType;
 import io.cucumber.tagexpressions.TagExpressionException;
 import io.cucumber.tagexpressions.TagExpressionParser;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 import static io.cucumber.core.options.OptionsFileParser.parseFeatureWithLinesFile;
@@ -38,6 +40,7 @@ public RuntimeOptionsBuilder parse(Class<?> clazz) {
                 addDryRun(options, args);
                 addMonochrome(options, args);
                 addTags(classWithOptions, options, args);
+                addCustomPredicate(options, args);
                 addPlugins(options, args);
                 addPublish(options, args);
                 addStrict(options, args);
@@ -82,6 +85,10 @@ private void addTags(Class<?> clazz, CucumberOptions options, RuntimeOptionsBuil
         }
     }
 
+    private void addCustomPredicate(CucumberOptions options, RuntimeOptionsBuilder args) {
+        args.setCustomPredicateClass(options.customPredicateClass());
+    }
+
     private void addPlugins(CucumberOptions options, RuntimeOptionsBuilder args) {
         for (String plugin : options.plugin()) {
             args.addPluginName(plugin);
@@ -206,6 +213,8 @@ public interface CucumberOptions {
 
         String tags();
 
+        Class<? extends Predicate<Pickle>> customPredicateClass();
+
         String[] plugin();
 
         boolean publish();

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

@@ -16,6 +16,7 @@
 import java.util.stream.Stream;
 
 import static io.cucumber.core.options.Constants.ANSI_COLORS_DISABLED_PROPERTY_NAME;
+import static io.cucumber.core.options.Constants.CUSTOM_PREDICATE_CLASS_PROPERTY_NAME;
 import static io.cucumber.core.options.Constants.EXECUTION_DRY_RUN_PROPERTY_NAME;
 import static io.cucumber.core.options.Constants.EXECUTION_LIMIT_PROPERTY_NAME;
 import static io.cucumber.core.options.Constants.EXECUTION_ORDER_PROPERTY_NAME;
@@ -70,6 +71,11 @@ public RuntimeOptionsBuilder parse(Map<String, String> properties) {
             splitAndThenFlatMap(CucumberPropertiesParser::parseFeatureFile),
             builder::addFeature);
 
+        parse(properties,
+            CUSTOM_PREDICATE_CLASS_PROPERTY_NAME,
+            PicklePredicateParser::parsePicklePredicateClass,
+            builder::setCustomPredicateClass);
+
         parseAll(properties,
             FEATURES_PROPERTY_NAME,
             splitAndThenFlatMap(CucumberPropertiesParser::parseRerunFile),

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

@@ -0,0 +1,25 @@
+package io.cucumber.core.options;
+
+import io.cucumber.core.gherkin.Pickle;
+
+import java.util.function.Predicate;
+
+public final class PicklePredicateParser {
+
+    @SuppressWarnings("unchecked")
+    public static Class<? extends Predicate<Pickle>> parsePicklePredicateClass(String predicateClassName) {
+        Class<?> clazz;
+        try {
+            clazz = Class.forName(predicateClassName);
+        } catch (ClassNotFoundException | ClassCastException e) {
+            throw new IllegalArgumentException(
+                String.format("Could not load predicate class for '%s'", predicateClassName), e);
+        }
+        if (!Predicate.class.isAssignableFrom(clazz)) {
+            throw new IllegalArgumentException(String.format("Predicate class '%s' was not a subclass of '%s'",
+                clazz, Predicate.class));
+        }
+        return (Class<? extends Predicate<Pickle>>) clazz;
+    }
+
+}

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

@@ -2,6 +2,7 @@
 
 import io.cucumber.core.backend.ObjectFactory;
 import io.cucumber.core.feature.FeatureWithLines;
+import io.cucumber.core.gherkin.Pickle;
 import io.cucumber.core.order.PickleOrder;
 import io.cucumber.core.order.StandardPickleOrders;
 import io.cucumber.core.plugin.NoPublishFormatter;
@@ -18,6 +19,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -40,6 +42,7 @@ public final class RuntimeOptions implements
     private final List<FeatureWithLines> featurePaths = new ArrayList<>();
     private final Set<Plugin> formatters = new LinkedHashSet<>();
     private final Set<Plugin> summaryPrinters = new LinkedHashSet<>();
+    private Class<? extends Predicate<Pickle>> customPredicateClass = null;
     private boolean dryRun;
     private boolean monochrome = false;
     private boolean wip = false;
@@ -198,6 +201,10 @@ void setFeaturePaths(List<FeatureWithLines> featurePaths) {
         this.featurePaths.addAll(featurePaths);
     }
 
+    void setCustomPredicateClass(Class<? extends Predicate<Pickle>> customPredicateClass) {
+        this.customPredicateClass = customPredicateClass;
+    }
+
     @Override
     public List<Expression> getTagExpressions() {
         return unmodifiableList(tagExpressions);
@@ -228,6 +235,11 @@ public Map<URI, Set<Integer>> getLineFilters() {
         return unmodifiableMap(lineFilters);
     }
 
+    @Override
+    public Class<? extends Predicate<Pickle>> getCustomPredicateClass() {
+        return customPredicateClass;
+    }
+
     @Override
     public int getLimitCount() {
         return getCount();