Add DefaultParameterType/DefaultTableCell/DefaultTableEntry in the DSL

Author: gaeljw

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

@@ -11,4 +11,10 @@ object Aliases {
 
   type DocStringDefinitionBody[T] = String => T
 
+  type DefaultParameterTransformerBody = (String, java.lang.reflect.Type) => AnyRef
+
+  type DefaultDataTableCellTransformerBody = (String, java.lang.reflect.Type) => AnyRef
+
+  type DefaultDataTableEntryTransformerBody = (Map[String, String], java.lang.reflect.Type) => AnyRef
+
 }

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

@@ -19,6 +19,9 @@ class GlueAdaptor(glue: Glue) {
     registry.docStringTypes.map(ScalaDocStringTypeDefinition(_, scenarioScoped)).foreach(glue.addDocStringType)
     registry.dataTableTypes.map(ScalaDataTableTypeDefinition(_, scenarioScoped)).foreach(glue.addDataTableType)
     registry.parameterTypes.map(ScalaParameterTypeDefinition(_, scenarioScoped)).foreach(glue.addParameterType)
+    registry.defaultParameterTransformers.map(ScalaDefaultParameterTransformerDefinition(_, scenarioScoped)).foreach(glue.addDefaultParameterTransformer)
+    registry.defaultDataTableCellTransformers.map(ScalaDefaultDataTableCellTransformerDefinition(_, scenarioScoped)).foreach(glue.addDefaultDataTableCellTransformer)
+    registry.defaultDataTableEntryTransformers.map(ScalaDefaultDataTableEntryTransformerDefinition(_, scenarioScoped)).foreach(glue.addDefaultDataTableEntryTransformer)
   }
 
 }

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

@@ -0,0 +1,40 @@
+package io.cucumber.scala
+
+import java.lang.reflect.Type
+
+import io.cucumber.core.backend.{DefaultDataTableCellTransformerDefinition, ScenarioScoped}
+import io.cucumber.datatable.TableCellByTypeTransformer
+
+trait ScalaDefaultDataTableCellTransformerDefinition extends DefaultDataTableCellTransformerDefinition with AbstractDatatableElementTransformerDefinition {
+
+  val details: ScalaDefaultDataTableCellTransformerDetails
+
+  override val emptyPatterns: Seq[String] = details.emptyPatterns
+
+  override val location: StackTraceElement = new Exception().getStackTrace()(3)
+
+  override val tableCellByTypeTransformer: TableCellByTypeTransformer = new TableCellByTypeTransformer {
+    override def transform(fromValue: String, toTypeValue: Type): AnyRef = {
+      details.body.apply(replaceEmptyPatternsWithEmptyString(fromValue), toTypeValue)
+    }
+  }
+
+}
+
+object ScalaDefaultDataTableCellTransformerDefinition {
+
+  def apply(details: ScalaDefaultDataTableCellTransformerDetails, scenarioScoped: Boolean): ScalaDefaultDataTableCellTransformerDefinition = {
+    if (scenarioScoped) {
+      new ScalaScenarioScopedDataTableCellTransformerDefinition(details)
+    } else {
+      new ScalaGlobalDataTableCellTransformerDefinition(details)
+    }
+  }
+
+}
+
+class ScalaScenarioScopedDataTableCellTransformerDefinition(override val details: ScalaDefaultDataTableCellTransformerDetails) extends ScalaDefaultDataTableCellTransformerDefinition with ScenarioScoped {
+}
+
+class ScalaGlobalDataTableCellTransformerDefinition(override val details: ScalaDefaultDataTableCellTransformerDetails) extends ScalaDefaultDataTableCellTransformerDefinition {
+}

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

