Upgrade to core v 4.2.0

Author: glibas

pom.xml

@@ -30,7 +30,7 @@
         <minimum.maven.version>3.3</minimum.maven.version>
         <outputDirectory>${project.build.directory}</outputDirectory>
         <scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
-        <cucumber.version>4.1.0</cucumber.version>
+        <cucumber.version>4.2.0</cucumber.version>
         <gherkin.version>5.1.0</gherkin.version>
         <groovy.version>2.4.12</groovy.version>
         <junit.version>4.12</junit.version>

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

@@ -1,7 +1,6 @@
 package cucumber.runtime.scala
 
 import java.lang.reflect.Type
-
 import cucumber.runtime.StepDefinition
 import gherkin.pickles.PickleStep
 import io.cucumber.stepexpression._
@@ -37,7 +36,7 @@ class ScalaStepDefinition(frame:StackTraceElement,
   def matchedArguments(step: PickleStep) = {
      expression = createExpression(pattern, typeRegistry)
      val argumentMatcher = new ExpressionArgumentMatcher(expression)
-     argumentMatcher.argumentsFrom(step)
+     argumentMatcher.argumentsFrom(step, parameterInfos:_*)
   }
 
   private def createExpression(expression: String, typeRegistry: TypeRegistry): StepExpression = {

scala/sources/src/test/scala/cucumber/runtime/scala/test/StepDefs.scala

@@ -14,7 +14,7 @@ import io.cucumber.datatable.DataTable
   */
 class CukesStepDefinitions extends ScalaDsl with EN {
 
-  Given("""I have {int} {string} in my belly""") { (howMany: Int, what: String) =>
+  Given("""I have {} {string} in my belly""") { (howMany: Int, what: String) =>
 
   }
 
@@ -66,7 +66,7 @@ class CukesStepDefinitions extends ScalaDsl with EN {
 
   var floatBelly: Float = 0.0f
 
-  Given("""I have eaten {float} floats""") { (arg0: Float) =>
+  Given("""I have eaten {} floats""") { (arg0: Float) =>
     floatBelly = arg0
   }
   Then("""^I should have one and a half floats in my belly$""") { () =>

scala/sources/src/test/scala/cucumber/runtime/scala/test/TypeRegistryConfiguration.scala

@@ -1,12 +1,13 @@
 package cucumber.runtime.scala.test
 
+import java.lang.reflect.Type
 import java.util
 import java.util.Locale
-
 import cucumber.api.{TypeRegistry, TypeRegistryConfigurer}
 import cucumber.runtime.scala.model.{Cukes, Person, Snake}
-import io.cucumber.cucumberexpressions.{ParameterType, Transformer}
-import io.cucumber.datatable.{DataTableType, TableEntryTransformer}
+import io.cucumber.cucumberexpressions.{ParameterByTypeTransformer, ParameterType, Transformer}
+import io.cucumber.datatable.dependency.com.fasterxml.jackson.databind.ObjectMapper
+import io.cucumber.datatable.{DataTableType, TableCellByTypeTransformer, TableEntryByTypeTransformer, TableEntryTransformer}
 
 class TypeRegistryConfiguration extends TypeRegistryConfigurer {
 
@@ -56,6 +57,11 @@ class TypeRegistryConfiguration extends TypeRegistryConfigurer {
   override def locale(): Locale = Locale.ENGLISH
 
   override def configureTypeRegistry(typeRegistry: TypeRegistry): Unit = {
+    val defaultTransformer = new DefaultTransformer()
+    typeRegistry.setDefaultDataTableCellTransformer(defaultTransformer)
+    typeRegistry.setDefaultDataTableEntryTransformer(defaultTransformer)
+    typeRegistry.setDefaultParameterTransformer(defaultTransformer)
+
     typeRegistry.defineParameterType(new ParameterType[Snake](
       "snake",
       "[=><]+",
@@ -86,5 +92,24 @@ class TypeRegistryConfiguration extends TypeRegistryConfigurer {
 
     typeRegistry.defineDataTableType(new DataTableType(classOf[Cukes],listTransformer))
   }
+  private class DefaultTransformer
+    extends ParameterByTypeTransformer
+      with TableEntryByTypeTransformer
+      with TableCellByTypeTransformer {
+
+    var objectMapper: ObjectMapper = new ObjectMapper()
+
+    override def transform(s: String, `type`: Type): AnyRef =
+      objectMapper.convertValue(s, objectMapper.constructType(`type`))
+
+
+    override def transform[T](s: String, aClass: Class[T]): T =
+      objectMapper.convertValue(s, aClass)
+
+    override def transform[T](map: util.Map[String, String],
+                              aClass: Class[T],
+                              tableCellByTypeTransformer: TableCellByTypeTransformer): T =
+      objectMapper.convertValue(map, aClass)
+  }
 
 }