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

Review Comments

Browse Source
This commit is contained in:
Katelyn Baker 2017-08-03 14:01:59 +01:00
parent 45ed78b1a8
commit 36cbcae99c
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,27 +171,25 @@ class SerializerFactory(val whitelist: ClassWhitelist = AllWhitelist) {
}
}
private fun processSchema(
schema: Schema,
cl: ClassLoader = DeserializedParameterizedType::class.java.classLoader) {
private fun processSchema(schema: Schema, cl: ClassLoader = DeserializedParameterizedType::class.java.classLoader) {
val carpenterSchemas = CarpenterSchemas.newInstance()
for (typeNotation in schema.types) {
try {
processSchemaEntry(typeNotation, cl)
}
catch (e: java.lang.ClassNotFoundException) {
catch (e: ClassNotFoundException) {
if ((cl != DeserializedParameterizedType::class.java.classLoader)
|| (typeNotation !is CompositeType)) throw e
typeNotation.carpenterSchema(carpenterSchemas = carpenterSchemas)
}
}
if (carpenterSchemas.isEmpty()) return
val mc = MetaCarpenter(carpenterSchemas)
mc.build()
if (carpenterSchemas.isNotEmpty()) {
val mc = MetaCarpenter(carpenterSchemas)
mc.build()
processSchema(schema, mc.classloader)
processSchema(schema, mc.classloader)
}
}
private fun processSchemaEntry(typeNotation: TypeNotation,
@ -318,10 +316,10 @@ class SerializerFactory(val whitelist: ClassWhitelist = AllWhitelist) {
fun nameForType(type: Type) : String = when (type) {
is Class<*> -> {
primitiveTypeName(type) ?: if (type.isArray) {
"${nameForType(type.componentType)}${if (type.componentType.isPrimitive) "[p]" else "[]"}"
"${nameForType(type.componentType)}${if(type.componentType.isPrimitive) "[p]" else "[]"}"
} else type.name
}
is ParameterizedType -> "${nameForType(type.rawType)ype.actualTypeArguments.joinToString { nameForType(it) }}>"
is ParameterizedType -> "${nameForType(type.rawType)}<${type.actualTypeArguments.joinToString { nameForType(it) }}>"
is GenericArrayType -> "${nameForType(type.genericComponentType)}[]"
else -> throw NotSerializableException("Unable to render type $type to a string.")
}

1
node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/carpenter/MetaCarpenter.kt
View File

@ -44,6 +44,7 @@ data class CarpenterSchemas (
get() = carpenterSchemas.size
fun isEmpty() = carpenterSchemas.isEmpty()
fun isNotEmpty() = carpenterSchemas.isNotEmpty()
}
/**