ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-22 20:15:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Carpenter / amqp syntesis tidyup

Browse Source 
- squashes a lot of WIP / rebase / code reformat commits
This commit is contained in:
Katelyn Baker 2017-06-15 14:49:18 +01:00
parent b4a62722fc
commit d76c1e75a4
4 changed files with 30 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/net/corda/core/serialization/amqp/Schema.kt
View File

@ -533,4 +533,4 @@ private fun fingerprintForObject(type: Type, contextType: Type?, alreadySeen: Mu
} }
interfacesForSerialization(type).map { fingerprintForType(it, type, alreadySeen, hasher, factory) } interfacesForSerialization(type).map { fingerprintForType(it, type, alreadySeen, hasher, factory) }
return hasher return hasher
} }

4
experimental/src/test/kotlin/net/corda/carpenter/CompositeMemberCompositeSchemaToClassCarpenterTests.kt
View File

@ -44,6 +44,9 @@ class CompositeMembers : AmqpCarpenterBase() {
assert(obj.second.schema.types[0] is CompositeType) assert(obj.second.schema.types[0] is CompositeType)
assert(obj.second.schema.types[1] is CompositeType) assert(obj.second.schema.types[1] is CompositeType)
println (obj.second.schema.types[0] as CompositeType)
println (obj.second.schema.types[1] as CompositeType)
var amqpSchemaA : CompositeType? = null var amqpSchemaA : CompositeType? = null
var amqpSchemaB : CompositeType? = null var amqpSchemaB : CompositeType? = null
@ -65,6 +68,7 @@ class CompositeMembers : AmqpCarpenterBase() {
assertEquals("a", amqpSchemaA!!.fields[0].name) assertEquals("a", amqpSchemaA!!.fields[0].name)
assertEquals("int", amqpSchemaA.fields[0].type) assertEquals("int", amqpSchemaA.fields[0].type)
assertEquals(2, amqpSchemaB?.fields?.size) assertEquals(2, amqpSchemaB?.fields?.size)
assertEquals("a", amqpSchemaB!!.fields[0].name) assertEquals("a", amqpSchemaB!!.fields[0].name)
assertEquals(classTestName("A"), amqpSchemaB.fields[0].type) assertEquals(classTestName("A"), amqpSchemaB.fields[0].type)

1
experimental/src/test/kotlin/net/corda/carpenter/InheritanceSchemaToClassCarpenterTests.kt
View File

@ -309,7 +309,6 @@ class InheritanceSchemaToClassCarpenterTests : AmqpCarpenterBase() {
fun memberInterface2() { fun memberInterface2() {
val testI = 25 val testI = 25
val testIIII = 50 val testIIII = 50
class A(override val i: Int) : I class A(override val i: Int) : I
class B(override val i : I, override val iiii : Int) : IIII class B(override val i : I, override val iiii : Int) : IIII

71
experimental/src/test/kotlin/net/corda/carpenter/SingleMemberCompositeSchemaToClassCarpenterTests.kt
View File

@ -1,14 +1,15 @@
package net.corda.carpenter package net.corda.carpenter
import net.corda.carpenter.test.AmqpCarpenterBase
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
import net.corda.core.serialization.amqp.* import net.corda.core.serialization.amqp.*
import net.corda.core.serialization.carpenter.CarpenterSchemas
import org.junit.Test import org.junit.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() { class SingleMemberCompositeSchemaToClassCarpenterTests {
private var factory = SerializerFactory()
fun serialise (clazz : Any) = SerializationOutput(factory).serialize(clazz)
@Test @Test
fun singleInteger() { fun singleInteger() {
@ -33,11 +34,7 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
assertEquals ("a", amqpSchema.fields[0].name) assertEquals ("a", amqpSchema.fields[0].name)
assertEquals ("int", amqpSchema.fields[0].type) assertEquals ("int", amqpSchema.fields[0].type)
val carpenterSchema = CarpenterSchemas.newInstance() val pinochio = ClassCarpenter().build(amqpSchema.carpenterSchema())
amqpSchema.carpenterSchema(carpenterSchemas = carpenterSchema, force = true)
val aSchema = carpenterSchema.carpenterSchemas.find { it.name == classTestName ("A") }!!
val pinochio = ClassCarpenter().build(aSchema)
val p = pinochio.constructors[0].newInstance (test) val p = pinochio.constructors[0].newInstance (test)
@ -50,7 +47,7 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
@CordaSerializable @CordaSerializable
data class A(val a : String) data class A(val a : String)
val a = A (test) var a = A (test)
val obj = DeserializationInput(factory).deserializeRtnEnvelope(serialise (a)) val obj = DeserializationInput(factory).deserializeRtnEnvelope(serialise (a))
@ -61,13 +58,13 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
assertEquals (1, obj.second.schema.types.size) assertEquals (1, obj.second.schema.types.size)
assert (obj.second.schema.types[0] is CompositeType) assert (obj.second.schema.types[0] is CompositeType)
val amqpSchema = obj.second.schema.types[0] as CompositeType var amqpSchema = obj.second.schema.types[0] as CompositeType
val carpenterSchema = CarpenterSchemas.newInstance() assertEquals (1, amqpSchema.fields.size)
amqpSchema.carpenterSchema(carpenterSchemas = carpenterSchema, force = true) assertEquals ("a", amqpSchema.fields[0].name)
assertEquals ("string", amqpSchema.fields[0].type)
val aSchema = carpenterSchema.carpenterSchemas.find { it.name == classTestName ("A") }!! var pinochio = ClassCarpenter().build(amqpSchema.carpenterSchema())
val pinochio = ClassCarpenter().build(aSchema)
val p = pinochio.constructors[0].newInstance (test) val p = pinochio.constructors[0].newInstance (test)
@ -81,9 +78,9 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
@CordaSerializable @CordaSerializable
data class A(val a : Char) data class A(val a : Char)
val a = A(test) var a = A (test)
val obj = DeserializationInput(factory).deserializeRtnEnvelope(serialise(a)) val obj = DeserializationInput(factory).deserializeRtnEnvelope(serialise (a))
assert (obj.first is A) assert (obj.first is A)
val amqpObj = obj.first as A val amqpObj = obj.first as A
@ -93,19 +90,13 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
assertEquals (1, obj.second.schema.types.size) assertEquals (1, obj.second.schema.types.size)
assert (obj.second.schema.types[0] is CompositeType) assert (obj.second.schema.types[0] is CompositeType)
val amqpSchema = obj.second.schema.types[0] as CompositeType var amqpSchema = obj.second.schema.types[0] as CompositeType
assertEquals (1, amqpSchema.fields.size) assertEquals (1, amqpSchema.fields.size)
assertEquals ("a", amqpSchema.fields[0].name) assertEquals ("a", amqpSchema.fields[0].name)
assertEquals ("char", amqpSchema.fields[0].type) assertEquals ("char", amqpSchema.fields[0].type)
val carpenterSchema = CarpenterSchema.newInstance() var pinochio = ClassCarpenter().build(ClassCarpenter.Schema(amqpSchema.name, amqpSchema.carpenterSchema()))
amqpSchema.carpenterSchema(carpenterSchema = carpenterSchema, force = true)
assert (classTestName ("A") in carpenterSchema.carpenterSchemas)
val aSchema = carpenterSchema.carpenterSchemas[classTestName ("A")]!!
val pinochio = ClassCarpenter().build(aSchema)
val p = pinochio.constructors[0].newInstance (test) val p = pinochio.constructors[0].newInstance (test)
@ -137,11 +128,8 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
assertEquals ("a", amqpSchema.fields[0].name) assertEquals ("a", amqpSchema.fields[0].name)
assertEquals ("long", amqpSchema.fields[0].type) assertEquals ("long", amqpSchema.fields[0].type)
val carpenterSchema = CarpenterSchemas.newInstance() var pinochio = ClassCarpenter().build(amqpSchema.carpenterSchema())
amqpSchema.carpenterSchema(carpenterSchemas = carpenterSchema, force = true)
val aSchema = carpenterSchema.carpenterSchemas.find { it.name == classTestName ("A") }!!
val pinochio = ClassCarpenter().build(aSchema)
val p = pinochio.constructors[0].newInstance (test) val p = pinochio.constructors[0].newInstance (test)
assertEquals (pinochio.getMethod("getA").invoke (p), amqpObj.a) assertEquals (pinochio.getMethod("getA").invoke (p), amqpObj.a)
@ -171,11 +159,8 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
assertEquals ("a", amqpSchema.fields[0].name) assertEquals ("a", amqpSchema.fields[0].name)
assertEquals ("short", amqpSchema.fields[0].type) assertEquals ("short", amqpSchema.fields[0].type)
val carpenterSchema = CarpenterSchemas.newInstance() var pinochio = ClassCarpenter().build(amqpSchema.carpenterSchema())
amqpSchema.carpenterSchema(carpenterSchemas = carpenterSchema, force = true)
val aSchema = carpenterSchema.carpenterSchemas.find { it.name == classTestName ("A")}!!
val pinochio = ClassCarpenter().build(aSchema)
val p = pinochio.constructors[0].newInstance (test) val p = pinochio.constructors[0].newInstance (test)
assertEquals (pinochio.getMethod("getA").invoke (p), amqpObj.a) assertEquals (pinochio.getMethod("getA").invoke (p), amqpObj.a)
@ -221,7 +206,7 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
@CordaSerializable @CordaSerializable
data class A(val a : Double) data class A(val a : Double)
val a = A (test) var a = A (test)
val obj = DeserializationInput(factory).deserializeRtnEnvelope(serialise (a)) val obj = DeserializationInput(factory).deserializeRtnEnvelope(serialise (a))
@ -232,17 +217,14 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
assertEquals (1, obj.second.schema.types.size) assertEquals (1, obj.second.schema.types.size)
assert (obj.second.schema.types[0] is CompositeType) assert (obj.second.schema.types[0] is CompositeType)
val amqpSchema = obj.second.schema.types[0] as CompositeType var amqpSchema = obj.second.schema.types[0] as CompositeType
assertEquals (1, amqpSchema.fields.size) assertEquals (1, amqpSchema.fields.size)
assertEquals ("a", amqpSchema.fields[0].name) assertEquals ("a", amqpSchema.fields[0].name)
assertEquals ("double", amqpSchema.fields[0].type) assertEquals ("double", amqpSchema.fields[0].type)
val carpenterSchema = CarpenterSchemas.newInstance() var pinochio = ClassCarpenter().build(amqpSchema.carpenterSchema())
amqpSchema.carpenterSchema(carpenterSchemas = carpenterSchema, force = true)
val aSchema = carpenterSchema.carpenterSchemas.find { it.name == classTestName ("A")}!!
val pinochio = ClassCarpenter().build(aSchema)
val p = pinochio.constructors[0].newInstance (test) val p = pinochio.constructors[0].newInstance (test)
assertEquals (pinochio.getMethod("getA").invoke (p), amqpObj.a) assertEquals (pinochio.getMethod("getA").invoke (p), amqpObj.a)
@ -250,12 +232,12 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
@Test @Test
fun singleFloat() { fun singleFloat() {
val test : Float = 10.0F val test = 10.0F
@CordaSerializable @CordaSerializable
data class A(val a : Float) data class A(val a : Float)
val a = A (test) var a = A (test)
val obj = DeserializationInput(factory).deserializeRtnEnvelope(serialise (a)) val obj = DeserializationInput(factory).deserializeRtnEnvelope(serialise (a))
@ -266,19 +248,16 @@ class SingleMemberCompositeSchemaToClassCarpenterTests : AmqpCarpenterBase() {
assertEquals (1, obj.second.schema.types.size) assertEquals (1, obj.second.schema.types.size)
assert (obj.second.schema.types[0] is CompositeType) assert (obj.second.schema.types[0] is CompositeType)
val amqpSchema = obj.second.schema.types[0] as CompositeType var amqpSchema = obj.second.schema.types[0] as CompositeType
assertEquals (1, amqpSchema.fields.size) assertEquals (1, amqpSchema.fields.size)
assertEquals ("a", amqpSchema.fields[0].name) assertEquals ("a", amqpSchema.fields[0].name)
assertEquals ("float", amqpSchema.fields[0].type) assertEquals ("float", amqpSchema.fields[0].type)
val carpenterSchema = CarpenterSchemas.newInstance() var pinochio = ClassCarpenter().build(amqpSchema.carpenterSchema())
amqpSchema.carpenterSchema(carpenterSchemas = carpenterSchema, force = true)
val aSchema = carpenterSchema.carpenterSchemas.find { it.name == classTestName ("A") }!!
val pinochio = ClassCarpenter().build(aSchema)
val p = pinochio.constructors[0].newInstance (test) val p = pinochio.constructors[0].newInstance (test)
assertEquals (pinochio.getMethod("getA").invoke (p), amqpObj.a) // assertEquals (pinochio.getMethod("getA").invoke (p), amqpObj.a)
} }
} }