From 1c3ec2eb18f8d34fdf8485d1dc45def3140db1bc Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Tue, 28 Apr 2020 15:43:14 +0100 Subject: [PATCH] CORDA-3738: Upgrade to DJVM 1.1-RC01. (#6182) * Update for changes to API for DJVM 1.1-RC01. * Tidy up generics for DJVM serialization. --- constants.properties | 2 +- .../djvm/serializers/SandboxEnumSerializer.kt | 10 +++++----- .../serializers/SandboxSymbolSerializer.kt | 2 +- .../SandboxZonedDateTimeSerializer.kt | 2 +- .../net/corda/serialization/djvm/TestBase.kt | 19 ++----------------- 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/constants.properties b/constants.properties index 534cc1145a..0ed8cd5e3b 100644 --- a/constants.properties +++ b/constants.properties @@ -30,7 +30,7 @@ snakeYamlVersion=1.19 caffeineVersion=2.7.0 metricsVersion=4.1.0 metricsNewRelicVersion=1.1.1 -djvmVersion=1.0 +djvmVersion=1.1-RC01 deterministicRtVersion=1.0-RC02 openSourceBranch=https://github.com/corda/corda/blob/release/os/4.4 openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4 diff --git a/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxEnumSerializer.kt b/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxEnumSerializer.kt index a052e799da..87946820da 100644 --- a/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxEnumSerializer.kt +++ b/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxEnumSerializer.kt @@ -30,11 +30,11 @@ class SandboxEnumSerializer( private val localFactory: LocalSerializerFactory ) : CustomSerializer.Implements(clazz = classLoader.toSandboxAnyClass(Enum::class.java)) { @Suppress("unchecked_cast") - private val describeEnum: Function, Array> - = taskFactory.apply(DescribeEnum::class.java) as Function, Array> + private val describeEnum: Function, Array> + = taskFactory.apply(DescribeEnum::class.java) as Function, Array> @Suppress("unchecked_cast") - private val getEnumNames: Function, List> - = (taskFactory.apply(GetEnumNames::class.java) as Function, Array>) + private val getEnumNames: Function, List> + = (taskFactory.apply(GetEnumNames::class.java) as Function, Array>) .andThen { it.map(Any::toString) } @Suppress("unchecked_cast") private val isEnum: Predicate> @@ -70,7 +70,7 @@ class SandboxEnumSerializer( private class ConcreteEnumSerializer( declaredType: Class<*>, - private val members: Array, + private val members: Array, private val memberNames: List, factory: LocalSerializerFactory ) : AMQPSerializer { diff --git a/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxSymbolSerializer.kt b/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxSymbolSerializer.kt index bac43a452f..2dd0ba116c 100644 --- a/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxSymbolSerializer.kt +++ b/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxSymbolSerializer.kt @@ -24,7 +24,7 @@ class SandboxSymbolSerializer( init { val transformTask = taskFactory.apply(SymbolDeserializer::class.java) @Suppress("unchecked_cast") - transformer = basicInput.andThen(transformTask) as Function + transformer = basicInput.andThen(transformTask) as Function } override val schemaForDocumentation: Schema = Schema(emptyList()) diff --git a/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxZonedDateTimeSerializer.kt b/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxZonedDateTimeSerializer.kt index 46bb414f4f..ea9126c772 100644 --- a/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxZonedDateTimeSerializer.kt +++ b/serialization-djvm/src/main/kotlin/net/corda/serialization/djvm/serializers/SandboxZonedDateTimeSerializer.kt @@ -33,7 +33,7 @@ class SandboxZonedDateTimeSerializer( ) creator = task.andThen { input -> @Suppress("unchecked_cast", "SpreadOperator") - createTask(null, *(input as Array))!! + createTask(null, *(input as Array))!! } } diff --git a/serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/TestBase.kt b/serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/TestBase.kt index ae50b57eae..05edb2468d 100644 --- a/serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/TestBase.kt +++ b/serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/TestBase.kt @@ -79,37 +79,23 @@ abstract class TestBase(type: SandboxType) { } fun sandbox(action: Consumer) { - sandbox(WARNING, emptySet(), emptySet(), action) + sandbox(WARNING, emptySet(), action) } inline fun sandbox(visibleAnnotations: Set>, crossinline action: SandboxRuntimeContext.() -> Unit) { sandbox(visibleAnnotations, Consumer { ctx -> action(ctx) }) } - fun sandbox(visibleAnnotations: Set>, action: Consumer) { - sandbox(WARNING, visibleAnnotations, emptySet(), action) - } - - inline fun sandbox( - visibleAnnotations: Set>, - sandboxOnlyAnnotations: Set, - crossinline action: SandboxRuntimeContext.() -> Unit - ) { - sandbox(visibleAnnotations, sandboxOnlyAnnotations, Consumer { ctx -> action(ctx) }) - } - fun sandbox( visibleAnnotations: Set>, - sandboxOnlyAnnotations: Set, action: Consumer ) { - sandbox(WARNING, visibleAnnotations, sandboxOnlyAnnotations, action) + sandbox(WARNING, visibleAnnotations, action) } fun sandbox( minimumSeverityLevel: Severity, visibleAnnotations: Set>, - sandboxOnlyAnnotations: Set, action: Consumer ) { var thrownException: Throwable? = null @@ -117,7 +103,6 @@ abstract class TestBase(type: SandboxType) { UserPathSource(classPaths).use { userSource -> SandboxRuntimeContext(parentConfiguration.createChild(userSource, Consumer { it.setMinimumSeverityLevel(minimumSeverityLevel) - it.setSandboxOnlyAnnotations(sandboxOnlyAnnotations) it.setVisibleAnnotations(visibleAnnotations) })).use(action) }