#33 Translate Java sources to Kotlin (#36)

.github/workflows/gradle.yml

@@ -16,12 +16,14 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup up JDK 21
+      - name: Setup up JDK 20
         uses: actions/setup-java@v3
         with:
-          java-version: '21'
+          java-version: '20'
           distribution: 'temurin'
-          cache: gradle
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Build
         run: gradle build

buildSrc/build.gradle.kts

@@ -1,7 +1,17 @@
 plugins {
+    kotlin("jvm") version "1.9.24"
     `kotlin-dsl`
 }
 
 repositories {
+    mavenCentral()
     gradlePluginPortal()
 }
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin.coreLibrariesVersion}")
+    implementation("org.jetbrains.kotlin:kotlin-allopen:${kotlin.coreLibrariesVersion}")
+
+    implementation("org.springframework.boot:spring-boot-gradle-plugin:3.3.4")
+    implementation("io.spring.gradle:dependency-management-plugin:1.1.6")
+}

buildSrc/src/main/kotlin/buildlogic.kotlin-conventions.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    kotlin("jvm")
+}
+
+group = "ru.ifmo.se.dating"
+version = "1.0.0"
+
+repositories {
+    mavenCentral()
+}
+
+kotlin {
+    jvmToolchain(20)
+}

buildSrc/src/main/kotlin/buildlogic.kotlin-library-conventions.gradle.kts

@@ -0,0 +1,4 @@
+plugins {
+    id("buildlogic.kotlin-conventions")
+    `java-library`
+}

buildSrc/src/main/kotlin/buildlogic.spring-conventions.gradle.kts

@@ -0,0 +1,6 @@
+plugins {
+    id("buildlogic.kotlin-library-conventions")
+    id("org.springframework.boot")
+    id("io.spring.dependency-management")
+    kotlin("plugin.spring")
+}

common/testing/build.gradle.kts

@@ -1,9 +1,8 @@
 plugins {
-    id("buildlogic.java-library-conventions")
+    id("buildlogic.kotlin-library-conventions")
 }
 
 dependencies {
     api(libs.org.testcontainers.postgresql)
     api(libs.junit.junit)
-    compileOnly(libs.org.projectlombok.lombok)
 }

common/testing/src/main/kotlin/ru/ifmo/se/dating/container/Postgres.kt

@@ -0,0 +1,34 @@
+package ru.ifmo.se.dating.container
+
+import org.testcontainers.containers.PostgreSQLContainer
+
+class Postgres private constructor() : AutoCloseable {
+    private val container = PostgreSQLContainer(DOCKER_IMAGE_NAME)
+
+    fun jdbcUrl(): String {
+        return container.jdbcUrl
+    }
+
+    fun username(): String {
+        return container.username
+    }
+
+    fun password(): String {
+        return container.password
+    }
+
+    override fun close() {
+        container.stop()
+        container.close()
+    }
+
+    companion object {
+        private const val DOCKER_IMAGE_NAME = "postgres"
+
+        fun start(): Postgres {
+            val postgres = Postgres()
+            postgres.container.start()
+            return postgres
+        }
+    }
+}

gradle/libs.versions.toml

@@ -2,14 +2,11 @@
 com-fasterxml-jackson-core-jackson-databind = "2.17.2"
 io-swagger-core-v3-swagger-annotations = "2.2.23"
 io-swagger-core-v3-swagger-models = "2.2.23"
-javax-annotation-javax-annotation-api = "1.3.2"
-javax-servlet-javax-servlet-api = "4.0.1"
-javax-validation-validation-api = "2.0.1.Final"
+jakarta-validation-jakarta-validation-api = "3.1.0"
 junit-junit = "4.13.2"
 org-liquibase-liquibase-core = "4.29.2"
 org-openapitools-jackson-databind-nullable = "0.2.6"
 org-postgresql-postgresql = "42.7.4"
-org-projectlombok-lombok = "1.18.34"
 org-springdoc-springdoc-openapi-starter-webmvc-ui = "2.6.0"
 org-springframework-boot-spring-boot = "3.3.4"
 org-springframework-boot-spring-boot-starter-jdbc = "3.3.4"
@@ -23,14 +20,11 @@ org-testcontainers-postgresql = "1.20.1"
 com-fasterxml-jackson-core-jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "com-fasterxml-jackson-core-jackson-databind" }
 io-swagger-core-v3-swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "io-swagger-core-v3-swagger-annotations" }
 io-swagger-core-v3-swagger-models = { module = "io.swagger.core.v3:swagger-models", version.ref = "io-swagger-core-v3-swagger-models" }
