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

Review comments

Browse Source 
Rename rtn to serializer
Some whatspace reformatting
This commit is contained in:
Katelyn Baker 2017-08-14 17:32:01 +01:00
parent 2d28cb01d5
commit ae72d4d788
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializerFactory.kt
View File

@ -63,8 +63,7 @@ class SerializerFactory(val whitelist: ClassWhitelist = AllWhitelist) {
val actualType: Type = inferTypeVariables(actualClass, declaredClass, declaredType) ?: declaredType val actualType: Type = inferTypeVariables(actualClass, declaredClass, declaredType) ?: declaredType
val rtn = let { val serializer = if (Collection::class.java.isAssignableFrom(declaredClass)) {
if (Collection::class.java.isAssignableFrom(declaredClass)) {
serializersByType.computeIfAbsent(declaredType) { serializersByType.computeIfAbsent(declaredType) {
CollectionSerializer(declaredType as? ParameterizedType ?: DeserializedParameterizedType( CollectionSerializer(declaredType as? ParameterizedType ?: DeserializedParameterizedType(
declaredClass, arrayOf(AnyType), null), this) declaredClass, arrayOf(AnyType), null), this)
@ -77,11 +76,10 @@ class SerializerFactory(val whitelist: ClassWhitelist = AllWhitelist) {
} else { } else {
makeClassSerializer(actualClass ?: declaredClass, actualType, declaredType) makeClassSerializer(actualClass ?: declaredClass, actualType, declaredType)
} }
}
serializersByDescriptor.putIfAbsent(rtn.typeDescriptor, rtn) serializersByDescriptor.putIfAbsent(serializer.typeDescriptor, serializer)
return rtn return serializer
} }
/** /**