From 8e9ce48404272f83c3ce116c5c802015e6c5cd0c Mon Sep 17 00:00:00 2001 From: szymonsztuka Date: Thu, 20 Sep 2018 20:17:37 +0100 Subject: [PATCH] Follow refactoring CHECKPOINT_CONTEXT from SerializationDefaults to CheckpointSerializationDefaults etc in Enterprise only code. --- .../main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt | 5 +++-- .../main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt b/experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt index b72ba9af3c..0dfb1a179c 100644 --- a/experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt +++ b/experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt @@ -22,6 +22,7 @@ import net.corda.core.node.NodeInfo import net.corda.core.node.services.CordaService import net.corda.core.serialization.SerializeAsToken import net.corda.core.serialization.SingletonSerializeAsToken +import net.corda.core.serialization.internal.CheckpointSerializationFactory import net.corda.core.serialization.internal.SerializationEnvironmentImpl import net.corda.core.serialization.internal.effectiveSerializationEnv import net.corda.core.serialization.internal.nodeSerializationEnv @@ -37,7 +38,7 @@ import net.corda.node.internal.cordapp.CordappProviderImpl import net.corda.node.internal.cordapp.JarScanningCordappLoader import net.corda.node.serialization.amqp.AMQPServerSerializationScheme import net.corda.node.serialization.kryo.KRYO_CHECKPOINT_CONTEXT -import net.corda.node.serialization.kryo.KryoServerSerializationScheme +import net.corda.node.serialization.kryo.KryoSerializationScheme import net.corda.node.services.ContractUpgradeHandler import net.corda.node.services.FinalityHandler import net.corda.node.services.NotaryChangeHandler @@ -358,8 +359,8 @@ class FlowWorkerServiceHub(override val configuration: NodeConfiguration, overri SerializationFactoryImpl().apply { registerScheme(AMQPServerSerializationScheme(cordappLoader.cordapps)) registerScheme(AMQPClientSerializationScheme(cordappLoader.cordapps)) - registerScheme(KryoServerSerializationScheme()) }, + checkpointSerializationFactory = CheckpointSerializationFactory(KryoSerializationScheme), p2pContext = AMQP_P2P_CONTEXT.withClassLoader(classloader), rpcServerContext = AMQP_RPC_SERVER_CONTEXT.withClassLoader(classloader), storageContext = AMQP_STORAGE_CONTEXT.withClassLoader(classloader), diff --git a/experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt b/experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt index f89fea3b52..7b2bcbf5f6 100644 --- a/experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt +++ b/experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt @@ -14,6 +14,7 @@ import net.corda.core.node.services.ContractUpgradeService import net.corda.core.node.services.TransactionVerifierService import net.corda.core.serialization.SerializeAsToken import net.corda.core.serialization.SingletonSerializeAsToken +import net.corda.core.serialization.internal.CheckpointSerializationFactory import net.corda.core.serialization.internal.SerializationEnvironmentImpl import net.corda.core.serialization.internal.effectiveSerializationEnv import net.corda.core.serialization.internal.nodeSerializationEnv @@ -27,7 +28,7 @@ import net.corda.node.internal.cordapp.CordappProviderImpl import net.corda.node.internal.cordapp.JarScanningCordappLoader import net.corda.node.serialization.amqp.AMQPServerSerializationScheme import net.corda.node.serialization.kryo.KRYO_CHECKPOINT_CONTEXT -import net.corda.node.serialization.kryo.KryoServerSerializationScheme +import net.corda.node.serialization.kryo.KryoSerializationScheme import net.corda.node.services.api.AuditService import net.corda.node.services.api.MonitoringService import net.corda.node.services.api.ServiceHubInternal @@ -194,8 +195,8 @@ class RpcWorkerServiceHub(override val configuration: NodeConfiguration, overrid SerializationFactoryImpl().apply { registerScheme(AMQPServerSerializationScheme(cordappLoader.cordapps)) registerScheme(AMQPClientSerializationScheme(cordappLoader.cordapps)) - registerScheme(KryoServerSerializationScheme()) }, + checkpointSerializationFactory = CheckpointSerializationFactory(KryoSerializationScheme), p2pContext = AMQP_P2P_CONTEXT.withClassLoader(classloader), rpcServerContext = AMQP_RPC_SERVER_CONTEXT.withClassLoader(classloader), storageContext = AMQP_STORAGE_CONTEXT.withClassLoader(classloader),