-javax-annotation-javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax-annotation-javax-annotation-api" }
-javax-servlet-javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version.ref = "javax-servlet-javax-servlet-api" }
-javax-validation-validation-api = { module = "javax.validation:validation-api", version.ref = "javax-validation-validation-api" }
+jakarta-validation-jakarta-validation-api = { module = "jakarta.validation:jakarta.validation-api", version.ref = "jakarta-validation-jakarta-validation-api" }
 junit-junit = { module = "junit:junit", version.ref = "junit-junit" }
 org-liquibase-liquibase-core = { module = "org.liquibase:liquibase-core", version.ref = "org-liquibase-liquibase-core" }
 org-openapitools-jackson-databind-nullable = { module = "org.openapitools:jackson-databind-nullable", version.ref = "org-openapitools-jackson-databind-nullable" }
 org-postgresql-postgresql = { module = "org.postgresql:postgresql", version.ref = "org-postgresql-postgresql" }
-org-projectlombok-lombok = { module = "org.projectlombok:lombok", version.ref = "org-projectlombok-lombok" }
 org-springdoc-springdoc-openapi-starter-webmvc-ui = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", version.ref = "org-springdoc-springdoc-openapi-starter-webmvc-ui" }
 org-springframework-boot-spring-boot = { module = "org.springframework.boot:spring-boot", version.ref = "org-springframework-boot-spring-boot" }
 org-springframework-boot-spring-boot-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "org-springframework-boot-spring-boot-starter-jdbc" }

matchmaker/api/build.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-    id("buildlogic.java-library-conventions")
+    id("buildlogic.kotlin-library-conventions")
 }

matchmaker/api/src/main/resources/static/openapi/api.yml

@@ -53,7 +53,6 @@ paths:
                 type: array
                 items:
                   $ref: "#/components/schemas/PersonId"
-                uniqueItems: true
         401:
           $ref: "#/components/responses/401"
         500:
@@ -145,7 +144,6 @@ paths:
                 type: array
                 items:
                   $ref: "#/components/schemas/PersonId"
-                uniqueItems: true
         401:
           $ref: "#/components/responses/401"
         403:
@@ -195,7 +193,6 @@ paths:
                     - personId
                     - likes
                     - skips
-                uniqueItems: true
         401:
           $ref: "#/components/responses/401"
         403:

matchmaker/app/build.gradle.kts

@@ -1,8 +1,5 @@
 plugins {
-    id("buildlogic.java-conventions")
-    id("org.springframework.boot") version "3.0.0"
-    id("io.spring.dependency-management") version "1.0.11.RELEASE"
-    java
+    id("buildlogic.spring-conventions")
     application
 }
 
@@ -13,12 +10,8 @@ dependencies {
     implementation(libs.org.springdoc.springdoc.openapi.starter.webmvc.ui)
     testImplementation(project(":common-testing"))
     testImplementation(libs.org.springframework.boot.spring.boot.starter.test)
-    compileOnly(libs.org.projectlombok.lombok)
-    annotationProcessor(libs.org.projectlombok.lombok)
-    testCompileOnly(libs.org.projectlombok.lombok)
-    testAnnotationProcessor(libs.org.projectlombok.lombok)
 }
 
 application {
-    mainClass = "${group}.matchmaker.OpenApiGeneratorApplication"
+    mainClass = "${group}.matchmaker.ApplicationKt"
 }

matchmaker/app/src/test/kotlin/ru/ifmo/se/dating/matchmaker/DatabaseInitializer.kt

@@ -0,0 +1,18 @@
+package ru.ifmo.se.dating.matchmaker
+
+import org.springframework.boot.test.util.TestPropertyValues
+import org.springframework.context.ApplicationContextInitializer
+import org.springframework.context.ConfigurableApplicationContext
+import ru.ifmo.se.dating.container.Postgres
+
+class DatabaseInitializer : ApplicationContextInitializer<ConfigurableApplicationContext> {
+    private val postgres: Postgres = Postgres.start()
+
+    override fun initialize(applicationContext: ConfigurableApplicationContext) {
+        TestPropertyValues.of(
+            "spring.datasource.url=${postgres.jdbcUrl()}",
+            "spring.datasource.username=${postgres.username()}",
+            "spring.datasource.password=${postgres.password()}",
+        ).applyTo(applicationContext.environment)
+    }
+}

matchmaker/app/src/test/kotlin/ru/ifmo/se/dating/matchmaker/MatchmakerStartupTest.kt

@@ -0,0 +1,10 @@
+package ru.ifmo.se.dating.matchmaker
+
+import org.junit.Test
+
+class MatchmakerStartupTest : MatchmakerTestSuite() {
+    @Test
+    fun contextLoads() {
+        // Okay
+    }
+}