ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-19 23:53:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed issues with incorrect serialisation in test utilities.

Browse Source
This commit is contained in:
Clinton Alexander
2016-12-16 10:36:06 +00:00
parent d1c9cabd18
commit 234ffb141c
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
node/src/main/kotlin/net/corda/node/utilities/JsonSupport.kt
View File

@ -32,12 +32,6 @@ object JsonSupport {
mapper.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
mapper.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)
val timeModule = SimpleModule("java.time")
timeModule.addSerializer(LocalDate::class.java, ToStringSerializer)
timeModule.addDeserializer(LocalDate::class.java, LocalDateDeserializer)
timeModule.addKeyDeserializer(LocalDate::class.java, LocalDateKeyDeserializer)
timeModule.addSerializer(LocalDateTime::class.java, ToStringSerializer)
val cordaModule = SimpleModule("core")
cordaModule.addSerializer(Party::class.java, PartySerializer)
cordaModule.addDeserializer(Party::class.java, PartyDeserializer)
@ -62,12 +56,23 @@ object JsonSupport {
cordaModule.addSerializer(NodeInfo::class.java, NodeInfoSerializer)
cordaModule.addDeserializer(NodeInfo::class.java, NodeInfoDeserializer)
mapper.registerModule(timeModule)
mapper.registerModule(createJavaTimeModule())
mapper.registerModule(cordaModule)
mapper.registerModule(KotlinModule())
return mapper
}
fun createJavaTimeModule(): Module {
val timeModule = SimpleModule("java.time")
timeModule.apply {
addSerializer(LocalDate::class.java, ToStringSerializer)
addDeserializer(LocalDate::class.java, LocalDateDeserializer)
addKeyDeserializer(LocalDate::class.java, LocalDateKeyDeserializer)
addSerializer(LocalDateTime::class.java, ToStringSerializer)
}
return timeModule
}
class ServiceHubObjectMapper(val identities: IdentityService) : ObjectMapper()
object ToStringSerializer : JsonSerializer<Any>() {