[jOOQ#5399] Conversions.scala returns Option[_] instead of Option[T] …

…or Option[U] where this is possible
isusion · Jul 6, 2016 · d49dbfc · d49dbfc
1 parent 822e1d3
commit d49dbfc
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/jOOQ-scala/src/main/scala/org/jooq/scala/Conversions.scala b/jOOQ-scala/src/main/scala/org/jooq/scala/Conversions.scala
@@ -166,11 +166,11 @@ object Conversions {
     def fetchAnyOption[T]              (field : Field[_], newType : Class[_ <: T])                : Option[T]                   = Option(query.fetchAny(field, newType))
     def fetchAnyOption[T, U]           (field : Field[T], converter : Converter[_ >: T, _ <: U])  : Option[U]                   = Option(query.fetchAny[T, U](field, converter))
     def fetchAnyOption                 (fieldIndex : Int)                                         : Option[_]                   = Option(query.fetchAny(fieldIndex))
-    def fetchAnyOption[T]              (fieldIndex : Int, newType : Class[_ <: T])                : Option[_]                   = Option(query.fetchAny(fieldIndex, newType))
-    def fetchAnyOption[T, U]           (fieldIndex : Int, converter : Converter[_ >: T, _ <: U])  : Option[_]                   = Option(query.fetchAny(fieldIndex, converter))
+    def fetchAnyOption[T]              (fieldIndex : Int, newType : Class[_ <: T])                : Option[T]                   = Option(query.fetchAny(fieldIndex, newType))
+    def fetchAnyOption[T, U]           (fieldIndex : Int, converter : Converter[_ >: T, _ <: U])  : Option[U]                   = Option(query.fetchAny(fieldIndex, converter))
     def fetchAnyOption                 (fieldName : String)                                       : Option[_]                   = Option(query.fetchAny(fieldName))
-    def fetchAnyOption[T]              (fieldName : String, newType : Class[_ <: T])              : Option[_]                   = Option(query.fetchAny(fieldName, newType))
-    def fetchAnyOption[U]              (fieldName : String, converter : Converter[_, _ <: U])     : Option[_]                   = Option(query.fetchAny(fieldName, converter))
+    def fetchAnyOption[T]              (fieldName : String, newType : Class[_ <: T])              : Option[T]                   = Option(query.fetchAny(fieldName, newType))
+    def fetchAnyOption[U]              (fieldName : String, converter : Converter[_, _ <: U])     : Option[U]                   = Option(query.fetchAny(fieldName, converter))
     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))
@@ -182,11 +182,11 @@ object Conversions {
     def fetchOneOption[T]              (field : Field[_], newType : Class[_ <: T])                : Option[T]                   = Option(query.fetchOne(field, newType))
     def fetchOneOption[T, U]           (field : Field[T], converter : Converter[_ >: T, _ <: U])  : Option[U]                   = Option(query.fetchOne[T, U](field, converter))
     def fetchOneOption                 (fieldIndex : Int)                                         : Option[_]                   = Option(query.fetchOne(fieldIndex))
-    def fetchOneOption[T]              (fieldIndex : Int, newType : Class[_ <: T])                : Option[_]                   = Option(query.fetchOne(fieldIndex, newType))
-    def fetchOneOption[T, U]           (fieldIndex : Int, converter : Converter[_ >: T, _ <: U])  : Option[_]                   = Option(query.fetchOne(fieldIndex, converter))
+    def fetchOneOption[T]              (fieldIndex : Int, newType : Class[_ <: T])                : Option[T]                   = Option(query.fetchOne(fieldIndex, newType))
+    def fetchOneOption[T, U]           (fieldIndex : Int, converter : Converter[_ >: T, _ <: U])  : Option[U]                   = Option(query.fetchOne(fieldIndex, converter))
     def fetchOneOption                 (fieldName : String)                                       : Option[_]                   = Option(query.fetchOne(fieldName))
-    def fetchOneOption[T]              (fieldName : String, newType : Class[_ <: T])              : Option[_]                   = Option(query.fetchOne(fieldName, newType))
-    def fetchOneOption[U]              (fieldName : String, converter : Converter[_, _ <: U])     : Option[_]                   = Option(query.fetchOne(fieldName, converter))
+    def fetchOneOption[T]              (fieldName : String, newType : Class[_ <: T])              : Option[T]                   = Option(query.fetchOne(fieldName, newType))
+    def fetchOneOption[U]              (fieldName : String, converter : Converter[_, _ <: U])     : Option[U]                   = Option(query.fetchOne(fieldName, converter))
     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))