Merge pull request #184 from cucumber/scala3prep2

Convert Manifest to Java Type sooner

Author: gaeljw

cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDslRegistry.scala

@@ -2,7 +2,7 @@ package io.cucumber.scala
 
 import io.cucumber.scala.HookType.{AFTER, AFTER_STEP, BEFORE, BEFORE_STEP}
 
-class ScalaDslRegistry {
+final class ScalaDslRegistry {
 
   private var _stepDefinitions: Seq[ScalaStepDetails] = Seq()
 

cucumber-scala/src/main/scala/io/cucumber/scala/ScalaStepDefinition.scala

@@ -1,5 +1,6 @@
 package io.cucumber.scala
 
+import java.lang.reflect.{Type => JType}
 import java.util.{List => JList}
 
 import io.cucumber.core.backend.{ParameterInfo, ScenarioScoped, StepDefinition}
@@ -16,9 +17,8 @@ trait ScalaStepDefinition extends StepDefinition with AbstractGlueDefinition {
     stepDetails.types
   )
 
-  private def fromTypes(types: Seq[Manifest[_]]): JList[ParameterInfo] = {
+  private def fromTypes(types: Seq[JType]): JList[ParameterInfo] = {
     types
-      .map(ScalaTypeHelper.asJavaType)
       .map(new ScalaTypeResolver(_))
       .map(new ScalaParameterInfo(_))
       .toList

cucumber-scala/src/main/scala/io/cucumber/scala/ScalaStepDetails.scala

@@ -1,5 +1,7 @@
 package io.cucumber.scala
 
+import java.lang.reflect.{Type => JType}
+
 /** Implementation of step definition for scala.
   *
   * @param frame   Representation of a stack frame containing information about the context in which a
@@ -9,10 +11,10 @@ package io.cucumber.scala
   * @param types   Parameters types of body step definition
   * @param body    Function body of a step definition. This is what actually runs the code within the step def.
   */
-case class ScalaStepDetails(
+private[scala] case class ScalaStepDetails(
     frame: StackTraceElement,
     name: String,
     pattern: String,
-    types: Seq[Manifest[_]],
+    types: Seq[JType],
     body: List[Any] => Any
 )

cucumber-scala/src/main/scala/io/cucumber/scala/StepDsl.scala

@@ -1532,8 +1532,9 @@ private[scala] trait StepDsl extends BaseScalaDsl {
     private def register(
         manifests: Manifest[_ <: Any]*
     )(pf: PartialFunction[List[Any], Any]): Unit = {
+      val types = manifests.map(ScalaTypeHelper.asJavaType)
       registry.registerStep(
-        ScalaStepDetails(Utils.frame(self), name, regex, manifests, pf)
+        ScalaStepDetails(Utils.frame(self), name, regex, types, pf)
       )
     }