Skip to content

Commit 8741665

Browse files
sakethpathikesakethpathike
committed
chore: migrate Exposed to 1.0.0-beta-4
1 parent 9bdd157 commit 8741665

15 files changed

Lines changed: 59 additions & 58 deletions

File tree

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ dependencies {
3939
implementation("io.ktor:ktor-server-cors")
4040
testImplementation("io.ktor:ktor-server-test-host-jvm")
4141
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
42-
implementation("org.jetbrains.exposed:exposed-core:0.56.0")
43-
implementation("org.jetbrains.exposed:exposed-jdbc:0.56.0")
42+
implementation("org.jetbrains.exposed:exposed-core:1.0.0-beta-4")
43+
implementation("org.jetbrains.exposed:exposed-jdbc:1.0.0-beta-4")
4444

4545
implementation("org.xerial:sqlite-jdbc:3.44.1.0")
4646
implementation("com.h2database:h2:2.2.224")

‎src/main/kotlin/com/sakethh/linkora/data/Database.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import com.sakethh.linkora.ServerConfiguration
44
import com.sakethh.linkora.domain.model.ServerConfig
55
import com.sakethh.linkora.domain.tables.*
66
import com.sakethh.linkora.utils.useSysEnvValues
7-
import org.jetbrains.exposed.sql.Database
8-
import org.jetbrains.exposed.sql.SchemaUtils
9-
import org.jetbrains.exposed.sql.transactions.transaction
7+
import org.jetbrains.exposed.v1.jdbc.Database
8+
import org.jetbrains.exposed.v1.jdbc.SchemaUtils
9+
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
1010

1111
private fun connectToADatabase(serverConfig: ServerConfig): Database {
1212
return Database.connect(

‎src/main/kotlin/com/sakethh/linkora/data/repository/FoldersRepoImpl.kt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ import com.sakethh.linkora.utils.checkForLWWConflictAndThrow
1818
import kotlinx.serialization.encodeToString
1919
import kotlinx.serialization.json.Json
2020
import kotlinx.serialization.json.encodeToJsonElement
21-
import org.jetbrains.exposed.sql.*
22-
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
23-
import org.jetbrains.exposed.sql.transactions.transaction
21+
import org.jetbrains.exposed.v1.core.SqlExpressionBuilder.eq
22+
import org.jetbrains.exposed.v1.core.and
23+
import org.jetbrains.exposed.v1.jdbc.deleteWhere
24+
import org.jetbrains.exposed.v1.jdbc.insertAndGetId
25+
import org.jetbrains.exposed.v1.jdbc.selectAll
26+
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
27+
import org.jetbrains.exposed.v1.jdbc.update
2428
import java.time.Instant
2529

2630
class FoldersRepoImpl(private val panelsRepo: PanelsRepo) : FoldersRepo {

‎src/main/kotlin/com/sakethh/linkora/data/repository/LinksRepoImpl.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@ import com.sakethh.linkora.utils.checkForLWWConflictAndThrow
1717
import kotlinx.serialization.encodeToString
1818
import kotlinx.serialization.json.Json
1919
import kotlinx.serialization.json.encodeToJsonElement
20-
import org.jetbrains.exposed.sql.*
21-
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
22-
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
23-
import org.jetbrains.exposed.sql.transactions.transaction
20+
import org.jetbrains.exposed.v1.core.SqlExpressionBuilder.eq
21+
import org.jetbrains.exposed.v1.core.SqlExpressionBuilder.inList
22+
import org.jetbrains.exposed.v1.core.and
23+
import org.jetbrains.exposed.v1.jdbc.batchInsert
24+
import org.jetbrains.exposed.v1.jdbc.deleteWhere
25+
import org.jetbrains.exposed.v1.jdbc.insertAndGetId
26+
import org.jetbrains.exposed.v1.jdbc.selectAll
27+
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
28+
import org.jetbrains.exposed.v1.jdbc.update
2429
import java.time.Instant
2530

2631
class LinksRepoImpl : LinksRepo {

‎src/main/kotlin/com/sakethh/linkora/data/repository/MultiActionRepoImpl.kt‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ import kotlinx.coroutines.coroutineScope
2020
import kotlinx.serialization.encodeToString
2121
import kotlinx.serialization.json.Json
2222
import kotlinx.serialization.json.encodeToJsonElement
23-
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
24-
import org.jetbrains.exposed.sql.and
25-
import org.jetbrains.exposed.sql.deleteWhere
26-
import org.jetbrains.exposed.sql.selectAll
27-
import org.jetbrains.exposed.sql.transactions.transaction
28-
import org.jetbrains.exposed.sql.update
23+
import org.jetbrains.exposed.v1.core.SqlExpressionBuilder.inList
24+
import org.jetbrains.exposed.v1.core.and
25+
import org.jetbrains.exposed.v1.jdbc.deleteWhere
26+
import org.jetbrains.exposed.v1.jdbc.select
27+
import org.jetbrains.exposed.v1.jdbc.selectAll
28+
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
29+
import org.jetbrains.exposed.v1.jdbc.update
2930
import java.time.Instant
3031

3132
class MultiActionRepoImpl(
@@ -73,8 +74,7 @@ class MultiActionRepoImpl(
7374
Result.Success(
7475
response = TimeStampBasedResponse(
7576
eventTimestamp = eventTimestamp, message = "Archived $updatedRowsCount items."
76-
),
77-
webSocketEvent = WebSocketEvent(
77+
), webSocketEvent = WebSocketEvent(
7878
operation = Route.MultiAction.ARCHIVE_MULTIPLE_ITEMS.name,
7979
payload = Json.encodeToJsonElement(archiveMultipleItemsDTO.copy(eventTimestamp = eventTimestamp))
8080
)
@@ -192,7 +192,6 @@ class MultiActionRepoImpl(
192192
}.toList()
193193

194194

195-
196195
// initially, we'll insert the root folders
197196
lateinit var copiedRootFolderIds: List<Long>
198197
val sourceRootFolders = FoldersTable.selectAll().where {
@@ -299,8 +298,7 @@ class MultiActionRepoImpl(
299298
), webSocketEvent = WebSocketEvent(
300299
operation = Route.MultiAction.COPY_EXISTING_ITEMS.name, payload = Json.encodeToJsonElement(
301300
CopyItemsSocketResponseDTO(
302-
eventTimestamp = eventTimestamp,
303-
correlation = copyItemsDTO.correlation
301+
eventTimestamp = eventTimestamp, correlation = copyItemsDTO.correlation
304302
)
305303
)
306304
)

‎src/main/kotlin/com/sakethh/linkora/data/repository/PanelsRepoImpl.kt‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import com.sakethh.linkora.utils.checkForLWWConflictAndThrow
1515
import kotlinx.serialization.encodeToString
1616
import kotlinx.serialization.json.Json
1717
import kotlinx.serialization.json.encodeToJsonElement
18-
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
19-
import org.jetbrains.exposed.sql.and
20-
import org.jetbrains.exposed.sql.deleteWhere
21-
import org.jetbrains.exposed.sql.insertAndGetId
22-
import org.jetbrains.exposed.sql.transactions.transaction
23-
import org.jetbrains.exposed.sql.update
18+
import org.jetbrains.exposed.v1.core.SqlExpressionBuilder.eq
19+
import org.jetbrains.exposed.v1.core.and
20+
import org.jetbrains.exposed.v1.jdbc.deleteWhere
21+
import org.jetbrains.exposed.v1.jdbc.insertAndGetId
22+
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
23+
import org.jetbrains.exposed.v1.jdbc.update
2424
import java.time.Instant
2525

2626
class PanelsRepoImpl : PanelsRepo {
@@ -37,8 +37,7 @@ class PanelsRepoImpl : PanelsRepo {
3737
Result.Success(
3838
response = NewItemResponseDTO(
3939
timeStampBasedResponse = TimeStampBasedResponse(
40-
message = "New panel added with id : $it",
41-
eventTimestamp = eventTimestamp
40+
message = "New panel added with id : $it", eventTimestamp = eventTimestamp
4241
),
4342
id = it,
4443
correlation = addANewPanelDTO.correlation,
@@ -119,8 +118,7 @@ class PanelsRepoImpl : PanelsRepo {
119118
response = TimeStampBasedResponse(
120119
message = "Deleted the panel and respective connected panel folders (id : ${idBasedDTO.id}) successfully.",
121120
eventTimestamp = eventTimestamp
122-
),
123-
webSocketEvent = WebSocketEvent(
121+
), webSocketEvent = WebSocketEvent(
124122
operation = Route.Panel.DELETE_A_PANEL.name,
125123
payload = Json.encodeToJsonElement(idBasedDTO.copy(eventTimestamp = eventTimestamp))
126124
)
@@ -150,8 +148,7 @@ class PanelsRepoImpl : PanelsRepo {
150148
response = TimeStampBasedResponse(
151149
eventTimestamp = eventTimestamp,
152150
message = "Updated panel name to ${updatePanelNameDTO.newName} (id : ${updatePanelNameDTO.panelId})."
153-
),
154-
webSocketEvent = WebSocketEvent(
151+
), webSocketEvent = WebSocketEvent(
155152
operation = Route.Panel.UPDATE_A_PANEL_NAME.name,
156153
payload = Json.encodeToJsonElement(updatePanelNameDTO.copy(eventTimestamp = eventTimestamp))
157154
)
@@ -178,10 +175,8 @@ class PanelsRepoImpl : PanelsRepo {
178175
response = TimeStampBasedResponse(
179176
eventTimestamp = eventTimestamp,
180177
message = "Deleted folder from all panel folders where id = ${idBasedDTO.id}."
181-
),
182-
webSocketEvent = WebSocketEvent(
183-
operation = Route.Panel.DELETE_A_FOLDER_FROM_ALL_PANELS.name,
184-
payload = Json.encodeToJsonElement(
178+
), webSocketEvent = WebSocketEvent(
179+
operation = Route.Panel.DELETE_A_FOLDER_FROM_ALL_PANELS.name, payload = Json.encodeToJsonElement(
185180
idBasedDTO.copy(
186181
eventTimestamp = eventTimestamp
187182
)
@@ -210,8 +205,7 @@ class PanelsRepoImpl : PanelsRepo {
210205
response = TimeStampBasedResponse(
211206
eventTimestamp = eventTimestamp,
212207
message = "Deleted the folder with id ${deleteAPanelFromAFolderDTO.folderID} from a panel with id ${deleteAPanelFromAFolderDTO.panelId}."
213-
),
214-
webSocketEvent = WebSocketEvent(
208+
), webSocketEvent = WebSocketEvent(
215209
operation = Route.Panel.DELETE_A_FOLDER_FROM_A_PANEL.name,
216210
payload = Json.encodeToJsonElement(deleteAPanelFromAFolderDTO.copy(eventTimestamp = eventTimestamp))
217211
)
@@ -238,8 +232,7 @@ class PanelsRepoImpl : PanelsRepo {
238232
response = TimeStampBasedResponse(
239233
message = "Deleted all folders from the panel with id : ${idBasedDTO.id}.",
240234
eventTimestamp = eventTimestamp
241-
),
242-
webSocketEvent = WebSocketEvent(
235+
), webSocketEvent = WebSocketEvent(
243236
operation = Route.Panel.DELETE_ALL_FOLDERS_FROM_A_PANEL.name,
244237
payload = Json.encodeToJsonElement(idBasedDTO.copy(eventTimestamp = eventTimestamp))
245238
)

‎src/main/kotlin/com/sakethh/linkora/data/repository/SyncRepoImpl.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import kotlinx.coroutines.awaitAll
1616
import kotlinx.coroutines.coroutineScope
1717
import kotlinx.serialization.json.Json
1818
import kotlinx.serialization.json.encodeToJsonElement
19-
import org.jetbrains.exposed.sql.deleteAll
20-
import org.jetbrains.exposed.sql.selectAll
21-
import org.jetbrains.exposed.sql.transactions.transaction
19+
import org.jetbrains.exposed.v1.jdbc.deleteAll
20+
import org.jetbrains.exposed.v1.jdbc.selectAll
21+
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
2222
import java.time.Instant
2323

2424
class SyncRepoImpl : SyncRepo {

‎src/main/kotlin/com/sakethh/linkora/domain/tables/FoldersTable.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.sakethh.linkora.domain.tables
22

3-
import org.jetbrains.exposed.dao.id.LongIdTable
3+
import org.jetbrains.exposed.v1.core.dao.id.LongIdTable
44

55
object FoldersTable : LongIdTable(name = "folders_table") {
66
val lastModified = long("last_modified")

‎src/main/kotlin/com/sakethh/linkora/domain/tables/LinksTable.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.sakethh.linkora.domain.tables
22

3-
import org.jetbrains.exposed.dao.id.LongIdTable
3+
import org.jetbrains.exposed.v1.core.dao.id.LongIdTable
44

55
object LinksTable : LongIdTable(name = "links_table") {
66
val lastModified = long("last_modified")

‎src/main/kotlin/com/sakethh/linkora/domain/tables/PanelFoldersTable.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.sakethh.linkora.domain.tables
22

3-
import org.jetbrains.exposed.dao.id.LongIdTable
3+
import org.jetbrains.exposed.v1.core.dao.id.LongIdTable
44

55
object PanelFoldersTable : LongIdTable(name = "panel_folders") {
66
val folderId = long(name = "folder_id")

0 commit comments

Comments
 (0)