refactor(config): 调整序列化工具类, 便于进行测试.

修正序列化工具类的类名, 并调整访问权为 internal.
同时将 `checkJsonKey` 改成更方便的 `JsonObject.getPrimitiveValueOrThrow`.

scalabot-meta/src/main/kotlin/serializer/Serializer.kt

@@ -3,6 +3,7 @@ package net.lamgc.scalabot.config.serializer
 import com.google.gson.*
 import com.google.gson.reflect.TypeToken
 import net.lamgc.scalabot.config.*
+import net.lamgc.scalabot.config.serializer.SerializeUtils.getPrimitiveValueOrThrow
 import org.eclipse.aether.artifact.AbstractArtifact
 import org.eclipse.aether.artifact.Artifact
 import org.eclipse.aether.artifact.DefaultArtifact
@@ -81,8 +82,8 @@ object AuthenticationSerializer : JsonDeserializer<Authentication> {
         if (json !is JsonObject) {
             throw JsonParseException("Unsupported JSON type.")
         }
-        val username = SerializerUtils.checkJsonKey(json, "username")
+        val username = json.getPrimitiveValueOrThrow("username").asString
-        val password = SerializerUtils.checkJsonKey(json, "password")
+        val password = json.getPrimitiveValueOrThrow("password").asString
         val builder = AuthenticationBuilder()
         builder.addUsername(username)
         builder.addPassword(password)
@@ -91,14 +92,14 @@ object AuthenticationSerializer : JsonDeserializer<Authentication> {
 
 }
 
-private object SerializerUtils {
+internal object SerializeUtils {
-    fun checkJsonKey(json: JsonObject, key: String): String {
+
-        if (!json.has(key)) {
+    fun JsonObject.getPrimitiveValueOrThrow(fieldName: String): JsonPrimitive {
-            throw JsonParseException("Required field does not exist: $key")
+        val value = get(fieldName) ?: throw JsonParseException("Missing `$fieldName` field.")
-        } else if (!json.get(key).isJsonPrimitive) {
+        if (value !is JsonPrimitive) {
-            throw JsonParseException("Wrong field `$key` type: ${json.get(key)::class.java}")
+            throw JsonParseException("Invalid `account` field type.")
         }
-        return json.get(key).asString
+        return value
     }
 }
 
@@ -114,7 +115,7 @@ object MavenRepositoryConfigSerializer
             is JsonObject -> {
                 MavenRepositoryConfig(
                     id = json.get("id")?.asString,
-                    url = URL(SerializerUtils.checkJsonKey(json, "url")),
+                    url = URL(json.getPrimitiveValueOrThrow("url").asString),
                     proxy = if (json.has("proxy"))
                         context.deserialize<Proxy>(
                             json.get("proxy"), Proxy::class.java

scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt

@@ -5,6 +5,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import net.lamgc.scalabot.config.*
+import net.lamgc.scalabot.config.serializer.SerializeUtils.getPrimitiveValueOrThrow
 import org.eclipse.aether.artifact.Artifact
 import org.eclipse.aether.artifact.DefaultArtifact
 import org.eclipse.aether.repository.Authentication
@@ -12,54 +13,39 @@ import org.eclipse.aether.repository.AuthenticationContext
 import org.eclipse.aether.repository.Proxy
 import org.intellij.lang.annotations.Language
 import org.junit.jupiter.api.Assertions.assertThrows
-import java.lang.reflect.InvocationTargetException
-import java.lang.reflect.Method
 import java.lang.reflect.Type
 import java.net.URL
 import kotlin.test.*
 
-internal class SerializersKtTest {
+internal class SerializeUtilsTest {
-
-    private val instance: Any
-    private val method: Method
-
-    init {
-        val clazz = Class.forName("net.lamgc.scalabot.config.serializer.SerializerUtils")
-        method = clazz.getDeclaredMethod("checkJsonKey", JsonObject::class.java, String::class.java)
-        method.isAccessible = true
-        instance = clazz.getDeclaredField("INSTANCE").apply {
-            isAccessible = true
-        }.get(null)
-    }
-
-    private fun invoke(json: JsonObject, key: String): String {
-        try {
-            return method.invoke(instance, json, key) as String
-        } catch (e: InvocationTargetException) {
-            throw e.targetException
-        }
-    }
 
     @Test
-    fun `Json key checker test`() {
+    fun `getPrimitiveValueOrThrow test`() {
         assertThrows(JsonParseException::class.java) {
-            invoke(JsonObject(), "NOT_EXIST_KEY")
+            JsonObject().getPrimitiveValueOrThrow("NOT_EXIST_KEY")
-        }
-        assertThrows(JsonParseException::class.java) {
-            invoke(JsonObject().apply { add("NULL_KEY", JsonNull.INSTANCE) }, "NULL_KEY")
-        }
-        assertThrows(JsonParseException::class.java) {
-            invoke(JsonObject().apply { add("ARRAY_KEY", JsonArray()) }, "ARRAY_KEY")
-        }
-        assertThrows(JsonParseException::class.java) {
-            invoke(JsonObject().apply { add("OBJECT_KEY", JsonObject()) }, "OBJECT_KEY")
         }
 
-        val expectKey = "TEST"
+        assertThrows(JsonParseException::class.java) {
-        val expectString = "testString"
+            JsonObject().apply {
-        val json = JsonObject().apply { addProperty(expectKey, expectString) }
+                add("testKey", JsonArray())
+            }.getPrimitiveValueOrThrow("testKey")
+        }
+        assertThrows(JsonParseException::class.java) {
+            JsonObject().apply {
+                add("testKey", JsonObject())
+            }.getPrimitiveValueOrThrow("testKey")
+        }
+        assertThrows(JsonParseException::class.java) {
+            JsonObject().apply {
+                add("testKey", JsonNull.INSTANCE)
+            }.getPrimitiveValueOrThrow("testKey")
+        }
 
-        assertEquals(expectString, invoke(json, expectKey))
+        val expectKey = "STRING_KEY"
+        val expectValue = JsonPrimitive("A STRING")
+        assertEquals(expectValue, JsonObject()
+            .apply { add(expectKey, expectValue) }
+            .getPrimitiveValueOrThrow(expectKey))
     }
 }