ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-27 00:21:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-3218: Align DJVM with internal Corda Serialisation API. (#68)

Browse Source 
* Align DJVM with internal Corda Serialisation API.
* Ensure we get the latest SNAPSHOT of the serialisation code.
This commit is contained in:
Chris Rankin 2019-09-14 14:00:23 +01:00 committed by GitHub
parent e0ce1bd525
commit 394d503d41
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@ -25,7 +25,7 @@ allprojects {
} }
} }
configurations{ configurations {
// This is for the latest deterministic Corda SNAPSHOT artifacts... // This is for the latest deterministic Corda SNAPSHOT artifacts...
[ compileClasspath, runtimeClasspath ].forEach { cfg -> [ compileClasspath, runtimeClasspath ].forEach { cfg ->
cfg.resolutionStrategy { cfg.resolutionStrategy {
@ -38,6 +38,11 @@ allprojects {
} }
} }
} }
testRuntimeClasspath.resolutionStrategy {
// Always check the repository for a newer SNAPSHOT.
cacheChangingModulesFor 0, 'seconds'
}
} }
/* /*

2
src/main/kotlin/net/corda/djvm/serialization/SandboxSerializerFactoryFactory.kt
View File

@ -14,6 +14,7 @@ import java.util.*
import java.util.Collections.singleton import java.util.Collections.singleton
import java.util.Collections.unmodifiableMap import java.util.Collections.unmodifiableMap
import java.util.function.Function import java.util.function.Function
import java.util.function.Predicate
/** /**
* This has all been lovingly copied from [SerializerFactoryBuilder]. * This has all been lovingly copied from [SerializerFactoryBuilder].
@ -60,6 +61,7 @@ class SandboxSerializerFactoryFactory(
classloader = classLoader, classloader = classLoader,
descriptorBasedSerializerRegistry = descriptorBasedSerializerRegistry, descriptorBasedSerializerRegistry = descriptorBasedSerializerRegistry,
primitiveSerializerFactory = primitiveSerializerFactory, primitiveSerializerFactory = primitiveSerializerFactory,
isPrimitiveType = Predicate { clazz -> clazz.isPrimitive || clazz in primitiveTypes.keys },
customSerializerRegistry = customSerializerRegistry, customSerializerRegistry = customSerializerRegistry,
onlyCustomSerializers = false onlyCustomSerializers = false
) )