From 5354c777ce0c24f99ccfff062907225c824bd97b Mon Sep 17 00:00:00 2001 From: Christian Sailer Date: Fri, 10 Nov 2017 11:54:03 +0000 Subject: [PATCH] CORDA-781 code layout cleaned up --- .../internal/serialization/amqp/AMQPSerializationScheme.kt | 3 ++- .../internal/serialization/amqp/OverridePKSerializerTest.kt | 6 ------ .../internal/serialization/amqp/SerializationOutputTests.kt | 3 ++- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/AMQPSerializationScheme.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/AMQPSerializationScheme.kt index df2fd31576..7f87d53764 100644 --- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/AMQPSerializationScheme.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/AMQPSerializationScheme.kt @@ -70,7 +70,8 @@ abstract class AbstractAMQPSerializationScheme : SerializationScheme { protected abstract fun rpcClientSerializerFactory(context: SerializationContext): SerializerFactory protected abstract fun rpcServerSerializerFactory(context: SerializationContext): SerializerFactory - open protected val publicKeySerializer: CustomSerializer.Implements = net.corda.nodeapi.internal.serialization.amqp.custom.PublicKeySerializer + open protected val publicKeySerializer: CustomSerializer.Implements + = net.corda.nodeapi.internal.serialization.amqp.custom.PublicKeySerializer private fun getSerializerFactory(context: SerializationContext): SerializerFactory { return serializerFactoriesForContexts.computeIfAbsent(Pair(context.whitelist, context.deserializationClassLoader)) { diff --git a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/OverridePKSerializerTest.kt b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/OverridePKSerializerTest.kt index 0f2f892841..308394c5c5 100644 --- a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/OverridePKSerializerTest.kt +++ b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/OverridePKSerializerTest.kt @@ -23,7 +23,6 @@ class OverridePKSerializerTest { override val schemaForDocumentation: Schema get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. - } class AMQPTestSerializationScheme : AbstractAMQPSerializationScheme() { @@ -38,7 +37,6 @@ class OverridePKSerializerTest { } override val publicKeySerializer = TestPublicKeySerializer() - } class TestPublicKey : PublicKey { @@ -53,7 +51,6 @@ class OverridePKSerializerTest { override fun getFormat(): String { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } - } @Test @@ -64,8 +61,5 @@ class OverridePKSerializerTest { Assertions .assertThatThrownBy { scheme.serialize(key, AMQP_P2P_CONTEXT) } .hasMessageMatching("Custom write call") - - } - } \ No newline at end of file diff --git a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt index 3aaadb5929..a68cfefaf1 100644 --- a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt +++ b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt @@ -562,7 +562,8 @@ class SerializationOutputTests { 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) + val func = scheme::class.superclasses.single { it.simpleName == "AbstractAMQPSerializationScheme" } + .java.getDeclaredMethod("registerCustomSerializers", SerializerFactory::class.java) func.isAccessible = true val factory = SerializerFactory(AllWhitelist, ClassLoader.getSystemClassLoader())