From 3083db5d5091fd3fc282fc635e021f868f17e9c8 Mon Sep 17 00:00:00 2001 From: LWogan Date: Tue, 19 Nov 2024 16:31:20 +0000 Subject: [PATCH] CORE-20662: update avro to v12 --- .../FlowStatusSchemaCompatibilityTest.kt | 8 +++--- .../PipelineStateSchemaCompatibilityTest.kt | 8 +++--- ...rsistenceRequestSchemaCompatibilityTest.kt | 26 +++++++++---------- .../data/TokenClaimSchemaCompatibilityTest.kt | 4 +-- .../membership/state/RegistrationStateTest.kt | 2 +- .../HostedIdentityEntryCompatibilityTest.kt | 5 ++-- gradle/libs.versions.toml | 2 +- 7 files changed, 27 insertions(+), 28 deletions(-) diff --git a/data/avro-schema/src/test/kotlin/net/corda/data/flow/state/checkpoint/FlowStatusSchemaCompatibilityTest.kt b/data/avro-schema/src/test/kotlin/net/corda/data/flow/state/checkpoint/FlowStatusSchemaCompatibilityTest.kt index acdf8e4b8d..b4104d1d73 100644 --- a/data/avro-schema/src/test/kotlin/net/corda/data/flow/state/checkpoint/FlowStatusSchemaCompatibilityTest.kt +++ b/data/avro-schema/src/test/kotlin/net/corda/data/flow/state/checkpoint/FlowStatusSchemaCompatibilityTest.kt @@ -93,10 +93,10 @@ class FlowStatusSchemaCompatibilityTest { val oldSchema = Schema.Parser() .addTypes( - mapOf( - FlowKey::class.java.name to FlowKey.`SCHEMA$`, - FlowInitiatorType::class.java.name to FlowInitiatorType.`SCHEMA$`, - ExceptionEnvelope::class.java.name to ExceptionEnvelope.`SCHEMA$`, + listOf( + FlowKey.`SCHEMA$`, + FlowInitiatorType.`SCHEMA$`, + ExceptionEnvelope.`SCHEMA$` ) ) .parse(oldSchemaJson) diff --git a/data/avro-schema/src/test/kotlin/net/corda/data/flow/state/checkpoint/PipelineStateSchemaCompatibilityTest.kt b/data/avro-schema/src/test/kotlin/net/corda/data/flow/state/checkpoint/PipelineStateSchemaCompatibilityTest.kt index f63872827c..5d4cdeed9a 100644 --- a/data/avro-schema/src/test/kotlin/net/corda/data/flow/state/checkpoint/PipelineStateSchemaCompatibilityTest.kt +++ b/data/avro-schema/src/test/kotlin/net/corda/data/flow/state/checkpoint/PipelineStateSchemaCompatibilityTest.kt @@ -50,10 +50,10 @@ class PipelineStateSchemaCompatibilityTest { val oldSchema = Schema.Parser() .addTypes( - mapOf( - SecureHash::class.java.name to SecureHash.`SCHEMA$`, - RetryState::class.java.name to RetryState.`SCHEMA$`, - ExceptionEnvelope::class.java.name to ExceptionEnvelope.`SCHEMA$`, + listOf( + SecureHash.`SCHEMA$`, + RetryState.`SCHEMA$`, + ExceptionEnvelope.`SCHEMA$` ) ) .parse(oldSchemaJson) diff --git a/data/avro-schema/src/test/kotlin/net/corda/data/ledger/persistence/LedgerPersistenceRequestSchemaCompatibilityTest.kt b/data/avro-schema/src/test/kotlin/net/corda/data/ledger/persistence/LedgerPersistenceRequestSchemaCompatibilityTest.kt index 834a6bb292..911e164925 100644 --- a/data/avro-schema/src/test/kotlin/net/corda/data/ledger/persistence/LedgerPersistenceRequestSchemaCompatibilityTest.kt +++ b/data/avro-schema/src/test/kotlin/net/corda/data/ledger/persistence/LedgerPersistenceRequestSchemaCompatibilityTest.kt @@ -68,19 +68,19 @@ class LedgerPersistenceRequestSchemaCompatibilityTest { val oldSchema = Schema.Parser() .addTypes( - mapOf( - HoldingIdentity::class.java.name to HoldingIdentity.`SCHEMA$`, - PersistTransaction::class.java.name to PersistTransaction.`SCHEMA$`, - PersistTransactionIfDoesNotExist::class.java.name to PersistTransactionIfDoesNotExist.`SCHEMA$`, - FindTransaction::class.java.name to FindTransaction.`SCHEMA$`, - FindUnconsumedStatesByType::class.java.name to FindUnconsumedStatesByType.`SCHEMA$`, - ResolveStateRefs::class.java.name to ResolveStateRefs.`SCHEMA$`, - UpdateTransactionStatus::class.java.name to UpdateTransactionStatus.`SCHEMA$`, - FindWithNamedQuery::class.java.name to FindWithNamedQuery.`SCHEMA$`, - FindSignedGroupParameters::class.java.name to FindSignedGroupParameters.`SCHEMA$`, - PersistSignedGroupParametersIfDoNotExist::class.java.name to PersistSignedGroupParametersIfDoNotExist.`SCHEMA$`, - FindSignedLedgerTransaction::class.java.name to FindSignedLedgerTransaction.`SCHEMA$`, - ExternalEventContext::class.java.name to ExternalEventContext.`SCHEMA$`, + listOf( + HoldingIdentity.`SCHEMA$`, + PersistTransaction.`SCHEMA$`, + PersistTransactionIfDoesNotExist.`SCHEMA$`, + FindTransaction.`SCHEMA$`, + FindUnconsumedStatesByType.`SCHEMA$`, + ResolveStateRefs.`SCHEMA$`, + UpdateTransactionStatus.`SCHEMA$`, + FindWithNamedQuery.`SCHEMA$`, + FindSignedGroupParameters.`SCHEMA$`, + PersistSignedGroupParametersIfDoNotExist.`SCHEMA$`, + FindSignedLedgerTransaction.`SCHEMA$`, + ExternalEventContext.`SCHEMA$` ) ) .parse(oldSchemaJson) diff --git a/data/avro-schema/src/test/kotlin/net/corda/data/ledger/utxo/token/selection/data/TokenClaimSchemaCompatibilityTest.kt b/data/avro-schema/src/test/kotlin/net/corda/data/ledger/utxo/token/selection/data/TokenClaimSchemaCompatibilityTest.kt index 284468df53..3f537a0854 100644 --- a/data/avro-schema/src/test/kotlin/net/corda/data/ledger/utxo/token/selection/data/TokenClaimSchemaCompatibilityTest.kt +++ b/data/avro-schema/src/test/kotlin/net/corda/data/ledger/utxo/token/selection/data/TokenClaimSchemaCompatibilityTest.kt @@ -45,8 +45,8 @@ class TokenClaimSchemaCompatibilityTest { val oldSchema = Schema.Parser() .addTypes( - mapOf( - Token::class.java.name to Token.`SCHEMA$`, + listOf( + Token.`SCHEMA$`, ) ) .parse(oldSchemaJson) diff --git a/data/avro-schema/src/test/kotlin/net/corda/data/membership/state/RegistrationStateTest.kt b/data/avro-schema/src/test/kotlin/net/corda/data/membership/state/RegistrationStateTest.kt index 3032520184..85009c4fcf 100644 --- a/data/avro-schema/src/test/kotlin/net/corda/data/membership/state/RegistrationStateTest.kt +++ b/data/avro-schema/src/test/kotlin/net/corda/data/membership/state/RegistrationStateTest.kt @@ -40,7 +40,7 @@ class RegistrationStateTest { """.trimIndent() val oldSchema = Schema.Parser() - .addTypes(mapOf(HoldingIdentity::class.java.name to HoldingIdentity.`SCHEMA$`)) + .addTypes(listOf(HoldingIdentity.`SCHEMA$`)) .parse(oldSchemaJson) val newSchema = RegistrationState.`SCHEMA$` diff --git a/data/avro-schema/src/test/kotlin/net/corda/data/p2p/HostedIdentityEntryCompatibilityTest.kt b/data/avro-schema/src/test/kotlin/net/corda/data/p2p/HostedIdentityEntryCompatibilityTest.kt index 936f088b9e..9e12d44814 100644 --- a/data/avro-schema/src/test/kotlin/net/corda/data/p2p/HostedIdentityEntryCompatibilityTest.kt +++ b/data/avro-schema/src/test/kotlin/net/corda/data/p2p/HostedIdentityEntryCompatibilityTest.kt @@ -51,9 +51,8 @@ class HostedIdentityEntryCompatibilityTest { """.trimIndent() val schemaV52 = Schema.Parser().addTypes( - mapOf( - HoldingIdentity::class.java.name to HoldingIdentity.`SCHEMA$`, - HostedIdentitySessionKeyAndCert::class.java.name to HostedIdentitySessionKeyAndCert.`SCHEMA$` + listOf( + HoldingIdentity.`SCHEMA$`, HostedIdentitySessionKeyAndCert.`SCHEMA$` ) ).parse(schemaV52Json) val schemaV521 = HostedIdentityEntry.`SCHEMA$` diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 394ee0f651..061f749854 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ kotlinVersion = "1.8.21" slf4jVersion = { strictly = "1.7.36" } # Main implementation dependencies -avroVersion = "1.11.4" +avroVersion = "1.12.0" apacheCommonsCodecVersion="1.16.1" commonsCompressVersion = "1.26.0" bouncycastleVersion = "1.77"