From 186269f8ff0dcc54897aa4faf0c50c46cc4f398a Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 10 Sep 2023 16:33:18 +0900 Subject: [PATCH] add explicit type --- .../scala/gitbucket/core/model/Activity.scala | 2 +- .../gitbucket/core/util/DatabaseConfig.scala | 16 ++++++++-------- .../gitbucket/core/GitBucketCoreModuleSpec.scala | 11 ++++++----- .../scala/gitbucket/core/api/ApiSpecModels.scala | 2 +- .../gitbucket/core/api/JsonFormatSpec.scala | 3 ++- .../scala/gitbucket/core/view/HelpersSpec.scala | 2 +- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/main/scala/gitbucket/core/model/Activity.scala b/src/main/scala/gitbucket/core/model/Activity.scala index a7ca6fb49..e35e1e348 100644 --- a/src/main/scala/gitbucket/core/model/Activity.scala +++ b/src/main/scala/gitbucket/core/model/Activity.scala @@ -11,7 +11,7 @@ trait ActivityComponent extends TemplateComponent { self: Profile => lazy val Activities = TableQuery[Activities] class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate { - def * = ??? + def * : slick.lifted.ProvenShape[Activity] = ??? } } diff --git a/src/main/scala/gitbucket/core/util/DatabaseConfig.scala b/src/main/scala/gitbucket/core/util/DatabaseConfig.scala index 75420d01f..c5f9e5958 100644 --- a/src/main/scala/gitbucket/core/util/DatabaseConfig.scala +++ b/src/main/scala/gitbucket/core/util/DatabaseConfig.scala @@ -99,26 +99,26 @@ object DatabaseType { object H2 extends DatabaseType { val jdbcDriver = "org.h2.Driver" - val slickDriver = BlockingH2Driver - val liquiDriver = new H2Database() + val slickDriver: BlockingJdbcProfile = BlockingH2Driver + val liquiDriver: AbstractJdbcDatabase = new H2Database() } object MySQL extends DatabaseType { val jdbcDriver = "org.mariadb.jdbc.Driver" - val slickDriver = BlockingMySQLDriver - val liquiDriver = new MySQLDatabase() + val slickDriver: BlockingJdbcProfile = BlockingMySQLDriver + val liquiDriver: AbstractJdbcDatabase = new MySQLDatabase() } object MariaDb extends DatabaseType { val jdbcDriver = "org.mariadb.jdbc.Driver" - val slickDriver = BlockingMySQLDriver - val liquiDriver = new MariaDBDatabase() + val slickDriver: BlockingJdbcProfile = BlockingMySQLDriver + val liquiDriver: AbstractJdbcDatabase = new MariaDBDatabase() } object PostgreSQL extends DatabaseType { val jdbcDriver = "org.postgresql.Driver2" - val slickDriver = BlockingPostgresDriver - val liquiDriver = new PostgresDatabase() + val slickDriver: BlockingJdbcProfile = BlockingPostgresDriver + val liquiDriver: AbstractJdbcDatabase = new PostgresDatabase() } object BlockingPostgresDriver extends slick.jdbc.PostgresProfile with BlockingJdbcProfile { diff --git a/src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala b/src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala index 39704e4f1..efd96c6f2 100644 --- a/src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala +++ b/src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala @@ -24,15 +24,16 @@ class GitBucketCoreModuleSpec extends AnyFunSuite { ) } - implicit private val suiteDescription = Description.createSuiteDescription(getClass) + implicit private val suiteDescription: Description = Description.createSuiteDescription(getClass) Seq("8.0", "5.7").foreach { tag => test(s"Migration MySQL $tag", ExternalDBTest) { val container = new MySQLContainer() { - override val container = new org.testcontainers.containers.MySQLContainer(s"mysql:$tag") { - override def getDriverClassName = "org.mariadb.jdbc.Driver" - override def getJdbcUrl: String = super.getJdbcUrl + "?permitMysqlScheme" - } + override val container: org.testcontainers.containers.MySQLContainer[_] = + new org.testcontainers.containers.MySQLContainer(s"mysql:$tag") { + override def getDriverClassName = "org.mariadb.jdbc.Driver" + override def getJdbcUrl: String = super.getJdbcUrl + "?permitMysqlScheme" + } // TODO https://jira.mariadb.org/browse/CONJ-663 container.withCommand("mysqld --default-authentication-plugin=mysql_native_password") } diff --git a/src/test/scala/gitbucket/core/api/ApiSpecModels.scala b/src/test/scala/gitbucket/core/api/ApiSpecModels.scala index 9c28f05d4..fca99815b 100644 --- a/src/test/scala/gitbucket/core/api/ApiSpecModels.scala +++ b/src/test/scala/gitbucket/core/api/ApiSpecModels.scala @@ -13,7 +13,7 @@ import org.eclipse.jgit.lib.ObjectId object ApiSpecModels { - implicit val context = JsonFormat.Context("http://gitbucket.exmple.com", None) + implicit val context: JsonFormat.Context = JsonFormat.Context("http://gitbucket.exmple.com", None) val date1 = { val d = Calendar.getInstance(TimeZone.getTimeZone("UTC")) diff --git a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala index 5845cef2c..ef3112eae 100644 --- a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala +++ b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala @@ -1,11 +1,12 @@ package gitbucket.core.api +import org.json4s.Formats import org.json4s.jackson.JsonMethods import org.scalatest.funsuite.AnyFunSuite class JsonFormatSpec extends AnyFunSuite { import ApiSpecModels._ - implicit val format = JsonFormat.jsonFormats + implicit val format: Formats = JsonFormat.jsonFormats private def expected(json: String) = json.replaceAll("\n", "") def normalizeJson(json: String) = { diff --git a/src/test/scala/gitbucket/core/view/HelpersSpec.scala b/src/test/scala/gitbucket/core/view/HelpersSpec.scala index 3b053665e..8ec3ee793 100644 --- a/src/test/scala/gitbucket/core/view/HelpersSpec.scala +++ b/src/test/scala/gitbucket/core/view/HelpersSpec.scala @@ -9,7 +9,7 @@ import org.mockito.Mockito._ class HelpersSpec extends AnyFunSpec { - private implicit val context = mock(classOf[Context]) + private implicit val context: Context = mock(classOf[Context]) private val repository = mock(classOf[RepositoryInfo]) import helpers._