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

Minor: auto-format of module: client

Browse Source
This commit is contained in:
Mike Hearn 2017-04-11 12:38:31 +02:00
parent d9391b3d29
commit 6f200562b3
10 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/jackson/src/main/kotlin/net/corda/jackson/JacksonSupport.kt
View File

@ -39,10 +39,12 @@ object JacksonSupport {
override fun partyFromName(partyName: String): Party? = rpc.partyFromName(partyName) override fun partyFromName(partyName: String): Party? = rpc.partyFromName(partyName)
override fun partyFromKey(owningKey: CompositeKey): Party? = rpc.partyFromKey(owningKey) override fun partyFromKey(owningKey: CompositeKey): Party? = rpc.partyFromKey(owningKey)
} }
class IdentityObjectMapper(val identityService: IdentityService, factory: JsonFactory) : PartyObjectMapper, ObjectMapper(factory) { class IdentityObjectMapper(val identityService: IdentityService, factory: JsonFactory) : PartyObjectMapper, ObjectMapper(factory) {
override fun partyFromName(partyName: String): Party? = identityService.partyFromName(partyName) override fun partyFromName(partyName: String): Party? = identityService.partyFromName(partyName)
override fun partyFromKey(owningKey: CompositeKey): Party? = identityService.partyFromKey(owningKey) override fun partyFromKey(owningKey: CompositeKey): Party? = identityService.partyFromKey(owningKey)
} }
class NoPartyObjectMapper(factory: JsonFactory) : PartyObjectMapper, ObjectMapper(factory) { class NoPartyObjectMapper(factory: JsonFactory) : PartyObjectMapper, ObjectMapper(factory) {
override fun partyFromName(partyName: String): Party? = throw UnsupportedOperationException() override fun partyFromName(partyName: String): Party? = throw UnsupportedOperationException()
override fun partyFromKey(owningKey: CompositeKey): Party? = throw UnsupportedOperationException() override fun partyFromKey(owningKey: CompositeKey): Party? = throw UnsupportedOperationException()

1
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AggregatedList.kt
View File

@ -4,7 +4,6 @@ import javafx.collections.FXCollections
import javafx.collections.ListChangeListener import javafx.collections.ListChangeListener
import javafx.collections.ObservableList import javafx.collections.ObservableList
import javafx.collections.transformation.TransformationList import javafx.collections.transformation.TransformationList
import kotlin.comparisons.compareValues
/** /**
* Given an [ObservableList]<[E]> and a grouping key [K], [AggregatedList] groups the elements by the key into a fresh * Given an [ObservableList]<[E]> and a grouping key [K], [AggregatedList] groups the elements by the key into a fresh

1
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ConcatenatedList.kt
View File

@ -5,7 +5,6 @@ import javafx.collections.ListChangeListener
import javafx.collections.ObservableList import javafx.collections.ObservableList
import javafx.collections.transformation.TransformationList import javafx.collections.transformation.TransformationList
import java.util.* import java.util.*
import kotlin.comparisons.compareValues
/** /**
* [ConcatenatedList] takes a list of lists and concatenates them. Any change to the underlying lists or the outer list * [ConcatenatedList] takes a list of lists and concatenates them. Any change to the underlying lists or the outer list

1
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MapValuesList.kt
View File

@ -4,7 +4,6 @@ import javafx.collections.FXCollections
import javafx.collections.MapChangeListener import javafx.collections.MapChangeListener
import javafx.collections.ObservableList import javafx.collections.ObservableList
import javafx.collections.ObservableMap import javafx.collections.ObservableMap
import kotlin.comparisons.compareValues
/** /**
* [MapValuesList] takes an [ObservableMap] and returns its values as an [ObservableList]. * [MapValuesList] takes an [ObservableMap] and returns its values as an [ObservableList].

4
client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClientImpl.kt
View File

@ -354,7 +354,9 @@ class CordaRPCClientImpl(private val session: ClientSession,
private fun deliver(msg: ClientMessage) { private fun deliver(msg: ClientMessage) {
sessionLock.withLock { msg.acknowledge() } sessionLock.withLock { msg.acknowledge() }
val kryo = createRPCKryoForDeserialization(this@CordaRPCClientImpl, qName, rpcName, rpcLocation) val kryo = createRPCKryoForDeserialization(this@CordaRPCClientImpl, qName, rpcName, rpcLocation)
val received: MarshalledObservation = try { msg.deserialize(kryo) } finally { val received: MarshalledObservation = try {
msg.deserialize(kryo)
} finally {
releaseRPCKryoForDeserialization(kryo) releaseRPCKryoForDeserialization(kryo)
} }
rpcLog.debug { "<- Observable [$rpcName] <- Received $received" } rpcLog.debug { "<- Observable [$rpcName] <- Received $received" }

5
client/rpc/src/test/kotlin/net/corda/client/rpc/AbstractClientRPC.kt
View File

@ -93,5 +93,8 @@ abstract class AbstractClientRPC {
return CordaRPCClientImpl(clientSession, ReentrantLock(), rpcUser.username).proxyFor(type) return CordaRPCClientImpl(clientSession, ReentrantLock(), rpcUser.username).proxyFor(type)
} }
fun safeClose(obj: Any) = try { (obj as AutoCloseable).close() } catch (e: Exception) {} fun safeClose(obj: Any) = try {
(obj as AutoCloseable).close()
} catch (e: Exception) {
}
} }

4
client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPermissionsTest.kt
View File

@ -1,12 +1,12 @@
package net.corda.client.rpc package net.corda.client.rpc
import net.corda.core.messaging.RPCOps import net.corda.core.messaging.RPCOps
import net.corda.node.services.messaging.* import net.corda.node.services.messaging.requirePermission
import net.corda.nodeapi.PermissionException import net.corda.nodeapi.PermissionException
import net.corda.nodeapi.User import net.corda.nodeapi.User
import org.junit.After import org.junit.After
import org.junit.Test import org.junit.Test
import kotlin.test.* import kotlin.test.assertFailsWith
class RPCPermissionsTest : AbstractClientRPC() { class RPCPermissionsTest : AbstractClientRPC() {
companion object { companion object {