From d86cb1ac645f1a642ac6b6ed15c8d8658ae3e75e Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Wed, 9 Aug 2017 14:21:29 +0100 Subject: [PATCH] Remove deprecated partyFromName() function --- .../src/main/kotlin/net/corda/jackson/JacksonSupport.kt | 8 -------- .../main/kotlin/net/corda/core/messaging/CordaRPCOps.kt | 6 ------ .../net/corda/core/node/services/IdentityService.kt | 2 -- .../kotlin/net/corda/node/internal/CordaRPCOpsImpl.kt | 3 --- .../node/services/identity/InMemoryIdentityService.kt | 2 -- 5 files changed, 21 deletions(-) diff --git a/client/jackson/src/main/kotlin/net/corda/jackson/JacksonSupport.kt b/client/jackson/src/main/kotlin/net/corda/jackson/JacksonSupport.kt index af5ca3c489..ee8333f06e 100644 --- a/client/jackson/src/main/kotlin/net/corda/jackson/JacksonSupport.kt +++ b/client/jackson/src/main/kotlin/net/corda/jackson/JacksonSupport.kt @@ -47,32 +47,24 @@ object JacksonSupport { // If you change this API please update the docs in the docsite (json.rst) interface PartyObjectMapper { - @Deprecated("Use partyFromX500Name instead") - fun partyFromName(partyName: String): Party? fun partyFromX500Name(name: X500Name): Party? fun partyFromKey(owningKey: PublicKey): Party? fun partiesFromName(query: String): Set } class RpcObjectMapper(val rpc: CordaRPCOps, factory: JsonFactory, val fuzzyIdentityMatch: Boolean) : PartyObjectMapper, ObjectMapper(factory) { - @Suppress("OverridingDeprecatedMember", "DEPRECATION") - override fun partyFromName(partyName: String): Party? = rpc.partyFromName(partyName) override fun partyFromX500Name(name: X500Name): Party? = rpc.partyFromX500Name(name) override fun partyFromKey(owningKey: PublicKey): Party? = rpc.partyFromKey(owningKey) override fun partiesFromName(query: String) = rpc.partiesFromName(query, fuzzyIdentityMatch) } class IdentityObjectMapper(val identityService: IdentityService, factory: JsonFactory, val fuzzyIdentityMatch: Boolean) : PartyObjectMapper, ObjectMapper(factory) { - @Suppress("OverridingDeprecatedMember", "DEPRECATION") - override fun partyFromName(partyName: String): Party? = identityService.partyFromName(partyName) override fun partyFromX500Name(name: X500Name): Party? = identityService.partyFromX500Name(name) override fun partyFromKey(owningKey: PublicKey): Party? = identityService.partyFromKey(owningKey) override fun partiesFromName(query: String) = identityService.partiesFromName(query, fuzzyIdentityMatch) } class NoPartyObjectMapper(factory: JsonFactory) : PartyObjectMapper, ObjectMapper(factory) { - @Suppress("OverridingDeprecatedMember", "DEPRECATION") - override fun partyFromName(partyName: String): Party? = throw UnsupportedOperationException() override fun partyFromX500Name(name: X500Name): Party? = throw UnsupportedOperationException() override fun partyFromKey(owningKey: PublicKey): Party? = throw UnsupportedOperationException() override fun partiesFromName(query: String) = throw UnsupportedOperationException() diff --git a/core/src/main/kotlin/net/corda/core/messaging/CordaRPCOps.kt b/core/src/main/kotlin/net/corda/core/messaging/CordaRPCOps.kt index 5304536b47..84e30e9140 100644 --- a/core/src/main/kotlin/net/corda/core/messaging/CordaRPCOps.kt +++ b/core/src/main/kotlin/net/corda/core/messaging/CordaRPCOps.kt @@ -255,12 +255,6 @@ interface CordaRPCOps : RPCOps { */ fun partyFromKey(key: PublicKey): Party? - /** - * Returns the [Party] with the given name as it's [Party.name] - */ - @Deprecated("Use partyFromX500Name instead") - fun partyFromName(name: String): Party? - /** * Returns the [Party] with the X.500 principal as it's [Party.name] */ diff --git a/core/src/main/kotlin/net/corda/core/node/services/IdentityService.kt b/core/src/main/kotlin/net/corda/core/node/services/IdentityService.kt index 72266c8e3c..d3b12375d8 100644 --- a/core/src/main/kotlin/net/corda/core/node/services/IdentityService.kt +++ b/core/src/main/kotlin/net/corda/core/node/services/IdentityService.kt @@ -103,8 +103,6 @@ interface IdentityService { // but for now this is not supported. fun partyFromKey(key: PublicKey): Party? - @Deprecated("Use partyFromX500Name or partiesFromName") - fun partyFromName(name: String): Party? fun partyFromX500Name(principal: X500Name): Party? diff --git a/node/src/main/kotlin/net/corda/node/internal/CordaRPCOpsImpl.kt b/node/src/main/kotlin/net/corda/node/internal/CordaRPCOpsImpl.kt index 2b61838f39..d934483095 100644 --- a/node/src/main/kotlin/net/corda/node/internal/CordaRPCOpsImpl.kt +++ b/node/src/main/kotlin/net/corda/node/internal/CordaRPCOpsImpl.kt @@ -151,9 +151,6 @@ class CordaRPCOpsImpl( override fun waitUntilRegisteredWithNetworkMap() = services.networkMapCache.mapServiceRegistered override fun partyFromAnonymous(party: AbstractParty): Party? = services.identityService.partyFromAnonymous(party) override fun partyFromKey(key: PublicKey) = services.identityService.partyFromKey(key) - @Suppress("DEPRECATION") - @Deprecated("Use partyFromX500Name instead") - override fun partyFromName(name: String) = services.identityService.partyFromName(name) override fun partyFromX500Name(x500Name: X500Name) = services.identityService.partyFromX500Name(x500Name) override fun partiesFromName(query: String, exactMatch: Boolean): Set = services.identityService.partiesFromName(query, exactMatch) override fun nodeIdentityFromParty(party: AbstractParty): NodeInfo? = services.networkMapCache.getNodeByLegalIdentity(party) diff --git a/node/src/main/kotlin/net/corda/node/services/identity/InMemoryIdentityService.kt b/node/src/main/kotlin/net/corda/node/services/identity/InMemoryIdentityService.kt index ad1bc49405..407fd18b65 100644 --- a/node/src/main/kotlin/net/corda/node/services/identity/InMemoryIdentityService.kt +++ b/node/src/main/kotlin/net/corda/node/services/identity/InMemoryIdentityService.kt @@ -87,8 +87,6 @@ class InMemoryIdentityService(identities: Iterable = emptyS override fun getAllIdentities(): Iterable = java.util.ArrayList(keyToParties.values) override fun partyFromKey(key: PublicKey): Party? = keyToParties[key]?.party - @Deprecated("Use partyFromX500Name") - override fun partyFromName(name: String): Party? = principalToParties[X500Name(name)]?.party override fun partyFromX500Name(principal: X500Name): Party? = principalToParties[principal]?.party override fun partyFromAnonymous(party: AbstractParty) = party as? Party ?: partyFromKey(party.owningKey) override fun partyFromAnonymous(partyRef: PartyAndReference) = partyFromAnonymous(partyRef.party)