Remove generics from ParameterTypeDefinition & ParameterDefinitionBody

Author: Tim te Beek

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

@@ -1,31 +1,28 @@
 package io.cucumber.java8;
 
+import java.util.Collections;
+
 import io.cucumber.core.backend.ParameterTypeDefinition;
 import io.cucumber.cucumberexpressions.ParameterType;
 
-import java.util.Arrays;
-import java.util.Collections;
-import net.jodah.typetools.TypeResolver;
-import net.jodah.typetools.TypeResolver.Unknown;
-
 import static net.jodah.typetools.TypeResolver.resolveRawArguments;
 
-class Java8ParameterTypeDefinition<R> extends AbstractGlueDefinition implements ParameterTypeDefinition {
+class Java8ParameterTypeDefinition extends AbstractGlueDefinition implements ParameterTypeDefinition {
 
-    private final ParameterType<R> parameterType;
+    private final ParameterType parameterType;
 
     @Override
     public ParameterType<?> parameterType() {
         return parameterType;
     }
 
-    <T extends ParameterDefinitionBody<R>> Java8ParameterTypeDefinition(String name, String regex, T body) {
+    <T extends ParameterDefinitionBody> Java8ParameterTypeDefinition(String name, String regex, Class<T> bodyClass, T body) {
         super(body, new Exception().getStackTrace()[3]);
-        Class<R> returnType = (Class<R>) resolveRawArguments(ParameterDefinitionBody.class, body.getClass())[0];
-        this.parameterType = new ParameterType<R>(name, Collections.singletonList(regex), returnType, this::execute);
+        Class<?> returnType = resolveRawArguments(bodyClass, body.getClass())[0];
+        this.parameterType = new ParameterType(name, Collections.singletonList(regex), returnType, this::execute);
     }
 
-    private R execute(String[] parameterContent) throws Throwable {
-        return (R) Invoker.invoke(this, body, method, parameterContent);
+    private Object execute(String[] parameterContent) throws Throwable {
+        return Invoker.invoke(this, body, method, parameterContent);
     }
 }

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

@@ -366,7 +366,7 @@ default <T> void DataTableType(DataTableDefinitionBody<T> body) {
      *      Expressions</a>
      */
     default <R> void ParameterType(String name, String regex, ParameterDefinitionBody.A1<R> definitionBody) {
-        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition<>(name, regex, definitionBody));
+        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition(name, regex, ParameterDefinitionBody.A1.class, definitionBody));
     }
 
     /**
@@ -385,55 +385,55 @@ default <R> void ParameterType(String name, String regex, ParameterDefinitionBod
      *      Expressions</a>
      */
     default <R> void ParameterType(String name, String regex, ParameterDefinitionBody.A2<R> definitionBody) {
-        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition<>(name, regex, definitionBody));
+        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition(name, regex, ParameterDefinitionBody.A2.class, definitionBody));
     }
 
     /**
      * @see LambdaGlue#ParameterType(String, String, io.cucumber.java8.ParameterDefinitionBody.A2)
      */
     default <R> void ParameterType(String name, String regex, ParameterDefinitionBody.A3<R> definitionBody) {
-        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition<>(name, regex, definitionBody));
+        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition(name, regex, ParameterDefinitionBody.A3.class, definitionBody));
     }
 
     /**
      * @see LambdaGlue#ParameterType(String, String, io.cucumber.java8.ParameterDefinitionBody.A2)
      */
     default <R> void ParameterType(String name, String regex, ParameterDefinitionBody.A4<R> definitionBody) {
-        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition<>(name, regex, definitionBody));
+        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition(name, regex, ParameterDefinitionBody.A4.class, definitionBody));
     }
 
     /**
      * @see LambdaGlue#ParameterType(String, String, io.cucumber.java8.ParameterDefinitionBody.A2)
      */
     default <R> void ParameterType(String name, String regex, ParameterDefinitionBody.A5<R> definitionBody) {
-        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition<>(name, regex, definitionBody));
+        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition(name, regex, ParameterDefinitionBody.A5.class, definitionBody));
     }
 
     /**
      * @see LambdaGlue#ParameterType(String, String, io.cucumber.java8.ParameterDefinitionBody.A2)
      */
     default <R> void ParameterType(String name, String regex, ParameterDefinitionBody.A6<R> definitionBody) {
-        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition<>(name, regex, definitionBody));
+        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition(name, regex, ParameterDefinitionBody.A6.class, definitionBody));
     }
 
     /**
      * @see LambdaGlue#ParameterType(String, String, io.cucumber.java8.ParameterDefinitionBody.A2)
      */
     default <R> void ParameterType(String name, String regex, ParameterDefinitionBody.A7<R> definitionBody) {
-        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition<>(name, regex, definitionBody));
+        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition(name, regex, ParameterDefinitionBody.A7.class, definitionBody));
     }
 
     /**
      * @see LambdaGlue#ParameterType(String, String, io.cucumber.java8.ParameterDefinitionBody.A2)
      */
     default <R> void ParameterType(String name, String regex, ParameterDefinitionBody.A8<R> definitionBody) {
-        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition<>(name, regex, definitionBody));
+        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition(name, regex, ParameterDefinitionBody.A8.class, definitionBody));
     }
 
     /**
      * @see LambdaGlue#ParameterType(String, String, io.cucumber.java8.ParameterDefinitionBody.A2)
      */
     default <R> void ParameterType(String name, String regex, ParameterDefinitionBody.A9<R> definitionBody) {
-        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition<>(name, regex, definitionBody));
+        LambdaGlueRegistry.INSTANCE.get().addParameterType(new Java8ParameterTypeDefinition(name, regex, ParameterDefinitionBody.A9.class, definitionBody));
     }
 }

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

