chore: Stop using the deprecated transform()

Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · Jul 31, 2024 · aa55158 · aa55158
1 parent 968ef7a
commit aa55158
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/scanner/src/main/kotlin/storages/PackageBasedPostgresStorage.kt b/scanner/src/main/kotlin/storages/PackageBasedPostgresStorage.kt
@@ -126,7 +126,7 @@ class PackageBasedPostgresStorage(
         return runCatching {
             database.transaction {
                 ScanResultDao.find {
-                    var expression = (ScanResults.identifier eq pkg.id.toCoordinates())
+                    var expression = ScanResults.identifier eq pkg.id
 
                     scannerMatcher?.regScannerName?.let {
                         expression = expression and (rawParam("scan_result->'scanner'->>'name'") tilde it)

diff --git a/scanner/src/main/kotlin/storages/utils/ScanResultDao.kt b/scanner/src/main/kotlin/storages/utils/ScanResultDao.kt
@@ -23,18 +23,22 @@ import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.Column
 
 import org.ossreviewtoolkit.model.Identifier
 import org.ossreviewtoolkit.model.ScanResult
 
 object ScanResults : IntIdTable("scan_results") {
-    val identifier = text("identifier").index("identifier")
+    val identifier: Column<Identifier> = text("identifier")
+        .transform({ Identifier(it) }, { it.toCoordinates() })
+        .index("identifier")
+
     val scanResult = jsonb<ScanResult>("scan_result")
 }
 
 class ScanResultDao(id: EntityID<Int>) : IntEntity(id) {
     companion object : IntEntityClass<ScanResultDao>(ScanResults)
 
-    var identifier: Identifier by ScanResults.identifier.transform({ it.toCoordinates() }, { Identifier(it) })
+    var identifier: Identifier by ScanResults.identifier
     var scanResult: ScanResult by ScanResults.scanResult
 }