Skip to content

Commit d1ce373

Browse files
committed
fix: scala 2 compatibility
1 parent 2a32bad commit d1ce373

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class MongoJdbcConnection(databaseProvider: DatabaseProvider) extends Connection
220220
override def getClientInfo: Properties = {
221221
val properties = new Properties()
222222
properties.setProperty("ApplicationName", databaseProvider.config.applicationName)
223-
val document = Document(JsonConverter().toJson(databaseProvider.config))
223+
val document = Document(new JsonConverter().toJson(databaseProvider.config))
224224
BsonConverter.asMap(document).foreach(entry => properties.setProperty(entry._1, entry._2.toString))
225225
properties
226226
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.statement.MongoPreparedStatement
55

6-
import java.sql.{Connection, DriverManager, SQLFeatureNotSupportedException, SQLWarning, Savepoint}
6+
import java.sql.{ Connection, SQLFeatureNotSupportedException, Savepoint }
77
import java.util.Properties
88
import java.util.concurrent.Executor
99

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

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

3+
import dev.mongocamp.driver.mongodb._
34
import dev.mongocamp.driver.mongodb.jdbc.resultSet.MongoDbResultSet
4-
import munit.FunSuite
55
import org.joda.time.DateTime
66
import org.mongodb.scala.bson.collection.immutable.Document
7-
import dev.mongocamp.driver.mongodb.*
87
import org.mongodb.scala.model.Updates
98

10-
import java.sql.{Date, ResultSet, SQLFeatureNotSupportedException, Time, Timestamp}
9+
import java.sql.{ResultSet, SQLFeatureNotSupportedException, Time}
1110

1211
class MongoDbResultSetSuite extends BaseJdbcSuite {
1312

@@ -68,7 +67,7 @@ class MongoDbResultSetSuite extends BaseJdbcSuite {
6867
test("getTime() should return the correct value") {
6968
val resultSet = initializeResultSet()
7069
resultSet.next()
71-
assertEquals(resultSet.getTime("date").toString, new DateTime("2021-01-01T00:00:00Z").toString("HH:mm:ss"))
70+
assertEquals(resultSet.getTime("date"), new Time(new DateTime("2021-01-01T00:00:00Z").toDate.getTime))
7271
}
7372

7473
test("getTimestamp() should return the correct value") {

0 commit comments

Comments
 (0)