Refactor steps parameters infos computation

Author: gaeljw

scala/sources/src/main/scala/io/cucumber/scala/ScalaDsl.scala

@@ -1,7 +1,5 @@
 package io.cucumber.scala
 
-import java.lang.reflect.{ParameterizedType, Type}
-
 import io.cucumber.scala.Aliases._
 
 import scala.reflect.ClassTag
@@ -912,25 +910,10 @@ private[scala] trait StepDsl extends BaseScalaDsl {
       }
     }
 
-    private def register(ms: Manifest[_ <: Any]*)(pf: PartialFunction[List[Any], Any]): Unit = {
-      val types = ms.map(m => toJavaType(m)).toArray
-      registry.stepDefinitions += ScalaStepDetails(Utils.frame(self), name, regex, types, pf)
+    private def register(manifests: Manifest[_ <: Any]*)(pf: PartialFunction[List[Any], Any]): Unit = {
+      registry.stepDefinitions += ScalaStepDetails(Utils.frame(self), name, regex, manifests, pf)
     }
 
-    private def toJavaType(m: Manifest[_]): Type = {
-      val typeArgs = m.typeArguments
-      if (typeArgs.isEmpty) {
-        m.runtimeClass
-      } else {
-        new ParameterizedType {
-          override def getActualTypeArguments: Array[Type] = typeArgs.map(toJavaType).toArray
-
-          override def getRawType: Type = m.runtimeClass
-
-          override def getOwnerType: Type = ???
-        }
-      }
-    }
   }
 
 }

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

@@ -1,6 +1,5 @@
 package io.cucumber.scala
 
-import java.lang.reflect.Type
 import java.util.{List => JList}
 
 import io.cucumber.core.backend.{ParameterInfo, ScenarioScoped, StepDefinition}
@@ -14,10 +13,11 @@ trait ScalaStepDefinition extends StepDefinition with AbstractGlueDefinition {
 
   override val location: StackTraceElement = stepDetails.frame
 
-  val parametersInfo: JList[ParameterInfo] = fromTypes(stepDetails.types)
+  override val parameterInfos: JList[ParameterInfo] = fromTypes(stepDetails.types)
 
-  private def fromTypes(types: Array[Type]): JList[ParameterInfo] = {
+  private def fromTypes(types: Seq[Manifest[_]]): JList[ParameterInfo] = {
     types
+      .map(ScalaTypeHelper.asJavaType)
       .map(new ScalaTypeResolver(_))
       .map(new ScalaParameterInfo(_))
       .toList
@@ -34,8 +34,6 @@ trait ScalaStepDefinition extends StepDefinition with AbstractGlueDefinition {
 
   override def getPattern: String = stepDetails.pattern
 
-  override def parameterInfos(): JList[ParameterInfo] = parametersInfo
-
   // Easier to just print out fileName and lineNumber
   override def getLocation(): String = stepDetails.frame.getFileName + ":" + stepDetails.frame.getLineNumber
 

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

@@ -1,7 +1,5 @@
 package io.cucumber.scala
 
-import java.lang.reflect.Type
-
 /**
  * Implementation of step definition for scala.
  *
@@ -15,5 +13,5 @@ import java.lang.reflect.Type
 case class ScalaStepDetails(frame: StackTraceElement,
                             name: String,
                             pattern: String,
-                            types: Array[Type],
+                            types: Seq[Manifest[_]],
                             body: List[Any] => Any)

scala/sources/src/main/scala/io/cucumber/scala/ScalaTypeHelper.scala

@@ -0,0 +1,25 @@
+package io.cucumber.scala
+
+import java.lang.reflect.{ParameterizedType, Type}
+
+object ScalaTypeHelper {
+
+  def asJavaType(m: Manifest[_]): Type = {
+    if (m.typeArguments.isEmpty) {
+      m.runtimeClass
+    } else {
+      new ScalaParameterizedType(m)
+    }
+  }
+
+}
+
+class ScalaParameterizedType(manifest: Manifest[_]) extends ParameterizedType {
+
+  override def getActualTypeArguments: Array[Type] = manifest.typeArguments.map(ScalaTypeHelper.asJavaType).toArray
+
+  override def getRawType: Type = manifest.runtimeClass
+
+  override def getOwnerType: Type = null
+
+}