From fb8bf3c93ad2488b9e3728bb1a276c81dc93eea6 Mon Sep 17 00:00:00 2001 From: Matthew Layton Date: Thu, 18 Aug 2022 22:33:38 +0100 Subject: [PATCH] Added @Transient annotation to criteria fields in resolvable implementations to prevent them being included in serialization. --- gradle.properties | 2 +- .../src/main/kotlin/io/onixlabs/corda/test/contract/Customer.kt | 1 + .../src/main/kotlin/io/onixlabs/corda/test/contract/Reward.kt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b7b8407..8f89e8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ name=onixlabs-corda-core group=io.onixlabs -version=4.0.1 +version=4.0.2 onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12 onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3 diff --git a/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Customer.kt b/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Customer.kt index 3fef2b2..c3e1f2f 100644 --- a/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Customer.kt +++ b/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Customer.kt @@ -69,6 +69,7 @@ data class Customer( private class RewardResolver(private val customer: Customer) : AbstractPluralResolvable() { + @Transient override val criteria: QueryCriteria = vaultQuery { expression(RewardEntity::owner equalTo customer.owner) expression(RewardEntity::customerLinearId equalTo customer.linearId.id) diff --git a/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Reward.kt b/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Reward.kt index bbffef4..01716d4 100644 --- a/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Reward.kt +++ b/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Reward.kt @@ -59,6 +59,7 @@ data class Reward( private class CustomerResolver(private val reward: Reward) : AbstractSingularResolvable() { + @Transient override val criteria: QueryCriteria = vaultQuery { relevancyStatus(Vault.RelevancyStatus.ALL) linearIds(reward.customerLinearId)