Merge pull request #2024 from corda/christians_public-key-caching-hooks

Public key customization hooks

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/OverridePKSerializerTest.kt

@@ -0,0 +1,65 @@
+package net.corda.nodeapi.internal.serialization.amqp
+
+import net.corda.core.serialization.SerializationContext
+import net.corda.core.utilities.ByteSequence
+import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
+import org.apache.qpid.proton.codec.Data
+import org.assertj.core.api.Assertions
+import org.junit.Test
+import java.lang.reflect.Type
+import java.security.PublicKey
+
+class OverridePKSerializerTest {
+    class SerializerTestException(message: String) : Exception(message)
+
+    class TestPublicKeySerializer : CustomSerializer.Implements<PublicKey>(PublicKey::class.java) {
+        override fun writeDescribedObject(obj: PublicKey, data: Data, type: Type, output: SerializationOutput) {
+            throw SerializerTestException("Custom write call")
+        }
+
+        override fun readObject(obj: Any, schema: Schema, input: DeserializationInput): PublicKey {
+            throw SerializerTestException("Custom read call")
+        }
+
+        override val schemaForDocumentation: Schema
+            get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+    }
+
+    class AMQPTestSerializationScheme : AbstractAMQPSerializationScheme() {
+        override fun rpcServerSerializerFactory(context: SerializationContext): SerializerFactory {
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        }
+
+        override fun canDeserializeVersion(byteSequence: ByteSequence, target: SerializationContext.UseCase): Boolean = true
+
+        override fun rpcClientSerializerFactory(context: SerializationContext): SerializerFactory {
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        }
+
+        override val publicKeySerializer = TestPublicKeySerializer()
+    }
+
+    class TestPublicKey : PublicKey {
+        override fun getAlgorithm(): String {
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        }
+
+        override fun getEncoded(): ByteArray {
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        }
+
+        override fun getFormat(): String {
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        }
+    }
+
+    @Test
+    fun `test publicKeySerializer is overridden`() {
+        val scheme = AMQPTestSerializationScheme()
+        val key = TestPublicKey()
+
+        Assertions
+                .assertThatThrownBy { scheme.serialize(key, AMQP_P2P_CONTEXT) }
+                .hasMessageMatching("Custom write call")
+    }
+}

node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt

@@ -36,6 +36,10 @@ import java.nio.ByteBuffer
 import java.time.*
 import java.time.temporal.ChronoUnit
 import java.util.*
+import kotlin.reflect.full.declaredFunctions
+import kotlin.reflect.full.declaredMemberFunctions
+import kotlin.reflect.full.superclasses
+import kotlin.reflect.jvm.javaMethod
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
@@ -557,11 +561,16 @@ class SerializationOutputTests {
     fun `test transaction state`() {
         val state = TransactionState(FooState(), FOO_PROGRAM_ID, MEGA_CORP)
 
+        val scheme = AMQPServerSerializationScheme()
+        val func = scheme::class.superclasses.single { it.simpleName == "AbstractAMQPSerializationScheme" }
+                .java.getDeclaredMethod("registerCustomSerializers", SerializerFactory::class.java)
+        func.isAccessible = true
+
         val factory = SerializerFactory(AllWhitelist, ClassLoader.getSystemClassLoader())
-        AbstractAMQPSerializationScheme.registerCustomSerializers(factory)
+        func.invoke(scheme, factory)
 
         val factory2 = SerializerFactory(AllWhitelist, ClassLoader.getSystemClassLoader())
-        AbstractAMQPSerializationScheme.registerCustomSerializers(factory2)
+        func.invoke(scheme, factory2)
 
         val desState = serdes(state, factory, factory2, expectedEqual = false, expectDeserializedEqual = false)
         assertTrue((desState as TransactionState<*>).data is FooState)