usbharu
/
Hideout
mirror of https://github.com/usbharu/Hideout.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: ActivityのTypeのパース時のエラーを修正

This commit is contained in:
usbharu 2023-10-31 16:24:15 +09:00
parent d884387bcf
commit 51a477d5b9
Signed by: usbharu
GPG Key ID: 6556747BF94EEBC8
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/kotlin/dev/usbharu/hideout/service/ap/APService.kt
View File

@ -186,7 +186,11 @@ class APServiceImpl(
val logger: Logger = LoggerFactory.getLogger(APServiceImpl::class.java) val logger: Logger = LoggerFactory.getLogger(APServiceImpl::class.java)
override fun parseActivity(json: String): ActivityType { override fun parseActivity(json: String): ActivityType {
val readTree = objectMapper.readTree(json) val readTree = try {
objectMapper.readTree(json)
} catch (e: com.fasterxml.jackson.core.JsonParseException) {
throw JsonParseException("Failed to parse json", e)
}
logger.trace( logger.trace(
""" """
| |
@ -204,11 +208,19 @@ class APServiceImpl(
} }
val type = readTree["type"] ?: throw JsonParseException("Type is null") val type = readTree["type"] ?: throw JsonParseException("Type is null")
if (type.isArray) { if (type.isArray) {
return type.firstNotNullOf { jsonNode: JsonNode -> try {
ActivityType.values().firstOrNull { it.name.equals(jsonNode.asText(), true) } return type.firstNotNullOf { jsonNode: JsonNode ->
ActivityType.values().firstOrNull { it.name.equals(jsonNode.asText(), true) }
}
} catch (e: NoSuchElementException) {
throw IllegalArgumentException("No valid TYPE", e)
} }
} }
return ActivityType.values().first { it.name.equals(type.asText(), true) } try {
return ActivityType.values().first { it.name.equals(type.asText(), true) }
} catch (e: NoSuchElementException) {
throw IllegalArgumentException("No valid TYPE", e)
}
} }
@Suppress("CyclomaticComplexMethod", "NotImplementedDeclaration") @Suppress("CyclomaticComplexMethod", "NotImplementedDeclaration")
@ -219,6 +231,7 @@ class APServiceImpl(
ActivityType.Follow -> ActivityType.Follow ->
apReceiveFollowService apReceiveFollowService
.receiveFollow(objectMapper.readValue(json, Follow::class.java)) .receiveFollow(objectMapper.readValue(json, Follow::class.java))
ActivityType.Create -> apCreateService.receiveCreate(objectMapper.readValue(json)) ActivityType.Create -> apCreateService.receiveCreate(objectMapper.readValue(json))
ActivityType.Like -> apLikeService.receiveLike(objectMapper.readValue(json)) ActivityType.Like -> apLikeService.receiveLike(objectMapper.readValue(json))
ActivityType.Undo -> apUndoService.receiveUndo(objectMapper.readValue(json)) ActivityType.Undo -> apUndoService.receiveUndo(objectMapper.readValue(json))