@@ -0,0 +1,47 @@
+package io.cucumber.scala
+
+import java.lang.reflect.Type
+import java.util.{Map => JavaMap}
+
+import io.cucumber.core.backend.{DefaultDataTableEntryTransformerDefinition, ScenarioScoped}
+import io.cucumber.datatable.{TableCellByTypeTransformer, TableEntryByTypeTransformer}
+
+import scala.collection.JavaConverters._
+
+trait ScalaDefaultDataTableEntryTransformerDefinition extends DefaultDataTableEntryTransformerDefinition with AbstractDatatableElementTransformerDefinition {
+
+  val details: ScalaDefaultDataTableEntryTransformerDetails
+
+  override val emptyPatterns: Seq[String] = details.emptyPatterns
+
+  override val location: StackTraceElement = new Exception().getStackTrace()(3)
+
+  override val tableEntryByTypeTransformer: TableEntryByTypeTransformer = new TableEntryByTypeTransformer {
+    override def transform(fromValue: JavaMap[String, String], toValueType: Type, tableCellByTypeTransformer: TableCellByTypeTransformer): AnyRef = {
+      replaceEmptyPatternsWithEmptyString(fromValue.asScala.toMap)
+        .map(details.body.apply(_, toValueType))
+        .get
+    }
+  }
+
+  override val headersToProperties: Boolean = true
+
+}
+
+object ScalaDefaultDataTableEntryTransformerDefinition {
+
+  def apply(details: ScalaDefaultDataTableEntryTransformerDetails, scenarioScoped: Boolean): ScalaDefaultDataTableEntryTransformerDefinition = {
+    if (scenarioScoped) {
+      new ScalaScenarioScopedDataTableEntryTransformerDefinition(details)
+    } else {
+      new ScalaGlobalDataTableEntryTransformerDefinition(details)
+    }
+  }
+
+}
+
+class ScalaScenarioScopedDataTableEntryTransformerDefinition(override val details: ScalaDefaultDataTableEntryTransformerDetails) extends ScalaDefaultDataTableEntryTransformerDefinition with ScenarioScoped {
+}
+
+class ScalaGlobalDataTableEntryTransformerDefinition(override val details: ScalaDefaultDataTableEntryTransformerDetails) extends ScalaDefaultDataTableEntryTransformerDefinition {
+}

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

@@ -0,0 +1,38 @@
+package io.cucumber.scala
+
+import java.lang.reflect.Type
+
+import io.cucumber.core.backend.{DefaultParameterTransformerDefinition, ScenarioScoped}
+import io.cucumber.cucumberexpressions.ParameterByTypeTransformer
+
+trait ScalaDefaultParameterTransformerDefinition extends DefaultParameterTransformerDefinition with AbstractGlueDefinition {
+
+  val details: ScalaDefaultParameterTransformerDetails
+
+  override val location: StackTraceElement = new Exception().getStackTrace()(3)
+
+  override val parameterByTypeTransformer: ParameterByTypeTransformer = new ParameterByTypeTransformer {
+    override def transform(fromValue: String, toValue: Type): AnyRef = {
+      details.body.apply(fromValue, toValue)
+    }
+  }
+
+}
+
+object ScalaDefaultParameterTransformerDefinition {
+
+  def apply(details: ScalaDefaultParameterTransformerDetails, scenarioScoped: Boolean): ScalaDefaultParameterTransformerDefinition = {
+    if (scenarioScoped) {
+      new ScalaScenarioScopedDefaultParameterTransformerDefinition(details)
+    } else {
+      new ScalaGlobalDefaultParameterTransformerDefinition(details)
+    }
+  }
+
+}
+
+class ScalaScenarioScopedDefaultParameterTransformerDefinition(override val details: ScalaDefaultParameterTransformerDetails) extends ScalaDefaultParameterTransformerDefinition with ScenarioScoped {
+}
+
+class ScalaGlobalDefaultParameterTransformerDefinition(override val details: ScalaDefaultParameterTransformerDetails) extends ScalaDefaultParameterTransformerDefinition {
+}

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

@@ -0,0 +1,9 @@
+package io.cucumber.scala
+
+import io.cucumber.scala.Aliases.{DefaultDataTableCellTransformerBody, DefaultDataTableEntryTransformerBody, DefaultParameterTransformerBody}
+
+case class ScalaDefaultParameterTransformerDetails(body: DefaultParameterTransformerBody)
+
+case class ScalaDefaultDataTableCellTransformerDetails(emptyPatterns: Seq[String], body: DefaultDataTableCellTransformerBody)
+
+case class ScalaDefaultDataTableEntryTransformerDetails(emptyPatterns: Seq[String], body: DefaultDataTableEntryTransformerBody)

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

@@ -2,7 +2,7 @@ package io.cucumber.scala
 
 import java.lang.reflect.{ParameterizedType, Type}
 
-import io.cucumber.scala.Aliases.{DocStringDefinitionBody, HookBody}
+import io.cucumber.scala.Aliases.{DefaultDataTableCellTransformerBody, DefaultDataTableEntryTransformerBody, DefaultParameterTransformerBody, DocStringDefinitionBody, HookBody}
 
 import scala.reflect.ClassTag
 
