mirror of
https://github.com/corda/corda.git
synced 2025-02-07 11:30:22 +00:00
152848730d
# Conflicts: # build.gradle # client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt # node-api/build.gradle # node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/AllButBlacklisted.kt # serialization/src/main/kotlin/net/corda/serialization/internal/AttachmentsClassLoader.kt # serialization/src/main/kotlin/net/corda/serialization/internal/DefaultWhitelist.kt # serialization/src/main/kotlin/net/corda/serialization/internal/GeneratedAttachment.kt # serialization/src/main/kotlin/net/corda/serialization/internal/OrdinalIO.kt # serialization/src/main/kotlin/net/corda/serialization/internal/SerializationFormat.kt # serialization/src/main/kotlin/net/corda/serialization/internal/SerializationScheme.kt # serialization/src/main/kotlin/net/corda/serialization/internal/SerializeAsTokenContextImpl.kt # serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt # serialization/src/main/kotlin/net/corda/serialization/internal/UseCaseAwareness.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPDescriptorRegistry.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPPrimitiveSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializerFactories.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ArraySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CollectionSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CorDappCustomSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CustomSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializationInput.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedGenericArrayType.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedType.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumEvolutionSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Envelope.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/FingerPrinter.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/MapSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializers.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Schema.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationOutput.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializerFactory.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SingletonSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SupportedTransforms.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformTypes.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformsSchema.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigDecimalSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigIntegerSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BitSetSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CertPathSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ClassSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ContractAttachmentSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CurrencySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/DurationSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/EnumSetSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InputStreamSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InstantSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/MonthDaySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetDateTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OpaqueBytesSubSequenceSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PeriodSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PrivateKeySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PublicKeySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/SimpleStringSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ThrowableSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CRLSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CertificateSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearMonthSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZoneIdSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZonedDateTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenter.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Exceptions.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/MetaCarpenter.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Schema.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/SchemaFields.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClassResolver.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClosureSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/DefaultKryoCustomizer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/KryoSerializationScheme.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/SerializeAsTokenSerializer.kt # serialization/src/test/java/net/corda/serialization/internal/ForbiddenLambdaSerializationTests.java # serialization/src/test/java/net/corda/serialization/internal/LambdaCheckpointSerializationTest.java # serialization/src/test/java/net/corda/serialization/internal/amqp/ErrorMessageTests.java # serialization/src/test/java/net/corda/serialization/internal/amqp/JavaGenericsTest.java # serialization/src/test/java/net/corda/serialization/internal/amqp/JavaPrivatePropertyTests.java # serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerialiseEnumTests.java # serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerializationOutputTests.java # serialization/src/test/java/net/corda/serialization/internal/amqp/ListsSerializationJavaTest.java # serialization/src/test/java/net/corda/serialization/internal/amqp/SetterConstructorTests.java # serialization/src/test/kotlin/net/corda/serialization/internal/AttachmentsClassLoaderTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/ContractAttachmentSerializerTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/CordaClassResolverTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/ListsSerializationTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/MapsSerializationTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/PrivateKeySerializationTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/SerializationTokenTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/SetsSerializationTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/CorDappSerializerTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeAndReturnEnvelopeTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeMapTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryOfEnumsTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeSimpleTypesTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedTypeTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolvabilityTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolveTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/ErrorMessagesTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializerGetterTesting.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/FingerPrinterTesting.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/GenericsTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/OverridePKSerializerTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/PrivatePropertyTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializationPropertyOrdering.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializeAndReturnSchemaTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/StaticInitialisationOfSerializedObjectTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTestUtils.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterWhitelistTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/CompositeMemberCompositeSchemaToClassCarpenterTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/EnumClassTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/InheritanceSchemaToClassCarpenterTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/MultiMemberCompositeSchemaToClassCarpenterTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/SingleMemberCompositeSchemaToClassCarpenterTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoStreamsTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoTests.kt # settings.gradle