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

Replaced clock object with clock class and added documentation.

Browse Source
This commit is contained in:
Clinton Alexander
2016-10-20 15:54:59 +01:00
parent 54e002f654
commit cbb8aa74f9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
node/src/main/kotlin/com/r3corda/node/driver/Driver.kt
View File

@ -107,6 +107,7 @@ sealed class PortAllocation {
* and may be specified in [DriverDSL.startNode]. * and may be specified in [DriverDSL.startNode].
* @param portAllocation The port allocation strategy to use for the messaging and the web server addresses. Defaults to incremental. * @param portAllocation The port allocation strategy to use for the messaging and the web server addresses. Defaults to incremental.
* @param debugPortAllocation The port allocation strategy to use for jvm debugging. Defaults to incremental. * @param debugPortAllocation The port allocation strategy to use for jvm debugging. Defaults to incremental.
* @param clockClass A class that extends the Clock interface to use instead of the default NodeClock.
* @param isDebug Indicates whether the spawned nodes should start in jdwt debug mode. * @param isDebug Indicates whether the spawned nodes should start in jdwt debug mode.
* @param dsl The dsl itself. * @param dsl The dsl itself.
* @return The value returned in the [dsl] closure. * @return The value returned in the [dsl] closure.
@ -115,7 +116,7 @@ fun <A> driver(
baseDirectory: String = "build/${getTimestampAsDirectoryName()}", baseDirectory: String = "build/${getTimestampAsDirectoryName()}",
portAllocation: PortAllocation = PortAllocation.Incremental(10000), portAllocation: PortAllocation = PortAllocation.Incremental(10000),
debugPortAllocation: PortAllocation = PortAllocation.Incremental(5005), debugPortAllocation: PortAllocation = PortAllocation.Incremental(5005),
clock: Clock = NodeClock(), clockClass: Class<*> = NodeClock::class.java,
isDebug: Boolean = false, isDebug: Boolean = false,
dsl: DriverDSLExposedInterface.() -> A dsl: DriverDSLExposedInterface.() -> A
) = genericDriver( ) = genericDriver(
@ -123,7 +124,7 @@ fun <A> driver(
portAllocation = portAllocation, portAllocation = portAllocation,
debugPortAllocation = debugPortAllocation, debugPortAllocation = debugPortAllocation,
baseDirectory = baseDirectory, baseDirectory = baseDirectory,
clock = clock, clockClass = clockClass,
isDebug = isDebug isDebug = isDebug
), ),
coerce = { it }, coerce = { it },
@ -207,7 +208,7 @@ open class DriverDSL(
val portAllocation: PortAllocation, val portAllocation: PortAllocation,
val debugPortAllocation: PortAllocation, val debugPortAllocation: PortAllocation,
val baseDirectory: String, val baseDirectory: String,
val clock: Clock, val clockClass: Class<*>,
val isDebug: Boolean val isDebug: Boolean
) : DriverDSLInternalInterface { ) : DriverDSLInternalInterface {
private val networkMapName = "NetworkMapService" private val networkMapName = "NetworkMapService"
@ -306,7 +307,7 @@ open class DriverDSL(
"webAddress" to apiAddress.toString(), "webAddress" to apiAddress.toString(),
"extraAdvertisedServiceIds" to advertisedServices.joinToString(","), "extraAdvertisedServiceIds" to advertisedServices.joinToString(","),
"networkMapAddress" to networkMapAddress.toString(), "networkMapAddress" to networkMapAddress.toString(),
"clockClass" to clock.javaClass.name "clockClass" to clockClass.name
) )
) )
@ -335,7 +336,7 @@ open class DriverDSL(
"artemisAddress" to networkMapAddress.toString(), "artemisAddress" to networkMapAddress.toString(),
"webAddress" to apiAddress.toString(), "webAddress" to apiAddress.toString(),
"extraAdvertisedServiceIds" to "", "extraAdvertisedServiceIds" to "",
"clockClass" to clock.javaClass.name "clockClass" to clockClass.name
) )
) )