ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-02 07:30:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2227 Emit java.lang.Object, not *, in TypeNotation (#4387)

Browse Source
This commit is contained in:
Dominic Fox 2018-12-07 21:57:10 +00:00 committed by Shams Asari
parent b020e602ba
commit c554b33ff6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPTypeIdentifiers.kt
View File

@ -47,7 +47,7 @@ object AMQPTypeIdentifiers {
is TypeIdentifier.Erased -> typeIdentifier.name is TypeIdentifier.Erased -> typeIdentifier.name
is TypeIdentifier.Unparameterised -> primitiveTypeNamesByName[typeIdentifier] ?: typeIdentifier.name is TypeIdentifier.Unparameterised -> primitiveTypeNamesByName[typeIdentifier] ?: typeIdentifier.name
is TypeIdentifier.UnknownType -> "?" is TypeIdentifier.UnknownType -> "?"
is TypeIdentifier.TopType -> TypeIdentifier.TopType.name is TypeIdentifier.TopType -> Any::class.java.name
is TypeIdentifier.ArrayOf -> is TypeIdentifier.ArrayOf ->
if (typeIdentifier == primitiveByteArrayType) "binary" if (typeIdentifier == primitiveByteArrayType) "binary"
else nameForType(typeIdentifier.componentType) + else nameForType(typeIdentifier.componentType) +

8
serialization/src/test/kotlin/net/corda/serialization/internal/amqp/AMQPRemoteTypeModelTests.kt
View File

@ -45,10 +45,10 @@ class AMQPRemoteTypeModelTests {
@Test @Test
fun `round-trip some types through AMQP serialisations`() { fun `round-trip some types through AMQP serialisations`() {
arrayOf("").assertRemoteType("String[]") arrayOf("").assertRemoteType("String[]")
listOf(1).assertRemoteType("List<*>") listOf(1).assertRemoteType("List<Object>")
arrayOf(listOf(1)).assertRemoteType("List[]") arrayOf(listOf(1)).assertRemoteType("List[]")
Enum.BAZ.assertRemoteType("Enum(FOO|BAR|BAZ)") Enum.BAZ.assertRemoteType("Enum(FOO|BAR|BAZ)")
mapOf("string" to 1).assertRemoteType("Map<*, *>") mapOf("string" to 1).assertRemoteType("Map<Object, Object>")
arrayOf(byteArrayOf(1, 2, 3)).assertRemoteType("byte[][]") arrayOf(byteArrayOf(1, 2, 3)).assertRemoteType("byte[][]")
SimpleClass(1, 2.0, null, byteArrayOf(1, 2, 3), byteArrayOf(4, 5, 6)) SimpleClass(1, 2.0, null, byteArrayOf(1, 2, 3), byteArrayOf(4, 5, 6))
@ -63,11 +63,11 @@ class AMQPRemoteTypeModelTests {
C(arrayOf("a", "b"), listOf(UUID.randomUUID()), mapOf(UUID.randomUUID() to intArrayOf(1, 2, 3)), Enum.BAZ) C(arrayOf("a", "b"), listOf(UUID.randomUUID()), mapOf(UUID.randomUUID() to intArrayOf(1, 2, 3)), Enum.BAZ)
.assertRemoteType(""" .assertRemoteType("""
C: Interface<String, UUID, *> C: Interface<String, UUID, Object>
array: String[] array: String[]
enum: Enum(FOO|BAR|BAZ) enum: Enum(FOO|BAR|BAZ)
list: List<UUID> list: List<UUID>
map: Map<UUID, *> map: Map<UUID, Object>
""") """)
} }

2
serialization/src/test/kotlin/net/corda/serialization/internal/amqp/AMQPTypeIdentifierParserTests.kt
View File

@ -67,7 +67,7 @@ class AMQPTypeIdentifierParserTests {
assertParsesCompatibly<IntArray>() assertParsesCompatibly<IntArray>()
assertParsesCompatibly<Array<Int>>() assertParsesCompatibly<Array<Int>>()
assertParsesCompatibly<List<Int>>() assertParsesCompatibly<List<Int>>()
assertParsesCompatibly<WithParameter<*>>() assertParsesTo<WithParameter<*>>("WithParameter<Object>")
assertParsesCompatibly<WithParameter<Int>>() assertParsesCompatibly<WithParameter<Int>>()
assertParsesCompatibly<Array<out WithParameter<Int>>>() assertParsesCompatibly<Array<out WithParameter<Int>>>()
assertParsesCompatibly<WithParameters<IntArray, WithParameter<Array<WithParameters<Array<Array<Date>>, UUID>>>>>() assertParsesCompatibly<WithParameters<IntArray, WithParameter<Array<WithParameters<Array<Array<Date>>, UUID>>>>>()