Skip to content

Commit b4982df

Browse files
committed
fix: scala 2 compatibility
1 parent 8d28c81 commit b4982df

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html
4343
//crossScalaVersions := Seq("2.13.16")
4444
crossScalaVersions := Seq("3.6.0", "2.13.16")
4545

46-
scalaVersion := crossScalaVersions.value.head
46+
scalaVersion := crossScalaVersions.value.last
4747

4848
scalacOptions += "-deprecation"
4949

project/plugins.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
2121

2222
addSbtPlugin("dev.quadstingray" %% "sbt-json" % "0.7.1")
2323

24-
addSbtPlugin("ch.epfl.scala" % "sbt-scala3-migrate" % "0.7.2")
25-
2624

2725
addDependencyTreePlugin
2826

src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.mongocamp.driver.mongodb.jdbc.resultSet
22

3-
import dev.mongocamp.driver.mongodb.*
3+
import dev.mongocamp.driver.mongodb._
44
import dev.mongocamp.driver.mongodb.bson.BsonConverter
55
import dev.mongocamp.driver.mongodb.jdbc.MongoJdbcCloseable
66
import org.mongodb.scala.bson.collection.immutable.Document

src/main/scala/dev/mongocamp/driver/mongodb/jdbc/statement/MongoPreparedStatement.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -551,37 +551,37 @@ case class MongoPreparedStatement(connection: MongoJdbcConnection) extends Calla
551551

552552
override def getBoolean(parameterIndex: Int): Boolean = {
553553
checkClosed()
554-
getStringOption(parameterIndex).flatMap(v => Try(v.toBoolean).toOption).orNull.asInstanceOf[Boolean]
554+
getStringOption(parameterIndex).flatMap(v => Try(v.toBoolean).toOption).getOrElse(false)
555555
}
556556

557557
override def getByte(parameterIndex: Int): Byte = {
558558
checkClosed()
559-
getStringOption(parameterIndex).flatMap(v => Try(v.toByte).toOption).orNull.asInstanceOf[Byte]
559+
getStringOption(parameterIndex).flatMap(v => Try(v.toByte).toOption).getOrElse(Byte.MinValue)
560560
}
561561

562562
override def getShort(parameterIndex: Int): Short = {
563563
checkClosed()
564-
getStringOption(parameterIndex).flatMap(v => Try(v.toShort).toOption).orNull.asInstanceOf[Short]
564+
getStringOption(parameterIndex).flatMap(v => Try(v.toShort).toOption).getOrElse(Short.MinValue)
565565
}
566566

567567
override def getInt(parameterIndex: Int): Int = {
568568
checkClosed()
569-
getStringOption(parameterIndex).flatMap(v => Try(v.toInt).toOption).orNull.asInstanceOf[Int]
569+
getStringOption(parameterIndex).flatMap(v => Try(v.toInt).toOption).getOrElse(Int.MinValue)
570570
}
571571

572572
override def getLong(parameterIndex: Int): Long = {
573573
checkClosed()
574-
getStringOption(parameterIndex).flatMap(v => Try(v.toLong).toOption).orNull.asInstanceOf[Long]
574+
getStringOption(parameterIndex).flatMap(v => Try(v.toLong).toOption).getOrElse(Long.MinValue)
575575
}
576576

577577
override def getFloat(parameterIndex: Int): Float = {
578578
checkClosed()
579-
getStringOption(parameterIndex).flatMap(v => Try(v.toFloat).toOption).orNull.asInstanceOf[Float]
579+
getStringOption(parameterIndex).flatMap(v => Try(v.toFloat).toOption).getOrElse(Float.MinValue)
580580
}
581581

582582
override def getDouble(parameterIndex: Int): Double = {
583583
checkClosed()
584-
getStringOption(parameterIndex).flatMap(v => Try(v.toDouble).toOption).orNull.asInstanceOf[Double]
584+
getStringOption(parameterIndex).flatMap(v => Try(v.toDouble).toOption).getOrElse(Double.MinValue)
585585
}
586586

587587
override def getBigDecimal(parameterIndex: Int, scale: Int): java.math.BigDecimal = getBigDecimal(parameterIndex)
@@ -680,7 +680,7 @@ case class MongoPreparedStatement(connection: MongoJdbcConnection) extends Calla
680680
override def getURL(parameterIndex: Int): URL = {
681681
checkClosed()
682682
Option(getString(parameterIndex)).flatMap(v => {
683-
val urlParser = Try(java.net.URI(v).toURL)
683+
val urlParser = Try(new java.net.URI(v).toURL)
684684
urlParser.toOption
685685
}).orNull
686686
}

src/test/scala/dev/mongocamp/driver/mongodb/jdbc/MongoDbResultSetSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package dev.mongocamp.driver.mongodb.jdbc
22

3-
import dev.mongocamp.driver.mongodb.*
3+
import dev.mongocamp.driver.mongodb._
44
import dev.mongocamp.driver.mongodb.jdbc.resultSet.MongoDbResultSet
55
import org.joda.time.DateTime
66
import org.mongodb.scala.bson.collection.immutable.Document
77
import org.mongodb.scala.model.Updates
88

9-
import java.sql.*
9+
import java.sql._
1010

1111
class MongoDbResultSetSuite extends BaseJdbcSuite {
1212

0 commit comments

Comments
 (0)