ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-07 11:30:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27

Browse Source
This commit is contained in:
Stefano Franz 2018-07-11 11:44:20 +01:00
commit fd13697ecc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializerFactory.kt
View File

@ -150,7 +150,7 @@ open class SerializerFactory(
}
}
Enum::class.java.isAssignableFrom(actualClass ?: declaredClass) -> {
logger.debug("class=[${actualClass?.simpleName} | $declaredClass] is an enumeration "
logger.info("class=[${actualClass?.simpleName} | $declaredClass] is an enumeration "
+ "declaredType=${declaredType.typeName} "
+ "isEnum=${declaredType::class.java.isEnum}")
@ -257,7 +257,7 @@ open class SerializerFactory(
* that expects to find getters and a constructor with a parameter for each property.
*/
open fun register(customSerializer: CustomSerializer<out Any>) {
logger.debug ("action=\"Registering custom serializer\", class=\"${customSerializer.type}\"")
logger.info ("action=\"Registering custom serializer\", class=\"${customSerializer.type}\"")
if (!serializersByDescriptor.containsKey(customSerializer.typeDescriptor)) {
customSerializers += customSerializer
serializersByDescriptor[customSerializer.typeDescriptor] = customSerializer
@ -268,7 +268,7 @@ open class SerializerFactory(
}
fun registerExternal(customSerializer: CorDappCustomSerializer) {
logger.debug ("action=\"Registering external serializer\", class=\"${customSerializer.type}\"")
logger.info ("action=\"Registering external serializer\", class=\"${customSerializer.type}\"")
if (!serializersByDescriptor.containsKey(customSerializer.typeDescriptor)) {
customSerializers += customSerializer
serializersByDescriptor[customSerializer.typeDescriptor] = customSerializer
@ -289,7 +289,7 @@ open class SerializerFactory(
// doesn't match that of the serialised object then we are dealing with different
// instance of the class, as such we need to build an EvolutionSerializer
if (serialiser.typeDescriptor != typeNotation.descriptor.name) {
logger.debug("typeNotation=${typeNotation.name} action=\"requires Evolution\"")
logger.info("typeNotation=${typeNotation.name} action=\"requires Evolution\"")
getEvolutionSerializer(typeNotation, serialiser, schemaAndDescriptor.schemas)
}
} catch (e: ClassNotFoundException) {
@ -298,7 +298,7 @@ open class SerializerFactory(
throw e
}
else {
logger.debug("typeNotation=\"${typeNotation.name}\" action=\"carpentry required\"")
logger.info("typeNotation=\"${typeNotation.name}\" action=\"carpentry required\"")
}
metaSchema.buildFor(typeNotation, classloader)
}
@ -399,7 +399,7 @@ open class SerializerFactory(
|| !customSerializer.isSerializerFor(declaredSuperClass)
|| !customSerializer.revealSubclassesInSchema
) {
logger.debug ("action=\"Using custom serializer\", class=${clazz.typeName}, " +
logger.info ("action=\"Using custom serializer\", class=${clazz.typeName}, " +
"declaredType=${declaredType.typeName}")
@Suppress("UNCHECKED_CAST")