LamGC/oracle-manager
1
0
Fork 0
mirror of https://github.com/LamGC/oracle-manager.git synced 2025-04-29 22:27:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: 改进 JsonObject 构造方式.

Browse Source 
设计 JsonNull 用于在合并 CallbackData 时移除相关数据.
This commit is contained in:
LamGC 2022-04-23 15:17:07 +08:00
parent 2df20a2db2
commit 26f84b9b27
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/kotlin/Utils.kt
View File

@ -7,6 +7,7 @@ import com.google.common.cache.Cache
import com.google.common.cache.CacheBuilder import com.google.common.cache.CacheBuilder
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.JsonElement import com.google.gson.JsonElement
import com.google.gson.JsonNull
import com.google.gson.JsonObject import com.google.gson.JsonObject
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.oracle.bmc.ConfigFileReader.ConfigFile import com.oracle.bmc.ConfigFileReader.ConfigFile
@ -341,7 +342,14 @@ data class InlineKeyboardCallback(
} }
val nextExtraData = this.extraData.deepCopy() val nextExtraData = this.extraData.deepCopy()
for (key in newExtraData.keySet()) { for (key in newExtraData.keySet()) {
nextExtraData.add(key, newExtraData[key]) val value = newExtraData[key]
if (value == JsonNull.INSTANCE) {
if (nextExtraData.has(key)) {
nextExtraData.remove(key)
}
} else {
nextExtraData.add(key, value)
}
} }
return InlineKeyboardCallback(newAction, nextExtraData) return InlineKeyboardCallback(newAction, nextExtraData)
} }
@ -416,6 +424,14 @@ class JsonObjectBuilder(private val jsonObject: JsonObject) {
operator fun String.plusAssign(value: Any) { operator fun String.plusAssign(value: Any) {
jsonObject.add(this, gson.toJsonTree(value)) jsonObject.add(this, gson.toJsonTree(value))
} }
fun String.delete(setNull: Boolean = false) {
if (setNull) {
jsonObject.add(this, JsonNull.INSTANCE)
} else {
jsonObject.remove(this)
}
}
} }
fun jsonObjectOf(jsonObject: JsonObject = JsonObject(), block: JsonObjectBuilder.() -> Unit): JsonObject { fun jsonObjectOf(jsonObject: JsonObject = JsonObject(), block: JsonObjectBuilder.() -> Unit): JsonObject {