Skip to content

Commit

Permalink
fix: scala 2 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
QuadStingray committed Feb 7, 2025
1 parent 8d28c81 commit b4982df
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html
//crossScalaVersions := Seq("2.13.16")
crossScalaVersions := Seq("3.6.0", "2.13.16")

scalaVersion := crossScalaVersions.value.head
scalaVersion := crossScalaVersions.value.last

scalacOptions += "-deprecation"

Expand Down
2 changes: 0 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")

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

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


addDependencyTreePlugin

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.mongocamp.driver.mongodb.jdbc.resultSet

import dev.mongocamp.driver.mongodb.*
import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.bson.BsonConverter
import dev.mongocamp.driver.mongodb.jdbc.MongoJdbcCloseable
import org.mongodb.scala.bson.collection.immutable.Document
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -551,37 +551,37 @@ case class MongoPreparedStatement(connection: MongoJdbcConnection) extends Calla

override def getBoolean(parameterIndex: Int): Boolean = {
checkClosed()
getStringOption(parameterIndex).flatMap(v => Try(v.toBoolean).toOption).orNull.asInstanceOf[Boolean]
getStringOption(parameterIndex).flatMap(v => Try(v.toBoolean).toOption).getOrElse(false)
}

override def getByte(parameterIndex: Int): Byte = {
checkClosed()
getStringOption(parameterIndex).flatMap(v => Try(v.toByte).toOption).orNull.asInstanceOf[Byte]
getStringOption(parameterIndex).flatMap(v => Try(v.toByte).toOption).getOrElse(Byte.MinValue)
}

override def getShort(parameterIndex: Int): Short = {
checkClosed()
getStringOption(parameterIndex).flatMap(v => Try(v.toShort).toOption).orNull.asInstanceOf[Short]
getStringOption(parameterIndex).flatMap(v => Try(v.toShort).toOption).getOrElse(Short.MinValue)
}

override def getInt(parameterIndex: Int): Int = {
checkClosed()
getStringOption(parameterIndex).flatMap(v => Try(v.toInt).toOption).orNull.asInstanceOf[Int]
getStringOption(parameterIndex).flatMap(v => Try(v.toInt).toOption).getOrElse(Int.MinValue)
}

override def getLong(parameterIndex: Int): Long = {
checkClosed()
getStringOption(parameterIndex).flatMap(v => Try(v.toLong).toOption).orNull.asInstanceOf[Long]
getStringOption(parameterIndex).flatMap(v => Try(v.toLong).toOption).getOrElse(Long.MinValue)
}

override def getFloat(parameterIndex: Int): Float = {
checkClosed()
getStringOption(parameterIndex).flatMap(v => Try(v.toFloat).toOption).orNull.asInstanceOf[Float]
getStringOption(parameterIndex).flatMap(v => Try(v.toFloat).toOption).getOrElse(Float.MinValue)
}

override def getDouble(parameterIndex: Int): Double = {
checkClosed()
getStringOption(parameterIndex).flatMap(v => Try(v.toDouble).toOption).orNull.asInstanceOf[Double]
getStringOption(parameterIndex).flatMap(v => Try(v.toDouble).toOption).getOrElse(Double.MinValue)
}

override def getBigDecimal(parameterIndex: Int, scale: Int): java.math.BigDecimal = getBigDecimal(parameterIndex)
Expand Down Expand Up @@ -680,7 +680,7 @@ case class MongoPreparedStatement(connection: MongoJdbcConnection) extends Calla
override def getURL(parameterIndex: Int): URL = {
checkClosed()
Option(getString(parameterIndex)).flatMap(v => {
val urlParser = Try(java.net.URI(v).toURL)
val urlParser = Try(new java.net.URI(v).toURL)
urlParser.toOption
}).orNull
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package dev.mongocamp.driver.mongodb.jdbc

import dev.mongocamp.driver.mongodb.*
import dev.mongocamp.driver.mongodb._
import dev.mongocamp.driver.mongodb.jdbc.resultSet.MongoDbResultSet
import org.joda.time.DateTime
import org.mongodb.scala.bson.collection.immutable.Document
import org.mongodb.scala.model.Updates

import java.sql.*
import java.sql._

class MongoDbResultSetSuite extends BaseJdbcSuite {

Expand Down

0 comments on commit b4982df

Please sign in to comment.