diff --git a/scalabot-meta/src/main/kotlin/serializer/Serializer.kt b/scalabot-meta/src/main/kotlin/serializer/Serializer.kt index 2ff6a90..9899b96 100644 --- a/scalabot-meta/src/main/kotlin/serializer/Serializer.kt +++ b/scalabot-meta/src/main/kotlin/serializer/Serializer.kt @@ -115,16 +115,16 @@ object MavenRepositoryConfigSerializer MavenRepositoryConfig( id = json.get("id")?.asString, url = URL(SerializerUtils.checkJsonKey(json, "url")), - proxy = if (json.has("proxy") && json.get("proxy").isJsonObject) + proxy = if (json.has("proxy")) context.deserialize( - json.getAsJsonObject("proxy"), Proxy::class.java + json.get("proxy"), Proxy::class.java ) else null, layout = json.get("layout")?.asString ?: "default", enableReleases = json.get("enableReleases")?.asBoolean ?: true, enableSnapshots = json.get("enableSnapshots")?.asBoolean ?: true, - authentication = if (json.has("authentication") && json.get("authentication").isJsonObject) + authentication = if (json.has("authentication")) context.deserialize( - json.getAsJsonObject("authentication"), Authentication::class.java + json.get("authentication"), Authentication::class.java ) else null ) } diff --git a/scalabot-meta/src/test/kotlin/serializer/SerializersKtTest.kt b/scalabot-meta/src/test/kotlin/serializer/SerializersKtTest.kt index 6cefc4a..c5cd5dd 100644 --- a/scalabot-meta/src/test/kotlin/serializer/SerializersKtTest.kt +++ b/scalabot-meta/src/test/kotlin/serializer/SerializersKtTest.kt @@ -227,7 +227,6 @@ internal class MavenRepositoryConfigSerializerTest { // ------------------------------------ - jsonObject.add("authentication", JsonArray()) jsonObject.add("layout", mockk { every { asString }.returns(null) })