Remove CordaSerializable from DistributionRecord

Author: kasiastreich

Diff for: workflows/src/main/kotlin/com/r3/corda/lib/tokens/workflows/internal/schemas/DistributionRecord.kt

@@ -2,10 +2,14 @@ package com.r3.corda.lib.tokens.workflows.internal.schemas
 
 import net.corda.core.identity.Party
 import net.corda.core.schemas.MappedSchema
-import net.corda.core.serialization.CordaSerializable
 import org.hibernate.annotations.Type
 import java.util.*
-import javax.persistence.*
+import javax.persistence.Column
+import javax.persistence.Entity
+import javax.persistence.GeneratedValue
+import javax.persistence.Id
+import javax.persistence.Index
+import javax.persistence.Table
 
 object DistributionRecordSchema
 
@@ -15,7 +19,6 @@ object DistributionRecordSchemaV1 : MappedSchema(
         mappedTypes = listOf(DistributionRecord::class.java)
 )
 
-@CordaSerializable
 @Entity
 @Table(name = "distribution_record", indexes = [Index(name = "dist_record_idx", columnList = "linear_id")])
 class DistributionRecord(

Diff for: workflows/src/main/kotlin/com/r3/corda/lib/tokens/workflows/internal/testflows/TestFlows.kt

@@ -17,7 +17,6 @@ import com.r3.corda.lib.tokens.workflows.internal.flows.distribution.UpdateDistr
 import com.r3.corda.lib.tokens.workflows.internal.flows.distribution.getDistributionList
 import com.r3.corda.lib.tokens.workflows.internal.flows.finality.ObserverAwareFinalityFlow
 import com.r3.corda.lib.tokens.workflows.internal.flows.finality.ObserverAwareFinalityFlowHandler
-import com.r3.corda.lib.tokens.workflows.internal.schemas.DistributionRecord
 import com.r3.corda.lib.tokens.workflows.utilities.getPreferredNotary
 import com.r3.corda.lib.tokens.workflows.utilities.ourSigningKeys
 import net.corda.core.contracts.Amount
@@ -37,6 +36,7 @@ import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.seconds
 import net.corda.core.utilities.unwrap
 import java.time.Duration
+import java.util.*
 
 // This is very simple test flow for DvP.
 @CordaSerializable
@@ -94,11 +94,14 @@ class DvPFlowHandler(val otherSession: FlowSession) : FlowLogic<Unit>() {
     }
 }
 
+@CordaSerializable
+data class DistributionRecordSerial(val linearId: UUID, val party: Party)
+
 @StartableByRPC
-class GetDistributionList(val housePtr: TokenPointer<House>) : FlowLogic<List<DistributionRecord>>() {
+class GetDistributionList(val housePtr: TokenPointer<House>) : FlowLogic<List<DistributionRecordSerial>>() {
     @Suspendable
-    override fun call(): List<DistributionRecord> {
-        return getDistributionList(serviceHub, housePtr.pointer.pointer)
+    override fun call(): List<DistributionRecordSerial> {
+        return getDistributionList(serviceHub, housePtr.pointer.pointer).map { DistributionRecordSerial(it.linearId, it.party) }
     }
 }