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

CORDA-540: AMQP-forge "example-code" (#1439)

Browse Source
This commit is contained in:
Viktor Kolomeyko 2017-09-07 11:17:55 +01:00 committed by GitHub
parent 916c25508e
commit 50c51493c3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/example-code/src/main/kotlin/net/corda/docs/WorkflowTransactionBuildTutorial.kt
View File

@ -30,7 +30,7 @@ enum class WorkflowState {
* Minimal contract to encode a simple workflow with one initial state and two possible eventual states. * Minimal contract to encode a simple workflow with one initial state and two possible eventual states.
* It is assumed one party unilaterally submits and the other manually retrieves the deal and completes it. * It is assumed one party unilaterally submits and the other manually retrieves the deal and completes it.
*/ */
data class TradeApprovalContract(private val blank: Void? = null) : Contract { data class TradeApprovalContract(val blank: Unit? = null) : Contract {
interface Commands : CommandData { interface Commands : CommandData {
class Issue : TypeOnlyCommandData(), Commands // Record receipt of deal details class Issue : TypeOnlyCommandData(), Commands // Record receipt of deal details

6
node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializerFactory.kt
View File

@ -7,10 +7,7 @@ import net.corda.core.serialization.CordaSerializable
import net.corda.nodeapi.internal.serialization.carpenter.* import net.corda.nodeapi.internal.serialization.carpenter.*
import org.apache.qpid.proton.amqp.* import org.apache.qpid.proton.amqp.*
import java.io.NotSerializableException import java.io.NotSerializableException
import java.lang.reflect.GenericArrayType import java.lang.reflect.*
import java.lang.reflect.ParameterizedType
import java.lang.reflect.Type
import java.lang.reflect.WildcardType
import java.util.* import java.util.*
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CopyOnWriteArrayList
@ -346,6 +343,7 @@ class SerializerFactory(val whitelist: ClassWhitelist, cl: ClassLoader) {
is ParameterizedType -> "${nameForType(type.rawType)}<${type.actualTypeArguments.joinToString { nameForType(it) }}>" is ParameterizedType -> "${nameForType(type.rawType)}<${type.actualTypeArguments.joinToString { nameForType(it) }}>"
is GenericArrayType -> "${nameForType(type.genericComponentType)}[]" is GenericArrayType -> "${nameForType(type.genericComponentType)}[]"
is WildcardType -> "Any" is WildcardType -> "Any"
is TypeVariable<*> -> "?"
else -> throw NotSerializableException("Unable to render type $type to a string.") else -> throw NotSerializableException("Unable to render type $type to a string.")
} }