Issue #2: replacing Manifest.erasure with Manifest.runtimeClass

Author: agustafson

mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Binding.scala

@@ -94,7 +94,7 @@ object Binding {
       ,if (typeHandler != null) Some("typeHandler=" + typeHandler.unwrap.getName) else None
       ,if (resultMap != null) Some("resultMap=" + resultMap.fqi.id) else None
       ,{
-        val t = manifest[JavaType].erasure
+        val t = manifest[JavaType].runtimeClass
         if (t != classOf[Object]) Some("javaType=" + translate(t)) else None
       }
       ) filter {_ match {case Some(x) => true; case None => false }} map {_.get} mkString("#{", ",", "}")

mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Delete.scala

@@ -27,7 +27,7 @@ abstract class Delete [Param : Manifest]
   extends Statement 
      with SQLFunction1[Param,Int] {
 
-  def parameterTypeClass = manifest[Param].erasure
+  def parameterTypeClass = manifest[Param].runtimeClass
 
   /** Exceutes the SQL DELETE Statement
     * @param param Input paramenter of the statement

mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Insert.scala

@@ -32,7 +32,7 @@ abstract class Insert[Param : Manifest]
     */
   var keyGenerator : KeyGenerator = null //JdbcGeneratedKey(null, "id")
 
-  def parameterTypeClass = manifest[Param].erasure
+  def parameterTypeClass = manifest[Param].runtimeClass
 
   /** Exceutes the SQL INSERT Statement
     * @param param Input paramenter of the statement

mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/KeyGenerator.scala

@@ -73,7 +73,7 @@ abstract class SqlGeneratedKey[Type : Manifest] extends KeyGenerator {
   var executeBefore   : Boolean = false
 
   /** Returns the Class of the generated key. */
-  val resultTypeClass = manifest[Type].erasure
+  val resultTypeClass = manifest[Type].runtimeClass
 
   /** Dynamic SQL CODE to be executed in order to obtain/generate the key
     * == Code sample ==

mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultMap.scala

@@ -31,7 +31,7 @@ class ResultMap[ResultType : Manifest](val parent : ResultMap[_] = null) {
   var fqi : FQI = null
   var autoMapping : Boolean = false
 
-  def resultTypeClass = manifest[ResultType].erasure
+  def resultTypeClass = manifest[ResultType].runtimeClass
 
   /** A single result mapping between a column and a property or field.
     * This property will be used for comparisons.

mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Select.scala

@@ -75,7 +75,7 @@ abstract class SelectList[Result : Manifest]
   with SQLFunction0[Seq[Result]] {
 
   def parameterTypeClass = classOf[Nothing]
-  def resultTypeClass = manifest[Result].erasure
+  def resultTypeClass = manifest[Result].runtimeClass
 
   def apply()(implicit s : Session) : Seq[Result] = 
     execute { s.selectList[Result](fqi.id) }
@@ -112,8 +112,8 @@ abstract class SelectListBy[Param : Manifest, Result : Manifest]
   extends Select 
   with SQLFunction1[Param, Seq[Result]] {
 
-  def parameterTypeClass = manifest[Param].erasure
-  def resultTypeClass = manifest[Result].erasure
+  def parameterTypeClass = manifest[Param].runtimeClass
+  def resultTypeClass = manifest[Result].runtimeClass
 
   def apply(param : Param)(implicit s : Session) : Seq[Result] = 
     execute { s.selectList[Param,Result](fqi.id, param) }
@@ -150,7 +150,7 @@ abstract class SelectListPage[Result : Manifest]
   with SQLFunction1[RowBounds,Seq[Result]] {
 
   def parameterTypeClass = classOf[Nothing]
-  def resultTypeClass = manifest[Result].erasure
+  def resultTypeClass = manifest[Result].runtimeClass
 
   def apply(rowBounds : RowBounds)(implicit s : Session) : Seq[Result] = 
     execute { s.selectList[Null,Result](fqi.id, null, rowBounds) }
@@ -187,8 +187,8 @@ abstract class SelectListPageBy[Param : Manifest, Result : Manifest]
   extends Select
   with SQLFunction2[Param, RowBounds, Seq[Result]] {
 
-  def parameterTypeClass = manifest[Param].erasure
-  def resultTypeClass = manifest[Result].erasure
+  def parameterTypeClass = manifest[Param].runtimeClass
+  def resultTypeClass = manifest[Result].runtimeClass
 
   def apply(param : Param, rowBounds : RowBounds)(implicit s : Session) : Seq[Result] = 
     execute { s.selectList[Param,Result](fqi.id, param, rowBounds) }
@@ -225,7 +225,7 @@ abstract class SelectOne[Result : Manifest]
   with SQLFunction0[Option[Result]] {
 
   def parameterTypeClass = classOf[Nothing]
-  def resultTypeClass = manifest[Result].erasure
+  def resultTypeClass = manifest[Result].runtimeClass
 
   def apply()(implicit s : Session) : Option[Result] = 
     execute {
@@ -262,8 +262,8 @@ abstract class SelectOneBy[Param : Manifest, Result : Manifest]
   extends Select
   with SQLFunction1[Param, Option[Result]] {
 
-  def parameterTypeClass = manifest[Param].erasure
-  def resultTypeClass = manifest[Result].erasure
+  def parameterTypeClass = manifest[Param].runtimeClass
+  def resultTypeClass = manifest[Result].runtimeClass
 
   def apply(param : Param)(implicit s : Session) : Option[Result] = 
     execute {
@@ -303,7 +303,7 @@ abstract class SelectMap[ResultKey, ResultValue : Manifest](mapKey : String)
   with SQLFunction0[Map[ResultKey, ResultValue]] {
 
   def parameterTypeClass = classOf[Nothing]
-  def resultTypeClass = manifest[ResultValue].erasure
+  def resultTypeClass = manifest[ResultValue].runtimeClass
 
   def apply()(implicit s : Session) : Map[ResultKey, ResultValue] = 
     execute { s.selectMap[ResultKey,ResultValue](fqi.id, mapKey) }
@@ -340,8 +340,8 @@ abstract class SelectMapBy[Param : Manifest, ResultKey, ResultValue : Manifest](
   extends Select
   with SQLFunction1[Param, Map[ResultKey, ResultValue]] {
 
-  def parameterTypeClass = manifest[Param].erasure
-  def resultTypeClass = manifest[ResultValue].erasure
+  def parameterTypeClass = manifest[Param].runtimeClass
+  def resultTypeClass = manifest[ResultValue].runtimeClass
 
   def apply(param : Param)(implicit s : Session) : Map[ResultKey, ResultValue] = 
     execute { s.selectMap[Param,ResultKey,ResultValue](fqi.id, param, mapKey) }
@@ -378,7 +378,7 @@ abstract class SelectMapPage[ResultKey, ResultValue : Manifest](mapKey : String)
   with SQLFunction1[RowBounds, Map[ResultKey, ResultValue]] {
 
   def parameterTypeClass = classOf[Nothing]
-  def resultTypeClass = manifest[ResultValue].erasure
+  def resultTypeClass = manifest[ResultValue].runtimeClass
 
   def apply(rowBounds : RowBounds)(implicit s : Session) : Map[ResultKey, ResultValue] = 
     execute { s.selectMap[Null,ResultKey,ResultValue](fqi.id, null, mapKey, rowBounds) }
@@ -415,8 +415,8 @@ abstract class SelectMapPageBy[Param : Manifest, ResultKey, ResultValue : Manife
   extends Select
   with SQLFunction2[Param, RowBounds, Map[ResultKey, ResultValue]] {
 
-  def parameterTypeClass = manifest[Param].erasure
-  def resultTypeClass = manifest[ResultValue].erasure
+  def parameterTypeClass = manifest[Param].runtimeClass
+  def resultTypeClass = manifest[ResultValue].runtimeClass
 
   def apply(param : Param, rowBounds : RowBounds)(implicit s : Session) : Map[ResultKey, ResultValue] = 
     execute { s.selectMap[Param,ResultKey,ResultValue](fqi.id, param, mapKey, rowBounds) }

mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/T.scala

@@ -21,8 +21,8 @@ package org.mybatis.scala.mapping
   * @tparam t wrapped type
   */
 class T[t : Manifest] {
-  val raw = manifest[t].erasure.asInstanceOf[Class[Any]]
-  val unwrap = manifest[t].erasure.asInstanceOf[Class[t]]
+  val raw = manifest[t].runtimeClass.asInstanceOf[Class[Any]]
+  val unwrap = manifest[t].runtimeClass.asInstanceOf[Class[t]]
   val isVoid = unwrap == java.lang.Void.TYPE
 }
 

mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/Update.scala

@@ -27,7 +27,7 @@ abstract class Update[Param : Manifest]
   extends Statement 
   with SQLFunction1[Param,Int] {
 
-  def parameterTypeClass = manifest[Param].erasure
+  def parameterTypeClass = manifest[Param].runtimeClass
 
   /** Exceutes the SQL UPDATE Statement
     * @param param Input paramenter of the statement