From a4a96a70dbc57148cf0356a33127e9a8e5640a2f Mon Sep 17 00:00:00 2001 From: Ahmad Shahwan Date: Wed, 31 Jul 2024 10:27:13 +0200 Subject: [PATCH] Fix code style --- .../ca/fixtures/inmem/InMemCrudRepository.kt | 2 +- .../inmem/food/InMemCourseRepository.kt | 2 +- .../inmem/food/InMemCuisineRepository.kt | 2 +- .../inmem/food/InMemDishRepository.kt | 2 +- .../inmem/food/InMemServingRepository.kt | 2 +- .../inmem/media/InMemImageRepository.kt | 2 +- .../suites/food/CourseRepositoryTestBase.kt | 2 +- .../suites/food/CuisineRepositoryTestBase.kt | 2 +- .../ca/suites/food/DishRepositoryTestBase.kt | 2 +- .../suites/food/ServingRepositoryTestBase.kt | 2 +- .../ca/controllers/graphql/Pagination.kt | 2 +- .../graphql/media/ImageControllerTest.kt | 25 +++++++++++-------- .../ca/persistence/sql/SqlCrudRepository.kt | 4 +-- .../main/resources/application-dev.properties | 1 - .../changesets/20240702-1100-001-media.yaml | 2 +- .../changesets/20240718-2130-001-food.yaml | 2 +- 16 files changed, 29 insertions(+), 27 deletions(-) diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/InMemCrudRepository.kt b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/InMemCrudRepository.kt index a63f8e9..d98f885 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/InMemCrudRepository.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/InMemCrudRepository.kt @@ -7,7 +7,7 @@ import co.digamma.ca.domain.api.common.NotFoundException import co.digamma.ca.domain.api.model.Model import co.digamma.ca.domain.spi.CrudRepository -open class InMemCrudRepository: CrudRepository { +open class InMemCrudRepository : CrudRepository { private val data: MutableMap = HashMap() override fun retrieve(id: String): T? = data[id] diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemCourseRepository.kt b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemCourseRepository.kt index 79aefc5..ce85368 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemCourseRepository.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemCourseRepository.kt @@ -6,4 +6,4 @@ import co.digamma.ca.domain.spi.food.CourseRepository import co.digamma.ca.fixtures.inmem.InMemCrudRepository @Singleton -class InMemCourseRepository: InMemCrudRepository(), CourseRepository \ No newline at end of file +class InMemCourseRepository : InMemCrudRepository(), CourseRepository \ No newline at end of file diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemCuisineRepository.kt b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemCuisineRepository.kt index 3bad3e6..55c1e35 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemCuisineRepository.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemCuisineRepository.kt @@ -6,4 +6,4 @@ import co.digamma.ca.domain.spi.food.CuisineRepository import co.digamma.ca.fixtures.inmem.InMemCrudRepository @Singleton -class InMemCuisineRepository: InMemCrudRepository(), CuisineRepository \ No newline at end of file +class InMemCuisineRepository : InMemCrudRepository(), CuisineRepository \ No newline at end of file diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemDishRepository.kt b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemDishRepository.kt index 6358d5d..ef7476f 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemDishRepository.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemDishRepository.kt @@ -6,4 +6,4 @@ import co.digamma.ca.domain.spi.food.DishRepository import co.digamma.ca.fixtures.inmem.InMemCrudRepository @Singleton -class InMemDishRepository: InMemCrudRepository(), DishRepository \ No newline at end of file +class InMemDishRepository : InMemCrudRepository(), DishRepository \ No newline at end of file diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemServingRepository.kt b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemServingRepository.kt index b501f3a..4f854a0 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemServingRepository.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/food/InMemServingRepository.kt @@ -6,4 +6,4 @@ import co.digamma.ca.domain.spi.food.ServingRepository import co.digamma.ca.fixtures.inmem.InMemCrudRepository @Singleton -class InMemServingRepository: InMemCrudRepository(), ServingRepository \ No newline at end of file +class InMemServingRepository : InMemCrudRepository(), ServingRepository \ No newline at end of file diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/media/InMemImageRepository.kt b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/media/InMemImageRepository.kt index e90acb4..729136b 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/media/InMemImageRepository.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/fixtures/inmem/media/InMemImageRepository.kt @@ -6,4 +6,4 @@ import co.digamma.ca.domain.spi.media.ImageRepository import co.digamma.ca.fixtures.inmem.InMemCrudRepository @Singleton -class InMemImageRepository: InMemCrudRepository(), ImageRepository \ No newline at end of file +class InMemImageRepository : InMemCrudRepository(), ImageRepository \ No newline at end of file diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/CourseRepositoryTestBase.kt b/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/CourseRepositoryTestBase.kt index 719bc2d..3b11ef3 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/CourseRepositoryTestBase.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/CourseRepositoryTestBase.kt @@ -8,7 +8,7 @@ import java.util.Locale abstract class CourseRepositoryTestBase : CrudRepositoryTestBase() { - abstract override val sut : CourseRepository + abstract override val sut: CourseRepository override fun newModel() = Course( id = RandGen.uuid(), diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/CuisineRepositoryTestBase.kt b/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/CuisineRepositoryTestBase.kt index e5a1f69..fc02988 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/CuisineRepositoryTestBase.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/CuisineRepositoryTestBase.kt @@ -8,7 +8,7 @@ import java.util.Locale abstract class CuisineRepositoryTestBase : CrudRepositoryTestBase() { - abstract override val sut : CuisineRepository + abstract override val sut: CuisineRepository override fun newModel() = Cuisine( id = RandGen.uuid(), diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/DishRepositoryTestBase.kt b/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/DishRepositoryTestBase.kt index 97363aa..ab34aa8 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/DishRepositoryTestBase.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/DishRepositoryTestBase.kt @@ -14,7 +14,7 @@ import java.util.Locale abstract class DishRepositoryTestBase : CrudRepositoryTestBase() { - abstract override val sut : DishRepository + abstract override val sut: DishRepository abstract val courseRepository: CourseRepository abstract val cuisineRepository: CuisineRepository abstract val servingRepository: ServingRepository diff --git a/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/ServingRepositoryTestBase.kt b/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/ServingRepositoryTestBase.kt index f176d95..3232081 100644 --- a/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/ServingRepositoryTestBase.kt +++ b/backend/domain/src/test/kotlin/co/digamma/ca/suites/food/ServingRepositoryTestBase.kt @@ -8,7 +8,7 @@ import java.util.Locale abstract class ServingRepositoryTestBase : CrudRepositoryTestBase() { - abstract override val sut : ServingRepository + abstract override val sut: ServingRepository override fun newModel() = Serving( id = RandGen.uuid(), diff --git a/backend/graphql/src/main/kotlin/co/digamma/ca/controllers/graphql/Pagination.kt b/backend/graphql/src/main/kotlin/co/digamma/ca/controllers/graphql/Pagination.kt index 5acae8e..2ec4dad 100644 --- a/backend/graphql/src/main/kotlin/co/digamma/ca/controllers/graphql/Pagination.kt +++ b/backend/graphql/src/main/kotlin/co/digamma/ca/controllers/graphql/Pagination.kt @@ -22,7 +22,7 @@ data class PageQuery( private fun Int.toCursor() = DefaultConnectionCursor(this.toString()) -fun Page.asConnection(): Connection { +fun Page.asConnection(): Connection { return DefaultConnection( this.results.mapIndexed { index, item -> DefaultEdge(item, index.toCursor()) }, DefaultPageInfo( diff --git a/backend/graphql/src/test/kotlin/co/digamma/ca/controllers/graphql/media/ImageControllerTest.kt b/backend/graphql/src/test/kotlin/co/digamma/ca/controllers/graphql/media/ImageControllerTest.kt index 0ce540d..5354ff2 100644 --- a/backend/graphql/src/test/kotlin/co/digamma/ca/controllers/graphql/media/ImageControllerTest.kt +++ b/backend/graphql/src/test/kotlin/co/digamma/ca/controllers/graphql/media/ImageControllerTest.kt @@ -49,13 +49,15 @@ class ImageControllerTest { @Autowired private lateinit var mockMvc: MockMvc - private val client get(): WebTestClient = - MockMvcWebTestClient.bindTo(mockMvc) - .baseUrl("/graphql") - .build() + private val client + get(): WebTestClient = + MockMvcWebTestClient.bindTo(mockMvc) + .baseUrl("/graphql") + .build() - private val tester get(): HttpGraphQlTester = - HttpGraphQlTester.create(client) + private val tester + get(): HttpGraphQlTester = + HttpGraphQlTester.create(client) @Test fun image() { @@ -68,10 +70,11 @@ class ImageControllerTest { tester.document(GET_IMAGE_DOCUMENT) .variables(mapOf("id" to createdId)) .execute() - .path("data.image") { it - .path("id").entity(String::class.java).isEqualTo(createdId) - .path("description").entity(String::class.java).isEqualTo(DESCRIPTION) - .path("url").entity(String::class.java).isEqualTo(URL) + .path("data.image") { + it + .path("id").entity(String::class.java).isEqualTo(createdId) + .path("description").entity(String::class.java).isEqualTo(DESCRIPTION) + .path("url").entity(String::class.java).isEqualTo(URL) } } @@ -101,7 +104,7 @@ class ImageControllerTest { .variables(mapOf("id" to createdId)) .execute() .errors() - .expect { it.errorType.toString() === "NOT_FOUND" } + .expect { it.errorType.toString() === "NOT_FOUND" } .verify() } } \ No newline at end of file diff --git a/backend/sql/src/main/kotlin/co/digamma/ca/persistence/sql/SqlCrudRepository.kt b/backend/sql/src/main/kotlin/co/digamma/ca/persistence/sql/SqlCrudRepository.kt index 679df34..437853f 100644 --- a/backend/sql/src/main/kotlin/co/digamma/ca/persistence/sql/SqlCrudRepository.kt +++ b/backend/sql/src/main/kotlin/co/digamma/ca/persistence/sql/SqlCrudRepository.kt @@ -23,7 +23,7 @@ import org.jooq.impl.SQLDataType private const val TIMESTAMP_FIELD_NAME = "timestamp" -abstract class SqlCrudRepository>( +abstract class SqlCrudRepository>( protected val table: Table, protected val idField: TableField, protected val dsl: DSLContext, @@ -50,7 +50,7 @@ abstract class SqlCrudRepository>( override fun retrieve(pageSpecs: PageSpecs): Page { val total = this.dsl.selectCount().from(this.table).fetchOne(0, Int::class.java)!! - val list = this.joining(this.dsl.select().from(this.table)) + val list = this.joining(this.dsl.select().from(this.table)) .offset(pageSpecs.index * pageSpecs.size) .limit(pageSpecs.size) .fetch(this::toModel) diff --git a/backend/sql/src/main/resources/application-dev.properties b/backend/sql/src/main/resources/application-dev.properties index 2855b17..f881d60 100644 --- a/backend/sql/src/main/resources/application-dev.properties +++ b/backend/sql/src/main/resources/application-dev.properties @@ -1,6 +1,5 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/ca spring.datasource.username=su spring.datasource.password=sekret - spring.liquibase.test-rollback-on-update=true spring.liquibase.show-summary=verbose diff --git a/backend/sql/src/main/resources/db/changelog/changesets/20240702-1100-001-media.yaml b/backend/sql/src/main/resources/db/changelog/changesets/20240702-1100-001-media.yaml index f8b1b2b..cb3b7b6 100644 --- a/backend/sql/src/main/resources/db/changelog/changesets/20240702-1100-001-media.yaml +++ b/backend/sql/src/main/resources/db/changelog/changesets/20240702-1100-001-media.yaml @@ -21,7 +21,7 @@ databaseChangeLog: name: id type: char(36) constraints: - primaryKey: true + primaryKey: true - column: name: locale type: varchar(255) diff --git a/backend/sql/src/main/resources/db/changelog/changesets/20240718-2130-001-food.yaml b/backend/sql/src/main/resources/db/changelog/changesets/20240718-2130-001-food.yaml index afa9b03..2ece0fb 100644 --- a/backend/sql/src/main/resources/db/changelog/changesets/20240718-2130-001-food.yaml +++ b/backend/sql/src/main/resources/db/changelog/changesets/20240718-2130-001-food.yaml @@ -21,7 +21,7 @@ databaseChangeLog: name: id type: char(36) constraints: - primaryKey: true + primaryKey: true - column: name: locale type: varchar(255)