LamGC/ScalaBot
1
0
Fork 0
mirror of https://github.com/LamGC/ScalaBot.git synced 2025-04-30 06:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): 包装 Serializer 可能抛出的异常.

Browse Source 
增加对 Serializer 中可能抛出的异常(例如 MalformedURLException, IllegalArgumentException)包装成 JsonParseException, 以避免异常类型混乱的问题.
This commit is contained in:
LamGC 2022-06-23 12:25:14 +08:00
parent d5e66156b9
commit a2667438f2
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scalabot-meta/src/main/kotlin/serializer/Serializer.kt
View File

@ -11,6 +11,7 @@ import org.eclipse.aether.repository.Authentication
import org.eclipse.aether.repository.Proxy import org.eclipse.aether.repository.Proxy
import org.eclipse.aether.util.repository.AuthenticationBuilder import org.eclipse.aether.util.repository.AuthenticationBuilder
import java.lang.reflect.Type import java.lang.reflect.Type
import java.net.MalformedURLException
import java.net.URL import java.net.URL
object ProxyTypeSerializer : JsonDeserializer<ProxyType>, object ProxyTypeSerializer : JsonDeserializer<ProxyType>,
@ -65,7 +66,12 @@ object ArtifactSerializer : JsonSerializer<Artifact>, JsonDeserializer<Artifact>
if (!json.isJsonPrimitive) { if (!json.isJsonPrimitive) {
throw JsonParseException("Wrong configuration value type.") throw JsonParseException("Wrong configuration value type.")
} }
return DefaultArtifact(json.asString.trim()) val artifactStr = json.asString.trim()
try {
return DefaultArtifact(artifactStr)
} catch (e: IllegalArgumentException) {
throw JsonParseException("Invalid artifact format: `${artifactStr}`.")
}
} }
} }
@ -124,10 +130,14 @@ object MavenRepositoryConfigSerializer
) )
} }
is JsonPrimitive -> { is JsonPrimitive -> {
MavenRepositoryConfig(url = URL(json.asString)) try {
return MavenRepositoryConfig(url = URL(json.asString))
} catch (e: MalformedURLException) {
throw JsonParseException("Invalid URL: ${json.asString}", e)
}
} }
else -> { else -> {
throw JsonParseException("Unsupported Maven warehouse configuration type.") throw JsonParseException("Unsupported Maven repository configuration type. (Only support JSON object or url string)")
} }
} }
} }