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

CORDA-499: Remove further Kt classes (#1489)

Browse Source 
* Change how NetworkHostAndPort is parsed

Change from using a global extension function to parse
NetworkHostAndPort strings, into using a function on the companion
object. This is a lot easier for Java interop and matches the common
style used elsewhere both in Corda and in Java libraries.

* Move JAR extraction into new utils file

* Move path verification function to ArtemisUtils

Move path verification function "requireOnDefaultFileSystem()" to new
ArtemisUtils.kt file, as this makes more sense from a Java interop
perspective.

* Add JvmName to AMQPSchemaExtensions

* Add JvmName to AMQPSerializationScheme

* Revert "Move JAR extraction into new utils file"

This reverts commit 1f0f41909b68ff21cc24b5efd6a1a360393a0a14.

* Reformat code

* Run formatter on ArtemisUtils
This commit is contained in:
Ross Nicoll
2017-09-14 17:34:01 +01:00
committed by josecoll
parent 68153b5acd
commit 3d577e5eed
12 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
testing/node-driver/src/main/kotlin/net/corda/testing/RPCDriver.kt
View File

@ -12,7 +12,6 @@ import net.corda.core.internal.concurrent.map
import net.corda.core.internal.div
import net.corda.core.messaging.RPCOps
import net.corda.core.utilities.NetworkHostAndPort
import net.corda.core.utilities.parseNetworkHostAndPort
import net.corda.node.services.RPCUserService
import net.corda.node.services.messaging.ArtemisMessagingServer
import net.corda.node.services.messaging.RPCServer
@ -508,7 +507,7 @@ class RandomRpcUser {
require(args.size == 4)
@Suppress("UNCHECKED_CAST")
val rpcClass = Class.forName(args[0]) as Class<RPCOps>
val hostAndPort = args[1].parseNetworkHostAndPort()
val hostAndPort = NetworkHostAndPort.parse(args[1])
val username = args[2]
val password = args[3]
CordaRPCClient.initialiseSerialization()

2
testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
View File

@ -653,7 +653,7 @@ class DriverDSL(
is NetworkMapStartStrategy.Nominated -> {
serviceConfig(networkMapCandidates.filter {
it.name == legalName.toString()
}.single().config.getString("p2pAddress").parseNetworkHostAndPort()).let {
}.single().config.getString("p2pAddress").let(NetworkHostAndPort.Companion::parse)).let {
{ nodeName: CordaX500Name -> if (nodeName == legalName) null else it }
}
}