Skip to content

Commit 792959a

Browse files
committed
add explicit types. prepare -Xsource:3
1 parent 3411567 commit 792959a

File tree

9 files changed

+14
-9
lines changed

9 files changed

+14
-9
lines changed

core/src/main/scala/scalikejdbc/async/internal/PoolableAsyncConnection.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package scalikejdbc.async.internal
1717

1818
import com.github.jasync.sql.db.ConcreteConnection
19+
import com.github.jasync.sql.db.Connection
1920
import com.github.jasync.sql.db.pool.ConnectionPool
2021
import scalikejdbc.async.NonSharedAsyncConnection
2122
import scalikejdbc.async.ShortenedNames._
@@ -38,7 +39,7 @@ private[scalikejdbc] abstract class PoolableAsyncConnection[
3839
): Future[NonSharedAsyncConnection] =
3940
Future.failed(new UnsupportedOperationException)
4041

41-
private[scalikejdbc] lazy val underlying = pool
42+
private[scalikejdbc] lazy val underlying: Connection = pool
4243

4344
/**
4445
* Close or release this connection.

core/src/main/scala/scalikejdbc/async/internal/mysql/SingleAsyncMySQLConnection.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package scalikejdbc.async.internal.mysql
1717

1818
import com.github.jasync.sql.db.Configuration
19+
import com.github.jasync.sql.db.Connection
1920
import com.github.jasync.sql.db.mysql.util.URLParser
2021
import scalikejdbc.async._, internal._
2122

@@ -36,7 +37,7 @@ private[scalikejdbc] case class SingleAsyncMySQLConnection(
3637
override protected def parseUrl(url: String): Configuration =
3738
URLParser.INSTANCE.parse(url, StandardCharsets.UTF_8)
3839

39-
private[scalikejdbc] val underlying = {
40+
private[scalikejdbc] val underlying: Connection = {
4041
new com.github.jasync.sql.db.mysql.MySQLConnection(
4142
configuration(url, user, password, connectionSettings)
4243
)

core/src/main/scala/scalikejdbc/async/internal/postgresql/SingleAsyncPostgreSQLConnection.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package scalikejdbc.async.internal.postgresql
1717

1818
import com.github.jasync.sql.db.Configuration
19+
import com.github.jasync.sql.db.Connection
1920
import com.github.jasync.sql.db.postgresql.util.URLParser
2021
import scalikejdbc.async._, internal._
2122

@@ -36,7 +37,7 @@ private[scalikejdbc] case class SingleAsyncPostgreSQLConnection(
3637
override protected def parseUrl(url: String): Configuration =
3738
URLParser.INSTANCE.parse(url, StandardCharsets.UTF_8)
3839

39-
private[scalikejdbc] val underlying = {
40+
private[scalikejdbc] val underlying: Connection = {
4041
new com.github.jasync.sql.db.postgresql.PostgreSQLConnection(
4142
configuration(url, user, password, connectionSettings)
4243
)

core/src/test/scala/programmerlist/Company.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ case class Company(
2626

2727
object Company extends SQLSyntaxSupport[Company] with ShortenedNames {
2828

29-
override val columnNames =
29+
override val columnNames: Seq[String] =
3030
Seq("id", "name", "url", "created_at", "deleted_at")
3131

3232
def apply(c: SyntaxProvider[Company])(rs: WrappedResultSet): Company =

core/src/test/scala/programmerlist/Programmer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ case class Programmer(
5252

5353
object Programmer extends SQLSyntaxSupport[Programmer] with ShortenedNames {
5454

55-
override val columnNames =
55+
override val columnNames: Seq[String] =
5656
Seq("id", "name", "company_id", "created_timestamp", "deleted_timestamp")
5757
override val nameConverters = Map("At$" -> "_timestamp")
5858

core/src/test/scala/programmerlist/ProgrammerSkill.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ case class ProgrammerSkill(programmerId: Long, skillId: Long)
66

77
object ProgrammerSkill extends SQLSyntaxSupport[ProgrammerSkill] {
88

9-
override val columnNames = Seq("programmer_id", "skill_id")
9+
override val columnNames: Seq[String] = Seq("programmer_id", "skill_id")
1010

1111
lazy val ps = ProgrammerSkill.syntax("ps")
1212
}

core/src/test/scala/programmerlist/Skill.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ case class Skill(
2525

2626
object Skill extends SQLSyntaxSupport[Skill] with ShortenedNames {
2727

28-
override val columnNames = Seq("id", "name", "created_at", "deleted_at")
28+
override val columnNames: Seq[String] =
29+
Seq("id", "name", "created_at", "deleted_at")
2930

3031
def apply(s: SyntaxProvider[Skill])(rs: WrappedResultSet): Skill =
3132
apply(s.resultName)(rs)

core/src/test/scala/sample/AsyncLover.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ case class AsyncLover(
1818

1919
object AsyncLover extends SQLSyntaxSupport[AsyncLover] {
2020

21-
override val columns = Seq(
21+
override val columns: Seq[String] = Seq(
2222
"id",
2323
"name",
2424
"rating",

core/src/test/scala/unit/DBSettings.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package unit
33
import scalikejdbc._
44
import async.{ AsyncConnectionPoolSettings, _ }
55
import com.dimafeng.testcontainers.{
6+
Container,
67
ForAllTestContainer,
78
MultipleContainers,
89
MySQLContainer,
@@ -20,7 +21,7 @@ trait DBSettings extends ForAllTestContainer { self: Suite =>
2021
protected[this] final val postgres = PostgreSQLContainer(
2122
DockerImageName.parse("postgres:11.4")
2223
)
23-
override val container = MultipleContainers(mysql, postgres)
24+
override val container: Container = MultipleContainers(mysql, postgres)
2425

2526
protected[this] final def mysqlJdbcUrl = mysql.jdbcUrl
2627
protected[this] final def postgresJdbcUrl = postgres.jdbcUrl

0 commit comments

Comments
 (0)