Added @Transient annotation to criteria fields in resolvable implementations to prevent them being included in serialization.

Author: MrMatthewLayton

build.gradle

@@ -5,7 +5,7 @@ buildscript {
 
         corda_artifactory_url = 'https://software.r3.com/artifactory'
         corda_group = 'net.corda'
-        corda_release_version = '4.8'
+        corda_release_version = '4.9'
 
         corda_gradle_plugin_group = 'net.corda.plugins'
         corda_gradle_plugin_version = '5.0.4'
@@ -14,10 +14,10 @@ buildscript {
         junit_version = '5.3.1'
 
         onixlabs_group = 'io.onixlabs'
-        onixlabs_corda_core_release_version = '4.0.0'
-        onixlabs_corda_idfx_release_version = '4.0.0'
+        onixlabs_corda_core_release_version = '4.0.2'
+        onixlabs_corda_idfx_release_version = '4.0.2'
 
-        cordapp_platform_version = 10
+        cordapp_platform_version = 11
         cordapp_contract_name = 'ONIXLabs Corda BNMS Contract'
         cordapp_workflow_name = 'ONIXLabs Corda BNMS Workflow'
         cordapp_vendor_name = 'ONIXLabs'

gradle.properties

@@ -1,5 +1,5 @@
 name=onixlabs-corda-bnms
 group=io.onixlabs
-version=2.0.0-rc14-pv10
+version=2.0.0-rc15
 onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12
 onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3

onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/relationship/Relationship.kt

@@ -129,6 +129,7 @@ data class Relationship(
         /**
          * The vault query criteria which will be used to resolve relationship configurations.
          */
+        @Transient
         override val criteria: QueryCriteria = vaultQuery<RelationshipConfiguration> {
             expression(RelationshipConfigurationEntity::relationshipLinearId equalTo relationshipLinearId.id)
         }

onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/relationship/RelationshipConfiguration.kt

@@ -69,6 +69,7 @@ class RelationshipConfiguration private constructor(
         private val relationshipLinearId: UniqueIdentifier
     ) : AbstractSingularResolvable<Relationship>() {
 
+        @Transient
         override val criteria: QueryCriteria = vaultQuery<Relationship> {
             linearIds(relationshipLinearId)
         }

onixlabs-corda-bnms-contract/src/test/kotlin/io/onixlabs/corda/bnms/contract/ContractTest.kt

@@ -55,7 +55,7 @@ abstract class ContractTest {
     @BeforeEach
     private fun setup() {
         val networkParameters = testNetworkParameters(
-            minimumPlatformVersion = 10,
+            minimumPlatformVersion = 11,
             notaries = listOf(NotaryInfo(TestIdentity(DUMMY_NOTARY_NAME, 20).party, true))
         )
         _services = MockServices(cordapps, IDENTITY_A, networkParameters, IDENTITY_B, IDENTITY_C)

onixlabs-corda-bnms-workflow/src/test/kotlin/io/onixlabs/corda/bnms/workflow/FlowTest.kt

@@ -79,7 +79,7 @@ abstract class FlowTest {
     private fun setup() {
         _network = MockNetwork(
             MockNetworkParameters(
-                networkParameters = testNetworkParameters(minimumPlatformVersion = 10),
+                networkParameters = testNetworkParameters(minimumPlatformVersion = 11),
                 cordappsForAllNodes = listOf(
                     TestCordapp.findCordapp("io.onixlabs.corda.identityframework.contract"),
                     TestCordapp.findCordapp("io.onixlabs.corda.identityframework.workflow"),