From 3bf84ebbd4dde676553acfa22206683aa99b1b90 Mon Sep 17 00:00:00 2001 From: Katelyn Baker Date: Thu, 4 Jan 2018 16:24:23 +0000 Subject: [PATCH] Review Comments --- .../internal/serialization/amqp/ObjectSerializer.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/ObjectSerializer.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/ObjectSerializer.kt index fa86263665..6cba3bbea5 100644 --- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/ObjectSerializer.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/ObjectSerializer.kt @@ -2,6 +2,7 @@ package net.corda.nodeapi.internal.serialization.amqp import net.corda.core.utilities.contextLogger import net.corda.core.utilities.debug +import net.corda.core.utilities.trace import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory.Companion.nameForType import org.apache.qpid.proton.amqp.Symbol import org.apache.qpid.proton.codec.Data @@ -76,7 +77,7 @@ open class ObjectSerializer(val clazz: Type, factory: SerializerFactory) : AMQPS obj: List<*>, schemas: SerializationSchemas, input: DeserializationInput) : Any = ifThrowsAppend({ clazz.typeName }){ - logger.trace ("Calling construction based construction for ${clazz.typeName}") + logger.trace { "Calling construction based construction for ${clazz.typeName}" } return construct(obj.zip(propertySerializers.getters).map { it.second.readProperty(it.first, schemas, input) }) } @@ -85,7 +86,7 @@ open class ObjectSerializer(val clazz: Type, factory: SerializerFactory) : AMQPS obj: List<*>, schemas: SerializationSchemas, input: DeserializationInput) : Any = ifThrowsAppend({ clazz.typeName }){ - logger.trace ("Calling setter based construction for ${clazz.typeName}") + logger.trace { "Calling setter based construction for ${clazz.typeName}" } val instance : Any = javaConstructor?.newInstance() ?: throw NotSerializableException ( "Failed to instantiate instance of object $clazz") @@ -112,7 +113,7 @@ open class ObjectSerializer(val clazz: Type, factory: SerializerFactory) : AMQPS private fun generateProvides(): List = interfaces.map { nameForType(it) } fun construct(properties: List): Any { - logger.debug { "Calling constructor: '$javaConstructor' with properties '$properties'" } + logger.trace { "Calling constructor: '$javaConstructor' with properties '$properties'" } return javaConstructor?.newInstance(*properties.toTypedArray()) ?: throw NotSerializableException("Attempt to deserialize an interface: $clazz. Serialized form is invalid.")