Fixed broken data table lambda registration

Author: Anton Deryabin

java8/src/main/java/io/cucumber/java8/Java8DataTableTypeDefinition.java

@@ -8,6 +8,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Map;
+import net.jodah.typetools.TypeResolver;
 
 final class Java8DataTableTypeDefinition extends AbstractGlueDefinition implements DataTableTypeDefinition {
 
@@ -19,7 +20,7 @@ final class Java8DataTableTypeDefinition extends AbstractGlueDefinition implemen
     }
 
     private DataTableType createDataTableType(Method method) {
-        Type returnType = method.getGenericReturnType();
+        Class returnType = TypeResolver.resolveRawArguments(DataTableDefinitionBody.class, body.getClass())[0];
         Type[] parameterTypes = method.getGenericParameterTypes();
         Type parameterType = parameterTypes[0];
 

java8/src/main/java/io/cucumber/java8/Java8DocStringTypeDefinition.java

@@ -3,6 +3,7 @@
 import io.cucumber.core.backend.DocStringTypeDefinition;
 import io.cucumber.core.runtime.Invoker;
 import io.cucumber.docstring.DocStringType;
+import net.jodah.typetools.TypeResolver;
 
 final class Java8DocStringTypeDefinition extends AbstractGlueDefinition implements DocStringTypeDefinition {
 
@@ -15,6 +16,7 @@ public DocStringType docStringType() {
 
     Java8DocStringTypeDefinition(Object body, String contentType) {
         super(body, new Exception().getStackTrace()[3]);
+        Class returnType = TypeResolver.resolveRawArguments(DocStringDefinitionBody.class, body.getClass())[0];
         this.docStringType = new DocStringType(
             this.method.getReturnType(),
             contentType.isEmpty() ? method.getName() : contentType,

java8/src/main/java/io/cucumber/java8/Java8ParameterTypeDefinition.java

@@ -4,6 +4,7 @@
 import io.cucumber.core.runtime.Invoker;
 import io.cucumber.cucumberexpressions.ParameterType;
 import java.util.Collections;
+import net.jodah.typetools.TypeResolver;
 
 class Java8ParameterTypeDefinition extends AbstractGlueDefinition implements ParameterTypeDefinition {
 
@@ -16,7 +17,8 @@ public ParameterType<?> parameterType() {
 
     Java8ParameterTypeDefinition(Object body, String regex, String name) {
         super(body, new Exception().getStackTrace()[3]);
-        this.parameterType = new ParameterType(name, Collections.singletonList(regex), this.method.getReturnType(), this::execute);
+        Class returnType = TypeResolver.resolveRawArguments(ParameterDefinitionBody.class, body.getClass())[0];
+        this.parameterType = new ParameterType(name, Collections.singletonList(regex), returnType, this::execute);
     }
 
     private Object execute(String parameterContent) throws Throwable {