Merge pull request #52 from cucumber/clean-warnings-scala

Clean warnings scala

Author: gaeljw

CHANGELOG.md

@@ -26,6 +26,7 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
 
 ### Fixed
 
+- [Build] Remove build warnings ([#45](https://github.com/cucumber/cucumber-jvm-scala/issues/45) Gaël Jourdan-Weil)
 
 ## [5.6.0] (2020-05-03)
 

pom.xml

@@ -20,6 +20,7 @@
         <minimum.maven.version>3.3</minimum.maven.version>
         <outputDirectory>${project.build.directory}</outputDirectory>
         <scala-maven-plugin.version>3.4.6</scala-maven-plugin.version>
+        <build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version>
         <cucumber.version>5.7.0</cucumber.version>
         <gherkin.version>9.2.0</gherkin.version>
         <groovy.version>2.4.19</groovy.version>
@@ -235,6 +236,12 @@
                     </executions>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>${build-helper-maven-plugin.version}</version>
+                </plugin>
+
                 <!-- Non-standard plugins -->
                 <plugin>
                     <groupId>net.alchim31.maven</groupId>

scala/scala_2.11/pom.xml

@@ -18,6 +18,11 @@
             <version>${scala.2.11.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-collection-compat_2.11</artifactId>
+            <version>2.1.6</version>
+        </dependency>
 
         <!-- Users have to provide it (for JacksonDefaultDataTableTransformer) -->
         <dependency>
@@ -55,6 +60,24 @@
             </testResource>
         </testResources>
         <plugins>
+            <!-- Extra Sources for Scala 2.11 -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/scala</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>

scala/scala_2.11/src/main/scala/io/cucumber/scala/package.scala

@@ -0,0 +1,113 @@
+package io.cucumber
+
+import java.lang.reflect.Type
+import java.util.function.Supplier
+import java.util.{List => JavaList, Map => JavaMap}
+
+import io.cucumber.cucumberexpressions.{CaptureGroupTransformer, ParameterByTypeTransformer}
+import io.cucumber.datatable._
+import io.cucumber.docstring.DocStringType.Transformer
+
+/**
+ * Only for Scala 2.11 which does not support some Single Abstract Method
+ */
+package object scala {
+
+  import language.implicitConversions
+
+  // Cucumber Scala Types
+
+  implicit def function1AsDataTableEntryDefinitionBody[T](f: (Map[String, String]) => T): DataTableEntryDefinitionBody[T] = new DataTableEntryDefinitionBody[T] {
+    override def transform(entry: Map[String, String]): T = f.apply(entry)
+  }
+
+
+  implicit def function1AsDataTableRowDefinitionBody[T](f: (Seq[String]) => T): DataTableRowDefinitionBody[T] = new DataTableRowDefinitionBody[T] {
+    override def transform(row: Seq[String]): T = f.apply(row)
+  }
+
+
+  implicit def function1AsDataTableCellDefinitionBody[T](f: (String) => T): DataTableCellDefinitionBody[T] = new DataTableCellDefinitionBody[T] {
+    override def transform(cell: String): T = f.apply(cell)
+  }
+
+
+  implicit def function1AsDataTableDefinitionBody[T](f: (DataTable) => T): DataTableDefinitionBody[T] = new DataTableDefinitionBody[T] {
+    override def transform(dataTable: DataTable): T = f.apply(dataTable)
+  }
+
+  // Cucumber Core Types
+
+  implicit def function1AsTableCellTransformer[T](f: String => T): TableCellTransformer[T] = {
+    new TableCellTransformer[T] {
+      override def transform(cell: String): T = f.apply(cell)
+    }
+  }
+
+  implicit def function1AsTableTransformer[T](f: DataTable => T): TableTransformer[T] = {
+    new TableTransformer[T] {
+      override def transform(table: DataTable): T = f.apply(table)
+    }
+  }
+
+  implicit def function1AsTableEntryTransformer[T](f: JavaMap[String, String] => T): TableEntryTransformer[T] = {
+    new TableEntryTransformer[T] {
+      override def transform(entry: JavaMap[String, String]): T = f.apply(entry)
+    }
+  }
+
+  implicit def function1AsTableRowTransformer[T](f: JavaList[String] => T): TableRowTransformer[T] = {
+    new TableRowTransformer[T] {
+      override def transform(row: JavaList[String]): T = f.apply(row)
+    }
+  }
+
+  implicit def function1AsTableCellByTypeTransformer(f: (String, Type) => AnyRef): TableCellByTypeTransformer = {
+    new TableCellByTypeTransformer {
+      override def transform(fromValue: String, toTypeValue: Type): AnyRef = {
+        f.apply(fromValue, toTypeValue)
+      }
+    }
+  }
+
+  implicit def function1AsTableEntryByTypeTransformer(f: (JavaMap[String, String], Type, TableCellByTypeTransformer) => AnyRef): TableEntryByTypeTransformer = {
+    new TableEntryByTypeTransformer {
+      override def transform(fromValue: JavaMap[String, String], toValueType: Type, tableCellByTypeTransformer: TableCellByTypeTransformer): AnyRef = {
+        f.apply(fromValue, toValueType, tableCellByTypeTransformer)
+      }
+    }
+  }
+
+  implicit def function1AsParameterByTypeTransformer(f: (String, Type) => AnyRef): ParameterByTypeTransformer = {
+    new ParameterByTypeTransformer {
+      override def transform(fromValue: String, toValue: Type): AnyRef = {
+        f.apply(fromValue, toValue)
+      }
+    }
+  }
+
+  implicit def function1AsTransformer[T](f: (String) => T): Transformer[T] = {
+    new Transformer[T] {
+      override def transform(s: String): T = {
+        f.apply(s)
+      }
+    }
+  }
+
+  implicit def function1AsCaptureGroupTransformer[T](f: (Array[String]) => T): CaptureGroupTransformer[T] = {
+    new CaptureGroupTransformer[T] {
+      override def transform(parameterContent: Array[String]): T = {
+        f.apply(parameterContent)
+      }
+    }
+  }
+
+  // For tests
+
+  implicit def function1AsSupplier[T](f: () => T): Supplier[T] = {
+    new Supplier[T] {
+      override def get(): T = f.apply()
+    }
+  }
+
+}

scala/scala_2.12/pom.xml

@@ -18,6 +18,11 @@
             <version>${scala.2.12.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-collection-compat_2.12</artifactId>
+            <version>2.1.6</version>
+        </dependency>
 
         <!-- Users have to provide it (for JacksonDefaultDataTableTransformer) -->
         <dependency>

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

@@ -3,7 +3,7 @@ package io.cucumber.scala
 import io.cucumber.datatable.DataTable
 
 import scala.util.{Failure, Success, Try}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 trait AbstractDatatableElementTransformerDefinition extends AbstractGlueDefinition {
 

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

@@ -25,35 +25,3 @@ trait DataTableDefinitionBody[T] {
   def transform(dataTable: DataTable): T
 
 }
-
-object DataTableEntryDefinitionBody {
-
-  implicit def function1AsDataTableEntryDefinitionBody[T](f: (Map[String, String]) => T): DataTableEntryDefinitionBody[T] = new DataTableEntryDefinitionBody[T] {
-    override def transform(entry: Map[String, String]): T = f.apply(entry)
-  }
-
-}
-
-object DataTableRowDefinitionBody {
-
-  implicit def function1AsDataTableRowDefinitionBody[T](f: (Seq[String]) => T): DataTableRowDefinitionBody[T] = new DataTableRowDefinitionBody[T] {
-    override def transform(row: Seq[String]): T = f.apply(row)
-  }
-
-}
-
-object DataTableCellDefinitionBody {
-
-  implicit def function1AsDataTableCellDefinitionBody[T](f: (String) => T): DataTableCellDefinitionBody[T] = new DataTableCellDefinitionBody[T] {
-    override def transform(cell: String): T = f.apply(cell)
-  }
-
-}
-
-object DataTableDefinitionBody {
-
-  implicit def function1AsDataTableDefinitionBody[T](f: (DataTable) => T): DataTableDefinitionBody[T] = new DataTableDefinitionBody[T] {
-    override def transform(dataTable: DataTable): T = f.apply(dataTable)
-  }
-
-}

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

@@ -8,7 +8,7 @@ import java.util.{List => JList}
 import io.cucumber.core.backend._
 import io.cucumber.core.resource.{ClasspathScanner, ClasspathSupport}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.Try
 
 class ScalaBackend(lookup: Lookup, container: Container, classLoaderProvider: Supplier[ClassLoader]) extends Backend {

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

@@ -11,10 +11,8 @@ trait ScalaDataTableCellDefinition[T] extends ScalaDataTableTypeDefinition {
 
   override val location: StackTraceElement = new Exception().getStackTrace()(3)
 
-  private val transformer: TableCellTransformer[T] = new TableCellTransformer[T] {
-    override def transform(cell: String): T = {
-      details.body.transform(replaceEmptyPatternsWithEmptyString(cell))
-    }
+  private val transformer: TableCellTransformer[T] = (cell: String) => {
+    details.body.transform(replaceEmptyPatternsWithEmptyString(cell))
   }
 
   override val dataTableType = new DataTableType(details.tag.runtimeClass, transformer)

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

@@ -11,10 +11,8 @@ trait ScalaDataTableDefinition[T] extends ScalaDataTableTypeDefinition {
 
   override val location: StackTraceElement = new Exception().getStackTrace()(3)
 
-  private val transformer: TableTransformer[T] = new TableTransformer[T] {
-    override def transform(table: DataTable): T = {
-      details.body.transform(replaceEmptyPatternsWithEmptyString(table))
-    }
+  private val transformer: TableTransformer[T] = (table: DataTable) => {
+    details.body.transform(replaceEmptyPatternsWithEmptyString(table))
   }
 
   override val dataTableType = new DataTableType(details.tag.runtimeClass, transformer)