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

Make the choice of AMQP serializer for primitive types configurable.

Browse Source
This commit is contained in:
Chris Rankin 2019-08-22 18:02:55 +01:00
parent 99074b5a49
commit b2d335c518
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/LocalSerializerFactory.kt
View File

@ -12,6 +12,7 @@ import org.apache.qpid.proton.amqp.Symbol
import java.lang.reflect.ParameterizedType import java.lang.reflect.ParameterizedType
import java.lang.reflect.Type import java.lang.reflect.Type
import java.util.* import java.util.*
import java.util.function.Function
import javax.annotation.concurrent.ThreadSafe import javax.annotation.concurrent.ThreadSafe
/** /**
@ -89,6 +90,7 @@ class DefaultLocalSerializerFactory(
private val fingerPrinter: FingerPrinter, private val fingerPrinter: FingerPrinter,
override val classloader: ClassLoader, override val classloader: ClassLoader,
private val descriptorBasedSerializerRegistry: DescriptorBasedSerializerRegistry, private val descriptorBasedSerializerRegistry: DescriptorBasedSerializerRegistry,
private val primitiveSerializerFactory: Function<Class<*>, AMQPSerializer<Any>>,
private val customSerializerRegistry: CustomSerializerRegistry, private val customSerializerRegistry: CustomSerializerRegistry,
private val onlyCustomSerializers: Boolean) private val onlyCustomSerializers: Boolean)
: LocalSerializerFactory { : LocalSerializerFactory {
@ -237,7 +239,7 @@ class DefaultLocalSerializerFactory(
throw AMQPNotSerializableException( throw AMQPNotSerializableException(
type, type,
"Serializer does not support synthetic classes") "Serializer does not support synthetic classes")
AMQPTypeIdentifiers.isPrimitive(typeInformation.typeIdentifier) -> AMQPPrimitiveSerializer(clazz) AMQPTypeIdentifiers.isPrimitive(typeInformation.typeIdentifier) -> primitiveSerializerFactory.apply(clazz)
else -> makeNonCustomSerializer(type, typeInformation, clazz) else -> makeNonCustomSerializer(type, typeInformation, clazz)
} }
} }

1
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/RemoteSerializerFactory.kt
View File

@ -3,7 +3,6 @@ package net.corda.serialization.internal.amqp
import net.corda.core.serialization.SerializationContext import net.corda.core.serialization.SerializationContext
import net.corda.core.utilities.contextLogger import net.corda.core.utilities.contextLogger
import net.corda.serialization.internal.model.* import net.corda.serialization.internal.model.*
import org.hibernate.type.descriptor.java.ByteTypeDescriptor
import java.io.NotSerializableException import java.io.NotSerializableException
/** /**

4
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Schema.kt
View File

@ -4,6 +4,7 @@ import net.corda.core.KeepForDJVM
import net.corda.core.internal.uncheckedCast import net.corda.core.internal.uncheckedCast
import net.corda.serialization.internal.CordaSerializationMagic import net.corda.serialization.internal.CordaSerializationMagic
import net.corda.serialization.internal.amqp.AMQPTypeIdentifiers.isPrimitive import net.corda.serialization.internal.amqp.AMQPTypeIdentifiers.isPrimitive
import net.corda.serialization.internal.model.TypeIdentifier
import net.corda.serialization.internal.model.TypeIdentifier.TopType import net.corda.serialization.internal.model.TypeIdentifier.TopType
import net.corda.serialization.internal.model.TypeIdentifier.Companion.forGenericType import net.corda.serialization.internal.model.TypeIdentifier.Companion.forGenericType
import org.apache.qpid.proton.amqp.* import org.apache.qpid.proton.amqp.*
@ -14,7 +15,8 @@ import java.lang.reflect.Type
const val DESCRIPTOR_DOMAIN: String = "net.corda" const val DESCRIPTOR_DOMAIN: String = "net.corda"
val amqpMagic = CordaSerializationMagic("corda".toByteArray() + byteArrayOf(1, 0)) val amqpMagic = CordaSerializationMagic("corda".toByteArray() + byteArrayOf(1, 0))
fun typeDescriptorFor(type: Type): Symbol = Symbol.valueOf("$DESCRIPTOR_DOMAIN:${AMQPTypeIdentifiers.nameForType(type)}") fun typeDescriptorFor(typeId: TypeIdentifier): Symbol = Symbol.valueOf("$DESCRIPTOR_DOMAIN:${AMQPTypeIdentifiers.nameForType(typeId)}")
fun typeDescriptorFor(type: Type): Symbol = typeDescriptorFor(forGenericType(type))
fun redescribe(obj: Any?, type: Type): Any? { fun redescribe(obj: Any?, type: Type): Any? {
return if (obj == null || obj is DescribedType || obj is Binary || forGenericType(type).run { isPrimitive(this) || this == TopType }) { return if (obj == null || obj is DescribedType || obj is Binary || forGenericType(type).run { isPrimitive(this) || this == TopType }) {

9
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializerFactoryBuilder.kt
View File

@ -8,6 +8,7 @@ import net.corda.serialization.internal.carpenter.ClassCarpenterImpl
import net.corda.serialization.internal.model.* import net.corda.serialization.internal.model.*
import java.io.NotSerializableException import java.io.NotSerializableException
import java.util.Collections.unmodifiableMap import java.util.Collections.unmodifiableMap
import java.util.function.Function
@KeepForDJVM @KeepForDJVM
object SerializerFactoryBuilder { object SerializerFactoryBuilder {
@ -15,6 +16,7 @@ object SerializerFactoryBuilder {
* The standard mapping of Java object types to Java primitive types. * The standard mapping of Java object types to Java primitive types.
* The DJVM will need to override these, but probably not anyone else. * The DJVM will need to override these, but probably not anyone else.
*/ */
@Suppress("unchecked_cast")
private val javaPrimitiveTypes: Map<Class<*>, Class<*>> = unmodifiableMap(mapOf<Class<out Any>?, Class<out Any>?>( private val javaPrimitiveTypes: Map<Class<*>, Class<*>> = unmodifiableMap(mapOf<Class<out Any>?, Class<out Any>?>(
Boolean::class.javaObjectType to Boolean::class.javaPrimitiveType, Boolean::class.javaObjectType to Boolean::class.javaPrimitiveType,
Byte::class.javaObjectType to Byte::class.javaPrimitiveType, Byte::class.javaObjectType to Byte::class.javaPrimitiveType,
@ -104,6 +106,7 @@ object SerializerFactoryBuilder {
fingerPrinter, fingerPrinter,
classCarpenter.classloader, classCarpenter.classloader,
descriptorBasedSerializerRegistry, descriptorBasedSerializerRegistry,
Function { clazz -> AMQPPrimitiveSerializer(clazz) },
customSerializerRegistry, customSerializerRegistry,
onlyCustomSerializers) onlyCustomSerializers)
@ -132,15 +135,15 @@ object SerializerFactoryBuilder {
} }
object NoEvolutionSerializerFactory : EvolutionSerializerFactory { object NoEvolutionSerializerFactory : EvolutionSerializerFactory {
override fun getEvolutionSerializer(remoteTypeInformation: RemoteTypeInformation, localTypeInformation: LocalTypeInformation): AMQPSerializer<Any> { override fun getEvolutionSerializer(remote: RemoteTypeInformation, local: LocalTypeInformation): AMQPSerializer<Any> {
throw NotSerializableException(""" throw NotSerializableException("""
Evolution not permitted. Evolution not permitted.
Remote: Remote:
${remoteTypeInformation.prettyPrint(false)} ${remote.prettyPrint(false)}
Local: Local:
${localTypeInformation.prettyPrint(false)} ${local.prettyPrint(false)}
""") """)
} }