From 524ba27721222e292083d65c12b4c2abecc71f1c Mon Sep 17 00:00:00 2001 From: Andrius Dagys Date: Thu, 3 May 2018 13:52:11 +0100 Subject: [PATCH] Fix merge issues --- .../services/receiver/TunnelingBridgeReceiverService.kt | 2 +- .../src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt | 2 +- .../integration-test/kotlin/net/corda/node/amqp/SocksTests.kt | 2 +- node/src/main/kotlin/net/corda/node/internal/Node.kt | 3 ++- .../corda/node/services/transactions/MySQLNotaryService.kt | 4 +--- .../node/services/transactions/MySQLUniquenessProvider.kt | 4 ++-- .../net/corda/behave/service/proxy/CordaRPCProxyClient.kt | 2 +- .../kotlin/net/corda/behave/service/proxy/RPCProxyServer.kt | 2 +- .../net/corda/behave/service/proxy/RPCProxyWebService.kt | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/bridge/src/main/kotlin/net/corda/bridge/services/receiver/TunnelingBridgeReceiverService.kt b/bridge/src/main/kotlin/net/corda/bridge/services/receiver/TunnelingBridgeReceiverService.kt index 4016456b93..70fdbbe849 100644 --- a/bridge/src/main/kotlin/net/corda/bridge/services/receiver/TunnelingBridgeReceiverService.kt +++ b/bridge/src/main/kotlin/net/corda/bridge/services/receiver/TunnelingBridgeReceiverService.kt @@ -186,7 +186,7 @@ class TunnelingBridgeReceiverService(val conf: BridgeConfiguration, log.debug { "Received message from ${innerMessage.sourceLegalName}" } val onwardMessage = object : ReceivedMessage { override val topic: String = innerMessage.topic - override val applicationProperties: Map = innerMessage.originalHeaders.toMap() + override val applicationProperties: Map = innerMessage.originalHeaders.toMap() override val payload: ByteArray = innerMessage.originalPayload override val sourceLegalName: String = innerMessage.sourceLegalName.toString() override val sourceLink: NetworkHostAndPort = receivedMessage.sourceLink diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt index fb9cd9e887..ada8b59c3e 100644 --- a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt +++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt @@ -10,9 +10,9 @@ package net.corda.client.rpc -import KryoClientSerializationScheme import net.corda.client.rpc.internal.CordaRPCClientConfigurationImpl import net.corda.client.rpc.internal.RPCClient +import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme import net.corda.core.context.Actor import net.corda.core.context.Trace import net.corda.core.messaging.CordaRPCOps diff --git a/node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt b/node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt index 436bb12f5f..43996361fb 100644 --- a/node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/amqp/SocksTests.kt @@ -210,7 +210,7 @@ class SocksTests { artemis.session.createQueue(sendAddress, RoutingType.ANYCAST, "queue", true) val consumer = artemis.session.createConsumer("queue") val testData = "Test".toByteArray() - val testProperty = mutableMapOf() + val testProperty = mutableMapOf() testProperty["TestProp"] = "1" val message = amqpClient.createMessage(testData, sendAddress, CHARLIE_NAME.toString(), testProperty) amqpClient.write(message) diff --git a/node/src/main/kotlin/net/corda/node/internal/Node.kt b/node/src/main/kotlin/net/corda/node/internal/Node.kt index b9fd22b67a..246650e794 100644 --- a/node/src/main/kotlin/net/corda/node/internal/Node.kt +++ b/node/src/main/kotlin/net/corda/node/internal/Node.kt @@ -99,7 +99,8 @@ open class Node(configuration: NodeConfiguration, const val scanPackagesSystemProperty = "net.corda.node.cordapp.scan.packages" const val scanPackagesSeparator = "," - private fun makeCordappLoader(configuration: NodeConfiguration): CordappLoader { + @JvmStatic + protected fun makeCordappLoader(configuration: NodeConfiguration): CordappLoader { return System.getProperty(scanPackagesSystemProperty)?.let { scanPackages -> CordappLoader.createDefaultWithTestPackages(configuration, scanPackages.split(scanPackagesSeparator)) } ?: CordappLoader.createDefault(configuration.baseDirectory) diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/MySQLNotaryService.kt b/node/src/main/kotlin/net/corda/node/services/transactions/MySQLNotaryService.kt index e0c9ca1a09..067d020184 100644 --- a/node/src/main/kotlin/net/corda/node/services/transactions/MySQLNotaryService.kt +++ b/node/src/main/kotlin/net/corda/node/services/transactions/MySQLNotaryService.kt @@ -12,12 +12,10 @@ package net.corda.node.services.transactions import net.corda.core.flows.FlowLogic import net.corda.core.flows.FlowSession -import net.corda.core.node.services.TimeWindowChecker -import net.corda.core.node.services.TrustedAuthorityNotaryService +import net.corda.core.internal.notary.TrustedAuthorityNotaryService import net.corda.node.services.api.ServiceHubInternal import net.corda.node.services.config.MySQLConfiguration import java.security.PublicKey -import java.util.* /** Notary service backed by a replicated MySQL database. */ abstract class MySQLNotaryService( diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt b/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt index 79d9a2ed90..b0a9754511 100644 --- a/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt +++ b/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt @@ -22,10 +22,10 @@ import net.corda.core.crypto.SecureHash import net.corda.core.crypto.sha256 import net.corda.core.flows.NotarisationRequestSignature import net.corda.core.flows.NotaryError -import net.corda.core.flows.NotaryInternalException import net.corda.core.flows.StateConsumptionDetails import net.corda.core.identity.Party -import net.corda.core.node.services.UniquenessProvider +import net.corda.core.internal.notary.NotaryInternalException +import net.corda.core.internal.notary.UniquenessProvider import net.corda.core.serialization.SerializationDefaults import net.corda.core.serialization.SingletonSerializeAsToken import net.corda.core.serialization.serialize diff --git a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt index 01456ca21d..92d488235b 100644 --- a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt +++ b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt @@ -1,6 +1,6 @@ package net.corda.behave.service.proxy -import net.corda.client.rpc.internal.KryoClientSerializationScheme +import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme import net.corda.core.concurrent.CordaFuture import net.corda.core.contracts.ContractState import net.corda.core.crypto.SecureHash diff --git a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyServer.kt b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyServer.kt index e5e4370635..0e03c4a359 100644 --- a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyServer.kt +++ b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyServer.kt @@ -2,7 +2,7 @@ package net.corda.behave.service.proxy import net.corda.behave.service.proxy.RPCProxyServer.Companion.initialiseSerialization import net.corda.behave.service.proxy.RPCProxyServer.Companion.log -import net.corda.client.rpc.internal.KryoClientSerializationScheme +import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme import net.corda.core.serialization.internal.SerializationEnvironmentImpl import net.corda.core.serialization.internal.nodeSerializationEnv import net.corda.core.utilities.NetworkHostAndPort diff --git a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyWebService.kt b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyWebService.kt index 10ba274a76..df6d586aab 100644 --- a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyWebService.kt +++ b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyWebService.kt @@ -3,7 +3,7 @@ package net.corda.behave.service.proxy import net.corda.behave.service.proxy.RPCProxyWebService.Companion.RPC_PROXY_PATH import net.corda.client.rpc.CordaRPCClient import net.corda.client.rpc.CordaRPCClientConfiguration -import net.corda.client.rpc.internal.KryoClientSerializationScheme +import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme import net.corda.core.contracts.ContractState import net.corda.core.flows.FlowLogic import net.corda.core.messaging.CordaRPCOps