Skip to content

Commit 3f1be7f

Browse files
hazendazhazendaz
authored
Merge pull request #99 from benjamin3878/master
upgrade to scala 2.13.6
2 parents 245e387 + 1bd4972 commit 3f1be7f

File tree

12 files changed

+55
-55
lines changed

12 files changed

+55
-55
lines changed

‎mybatis-scala-core/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
<parent>
2323
<groupId>org.mybatis.scala</groupId>
24-
<artifactId>mybatis-scala-parent_2.12</artifactId>
25-
<version>1.2.1-SNAPSHOT</version>
24+
<artifactId>mybatis-scala-parent_2.13</artifactId>
25+
<version>1.3.0-SNAPSHOT</version>
2626
</parent>
2727

28-
<artifactId>mybatis-scala-core_2.12</artifactId>
29-
<version>1.2.1-SNAPSHOT</version>
28+
<artifactId>mybatis-scala-core_2.13</artifactId>
29+
<version>1.3.0-SNAPSHOT</version>
3030
<packaging>jar</packaging>
3131
<name>mybatis-scala-core</name>
3232

‎mybatis-scala-core/src/main/scala/org/mybatis/scala/config/Configuration.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ object Configuration {
213213
import org.apache.ibatis.plugin.Interceptor
214214
import scala.collection.mutable.ArrayBuffer
215215
import org.mybatis.scala.session.ExecutorType
216-
import scala.collection.JavaConversions._
216+
import scala.jdk.CollectionConverters._
217217
import org.apache.ibatis.mapping.Environment
218218

219219
/** Reference to self. Support for operational notation. */
@@ -251,16 +251,16 @@ object Configuration {
251251
// Pre ====================================================================
252252

253253
def properties(props: (String, String)*) =
254-
set(0, pre) { _.getVariables ++= Map(props: _*) }
254+
set(0, pre) { _.getVariables.asScala ++= Map(props: _*) }
255255

256256
def properties(props: Properties) =
257-
set(1, pre) { _.getVariables ++= props }
257+
set(1, pre) { _.getVariables.asScala ++= props.asScala }
258258

259259
def properties(resource: String) =
260-
set(2, pre) { _.getVariables ++= Resources.getResourceAsProperties(resource) }
260+
set(2, pre) { _.getVariables.asScala ++= Resources.getResourceAsProperties(resource).asScala }
261261

262262
def propertiesFromUrl(url: String) =
263-
set(3, pre) { _.getVariables ++= Resources.getUrlAsProperties(url) }
263+
set(3, pre) { _.getVariables.asScala ++= Resources.getUrlAsProperties(url).asScala }
264264

265265
def plugin(plugin: Interceptor) =
266266
set(4, pre) { _.addInterceptor(plugin) }
@@ -313,7 +313,7 @@ object Configuration {
313313
set(20, pre) { _.setJdbcTypeForNull(jdbcType.unwrap) }
314314

315315
def lazyLoadTriggerMethods(names: Set[String]) =
316-
set(21, pre) { _.setLazyLoadTriggerMethods(names) }
316+
set(21, pre) { _.setLazyLoadTriggerMethods(names.asJava) }
317317

318318
def environment(id: String, transactionFactory: TransactionFactory, dataSource: javax.sql.DataSource) =
319319
set(24, pre) { _.setEnvironment(new Environment(id, transactionFactory, dataSource)) }

‎mybatis-scala-core/src/main/scala/org/mybatis/scala/config/ObjectWrapperFactory.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ abstract class CollectionObjectWrapper extends org.apache.ibatis.reflection.wrap
3434
}
3535

3636
class ArrayBufferWrapper(buffer : scala.collection.mutable.ArrayBuffer[AnyRef]) extends CollectionObjectWrapper {
37-
import scala.collection.JavaConversions._
37+
import scala.jdk.CollectionConverters._
3838
def add(element : AnyRef) : Unit = buffer append element
39-
def addAll[E](elements : java.util.List[E]) : Unit = buffer.addAll(elements.asInstanceOf[java.util.Collection[AnyRef]])
39+
def addAll[E](elements : java.util.List[E]) : Unit = buffer.addAll(elements.asInstanceOf[java.util.Collection[AnyRef]].asScala)
4040
}
4141

4242
class HashSetWrapper(set : scala.collection.mutable.HashSet[AnyRef]) extends CollectionObjectWrapper {
43-
import scala.collection.JavaConversions._
43+
import scala.jdk.CollectionConverters._
4444
def add(element : AnyRef) : Unit = set add element
45-
def addAll[E](elements : java.util.List[E]) : Unit = set.addAll(elements.asInstanceOf[java.util.Collection[AnyRef]])
45+
def addAll[E](elements : java.util.List[E]) : Unit = set.addAll(elements.asInstanceOf[java.util.Collection[AnyRef]].asScala)
4646
}
4747

4848
class DefaultObjectWrapperFactory extends ObjectWrapperFactory {

‎mybatis-scala-core/src/main/scala/org/mybatis/scala/mapping/ResultMapping.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.mybatis.scala.mapping
1818
import org.apache.ibatis.`type`.{JdbcType => JdbcTypeEnum}
1919
import org.apache.ibatis.mapping.{ResultFlag => ResultFlagEnum}
2020
import java.util.{List => JList}
21-
import scala.collection.JavaConversions._
21+
import scala.jdk.CollectionConverters._
2222

2323
private[scala] class ResultMapping (
2424
resultType : T[_],
@@ -43,6 +43,6 @@ private[scala] class ResultMapping (
4343
def nestedResultMap : ResultMap[_] = nestedResultMap_
4444
def notNullColumn : String = notNullColumn_
4545
def typeHandlerClass : Class[_ <: TypeHandler[_]] = if (typeHandler == null) null else typeHandler.unwrap
46-
def flags : JList[ResultFlagEnum] = for (f <- flags_) yield f.unwrap
46+
def flags : JList[ResultFlagEnum] = (for (f <- flags_) yield f.unwrap).asJava
4747
def columnPrefix = columnPrefix_
4848
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.mybatis.scala.mapping
1818
import org.mybatis.scala.session.{Session, RowBounds, ResultHandlerDelegator, ResultContext}
1919
import scala.collection.mutable._;
2020
import java.util.{Map => JavaMap}
21-
import scala.collection.JavaConversions.mapAsJavaMap
21+
import scala.jdk.CollectionConverters._
2222

2323
/** Base class for all Select statements.
2424
*/
@@ -455,7 +455,7 @@ abstract class SelectOneByMap[Result : Manifest]
455455

456456
def apply(param : collection.Map[String, Any])(implicit s : Session) : Option[Result] =
457457
execute {
458-
Option(s.selectOne[JavaMap[String, Any],Result](fqi.id, mapAsJavaMap(param)))
458+
Option(s.selectOne[JavaMap[String, Any],Result](fqi.id, param.asJava))
459459
}
460460
}
461461

@@ -489,7 +489,7 @@ abstract class SelectListByMap[Result : Manifest]
489489
def resultTypeClass = manifest[Result].runtimeClass
490490

491491
def apply(param : collection.Map[String, Any])(implicit s : Session) : Seq[Result] =
492-
execute { s.selectList[JavaMap[String, Any],Result](fqi.id, param) }
492+
execute { s.selectList[JavaMap[String, Any],Result](fqi.id, param.asJava) }
493493

494494
def handle(param : collection.Map[String, Any], callback : ResultContext[_ <: Result] => Unit)(implicit s : Session) : Unit =
495495
execute { s.select(fqi.id, param, new ResultHandlerDelegator[Result](callback)) }

‎mybatis-scala-core/src/main/scala/org/mybatis/scala/session/Session.scala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.mybatis.scala.session
1717

1818
import org.apache.ibatis.session.SqlSession
19-
import scala.collection.JavaConversions._
19+
import scala.jdk.CollectionConverters._
2020
import scala.collection.mutable._
2121

2222
/** SqlSession Wrapper.
@@ -41,27 +41,27 @@ class Session(sqls : SqlSession) {
4141
}
4242

4343
def selectList[Result](statement : String) : Seq[Result] = {
44-
asScalaBuffer(sqls.selectList(statement))
44+
sqls.selectList(statement).asScala.toBuffer
4545
}
4646

4747
def selectList[Param,Result](statement : String, parameter : Param) : Seq[Result] = {
48-
asScalaBuffer(sqls.selectList(statement, parameter))
48+
sqls.selectList(statement, parameter).asScala.toBuffer
4949
}
5050

5151
def selectList[Param,Result](statement : String, parameter : Param, rowBounds : RowBounds) : Seq[Result] = {
52-
asScalaBuffer(sqls.selectList(statement, parameter, rowBounds.unwrap))
52+
sqls.selectList(statement, parameter, rowBounds.unwrap).asScala.toBuffer
5353
}
5454

5555
def selectMap[Key,Value](statement : String, mapKey : String) : Map[Key,Value] = {
56-
mapAsScalaMap(sqls.selectMap[Key,Value](statement, mapKey))
56+
sqls.selectMap[Key,Value](statement, mapKey).asScala
5757
}
5858

5959
def selectMap[Param,Key,Value](statement : String, parameter : Param, mapKey : String) : Map[Key,Value] = {
60-
mapAsScalaMap(sqls.selectMap[Key,Value](statement, parameter, mapKey))
60+
sqls.selectMap[Key,Value](statement, parameter, mapKey).asScala
6161
}
6262

6363
def selectMap[Param,Key,Value](statement : String, parameter : Param, mapKey : String, rowBounds : RowBounds) : Map[Key,Value] = {
64-
mapAsScalaMap(sqls.selectMap[Key,Value](statement, parameter, mapKey, rowBounds.unwrap))
64+
sqls.selectMap[Key,Value](statement, parameter, mapKey, rowBounds.unwrap).asScala
6565
}
6666

6767
def select[Param, Res](statement : String, parameter : Param, handler : ResultHandler[Res]) : Unit = {
@@ -110,6 +110,6 @@ class Session(sqls : SqlSession) {
110110

111111
def clearCache() : Unit = sqls.clearCache
112112

113-
def flushStatements() : Seq[BatchResult] = sqls.flushStatements
113+
def flushStatements() : Seq[BatchResult] = sqls.flushStatements.asScala
114114

115115
}

‎mybatis-scala-core/src/main/scala/org/mybatis/scala/session/SessionManager.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package org.mybatis.scala.session
1717

18-
import org.apache.ibatis.session._
1918
import org.apache.ibatis.logging.LogFactory
2019
import SessionManager.log
20+
import org.apache.ibatis.session.{SqlSession, SqlSessionFactory}
2121

2222
/** Session lifecycle manager.
2323
* Manages the lifecycle of the Session

‎mybatis-scala-samples/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
<parent>
2323
<groupId>org.mybatis.scala</groupId>
24-
<artifactId>mybatis-scala-parent_2.12</artifactId>
25-
<version>1.2.1-SNAPSHOT</version>
24+
<artifactId>mybatis-scala-parent_2.13</artifactId>
25+
<version>1.3.0-SNAPSHOT</version>
2626
</parent>
2727

28-
<artifactId>mybatis-scala-samples_2.12</artifactId>
28+
<artifactId>mybatis-scala-samples_2.13</artifactId>
2929
<packaging>jar</packaging>
3030
<name>mybatis-scala-samples</name>
3131

‎mybatis-scala-samples/src/main/scala/org/mybatis/scala/samples/insert/InsertSampleBatch.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ object InsertSampleBatch {
7272
db.transaction(ExecutorType.BATCH) { implicit session =>
7373

7474
DBSchema.create
75-
session.flushStatements
75+
session.flushStatements()
7676

7777
val g = new Group
7878
g.name = "New Group"
7979
insertGroup(g)
80-
session.flushStatements
80+
session.flushStatements()
8181

8282
Seq(("Jonh", "Smith"), ("Mary", "Jane"), ("Pepe", "Grillo")) map { (t) =>
8383
val p = new Person
@@ -87,7 +87,7 @@ object InsertSampleBatch {
8787
insertPerson(p)
8888
}
8989

90-
val created = session.flushStatements
90+
val created = session.flushStatements()
9191
for (result <- created) {
9292
println( "\n==========================================================" )
9393
println( result.getSql )

‎mybatis-scala-samples/src/main/scala/org/mybatis/scala/samples/util/DBSampleData.scala‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,25 @@ object DBSampleData {
4848

4949
def populate(implicit s : Session) = {
5050

51-
import scala.collection.JavaConversions._
51+
import scala.jdk.CollectionConverters._
5252

53-
insertGroup(Map("id" -> 1, "name" -> "Customers"))
54-
insertGroup(Map("id" -> 2, "name" -> "Suppliers"))
55-
insertGroup(Map("id" -> 3, "name" -> "Employees"))
53+
insertGroup(Map("id" -> 1, "name" -> "Customers").asJava)
54+
insertGroup(Map("id" -> 2, "name" -> "Suppliers").asJava)
55+
insertGroup(Map("id" -> 3, "name" -> "Employees").asJava)
5656

57-
insertPerson(Map("id" -> 1, "firstname" -> "John", "lastname" -> "Smart", "group" -> 1))
58-
insertPerson(Map("id" -> 2, "firstname" -> "Maria", "lastname" -> "Perez", "group" -> 2))
59-
insertPerson(Map("id" -> 3, "firstname" -> "Janeth", "lastname" -> "Ros", "group" -> 1))
60-
insertPerson(Map("id" -> 4, "firstname" -> "Paul", "lastname" -> "Jobs", "group" -> 3))
61-
insertPerson(Map("id" -> 5, "firstname" -> "Bill", "lastname" -> "Rich", "group" -> 1))
57+
insertPerson(Map("id" -> 1, "firstname" -> "John", "lastname" -> "Smart", "group" -> 1).asJava)
58+
insertPerson(Map("id" -> 2, "firstname" -> "Maria", "lastname" -> "Perez", "group" -> 2).asJava)
59+
insertPerson(Map("id" -> 3, "firstname" -> "Janeth", "lastname" -> "Ros", "group" -> 1).asJava)
60+
insertPerson(Map("id" -> 4, "firstname" -> "Paul", "lastname" -> "Jobs", "group" -> 3).asJava)
61+
insertPerson(Map("id" -> 5, "firstname" -> "Bill", "lastname" -> "Rich", "group" -> 1).asJava)
6262

63-
insertContactInfo(Map("person" -> 1, "address" -> "222 Street", "phone" -> "555-0988998"))
64-
insertContactInfo(Map("person" -> 2, "address" -> "333 Av", "phone" -> "554-7464363"))
65-
insertContactInfo(Map("person" -> 2, "address" -> "1 Rose Ave", "phone" -> "836-8456463"))
66-
insertContactInfo(Map("person" -> 3, "address" -> "444 St Rose", "phone" -> "665-9476558"))
67-
insertContactInfo(Map("person" -> 4, "address" -> "555 Wall Street", "phone" -> "666-7474664"))
68-
insertContactInfo(Map("person" -> 5, "address" -> "666 Mountain View", "phone" -> "571-9875923"))
69-
insertContactInfo(Map("person" -> 5, "address" -> "777 Mars", "phone" -> "587-3984792"))
63+
insertContactInfo(Map("person" -> 1, "address" -> "222 Street", "phone" -> "555-0988998").asJava)
64+
insertContactInfo(Map("person" -> 2, "address" -> "333 Av", "phone" -> "554-7464363").asJava)
65+
insertContactInfo(Map("person" -> 2, "address" -> "1 Rose Ave", "phone" -> "836-8456463").asJava)
66+
insertContactInfo(Map("person" -> 3, "address" -> "444 St Rose", "phone" -> "665-9476558").asJava)
67+
insertContactInfo(Map("person" -> 4, "address" -> "555 Wall Street", "phone" -> "666-7474664").asJava)
68+
insertContactInfo(Map("person" -> 5, "address" -> "666 Mountain View", "phone" -> "571-9875923").asJava)
69+
insertContactInfo(Map("person" -> 5, "address" -> "777 Mars", "phone" -> "587-3984792").asJava)
7070

7171
}
7272

0 commit comments

Comments
 (0)