fix: compatibility for scala 2.12 in LuceneQueryConverter

Author: QuadStingray

.github/workflows/main_test_release.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Run tests
         run: |
           timedatectl
-          sbt test
+          sbt +test
   release:
     needs: test
     runs-on: ubuntu-latest

.github/workflows/other_test.yml

@@ -35,4 +35,4 @@ jobs:
     - name: Run tests
       run: |
         timedatectl
-        sbt test
+        sbt +test

build.sbt

@@ -40,7 +40,7 @@ developers := List(
 
 licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))
 
-crossScalaVersions := Seq("2.13.10", "2.12.15")
+crossScalaVersions := Seq("2.13.10", "2.12.17")
 
 scalaVersion := crossScalaVersions.value.head
 

src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala

@@ -143,18 +143,27 @@ object LuceneQueryConverter extends LazyLogging {
   private def generateRegexQuery(pattern: String, options: String): Map[String, String] = {
     Map("$regex" -> pattern, "$options" -> options)
   }
-  private def checkAndConvertValue(s: String): Serializable = {
-    try {
-      if (s.toDoubleOption.getOrElse("").toString.equals(s)) {
-        s.toDouble
-      }
-      else if (s.toLongOption.getOrElse("").toString.equals(s)) {
-        s.toLong
+  private def checkAndConvertValue(s: String): Any = {
+
+    def checkOrReturn[A <: Any](f: () => A): Option[A] = {
+      try {
+        val value = f()
+        if (value.toString.equals(s)) {
+          Option(value)
+        }
+        else {
+          None
+        }
       }
-      else if (s.toBooleanOption.getOrElse("").toString.equals(s)) {
-        s.toBoolean
+      catch {
+        case e: Exception => None
       }
-      else {
+    }
+
+    try {
+      val convertedValue: Option[Any] =
+        (List() ++ checkOrReturn(() => s.toDouble) ++ checkOrReturn(() => s.toLong) ++ checkOrReturn(() => s.toBoolean)).headOption
+      convertedValue.getOrElse({
         val parsedOptions: Option[Date] = datePatters
           .map(pattern => {
             try {
@@ -169,7 +178,7 @@ object LuceneQueryConverter extends LazyLogging {
           .find(_.nonEmpty)
           .flatten
         parsedOptions.getOrElse(s)
-      }
+      })
     }
     catch {
       case _: Exception =>

src/test/scala/dev/mongocamp/driver/mongodb/gridfs/GridFSDatabaseSpec.scala

@@ -36,15 +36,14 @@ class GridFSDatabaseSpec extends Specification with GridfsDatabaseFunctions with
       ImageFilesDAO.renameFile(oid, "test.png").result()
       findImage(oid).getFilename must be equalTo "test.png"
 
-      val downloadPath = "/tmp/download_" + fileName
-      val result: Long = downloadImage(oid, downloadPath)
+      val downloadedFile = File.newTemporaryFile(suffix = fileName)
+      val result: Long = downloadImage(oid, downloadedFile.toString())
 
       result must not be equalTo(-1)
 
-      val downloadedFile = File(downloadPath)
       downloadedFile.exists must beTrue
 
-      val downloadBytes = File(downloadPath).bytes.toList
+      val downloadBytes = downloadedFile.bytes.toList
 
       downloadBytes.size must be equalTo uploadBytes.size