[Java] Allow parameter types access to test context

CHANGELOG.md

@@ -63,6 +63,10 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
     - Use `io.cucumber.core.cli.Main` instead
  * [Core] Deprecate `cucumber.api.Scenario`
     - Use `io.cucumber.core.api.Scenario` instead
+ * [Java] Deprecate `cucumber.api.java.*`
+    - Use `io.cucumber.java.*` instead
+ * [Java] Deprecate `cucumber.api.java8.*`
+    - Use `io.cucumber.java8.*` instead
  * [JUnit] Deprecate `cucumber.api.junit.Cucumber`
     - Use `io.cucumber.junit.Cucumber` instead. 
  * [TestNG] Deprecate `cucumber.api.testng.TestNGCucumberRunner`

README.md

@@ -8,14 +8,14 @@
 [![Coverage Status](https://coveralls.io/repos/github/cucumber/cucumber-jvm/badge.svg?branch=master)](https://coveralls.io/github/cucumber/cucumber-jvm?branch=master)
 
 Cucumber-JVM is a pure Java implementation of Cucumber. 
-You can [run](https://docs.cucumber.io/cucumber/api/#running-cucumber) it with 
+You can [run](https://cucumber.io/docs/cucumber/api/#running-cucumber) it with 
 the tool of your choice.
 
 Cucumber-JVM also integrates with all the popular 
-[Dependency Injection containers](https://docs.cucumber.io/installation/java/#dependency-injection).
+[Dependency Injection containers](https://cucumber.io/docs/installation/java/#dependency-injection).
 
 ## Getting started
- * [Installation](https://docs.cucumber.io/installation/java/)
+ * [Installation](https://cucumber.io/docs/installation/java/)
  * [Documentation](https://cucumber.io/docs)
  * [Hello World project](https://github.com/cucumber/cucumber-java-skeleton)
 

cdi2/pom.xml

@@ -1,6 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <properties>
+        <project.Automatic-Module-Name>io.cucumber.cdi2</project.Automatic-Module-Name>
         <openwebbeans.version>2.0.10</openwebbeans.version>
     </properties>
 

core/pom.xml

@@ -12,6 +12,7 @@
     <name>Cucumber-JVM: Core</name>
 
     <properties>
+        <project.Automatic-Module-Name>io.cucumber.core</project.Automatic-Module-Name>
         <!-- version 2.4.0 does not work on Java 7 -->
         <jsoup.version>1.12.1</jsoup.version>
         <xmlunit.version>1.6</xmlunit.version>

core/src/main/java/io/cucumber/core/api/TypeRegistryConfigurer.java

@@ -10,12 +10,15 @@
 @API(status = API.Status.STABLE)
 public interface TypeRegistryConfigurer {
     /**
-     * @return The locale to use.
+     * @return The locale to use, or null when language from feature file should be used.
      */
-    Locale locale();
+    default Locale locale() {
+        return null;
+    }
 
     /**
      * Configures the type registry.
+     *
      * @param typeRegistry The new type registry.
      */
     void configureTypeRegistry(TypeRegistry typeRegistry);

core/src/main/java/io/cucumber/core/backend/Backend.java

@@ -9,16 +9,18 @@
 @API(status = API.Status.STABLE)
 public interface Backend {
     /**
-     * Invoked once before all features. This is where stepdefs and hooks should be loaded.
-     * 
-     * @param glue Glue that provides the stepdefs to be executed.
+     * Invoked once before all features. This is where steps and hooks should be loaded.
+     *
+     * @param glue      Glue that provides the steps to be executed.
      * @param gluePaths The locations for the glue to be loaded.
      */
     void loadGlue(Glue glue, List<URI> gluePaths);
 
     /**
      * Invoked before a new scenario starts. Implementations should do any necessary
-     * setup of new, isolated state here.
+     * setup of new, isolated state here. Additional scenario scoped step definitions
+     * can be loaded here. These step definitions should implement
+     * {@link io.cucumber.core.runner.ScenarioScoped}
      */
     void buildWorld();
 

core/src/main/java/io/cucumber/core/backend/Container.java

@@ -8,7 +8,7 @@ public interface Container {
      * Collects glue classes in the classpath. Called once on init.
      *
      * @param glueClass Glue class containing cucumber.api annotations (Before, Given, When, ...)
-     * @return true if stepdefs and hooks in this class should be used, false if they should be ignored.
+     * @return true if steps and hook definitions in this class should be used, false if they should be ignored.
      */
     boolean addClass(Class<?> glueClass);
 }

core/src/main/java/io/cucumber/core/backend/DataTableTypeDefinition.java

@@ -0,0 +1,19 @@
+package io.cucumber.core.backend;
+
+import io.cucumber.datatable.DataTableType;
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE)
+public interface DataTableTypeDefinition {
+
+    DataTableType dataTableType();
+
+    /**
+     * The source line where the data table type is defined.
+     * Example: com/example/app/Cucumber.test():42
+     *
+     * @param detail true if extra detailed location information should be included.
+     * @return The source line of the step definition.
+     */
+    String getLocation(boolean detail);
+}

core/src/main/java/io/cucumber/core/backend/DefaultDataTableCellTransformerDefinition.java

@@ -0,0 +1,20 @@
+package io.cucumber.core.backend;
+
+import io.cucumber.datatable.TableCellByTypeTransformer;
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE)
+public interface DefaultDataTableCellTransformerDefinition {
+
+    TableCellByTypeTransformer tableCellByTypeTransformer();
+
+    /**
+     * The source line where the default data table cell  is defined.
+     * Example: com/example/app/Cucumber.test():42
+     *
+     * @param detail true if extra detailed location information should be included.
+     * @return The source line of the step definition.
+     */
+    String getLocation(boolean detail);
+
+}

core/src/main/java/io/cucumber/core/backend/DefaultDataTableEntryTransformerDefinition.java

@@ -0,0 +1,19 @@
+package io.cucumber.core.backend;
+
+import io.cucumber.datatable.TableEntryByTypeTransformer;
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE)
+public interface DefaultDataTableEntryTransformerDefinition {
+
+    TableEntryByTypeTransformer tableEntryByTypeTransformer();
+
+    /**
+     * The source line where the default table entry transformer is defined.
+     * Example: com/example/app/Cucumber.test():42
+     *
+     * @param detail true if extra detailed location information should be included.
+     * @return The source line of the step definition.
+     */
+    String getLocation(boolean detail);
+}

core/src/main/java/io/cucumber/core/backend/DefaultParameterTransformerDefinition.java

@@ -0,0 +1,19 @@
+package io.cucumber.core.backend;
+
+import io.cucumber.cucumberexpressions.ParameterByTypeTransformer;
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE)
+public interface DefaultParameterTransformerDefinition {
+
+    ParameterByTypeTransformer parameterByTypeTransformer();
+
+    /**
+     * The source line where the default parameter transformer is defined.
+     * Example: com/example/app/Cucumber.test():42
+     *
+     * @param detail true if extra detailed location information should be included.
+     * @return The source line of the step definition.
+     */
+    String getLocation(boolean detail);
+}

core/src/main/java/io/cucumber/core/backend/Glue.java

@@ -5,14 +5,24 @@
 @API(status = API.Status.STABLE)
 public interface Glue {
 
-    void addStepDefinition(StepDefinition stepDefinition) throws DuplicateStepDefinitionException;
+    void addStepDefinition(StepDefinition stepDefinition);
 
-    void addBeforeHook(HookDefinition hookDefinition);
+    void addBeforeHook(HookDefinition beforeHook);
 
-    void addAfterHook(HookDefinition hookDefinition);
+    void addAfterHook(HookDefinition afterHook);
 
     void addBeforeStepHook(HookDefinition beforeStepHook);
 
-    void addAfterStepHook(HookDefinition hookDefinition);
+    void addAfterStepHook(HookDefinition afterStepHook);
+
+    void addParameterType(ParameterTypeDefinition parameterTypeDefinition);
+
+    void addDataTableType(DataTableTypeDefinition dataTableTypeDefinition);
+
+    void addDefaultParameterTransformer(DefaultParameterTransformerDefinition defaultParameterTransformer);
+
+    void addDefaultDataTableEntryTransformer(DefaultDataTableEntryTransformerDefinition defaultDataTableEntryTransformer);
+
+    void addDefaultDataTableCellTransformer(DefaultDataTableCellTransformerDefinition defaultDataTableCellTransformer);
 
 }

core/src/main/java/io/cucumber/core/backend/ParameterTypeDefinition.java

@@ -0,0 +1,19 @@
+package io.cucumber.core.backend;
+
+import io.cucumber.cucumberexpressions.ParameterType;
+import org.apiguardian.api.API;
+
+@API(status = API.Status.EXPERIMENTAL)
+public interface ParameterTypeDefinition {
+
+    ParameterType<?> parameterType();
+
+    /**
+     * The source line where the parameter type is defined.
+     * Example: com/example/app/Cucumber.test():42
+     *
+     * @param detail true if extra detailed location information should be included.
+     * @return The source line of the step definition.
+     */
+    String getLocation(boolean detail);
+}

core/src/main/java/io/cucumber/core/event/StepDefinition.java

@@ -8,7 +8,7 @@ public interface StepDefinition {
 
     /**
      * The source line where the step definition is defined.
-     * Example: foo/bar/Zap.brainfuck:42
+     * Example: com/example/app/Cucumber.test():42
      *
      * @param detail true if extra detailed location information should be included.
      * @return The source line of the step definition.

core/src/main/java/io/cucumber/core/reflection/MethodFormat.java

@@ -13,7 +13,7 @@
  */
 public final class MethodFormat {
     private static final Pattern METHOD_PATTERN = Pattern.compile("((?:static\\s|public\\s)+)([^\\s]*)\\s\\.?(.*)\\.([^\\(]*)\\(([^\\)]*)\\)(?: throws )?(.*)");
-    private static final Pattern PACKAGE_PATTERN = Pattern.compile("[^,]*\\.");
+    private static final Pattern PACKAGE_PATTERN = Pattern.compile("[^,<>]*\\.");
     private final MessageFormat format;
 
     public static final MethodFormat SHORT = new MethodFormat("%c.%m(%a)");