Adds overload anotations and reorganizes param orders to improve java interop.

Joel Dudley · web-flow · commit 334ed4806bb1 · 2016-12-15T18:27:41.000Z
diff --git a/core/src/main/kotlin/net/corda/core/flows/FlowLogic.kt b/core/src/main/kotlin/net/corda/core/flows/FlowLogic.kt
@@ -51,22 +51,18 @@ abstract class FlowLogic<out T> {
 
     // Kotlin helpers that allow the use of generic types.
     inline fun <reified T : Any> sendAndReceive(otherParty: Party, payload: Any): UntrustworthyData<T> {
-        return sendAndReceive(otherParty, payload, T::class.java)
+        return sendAndReceive(T::class.java, otherParty, payload)
     }
 
-    // TODO: Move the receiveType param to first position for readability
-
     @Suspendable
-    fun <T : Any> sendAndReceive(otherParty: Party, payload: Any, receiveType: Class<T>): UntrustworthyData<T> {
+    fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any): UntrustworthyData<T> {
         return fsm.sendAndReceive(otherParty, payload, receiveType, sessionFlow)
     }
 
-    inline fun <reified T : Any> receive(otherParty: Party): UntrustworthyData<T> = receive(otherParty, T::class.java)
-
-    // TODO: Move the receiveType param to first position for readability
+    inline fun <reified T : Any> receive(otherParty: Party): UntrustworthyData<T> = receive(T::class.java, otherParty)
 
     @Suspendable
-    fun <T : Any> receive(otherParty: Party, receiveType: Class<T>): UntrustworthyData<T> {
+    fun <T : Any> receive(receiveType: Class<T>, otherParty: Party): UntrustworthyData<T> {
         return fsm.receive(otherParty, receiveType, sessionFlow)
     }
 
diff --git a/node/src/main/kotlin/net/corda/node/driver/Driver.kt b/node/src/main/kotlin/net/corda/node/driver/Driver.kt
@@ -141,15 +141,13 @@ sealed class PortAllocation {
  * @param dsl The dsl itself.
  * @return The value returned in the [dsl] closure.
  */
-
-// TODO: Add an @JvmOverloads annotation
-
+@JvmOverloads
 fun <A> driver(
+        isDebug: Boolean = false,
         driverDirectory: Path = Paths.get("build", getTimestampAsDirectoryName()),
         portAllocation: PortAllocation = PortAllocation.Incremental(10000),
         debugPortAllocation: PortAllocation = PortAllocation.Incremental(5005),
         useTestClock: Boolean = false,
-        isDebug: Boolean = false,
         dsl: DriverDSLExposedInterface.() -> A
 ) = genericDriver(
         driverDsl = DriverDSL(
diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/CordaRPCClient.kt b/node/src/main/kotlin/net/corda/node/services/messaging/CordaRPCClient.kt
@@ -96,9 +96,7 @@ class CordaRPCClient(val host: HostAndPort, override val config: NodeSSLConfigur
      *
      * @throws RPCException if the server version is too low or if the server isn't reachable within the given time.
      */
-
-    // TODO: Add an @JvmOverloads annotation
-
+    @JvmOverloads
     @Throws(RPCException::class)
     fun proxy(timeout: Duration? = null, minVersion: Int = 0): CordaRPCOps {
         return state.locked {