@@ -3,41 +3,41 @@
 import org.apiguardian.api.API;
 
 @API(status = API.Status.STABLE)
-public interface ParameterDefinitionBody<R> {
+public interface ParameterDefinitionBody {
     @FunctionalInterface
-    interface A1<R> extends ParameterDefinitionBody<R> {
+    interface A1<R> extends ParameterDefinitionBody {
         R accept(String p1) throws Throwable;
     }
     @FunctionalInterface
-    interface A2<R> extends ParameterDefinitionBody<R> {
+    interface A2<R> extends ParameterDefinitionBody {
         R accept(String p1, String p2) throws Throwable;
     }
     @FunctionalInterface
-    interface A3<R> extends ParameterDefinitionBody<R> {
+    interface A3<R> extends ParameterDefinitionBody {
         R accept(String p1, String p2, String p3) throws Throwable;
     }
     @FunctionalInterface
-    interface A4<R> extends ParameterDefinitionBody<R> {
+    interface A4<R> extends ParameterDefinitionBody {
         R accept(String p1, String p2, String p3, String p4) throws Throwable;
     }
     @FunctionalInterface
-    interface A5<R> extends ParameterDefinitionBody<R> {
+    interface A5<R> extends ParameterDefinitionBody {
         R accept(String p1, String p2, String p3, String p4, String p5) throws Throwable;
     }
     @FunctionalInterface
-    interface A6<R> extends ParameterDefinitionBody<R> {
+    interface A6<R> extends ParameterDefinitionBody {
         R accept(String p1, String p2, String p3, String p4, String p5, String p6) throws Throwable;
     }
     @FunctionalInterface
-    interface A7<R> extends ParameterDefinitionBody<R> {
+    interface A7<R> extends ParameterDefinitionBody {
         R accept(String p1, String p2, String p3, String p4, String p5, String p6, String p7) throws Throwable;
     }
     @FunctionalInterface
-    interface A8<R> extends ParameterDefinitionBody<R> {
+    interface A8<R> extends ParameterDefinitionBody {
         R accept(String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8) throws Throwable;
     }
     @FunctionalInterface
-    interface A9<R> extends ParameterDefinitionBody<R> {
+    interface A9<R> extends ParameterDefinitionBody {
         R accept(String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8, String p9) throws Throwable;
     }
 }