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

Revert constraint on registerProtocolInitiator()

Browse Source 
Revert constraint on registerProtocolInitiator(), as there may be cases that need it to not be
a ProtocolLogic. Added note to explain it's normally a ProtocolLogic but not always.
This commit is contained in:
Ross Nicoll
2016-10-04 14:50:09 +01:00
parent 94e830d19a
commit bd919bbe1b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt
View File

@ -114,7 +114,7 @@ abstract class AbstractNode(val configuration: NodeConfiguration, val networkMap
return smm.add(loggerName, logic).resultFuture return smm.add(loggerName, logic).resultFuture
} }
override fun <P : ProtocolLogic<*>> registerProtocolInitiator(markerClass: KClass<out P>, protocolFactory: (Party) -> ProtocolLogic<*>) { override fun registerProtocolInitiator(markerClass: KClass<*>, protocolFactory: (Party) -> ProtocolLogic<*>) {
require(markerClass !in protocolFactories) { "${markerClass.java.name} has already been used to register a protocol" } require(markerClass !in protocolFactories) { "${markerClass.java.name} has already been used to register a protocol" }
log.debug { "Registering ${markerClass.java.name}" } log.debug { "Registering ${markerClass.java.name}" }
protocolFactories[markerClass.java] = protocolFactory protocolFactories[markerClass.java] = protocolFactory

8
node/src/main/kotlin/com/r3corda/node/services/api/ServiceHubInternal.kt
View File

@ -76,12 +76,12 @@ abstract class ServiceHubInternal : ServiceHub {
* marker class has been registered then the corresponding factory will be used to create the protocol which will * marker class has been registered then the corresponding factory will be used to create the protocol which will
* communicate with the other side. If there is no mapping then the session attempt is rejected. * communicate with the other side. If there is no mapping then the session attempt is rejected.
* @param markerClass The marker [KClass] present in a session initiation attempt, which is a 1:1 mapping to a [Class] * @param markerClass The marker [KClass] present in a session initiation attempt, which is a 1:1 mapping to a [Class]
* using the <pre>::class</pre> construct. Any marker class can be used, with the default being the class of the initiating * using the <pre>::class</pre> construct. Conventionally this is a [ProtocolLogic] subclass, however any class can
* protocol. This enables the registration to be of the form: registerProtocolInitiator(InitiatorProtocol::class, ::InitiatedProtocol) * be used, with the default being the class of the initiating protocol. This enables the registration to be of the
* form: registerProtocolInitiator(InitiatorProtocol::class, ::InitiatedProtocol)
* @param protocolFactory The protocol factory generating the initiated protocol. * @param protocolFactory The protocol factory generating the initiated protocol.
* @param R the return type of the protocol logic
*/ */
abstract fun <P : ProtocolLogic<*>> registerProtocolInitiator(markerClass: KClass<out P>, protocolFactory: (Party) -> ProtocolLogic<*>) abstract fun registerProtocolInitiator(markerClass: KClass<*>, protocolFactory: (Party) -> ProtocolLogic<*>)
/** /**
* Return the protocol factory that has been registered with [markerClass], or null if no factory is found. * Return the protocol factory that has been registered with [markerClass], or null if no factory is found.

2
node/src/test/kotlin/com/r3corda/node/services/MockServiceHubInternal.kt
View File

@ -75,7 +75,7 @@ open class MockServiceHubInternal(
return smm.add(loggerName, logic).resultFuture return smm.add(loggerName, logic).resultFuture
} }
override fun <P : ProtocolLogic<*>> registerProtocolInitiator(markerClass: KClass<out P>, protocolFactory: (Party) -> ProtocolLogic<*>) { override fun registerProtocolInitiator(markerClass: KClass<*>, protocolFactory: (Party) -> ProtocolLogic<*>) {
protocolFactories[markerClass.java] = protocolFactory protocolFactories[markerClass.java] = protocolFactory
} }