From 55fbd00a9a77169d03dc29451fd06eaf800db08e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 25 Feb 2021 12:39:45 +0100 Subject: [PATCH] [jOOQ/jOOQ#11525] Upgrade scala version to 2.13.5 --- jOOQ-scala_2.13/pom.xml | 2 +- .../scala/org/jooq/scalaextensions/Conversions.scala | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jOOQ-scala_2.13/pom.xml b/jOOQ-scala_2.13/pom.xml index b418e7a91e..6830d8b47d 100644 --- a/jOOQ-scala_2.13/pom.xml +++ b/jOOQ-scala_2.13/pom.xml @@ -14,7 +14,7 @@ jOOQ Scala 2.13 - 2.13.2 + 2.13.5 ${project.basedir}/../.data diff --git a/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala b/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala index fbec2870c7..dc8c97419b 100644 --- a/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala +++ b/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala @@ -44,7 +44,7 @@ import org.jooq.impl._ // Avoid ambiguity with the internal org.jooq.impl.Array type. import scala.Array -import scala.collection.JavaConverters +import scala.jdk.CollectionConverters /** * jOOQ type conversions used to enhance the jOOQ Java API with Scala Traits @@ -121,7 +121,7 @@ object Conversions { i = i + 1; } - sb.result + sb.result() } } @@ -172,7 +172,7 @@ object Conversions { def fetchAnyOptionArray () : Option[Array[AnyRef]] = Option(query.fetchAnyArray) def fetchAnyOptionInto[E] (newType : Class[_ <: E]) : Option[E] = Option(query.fetchAnyInto(newType)) def fetchAnyOptionInto[Z <: Record](table : Table[Z]) : Option[Z] = Option(query.fetchAnyInto(table)) - def fetchAnyOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchAnyMap).map((m: java.util.Map[String, AnyRef]) => JavaConverters.asScala(m)) + def fetchAnyOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchAnyMap).map((m: java.util.Map[String, AnyRef]) => CollectionConverters.MapHasAsScala(m).asScala) def fetchOneOption () : Option[R] = Option(query.fetchOne) def fetchOneOption[E] (mapper : RecordMapper[_ >: R, E]) : Option[E] = Option(query.fetchOne(mapper)) @@ -188,7 +188,7 @@ object Conversions { def fetchOneOptionArray () : Option[Array[AnyRef]] = Option(query.fetchOneArray) def fetchOneOptionInto[E] (newType : Class[_ <: E]) : Option[E] = Option(query.fetchOneInto(newType)) def fetchOneOptionInto[Z <: Record](table : Table[Z]) : Option[Z] = Option(query.fetchOneInto(table)) - def fetchOneOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchOneMap).map((m: java.util.Map[String, AnyRef]) => JavaConverters.asScala(m)) + def fetchOneOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchOneMap).map((m: java.util.Map[String, AnyRef]) => CollectionConverters.MapHasAsScala(m).asScala) } // ------------------------------------------------------------------------- @@ -314,6 +314,8 @@ object Conversions { // Conversions from jOOQ Record[N] types to Scala Tuple[N] types // -------------------------------------------------------------------------- + import scala.language.implicitConversions + // [jooq-tools] START [tuples] /**