Refactor AppServer to Kotlin by this-Aditya · Pull Request #518 · RADAR-base/RADAR-Appserver

this-Aditya · 2025-01-08T10:55:55Z

Refactor AppServer to Kotlin

Solves: #332

yatharthranjan

Half-way through the review, please find the comments for half

yatharthranjan · 2025-06-06T13:09:07Z

build.gradle

+}
+
+kapt {
+    keepJavacAnnotationProcessors = true


which annotations is this for? can you check if there support for kapt from other equivalent libs?

The spring-context-indexer dependency, annotationProcessor "org.springframework:spring-context-indexer:$springVersion", was used for the mixed Java-Kotlin codebase. I'll remove this configuration.

yatharthranjan · 2025-06-06T13:10:00Z

build.gradle

+}
+
+jar {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE


which deps are duplicated? Might be good to add a resolution strategy

The file spring-configuration-metadata.json exists in two locations: one generated by KAPT and the other copied from the main resource directory, which ends up in the build location:

radar-appserver/build/tmp/kapt3/classes/main/META-INF/spring-configuration-metadata.json

radar-appserver/build/resources/main/META-INF/spring-configuration-metadata.json

The contents of both files are different. I created a custom task to read the content of the duplicate files, and the results are in the attached file

duplicates.txt

yatharthranjan · 2025-06-06T13:10:49Z

build.gradle

    hibernateValidatorVersion = '8.0.0.Final'
    minioVersion = '8.5.10'
+    kotlinVersion = '1.9.25'
+    jacksonKotlinVersion = '2.15.4'


would prefer moving to kotlinx serialisation instead of jackson

Currently, both the appserver and Jersey use Jackson. Once I complete the Jersey work, I'll migrate from Jackson to Kotlinx Serialization by next week.

yatharthranjan · 2025-06-06T13:11:59Z

build.gradle


+    //Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonKotlinVersion"


can be removed when moving to kotlinx with json contentNegotiation

yatharthranjan · 2025-06-06T13:13:05Z

build.gradle

+    implementation("io.ktor:ktor-client-core:$ktorVersion")
+    implementation "io.ktor:ktor-client-cio:$ktorVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"


are we moving to mockk instead of mockito ?

Yes, when writing the unit test for jersey I'll create the test cases using mockk.

yatharthranjan · 2025-06-10T11:28:36Z

src/main/java/org/radarbase/appserver/dto/DataMessageStateEventDto.kt

+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class DataMessageStateEventDto (
+    var id: Long? = null,


any reason all of these are var. Avoid vars where possible, especially in a data contract/interface.

same for all other DTOs

Since JPA doesn't encourage the use of data classes with val fields, I kept the fields as var and nullable in DTOs. This way, they can be easily mapped without needing strict null checks (!!) for every field.

For more information on not using data classes and val fields with JPA: Medium - A practical point of view on Kotlin data classes and JPA/Hibernate.

yatharthranjan · 2025-06-10T13:01:06Z

src/main/java/org/radarbase/appserver/dto/ProjectDto.kt

+
+    @field:NotNull
+    @field:NotEmpty
+    var projectId: String? = null,


can we make this non-nullable and remove the annotation?

Same reason as above.

yatharthranjan · 2025-06-11T10:25:50Z

src/main/java/org/radarbase/appserver/dto/fcm/FcmDataMessages.kt

+class FcmDataMessages {
+
+    @field:Size(max = 200)
+    private var _dataMessages: MutableList<FcmDataMessageDto> = mutableListOf()


you can use val here and have a constructor for setting dataMessages instead of fun withDataMessages

Okay, I'll update this.

yatharthranjan · 2025-06-11T10:28:19Z

src/main/java/org/radarbase/appserver/dto/fcm/FcmDataMessageDto.kt

+@Suppress("unused")
+@JsonIgnoreProperties(ignoreUnknown = true)
+class FcmDataMessageDto(dataMessageEntity: DataMessage? = null) : Serializable {
+    var id: Long? = dataMessageEntity?.id


you can use val with constructors?

Same reason for using var fields as mentioned in the above comment.

yatharthranjan · 2025-06-11T11:08:59Z

src/main/java/org/radarbase/appserver/dto/fcm/FcmNotificationDto.kt

+@Suppress("unused")
+@JsonIgnoreProperties(ignoreUnknown = true)
+class FcmNotificationDto(notificationEntity: Notification? = null) : Serializable {
+    var id: Long? = notificationEntity?.id


Similar you can use val with constructors instead of with... If you need to update the properties of the object somewhere, you can make a copy

Okay, I'll update this.

this-Aditya added 30 commits December 8, 2024 22:04

Update to dev config

40f25b8

Refactored application class

090fe1d

Configured build to use kotlin

451e9a6

Updated kotlin version

ca0e976

Some kotlin changes

526fa0b

update gradle and spring versions

bb2b25b

Disabling integration tests for now

803ed65

Now downloading sources and java-docs

6be2fba

Updating strings to enum

694d379

Disabling tests for now

0d181f7

Stopping test compiling

41d2c00

Replaced project dto with data class

333c39b

Added dependencies for mapstruct

ee71830

Refactored project dto

3257415

Corrected call sites for ProjectDTOs

bd433d3

Updated PathUtils and deleted java project service, repository

817c9e1

Added utility functions for projects

b2ef1b9

Refactored project service and repository

4cbef07

No arg plugin configs

4c4fc3f

Corrected kapt usage to autowire kotlin components

ecb39d9

Corrected dependencies of ProjectRepository

3d91b3c

Misc changes

a190f50

Updated Project entity and auditing class

8b37f2f

Misc changes for projects

d189075

Changes to project

080307e

Connection to postgres for testing with misc changes

742a66a

More changes for projects

074dbef

Added license

2255391

Deleted java files

67ad10f

Utility work

d58028b

Added missing licenses

f68b7f0

this-Aditya requested review from mpgxvii and yatharthranjan January 8, 2025 10:55

this-Aditya added 3 commits January 11, 2025 23:56

Correcting the integration tests

88dec17

Disabling ktor usage for now to pass CI

34c71fe

Resolved merge conflicts

62f8a1b

this-Aditya marked this pull request as draft January 11, 2025 18:55

Commenting failed test for now

aa0d1e5

this-Aditya force-pushed the kotlin-refactor branch from 8017828 to aa0d1e5 Compare January 11, 2025 20:02

this-Aditya added 3 commits January 12, 2025 01:46

Checking if issue is in controller conversion

8fa436a

Trying to pass integration tests

087b77f

Controllers to kotlin

171ca14

this-Aditya force-pushed the kotlin-refactor branch from 6200ddd to 0b788b5 Compare January 12, 2025 06:38

Refactor to pass CI

453cf3a

this-Aditya force-pushed the kotlin-refactor branch 2 times, most recently from 98af8a8 to 453cf3a Compare January 13, 2025 14:53

this-Aditya added 8 commits January 13, 2025 23:51

Final try to pass CI with kotlin integration tests

64364e9

Final touches

91d319b

Clearing the notification auth test database at last

49be0ec

Minor change

beb8d2d

Refining things

54968ec

Work on transmitters

844ee51

Final touches

e5902dd

Minor change

a8ac75b

this-Aditya force-pushed the kotlin-refactor branch from 8f5d724 to a8ac75b Compare January 18, 2025 12:06

this-Aditya marked this pull request as ready for review January 18, 2025 12:49

this-Aditya and others added 2 commits March 4, 2025 21:27

Merge branch 'dev' into kotlin-refactor

179a54d

Updating upload-artifacts job version

15f6254

yatharthranjan reviewed Jun 25, 2025

View reviewed changes

yatharthranjan mentioned this pull request Aug 7, 2025

First kotlin covert (partial) #336

Closed

1 task

Conversation

this-Aditya commented Jan 8, 2025

Uh oh!

yatharthranjan left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

this-Aditya Jun 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

this-Aditya Jun 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

this-Aditya Jun 30, 2025 •

edited

Loading

this-Aditya Jun 30, 2025 •

edited

Loading