@@ -22,7 +22,7 @@ private[scala] trait BaseScalaDsl {
 /**
  * Base trait for a scala step definition implementation.
  */
-trait ScalaDsl extends BaseScalaDsl with StepDsl with HookDsl with DataTableTypeDsl with DocStringTypeDsl with ParameterTypeDsl {
+trait ScalaDsl extends BaseScalaDsl with StepDsl with HookDsl with DataTableTypeDsl with DocStringTypeDsl with ParameterTypeDsl with DefaultTransformerDsl {
 
 }
 
@@ -304,6 +304,38 @@ private[scala] trait ParameterTypeDsl extends BaseScalaDsl {
 
 }
 
+private[scala] trait DefaultTransformerDsl extends BaseScalaDsl {
+
+  def DefaultParameterTransformer(body: DefaultParameterTransformerBody): Unit = {
+    registry.defaultParameterTransformers += ScalaDefaultParameterTransformerDetails(body)
+  }
+
+  def DefaultDataTableCellTransformer(body: DefaultDataTableCellTransformerBody): Unit = {
+    DefaultDataTableCellTransformer(NO_REPLACEMENT)(body)
+  }
+
+  def DefaultDataTableCellTransformer(replaceWithEmptyString: String)(body: DefaultDataTableCellTransformerBody): Unit = {
+    DefaultDataTableCellTransformer(Seq(replaceWithEmptyString))(body)
+  }
+
+  private def DefaultDataTableCellTransformer(replaceWithEmptyString: Seq[String])(body: DefaultDataTableCellTransformerBody): Unit = {
+    registry.defaultDataTableCellTransformers += ScalaDefaultDataTableCellTransformerDetails(replaceWithEmptyString, body)
+  }
+
+  def DefaultDataTableEntryTransformer(body: DefaultDataTableEntryTransformerBody): Unit = {
+    DefaultDataTableEntryTransformer(NO_REPLACEMENT)(body)
+  }
+
+  def DefaultDataTableEntryTransformer(replaceWithEmptyString: String)(body: DefaultDataTableEntryTransformerBody): Unit = {
+    DefaultDataTableEntryTransformer(Seq(replaceWithEmptyString))(body)
+  }
+
+  private def DefaultDataTableEntryTransformer(replaceWithEmptyString: Seq[String])(body: DefaultDataTableEntryTransformerBody): Unit = {
+    registry.defaultDataTableEntryTransformers += ScalaDefaultDataTableEntryTransformerDetails(replaceWithEmptyString, body)
+  }
+
+}
+
 private[scala] trait StepDsl extends BaseScalaDsl {
   self =>
 

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

@@ -20,5 +20,11 @@ class ScalaDslRegistry {
 
   val parameterTypes = new ArrayBuffer[ScalaParameterTypeDetails[_]]
 
+  val defaultParameterTransformers = new ArrayBuffer[ScalaDefaultParameterTransformerDetails]
+
+  val defaultDataTableCellTransformers = new ArrayBuffer[ScalaDefaultDataTableCellTransformerDetails]
+
+  val defaultDataTableEntryTransformers = new ArrayBuffer[ScalaDefaultDataTableEntryTransformerDetails]
+
 }
 

scala/sources/src/test/resources/tests/parametertypes/ParameterTypes.feature

@@ -8,3 +8,28 @@ Feature: As Cucumber Scala, I want to handle ParameterType definitions
 
   Scenario: define parameter type with three arguments
     Given kebab made from mushroom, meat and veg, defined by lambda
+
+  Scenario: define default parameter transformer
+    Given kebab made from anonymous meat, defined by lambda
+
+  Scenario: define default data table cell transformer - DataTable
+    Given default data table cells, defined by lambda
+      | Kebab   |
+      | [empty] |
+
+  Scenario: define default data table cell transformer - JList[Jlist]
+    Given default data table cells, defined by lambda, as rows
+      | Kebab   |
+      | [empty] |
+
+  Scenario: define default data table entry transformer - DataTable
+    Given default data table entries, defined by lambda
+      | dinner  |
+      | Kebab   |
+      | [empty] |
+
+  Scenario: define default data table entry transformer - JList
+    Given default data table entries, defined by lambda, as rows
+      | dinner  |
+      | Kebab   |
+      | [empty] |