Skip to content

Commit

Permalink
♻️ refactor: Upgrade mongo scala driver version to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
Tuncay Namli committed Aug 13, 2024
1 parent 1c85f43 commit e0fd2d5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ class TransactionSession(val transactionId:String) {
* @return
*/
def commit():Future[Unit] = {
val commitTransactionObservable: SingleObservable[Void] = new ScalaClientSession(dbSession).commitTransaction()
val commitAndRetryObservable: SingleObservable[Void] = commitAndRetry(commitTransactionObservable)
val commitTransactionObservable: SingleObservable[Unit] = new ScalaClientSession(dbSession).commitTransaction()
val commitAndRetryObservable: SingleObservable[Unit] = commitAndRetry(commitTransactionObservable)
runTransactionAndRetry(commitAndRetryObservable).head().map(_ => ())
}

Expand All @@ -47,7 +47,7 @@ class TransactionSession(val transactionId:String) {
* @param observable
* @return
*/
private def commitAndRetry(observable: SingleObservable[Void]): SingleObservable[Void] = {
private def commitAndRetry(observable: SingleObservable[Unit]): SingleObservable[Unit] = {
observable.recoverWith({
case e: MongoException if e.hasErrorLabel(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL) => {
println("UnknownTransactionCommitResult, retrying commit operation ...")
Expand All @@ -60,7 +60,7 @@ class TransactionSession(val transactionId:String) {
})
}

private def runTransactionAndRetry(observable: SingleObservable[Void]): SingleObservable[Void] = {
private def runTransactionAndRetry(observable: SingleObservable[Unit]): SingleObservable[Unit] = {
observable.recoverWith({
case e: MongoException if e.hasErrorLabel(MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL) => {
println("TransientTransactionError, aborting transaction and retrying ...")
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@
<scala.pcombinators>2.3.0</scala.pcombinators>
<akka-http.version>10.5.3</akka-http.version>
<akka.version>2.8.5</akka.version>
<mongodb.scala.version>4.11.1</mongodb.scala.version>
<!--mongodb.scala.version>4.11.1</mongodb.scala.version-->
<mongodb.scala.version>5.1.3</mongodb.scala.version>
<mongo.embedded.version>4.12.0</mongo.embedded.version>
<json4s.version>3.7.0-M11</json4s.version>
<scala.xml.version>2.2.0</scala.xml.version>
Expand Down

0 comments on commit e0fd2d5

Please sign in to comment.