From 20e36400625d9d503369e013f2c032aa891e71b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 3 Feb 2024 07:54:32 +0000 Subject: [PATCH 1/4] Update plugin com.diffplug.spotless to v6.25.0 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ab876d12..30d5b8d4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("com.diffplug.eclipse.apt") version "3.43.0" apply false - id("com.diffplug.spotless") version "6.13.0" apply false + id("com.diffplug.spotless") version "6.25.0" apply false id("org.domaframework.doma.compile") version "2.0.0" apply false kotlin("jvm") version "1.9.22" apply false kotlin("kapt") version "1.9.22" apply false From e726c6648886ca132251e1ba579537112b041652 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 00:48:39 +0000 Subject: [PATCH 2/4] Update plugin com.diffplug.spotless to v6.22.0 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ab876d12..58f85cc3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("com.diffplug.eclipse.apt") version "3.43.0" apply false - id("com.diffplug.spotless") version "6.13.0" apply false + id("com.diffplug.spotless") version "6.22.0" apply false id("org.domaframework.doma.compile") version "2.0.0" apply false kotlin("jvm") version "1.9.22" apply false kotlin("kapt") version "1.9.22" apply false From 50d04476773aa246957e354656e51b1d92353d82 Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 3 Feb 2024 17:16:01 +0900 Subject: [PATCH 3/4] Update ktlint --- dsl-style-kotlin/build.gradle.kts | 4 ++-- .../style/kotlin}/DbConfig.kt | 4 ++-- .../style/kotlin}/dao/ScriptDao.kt | 6 +++--- .../style/kotlin}/domain/Age.kt | 2 +- .../style/kotlin}/domain/AgeConverter.kt | 2 +- .../kotlin}/domain/DomainConverterProvider.kt | 2 +- .../style/kotlin}/domain/Salary.kt | 2 +- .../style/kotlin}/entity/Department.kt | 4 +++- .../style/kotlin}/entity/Employee.kt | 6 +++--- .../style/kotlin}/entity/EmployeeListener.kt | 2 +- .../style/kotlin}/entity/JobType.kt | 2 +- .../style/kotlin}/repository/EmployeeRepository.kt | 14 +++++++------- .../style/kotlin}/AggregateFunctionTest.kt | 4 ++-- .../style/kotlin}/BatchDeleteTest.kt | 4 ++-- .../style/kotlin}/BatchInsertTest.kt | 10 +++++----- .../style/kotlin}/BatchUpdateTest.kt | 6 +++--- .../style/kotlin}/DeleteTest.kt | 4 ++-- .../style/kotlin}/InsertTest.kt | 12 ++++++------ .../style/kotlin}/SelectTest.kt | 10 +++++----- .../style/kotlin}/TestEnvironment.kt | 8 ++++---- .../style/kotlin}/UpdateTest.kt | 6 +++--- 21 files changed, 58 insertions(+), 56 deletions(-) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/DbConfig.kt (88%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/dao/ScriptDao.kt (97%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/domain/Age.kt (73%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/domain/AgeConverter.kt (89%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/domain/DomainConverterProvider.kt (73%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/domain/Salary.kt (82%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/entity/Department.kt (90%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/entity/Employee.kt (93%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/entity/EmployeeListener.kt (96%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/entity/JobType.kt (64%) rename dsl-style-kotlin/src/main/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/repository/EmployeeRepository.kt (96%) rename dsl-style-kotlin/src/test/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/AggregateFunctionTest.kt (82%) rename dsl-style-kotlin/src/test/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/BatchDeleteTest.kt (81%) rename dsl-style-kotlin/src/test/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/BatchInsertTest.kt (74%) rename dsl-style-kotlin/src/test/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/BatchUpdateTest.kt (80%) rename dsl-style-kotlin/src/test/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/DeleteTest.kt (87%) rename dsl-style-kotlin/src/test/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/InsertTest.kt (77%) rename dsl-style-kotlin/src/test/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/SelectTest.kt (95%) rename dsl-style-kotlin/src/test/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/TestEnvironment.kt (91%) rename dsl-style-kotlin/src/test/kotlin/example/{dsl_style_kotlin => dsl/style/kotlin}/UpdateTest.kt (85%) diff --git a/dsl-style-kotlin/build.gradle.kts b/dsl-style-kotlin/build.gradle.kts index a8695e65..8b5c6bf6 100644 --- a/dsl-style-kotlin/build.gradle.kts +++ b/dsl-style-kotlin/build.gradle.kts @@ -19,7 +19,7 @@ tasks { kapt { arguments { - arg("doma.domain.converters", "example.dsl_style_kotlin.domain.DomainConverterProvider") + arg("doma.domain.converters", "example.dsl.style.kotlin.domain.DomainConverterProvider") } } @@ -38,7 +38,7 @@ java { spotless { kotlin { - ktlint("0.38.1") + ktlint("0.50.0") trimTrailingWhitespace() endWithNewline() } diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/DbConfig.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/DbConfig.kt similarity index 88% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/DbConfig.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/DbConfig.kt index d0cda7d3..e430f001 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/DbConfig.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/DbConfig.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin import org.seasar.doma.jdbc.Config import org.seasar.doma.jdbc.JdbcLogger @@ -10,7 +10,7 @@ class DbConfig( private val dialect: Dialect, private val dataSource: DataSource, private val jdbcLogger: JdbcLogger, - private val transactionManager: TransactionManager + private val transactionManager: TransactionManager, ) : Config { override fun getJdbcLogger(): JdbcLogger { return jdbcLogger diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/dao/ScriptDao.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/dao/ScriptDao.kt similarity index 97% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/dao/ScriptDao.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/dao/ScriptDao.kt index 8da04c4a..5aff5632 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/dao/ScriptDao.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/dao/ScriptDao.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin.dao +package example.dsl.style.kotlin.dao import org.seasar.doma.Dao import org.seasar.doma.Script @@ -28,7 +28,7 @@ interface ScriptDao { insert into employee values(12,'FORD',55,3000,'ANALYST','2008-12-20 12:34:56',3,1,CURRENT_TIMESTAMP,null); insert into employee values(13,'MILLER',51,1300,'MANAGER','2009-01-20 12:34:56',1,1,CURRENT_TIMESTAMP,null); insert into employee values(14,'SMITH',410,800,'PRESIDENT','2009-02-20 12:34:56',2,1,CURRENT_TIMESTAMP,null); - """ + """, ) @Script fun create() @@ -38,7 +38,7 @@ interface ScriptDao { drop sequence employee_seq; drop table employee; drop table department; - """ + """, ) @Script fun drop() diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/Age.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/Age.kt similarity index 73% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/Age.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/Age.kt index cd384a08..7639d266 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/Age.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/Age.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin.domain +package example.dsl.style.kotlin.domain class Age(val value: Int) { diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/AgeConverter.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/AgeConverter.kt similarity index 89% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/AgeConverter.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/AgeConverter.kt index 6aefd92a..935a1a4a 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/AgeConverter.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/AgeConverter.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin.domain +package example.dsl.style.kotlin.domain import org.seasar.doma.ExternalDomain import org.seasar.doma.jdbc.domain.DomainConverter diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/DomainConverterProvider.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/DomainConverterProvider.kt similarity index 73% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/DomainConverterProvider.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/DomainConverterProvider.kt index 684d0eb2..923400f3 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/DomainConverterProvider.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/DomainConverterProvider.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin.domain +package example.dsl.style.kotlin.domain import org.seasar.doma.DomainConverters diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/Salary.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/Salary.kt similarity index 82% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/Salary.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/Salary.kt index 664f2546..1320bae7 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/domain/Salary.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/domain/Salary.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin.domain +package example.dsl.style.kotlin.domain import org.seasar.doma.Domain diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/Department.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/Department.kt similarity index 90% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/Department.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/Department.kt index c29a47f2..07f5ae1c 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/Department.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/Department.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin.entity +package example.dsl.style.kotlin.entity import org.seasar.doma.Entity import org.seasar.doma.Id @@ -11,8 +11,10 @@ class Department { @Id var id: Int? = null var name: String? = null + @Version var version: Int? = null + @Transient val employees: MutableList = mutableListOf() } diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/Employee.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/Employee.kt similarity index 93% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/Employee.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/Employee.kt index 63240921..9a37ac5a 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/Employee.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/Employee.kt @@ -1,7 +1,7 @@ -package example.dsl_style_kotlin.entity +package example.dsl.style.kotlin.entity -import example.dsl_style_kotlin.domain.Age -import example.dsl_style_kotlin.domain.Salary +import example.dsl.style.kotlin.domain.Age +import example.dsl.style.kotlin.domain.Salary import org.seasar.doma.Column import org.seasar.doma.Entity import org.seasar.doma.GeneratedValue diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/EmployeeListener.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/EmployeeListener.kt similarity index 96% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/EmployeeListener.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/EmployeeListener.kt index d3e95a17..60cc3016 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/EmployeeListener.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/EmployeeListener.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin.entity +package example.dsl.style.kotlin.entity import org.seasar.doma.jdbc.entity.EntityListener import org.seasar.doma.jdbc.entity.PostDeleteContext diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/JobType.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/JobType.kt similarity index 64% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/JobType.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/JobType.kt index 977a1ddd..980f25fc 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/entity/JobType.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/entity/JobType.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin.entity +package example.dsl.style.kotlin.entity enum class JobType { SALESMAN, MANAGER, ANALYST, PRESIDENT, CLERK diff --git a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/repository/EmployeeRepository.kt b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/repository/EmployeeRepository.kt similarity index 96% rename from dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/repository/EmployeeRepository.kt rename to dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/repository/EmployeeRepository.kt index f5cd3d16..bfb1b8e1 100644 --- a/dsl-style-kotlin/src/main/kotlin/example/dsl_style_kotlin/repository/EmployeeRepository.kt +++ b/dsl-style-kotlin/src/main/kotlin/example/dsl/style/kotlin/repository/EmployeeRepository.kt @@ -1,10 +1,10 @@ -package example.dsl_style_kotlin.repository +package example.dsl.style.kotlin.repository -import example.dsl_style_kotlin.domain.Age -import example.dsl_style_kotlin.domain.Salary -import example.dsl_style_kotlin.entity.Department_ -import example.dsl_style_kotlin.entity.Employee -import example.dsl_style_kotlin.entity.Employee_ +import example.dsl.style.kotlin.domain.Age +import example.dsl.style.kotlin.domain.Salary +import example.dsl.style.kotlin.entity.Department_ +import example.dsl.style.kotlin.entity.Employee +import example.dsl.style.kotlin.entity.Employee_ import org.seasar.doma.jdbc.Config import org.seasar.doma.jdbc.criteria.option.LikeOption import org.seasar.doma.kotlin.jdbc.criteria.KEntityql @@ -151,7 +151,7 @@ class EmployeeRepository(config: Config) { from(d).where { eq(e.departmentId, d.id) eq(d.name, departmentName) - } + }, ) } .fetch() diff --git a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/AggregateFunctionTest.kt b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/AggregateFunctionTest.kt similarity index 82% rename from dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/AggregateFunctionTest.kt rename to dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/AggregateFunctionTest.kt index b49438ad..24af442a 100644 --- a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/AggregateFunctionTest.kt +++ b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/AggregateFunctionTest.kt @@ -1,6 +1,6 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin -import example.dsl_style_kotlin.repository.EmployeeRepository +import example.dsl.style.kotlin.repository.EmployeeRepository import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith diff --git a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/BatchDeleteTest.kt b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/BatchDeleteTest.kt similarity index 81% rename from dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/BatchDeleteTest.kt rename to dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/BatchDeleteTest.kt index bfd1b0d3..56878b30 100644 --- a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/BatchDeleteTest.kt +++ b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/BatchDeleteTest.kt @@ -1,6 +1,6 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin -import example.dsl_style_kotlin.repository.EmployeeRepository +import example.dsl.style.kotlin.repository.EmployeeRepository import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.seasar.doma.jdbc.Config diff --git a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/BatchInsertTest.kt b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/BatchInsertTest.kt similarity index 74% rename from dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/BatchInsertTest.kt rename to dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/BatchInsertTest.kt index 8a28cf2a..92d1f6f0 100644 --- a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/BatchInsertTest.kt +++ b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/BatchInsertTest.kt @@ -1,9 +1,9 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin -import example.dsl_style_kotlin.domain.Age -import example.dsl_style_kotlin.domain.Salary -import example.dsl_style_kotlin.entity.Employee -import example.dsl_style_kotlin.repository.EmployeeRepository +import example.dsl.style.kotlin.domain.Age +import example.dsl.style.kotlin.domain.Salary +import example.dsl.style.kotlin.entity.Employee +import example.dsl.style.kotlin.repository.EmployeeRepository import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.seasar.doma.jdbc.Config diff --git a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/BatchUpdateTest.kt b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/BatchUpdateTest.kt similarity index 80% rename from dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/BatchUpdateTest.kt rename to dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/BatchUpdateTest.kt index 3c876fd0..4e27ca3e 100644 --- a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/BatchUpdateTest.kt +++ b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/BatchUpdateTest.kt @@ -1,7 +1,7 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin -import example.dsl_style_kotlin.domain.Salary -import example.dsl_style_kotlin.repository.EmployeeRepository +import example.dsl.style.kotlin.domain.Salary +import example.dsl.style.kotlin.repository.EmployeeRepository import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.seasar.doma.jdbc.Config diff --git a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/DeleteTest.kt b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/DeleteTest.kt similarity index 87% rename from dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/DeleteTest.kt rename to dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/DeleteTest.kt index 97a1dc3b..ab739301 100644 --- a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/DeleteTest.kt +++ b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/DeleteTest.kt @@ -1,6 +1,6 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin -import example.dsl_style_kotlin.repository.EmployeeRepository +import example.dsl.style.kotlin.repository.EmployeeRepository import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith diff --git a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/InsertTest.kt b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/InsertTest.kt similarity index 77% rename from dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/InsertTest.kt rename to dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/InsertTest.kt index 4036f020..ffdbc983 100644 --- a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/InsertTest.kt +++ b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/InsertTest.kt @@ -1,10 +1,10 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin -import example.dsl_style_kotlin.domain.Age -import example.dsl_style_kotlin.domain.Salary -import example.dsl_style_kotlin.entity.Employee -import example.dsl_style_kotlin.entity.JobType -import example.dsl_style_kotlin.repository.EmployeeRepository +import example.dsl.style.kotlin.domain.Age +import example.dsl.style.kotlin.domain.Salary +import example.dsl.style.kotlin.entity.Employee +import example.dsl.style.kotlin.entity.JobType +import example.dsl.style.kotlin.repository.EmployeeRepository import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.seasar.doma.jdbc.Config diff --git a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/SelectTest.kt b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/SelectTest.kt similarity index 95% rename from dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/SelectTest.kt rename to dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/SelectTest.kt index a76078ac..6d941406 100644 --- a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/SelectTest.kt +++ b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/SelectTest.kt @@ -1,9 +1,9 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin -import example.dsl_style_kotlin.domain.Age -import example.dsl_style_kotlin.domain.Salary -import example.dsl_style_kotlin.entity.Employee -import example.dsl_style_kotlin.repository.EmployeeRepository +import example.dsl.style.kotlin.domain.Age +import example.dsl.style.kotlin.domain.Salary +import example.dsl.style.kotlin.entity.Employee +import example.dsl.style.kotlin.repository.EmployeeRepository import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Assertions.assertTrue diff --git a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/TestEnvironment.kt b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/TestEnvironment.kt similarity index 91% rename from dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/TestEnvironment.kt rename to dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/TestEnvironment.kt index 14bc0ef1..5524299a 100644 --- a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/TestEnvironment.kt +++ b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/TestEnvironment.kt @@ -1,4 +1,4 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin import org.junit.jupiter.api.extension.AfterAllCallback import org.junit.jupiter.api.extension.AfterTestExecutionCallback @@ -19,7 +19,7 @@ class TestEnvironment : BeforeAllCallback, AfterAllCallback, BeforeTestExecution private val jdbcLogger = Slf4jJdbcLogger() private val transactionManager = LocalTransactionManager(dataSource, jdbcLogger) private val config = DbConfig(dialect, dataSource, jdbcLogger, transactionManager) - private val dao = example.dsl_style_kotlin.dao.ScriptDaoImpl(config) + private val dao = example.dsl.style.kotlin.dao.ScriptDaoImpl(config) override fun beforeAll(context: ExtensionContext) { transactionManager.required { dao.create() } @@ -39,14 +39,14 @@ class TestEnvironment : BeforeAllCallback, AfterAllCallback, BeforeTestExecution override fun supportsParameter( parameterContext: ParameterContext, - extensionContext: ExtensionContext + extensionContext: ExtensionContext, ): Boolean { return parameterContext.parameter.type.isAssignableFrom(DbConfig::class.java) } override fun resolveParameter( parameterContext: ParameterContext, - extensionContext: ExtensionContext + extensionContext: ExtensionContext, ): Any { return config } diff --git a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/UpdateTest.kt b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/UpdateTest.kt similarity index 85% rename from dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/UpdateTest.kt rename to dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/UpdateTest.kt index 9ab1e567..5b9ed497 100644 --- a/dsl-style-kotlin/src/test/kotlin/example/dsl_style_kotlin/UpdateTest.kt +++ b/dsl-style-kotlin/src/test/kotlin/example/dsl/style/kotlin/UpdateTest.kt @@ -1,7 +1,7 @@ -package example.dsl_style_kotlin +package example.dsl.style.kotlin -import example.dsl_style_kotlin.entity.JobType -import example.dsl_style_kotlin.repository.EmployeeRepository +import example.dsl.style.kotlin.entity.JobType +import example.dsl.style.kotlin.repository.EmployeeRepository import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith From 50dc0d2222635fa2bd5fab6a4dcf68c31afdbabf Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 3 Feb 2024 17:22:54 +0900 Subject: [PATCH 4/4] Use ktlint 0.48.0 --- dsl-style-kotlin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsl-style-kotlin/build.gradle.kts b/dsl-style-kotlin/build.gradle.kts index 8b5c6bf6..a807e927 100644 --- a/dsl-style-kotlin/build.gradle.kts +++ b/dsl-style-kotlin/build.gradle.kts @@ -38,7 +38,7 @@ java { spotless { kotlin { - ktlint("0.50.0") + ktlint("0.48.0") trimTrailingWhitespace() endWithNewline() }