Review comments

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

View File

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