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

* 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

View File

@ -242,7 +242,7 @@ open class Node(override val configuration: FullNodeConfiguration,
session.deleteQueue(queueName)
clientFactory.close()
return publicHostAndPort.removePrefix("/").parseNetworkHostAndPort().host
return NetworkHostAndPort.parse(publicHostAndPort.removePrefix("/")).host
}
override fun startMessagingService(rpcOps: RPCOps) {

View File

@ -119,7 +119,7 @@ class ArtemisMessagingServer(override val config: NodeConfiguration,
private val nodeRunsNetworkMapService = config.networkMapService == null
init {
config.baseDirectory.expectedOnDefaultFileSystem()
config.baseDirectory.requireOnDefaultFileSystem()
}
/**