ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-22 09:08:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Upgrade dependencies, July edition.

Browse Source
This commit is contained in:
Mike Hearn
2016-07-04 15:34:45 +01:00
parent 4356cef1cd
commit 6fb7e59b91
6 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
node/src/main/kotlin/com/r3corda/node/utilities/JsonSupport.kt
View File

@ -73,7 +73,7 @@ object JsonSupport {
return try {
LocalDate.parse(parser.text)
} catch (e: Exception) {
throw JsonParseException("Invalid LocalDate ${parser.text}: ${e.message}", parser.currentLocation)
throw JsonParseException(parser, "Invalid LocalDate ${parser.text}: ${e.message}")
}
}
}
@ -98,7 +98,7 @@ object JsonSupport {
}
val mapper = parser.codec as ServiceHubObjectMapper
// TODO this needs to use some industry identifier(s) not just these human readable names
return mapper.identities.partyFromName(parser.text) ?: throw JsonParseException("Could not find a Party with name: ${parser.text}", parser.currentLocation)
return mapper.identities.partyFromName(parser.text) ?: throw JsonParseException(parser, "Could not find a Party with name: ${parser.text}")
}
}
@ -120,7 +120,7 @@ object JsonSupport {
@Suppress("UNCHECKED_CAST")
return SecureHash.parse(parser.text) as T
} catch (e: Exception) {
throw JsonParseException("Invalid hash ${parser.text}: ${e.message}", parser.currentLocation)
throw JsonParseException(parser, "Invalid hash ${parser.text}: ${e.message}")
}
}
}
@ -131,7 +131,7 @@ object JsonSupport {
val array = StringArrayDeserializer.instance.deserialize(parser, context)
BusinessCalendar.getInstance(*array)
} catch (e: Exception) {
throw JsonParseException("Invalid calendar(s) ${parser.text}: ${e.message}", parser.currentLocation)
throw JsonParseException(parser, "Invalid calendar(s) ${parser.text}: ${e.message}")
}
}
}
@ -151,7 +151,7 @@ object JsonSupport {
val A = Base58.decode(parser.text)
EdDSAPublicKey(EdDSAPublicKeySpec(A, ed25519Curve))
} catch (e: Exception) {
throw JsonParseException("Invalid public key ${parser.text}: ${e.message}", parser.currentLocation)
throw JsonParseException(parser, "Invalid public key ${parser.text}: ${e.message}")
}
}
}