Skip to content

Commit 026fbde

Browse files
committed
[publish] chore: update legacy database status code implementation
1 parent d38b085 commit 026fbde

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
allprojects {
88
group = "org.sayandev"
9-
version = "1.8.9.7"
9+
version = "1.8.9.8"
1010
description = "A modular Kotlin framework for Minecraft: JE"
1111

1212
plugins.apply("maven-publish")

stickynote-core/src/main/kotlin/org/sayandev/stickynote/core/database/Query.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Query private constructor(val statement: String) {
1515
var failedAttempts: Int = 0
1616
private set
1717

18-
var statusCode: Int = StatusCode.NOT_STARTED.code
18+
var statusCode: StatusCode = StatusCode.NOT_STARTED
1919

2020
fun addRequirement(query: Query): Query {
2121
requirements.add(query)
@@ -43,7 +43,7 @@ class Query private constructor(val statement: String) {
4343
fun hasDoneRequirements(): Boolean {
4444
var hasDoneRequirements = true
4545
for (query in requirements) {
46-
if (query.statusCode != StatusCode.FINISHED.code) {
46+
if (query.statusCode != StatusCode.FINISHED) {
4747
hasDoneRequirements = false
4848
break
4949
}
@@ -72,11 +72,11 @@ class Query private constructor(val statement: String) {
7272
return preparedStatement
7373
}
7474

75-
enum class StatusCode(val code: Int) {
76-
NOT_STARTED(-1),
77-
RUNNING(0),
78-
FAILED(1),
79-
FINISHED(2)
75+
enum class StatusCode {
76+
NOT_STARTED,
77+
RUNNING,
78+
FAILED,
79+
FINISHED
8080
}
8181

8282
companion object {

stickynote-core/src/main/kotlin/org/sayandev/stickynote/core/database/mysql/MySQLExecutor.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@ abstract class MySQLExecutor(
7373
if (queries.isEmpty()) continue
7474

7575
val removedQueries: MutableSet<Query> = HashSet()
76-
for (query in queries) {
77-
if (query.statusCode == StatusCode.FINISHED.code) removedQueries.add(query)
76+
for (query in queries.filter { it.statusCode == StatusCode.FINISHED }.toList()) {
77+
removedQueries.add(query)
7878
}
7979
queries.removeAll(removedQueries)
8080
queue[priority]!!.removeAll(removedQueries)
8181

8282
for (query in queries) {
83-
if (query.hasDoneRequirements() && query.statusCode != StatusCode.RUNNING.code) {
84-
query.statusCode = StatusCode.RUNNING.code
83+
if (query.hasDoneRequirements() && query.statusCode != StatusCode.RUNNING) {
84+
query.statusCode = StatusCode.RUNNING
8585

86-
executeQuery(query).whenComplete { statusCode: Int, error: Throwable? ->
86+
executeQuery(query).whenComplete { statusCode: StatusCode, error: Throwable? ->
8787
error?.printStackTrace()
8888

8989
query.statusCode = statusCode
@@ -142,10 +142,10 @@ abstract class MySQLExecutor(
142142
}
143143
}
144144

145-
private fun executeQuery(query: Query): CompletableFuture<Int> {
146-
val completableFuture = CompletableFuture<Int>()
145+
private fun executeQuery(query: Query): CompletableFuture<StatusCode> {
146+
val completableFuture = CompletableFuture<StatusCode>()
147147

148-
val runnable = Runnable { completableFuture.complete(executeQuerySync(query).statusCode.code) }
148+
val runnable = Runnable { completableFuture.complete(executeQuerySync(query).statusCode) }
149149

150150
threadPool.submit(runnable)
151151

0 commit comments

Comments
 (0)