[Java] Remove GlueBase

The split between java and java8 necessitated a glue base interface to
store lambda glue classes in the java backend. As java and java8 have
been merged this class is no longer needed.

Instead lambda glue steps now extend LambdaGlue.

Author: mpkorstanje

java/src/main/groovy/lambda.java.gsp

@@ -13,7 +13,7 @@ import io.cucumber.java.api.StepdefBody.A9;
 
 import io.cucumber.java.LambdaGlueRegistry;
 import io.cucumber.java.Java8StepDefinition;
-import io.cucumber.java.LambdaGlueBase;
+import io.cucumber.java.LambdaGlue;
 
 /**
  * ${locale.getDisplayLanguage()}
@@ -34,7 +34,7 @@ import io.cucumber.java.LambdaGlueBase;
  * attempt to transform the data table or doc string to the the
  * type of last argument.
  */
-public interface ${className} extends LambdaGlueBase {
+public interface ${className} extends LambdaGlue {
 <% i18n.stepKeywords.findAll { !it.contains('*') && !it.matches("^\\d.*") }.sort().unique().each { kw -> %>
     /**
      * Creates a new step definition.

java/src/main/java/io/cucumber/java/Function.java

@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 
 import static io.cucumber.core.io.MultiLoader.packageName;
 import static io.cucumber.java.ObjectFactoryLoader.loadObjectFactory;
@@ -41,7 +42,7 @@ public class JavaBackend implements Backend, LambdaGlueRegistry {
 
     private final MethodScanner methodScanner;
     private Glue glue;
-    private List<Class<? extends GlueBase>> glueBaseClasses = new ArrayList<Class<? extends GlueBase>>();
+    private List<Class<? extends LambdaGlue>> lambdaGlueClasses = new ArrayList<>();
 
     /**
      * The constructor called by reflection by default.
@@ -73,14 +74,14 @@ public void loadGlue(Glue glue, List<String> gluePaths) {
 
         // Scan for Java8 style glue (lambdas)
         for (final String gluePath : gluePaths) {
-            Collection<Class<? extends GlueBase>> glueDefinerClasses = classFinder.getDescendants(GlueBase.class, packageName(gluePath));
-            for (final Class<? extends GlueBase> glueClass : glueDefinerClasses) {
+            Collection<Class<? extends LambdaGlue>> glueDefinerClasses = classFinder.getDescendants(LambdaGlue.class, packageName(gluePath));
+            for (final Class<? extends LambdaGlue> glueClass : glueDefinerClasses) {
                 if (glueClass.isInterface()) {
                     continue;
                 }
 
                 if (objectFactory.addClass(glueClass)) {
-                    glueBaseClasses.add(glueClass);
+                    lambdaGlueClasses.add(glueClass);
                 }
             }
         }
@@ -107,8 +108,8 @@ public void buildWorld() {
         // in the constructor.
         try {
             INSTANCE.set(this);
-            for (Class<? extends GlueBase> glueBaseClass : glueBaseClasses) {
-                objectFactory.getInstance(glueBaseClass);
+            for (Class<? extends LambdaGlue> lambdaGlueClass: lambdaGlueClasses) {
+                objectFactory.getInstance(lambdaGlueClass);
             }
         } finally {
             INSTANCE.remove();

java/src/main/java/io/cucumber/java/GlueBase.java

@@ -3,7 +3,7 @@
 import io.cucumber.java.api.HookBody;
 import io.cucumber.java.api.HookNoArgsBody;
 
-public interface LambdaGlueBase extends GlueBase {
+public interface LambdaGlue {
 
     String[] EMPTY_TAG_EXPRESSIONS = new String[0];
     long NO_TIMEOUT = 0;

java/src/main/java/io/cucumber/java/JavaBackend.java

@@ -4,8 +4,10 @@
 import io.cucumber.core.backend.HookDefinition;
 import io.cucumber.core.backend.StepDefinition;
 
+import java.util.function.Function;
+
 public interface LambdaGlueRegistry {
-    ThreadLocal<LambdaGlueRegistry> INSTANCE = new ThreadLocal<LambdaGlueRegistry>();
+    ThreadLocal<LambdaGlueRegistry> INSTANCE = new ThreadLocal<>();
 
     void addStepDefinition(Function<TypeRegistry, StepDefinition> stepDefinition);