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

[CORDA-1472]: Crackdown on warnings. (#3136)

Browse Source
This commit is contained in:
Michele Sollecito 2018-05-14 21:15:52 +07:00 committed by GitHub
parent 5a92079011
commit d027b5b8f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
461 changed files with 1413 additions and 1578 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
.idea/compiler.xml generated
View File

@ -4,82 +4,28 @@
<bytecodeTargetLevel target="1.8"> <bytecodeTargetLevel target="1.8">
<module name="api-scanner_main" target="1.8" /> <module name="api-scanner_main" target="1.8" />
<module name="api-scanner_test" target="1.8" /> <module name="api-scanner_test" target="1.8" />
<module name="attachment-demo_integrationTest" target="1.8" />
<module name="attachment-demo_main" target="1.8" />
<module name="attachment-demo_test" target="1.8" />
<module name="bank-of-corda-demo_integrationTest" target="1.8" />
<module name="bank-of-corda-demo_main" target="1.8" />
<module name="bank-of-corda-demo_test" target="1.8" />
<module name="behave_behave" target="1.8" />
<module name="behave_main" target="1.8" />
<module name="behave_scenario" target="1.8" /> <module name="behave_scenario" target="1.8" />
<module name="behave_test" target="1.8" />
<module name="blobinspector_main" target="1.8" />
<module name="blobinspector_test" target="1.8" />
<module name="bootstrapper_main" target="1.8" />
<module name="bootstrapper_test" target="1.8" />
<module name="buildSrc_main" target="1.8" />
<module name="buildSrc_test" target="1.8" />
<module name="canonicalizer_main" target="1.8" />
<module name="canonicalizer_test" target="1.8" />
<module name="client_main" target="1.8" />
<module name="client_test" target="1.8" />
<module name="confidential-identities_main" target="1.8" />
<module name="confidential-identities_test" target="1.8" />
<module name="contracts-states_integrationTest" target="1.8" /> <module name="contracts-states_integrationTest" target="1.8" />
<module name="contracts-states_main" target="1.8" />
<module name="contracts-states_test" target="1.8" />
<module name="corda-core_integrationTest" target="1.8" /> <module name="corda-core_integrationTest" target="1.8" />
<module name="corda-core_smokeTest" target="1.8" /> <module name="corda-core_smokeTest" target="1.8" />
<module name="corda-finance_integrationTest" target="1.8" /> <module name="corda-finance_integrationTest" target="1.8" />
<module name="corda-project_main" target="1.8" />
<module name="corda-project_test" target="1.8" />
<module name="corda-webserver_integrationTest" target="1.8" /> <module name="corda-webserver_integrationTest" target="1.8" />
<module name="corda-webserver_main" target="1.8" /> <module name="corda-webserver_main" target="1.8" />
<module name="corda-webserver_test" target="1.8" /> <module name="corda-webserver_test" target="1.8" />
<module name="cordapp-configuration_main" target="1.8" />
<module name="cordapp-configuration_test" target="1.8" />
<module name="cordapp_integrationTest" target="1.8" />
<module name="cordapp_main" target="1.8" />
<module name="cordapp_test" target="1.8" />
<module name="cordform-common_main" target="1.8" /> <module name="cordform-common_main" target="1.8" />
<module name="cordform-common_test" target="1.8" /> <module name="cordform-common_test" target="1.8" />
<module name="cordformation_main" target="1.8" /> <module name="cordformation_main" target="1.8" />
<module name="cordformation_runnodes" target="1.8" /> <module name="cordformation_runnodes" target="1.8" />
<module name="cordformation_test" target="1.8" /> <module name="cordformation_test" target="1.8" />
<module name="core_extraResource" target="1.8" /> <module name="core_extraResource" target="1.8" />
<module name="core_integrationTest" target="1.8" />
<module name="core_main" target="1.8" />
<module name="core_smokeTest" target="1.8" />
<module name="core_test" target="1.8" />
<module name="demobench_main" target="1.8" />
<module name="demobench_test" target="1.8" />
<module name="docs_main" target="1.8" />
<module name="docs_source_example-code_integrationTest" target="1.8" /> <module name="docs_source_example-code_integrationTest" target="1.8" />
<module name="docs_source_example-code_main" target="1.8" /> <module name="docs_source_example-code_main" target="1.8" />
<module name="docs_source_example-code_test" target="1.8" /> <module name="docs_source_example-code_test" target="1.8" />
<module name="docs_test" target="1.8" />
<module name="example-code_integrationTest" target="1.8" />
<module name="example-code_main" target="1.8" />
<module name="example-code_test" target="1.8" />
<module name="experimental-kryo-hook_main" target="1.8" /> <module name="experimental-kryo-hook_main" target="1.8" />
<module name="experimental-kryo-hook_test" target="1.8" /> <module name="experimental-kryo-hook_test" target="1.8" />
<module name="experimental_main" target="1.8" />
<module name="experimental_test" target="1.8" />
<module name="explorer-capsule_main" target="1.6" />
<module name="explorer-capsule_test" target="1.6" />
<module name="explorer_main" target="1.8" />
<module name="explorer_test" target="1.8" />
<module name="finance_integrationTest" target="1.8" />
<module name="finance_main" target="1.8" />
<module name="finance_test" target="1.8" />
<module name="flows_integrationTest" target="1.8" /> <module name="flows_integrationTest" target="1.8" />
<module name="flows_main" target="1.8" />
<module name="flows_test" target="1.8" />
<module name="gradle-plugins-cordapp_main" target="1.8" /> <module name="gradle-plugins-cordapp_main" target="1.8" />
<module name="gradle-plugins-cordapp_test" target="1.8" /> <module name="gradle-plugins-cordapp_test" target="1.8" />
<module name="graphs_main" target="1.8" />
<module name="graphs_test" target="1.8" />
<module name="irs-demo-cordapp_integrationTest" target="1.8" /> <module name="irs-demo-cordapp_integrationTest" target="1.8" />
<module name="irs-demo-cordapp_main" target="1.8" /> <module name="irs-demo-cordapp_main" target="1.8" />
<module name="irs-demo-cordapp_main~1" target="1.8" /> <module name="irs-demo-cordapp_main~1" target="1.8" />
@ -87,68 +33,15 @@
<module name="irs-demo-cordapp_test~1" target="1.8" /> <module name="irs-demo-cordapp_test~1" target="1.8" />
<module name="irs-demo-web_main" target="1.8" /> <module name="irs-demo-web_main" target="1.8" />
<module name="irs-demo-web_test" target="1.8" /> <module name="irs-demo-web_test" target="1.8" />
<module name="irs-demo_integrationTest" target="1.8" />
<module name="irs-demo_main" target="1.8" />
<module name="irs-demo_systemTest" target="1.8" />
<module name="irs-demo_test" target="1.8" />
<module name="isolated_main" target="1.8" />
<module name="isolated_test" target="1.8" />
<module name="jackson_main" target="1.8" />
<module name="jackson_test" target="1.8" />
<module name="jfx_integrationTest" target="1.8" />
<module name="jfx_main" target="1.8" />
<module name="jfx_test" target="1.8" />
<module name="kryo-hook_main" target="1.8" />
<module name="kryo-hook_test" target="1.8" />
<module name="loadtest_main" target="1.8" />
<module name="loadtest_test" target="1.8" />
<module name="mock_main" target="1.8" />
<module name="mock_test" target="1.8" />
<module name="network-visualiser_main" target="1.8" />
<module name="network-visualiser_test" target="1.8" />
<module name="node-api_main" target="1.8" />
<module name="node-api_test" target="1.8" />
<module name="node-capsule_main" target="1.6" />
<module name="node-capsule_test" target="1.6" />
<module name="node-driver_integrationTest" target="1.8" />
<module name="node-driver_main" target="1.8" />
<module name="node-driver_test" target="1.8" />
<module name="node_integrationTest" target="1.8" />
<module name="node_main" target="1.8" />
<module name="node_smokeTest" target="1.8" /> <module name="node_smokeTest" target="1.8" />
<module name="node_test" target="1.8" />
<module name="notary-demo_main" target="1.8" />
<module name="notary-demo_test" target="1.8" />
<module name="publish-utils_main" target="1.8" /> <module name="publish-utils_main" target="1.8" />
<module name="publish-utils_test" target="1.8" /> <module name="publish-utils_test" target="1.8" />
<module name="quasar-hook_main" target="1.8" />
<module name="quasar-hook_test" target="1.8" />
<module name="quasar-utils_main" target="1.8" /> <module name="quasar-utils_main" target="1.8" />
<module name="quasar-utils_test" target="1.8" /> <module name="quasar-utils_test" target="1.8" />
<module name="rpc_integrationTest" target="1.8" />
<module name="rpc_main" target="1.8" />
<module name="rpc_smokeTest" target="1.8" />
<module name="rpc_test" target="1.8" />
<module name="samples_main" target="1.8" />
<module name="samples_test" target="1.8" />
<module name="sandbox_main" target="1.8" />
<module name="sandbox_test" target="1.8" />
<module name="shell_integrationTest" target="1.8" />
<module name="shell_main" target="1.8" />
<module name="shell_test" target="1.8" />
<module name="simm-valuation-demo_integrationTest" target="1.8" />
<module name="simm-valuation-demo_main" target="1.8" />
<module name="simm-valuation-demo_test" target="1.8" />
<module name="smoke-test-utils_main" target="1.8" />
<module name="smoke-test-utils_test" target="1.8" />
<module name="source-example-code_integrationTest" target="1.8" /> <module name="source-example-code_integrationTest" target="1.8" />
<module name="source-example-code_main" target="1.8" /> <module name="source-example-code_main" target="1.8" />
<module name="source-example-code_test" target="1.8" /> <module name="source-example-code_test" target="1.8" />
<module name="test-common_main" target="1.8" />
<module name="test-common_test" target="1.8" />
<module name="test-utils_integrationTest" target="1.8" /> <module name="test-utils_integrationTest" target="1.8" />
<module name="test-utils_main" target="1.8" />
<module name="test-utils_test" target="1.8" />
<module name="testing-node-driver_integrationTest" target="1.8" /> <module name="testing-node-driver_integrationTest" target="1.8" />
<module name="testing-node-driver_main" target="1.8" /> <module name="testing-node-driver_main" target="1.8" />
<module name="testing-node-driver_test" target="1.8" /> <module name="testing-node-driver_test" target="1.8" />
@ -158,23 +51,11 @@
<module name="testing-test-common_test" target="1.8" /> <module name="testing-test-common_test" target="1.8" />
<module name="testing-test-utils_main" target="1.8" /> <module name="testing-test-utils_main" target="1.8" />
<module name="testing-test-utils_test" target="1.8" /> <module name="testing-test-utils_test" target="1.8" />
<module name="tools_main" target="1.8" />
<module name="tools_test" target="1.8" />
<module name="trader-demo_integrationTest" target="1.8" />
<module name="trader-demo_main" target="1.8" />
<module name="trader-demo_test" target="1.8" />
<module name="verifier_integrationTest" target="1.8" /> <module name="verifier_integrationTest" target="1.8" />
<module name="verifier_main" target="1.8" /> <module name="verifier_main" target="1.8" />
<module name="verifier_test" target="1.8" /> <module name="verifier_test" target="1.8" />
<module name="web_main" target="1.8" />
<module name="web_test" target="1.8" />
<module name="webcapsule_main" target="1.6" />
<module name="webcapsule_test" target="1.6" />
<module name="webserver-webcapsule_main" target="1.8" /> <module name="webserver-webcapsule_main" target="1.8" />
<module name="webserver-webcapsule_test" target="1.8" /> <module name="webserver-webcapsule_test" target="1.8" />
<module name="webserver_integrationTest" target="1.8" />
<module name="webserver_main" target="1.8" />
<module name="webserver_test" target="1.8" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
<component name="JavacSettings"> <component name="JavacSettings">

10
client/jackson/src/main/kotlin/net/corda/client/jackson/JacksonSupport.kt
View File

@ -330,14 +330,14 @@ object JacksonSupport {
mapper.wellKnownPartyFromX500Name(principal) ?: throw JsonParseException(parser, "Could not find a Party with name $principal") mapper.wellKnownPartyFromX500Name(principal) ?: throw JsonParseException(parser, "Could not find a Party with name $principal")
} else { } else {
val nameMatches = mapper.partiesFromName(parser.text) val nameMatches = mapper.partiesFromName(parser.text)
if (nameMatches.isEmpty()) { when {
nameMatches.isEmpty() -> {
val publicKey = parser.readValueAs<PublicKey>() val publicKey = parser.readValueAs<PublicKey>()
mapper.partyFromKey(publicKey) mapper.partyFromKey(publicKey)
?: throw JsonParseException(parser, "Could not find a Party with key ${publicKey.toStringShort()}") ?: throw JsonParseException(parser, "Could not find a Party with key ${publicKey.toStringShort()}")
} else if (nameMatches.size == 1) { }
nameMatches.first() nameMatches.size == 1 -> nameMatches.first()
} else { else -> throw JsonParseException(parser, "Ambiguous name match '${parser.text}': could be any of " +
throw JsonParseException(parser, "Ambiguous name match '${parser.text}': could be any of " +
nameMatches.map { it.name }.joinToString(" ... or ... ")) nameMatches.map { it.name }.joinToString(" ... or ... "))
} }
} }

2
client/jackson/src/main/kotlin/net/corda/client/jackson/StringToMethodCallParser.kt
View File

@ -220,7 +220,7 @@ open class StringToMethodCallParser<in T : Any> @JvmOverloads constructor(
val paramNames = methodParamNames[name]!! val paramNames = methodParamNames[name]!!
val typeNames = args.parameters.map { it.type.simpleName } val typeNames = args.parameters.map { it.type.simpleName }
val paramTypes = paramNames.zip(typeNames) val paramTypes = paramNames.zip(typeNames)
paramTypes.map { "${it.first}: ${it.second}" }.joinToString(", ") paramTypes.joinToString(", ") { "${it.first}: ${it.second}" }
} }
Pair(name, argStr) Pair(name, argStr)
}.toMap() }.toMap()

1
client/jackson/src/test/kotlin/net/corda/client/jackson/StringToMethodCallParserTest.kt
View File

@ -3,7 +3,6 @@ package net.corda.client.jackson
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertArrayEquals
import org.junit.Test import org.junit.Test
import kotlin.reflect.full.primaryConstructor
import kotlin.test.assertEquals import kotlin.test.assertEquals
class StringToMethodCallParserTest { class StringToMethodCallParserTest {

6
client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
View File

@ -100,13 +100,13 @@ class NodeMonitorModelTest {
sequence( sequence(
// TODO : Add test for remove when driver DSL support individual node shutdown. // TODO : Add test for remove when driver DSL support individual node shutdown.
expect { output: NetworkMapCache.MapChange -> expect { output: NetworkMapCache.MapChange ->
require(output.node.legalIdentities.any { it.name == ALICE_NAME }) { "Expecting : ${ALICE_NAME}, Actual : ${output.node.legalIdentities.map(Party::name)}" } require(output.node.legalIdentities.any { it.name == ALICE_NAME }) { "Expecting : $ALICE_NAME, Actual : ${output.node.legalIdentities.map(Party::name)}" }
}, },
expect { output: NetworkMapCache.MapChange -> expect { output: NetworkMapCache.MapChange ->
require(output.node.legalIdentities.any { it.name == BOB_NAME }) { "Expecting : ${BOB_NAME}, Actual : ${output.node.legalIdentities.map(Party::name)}" } require(output.node.legalIdentities.any { it.name == BOB_NAME }) { "Expecting : $BOB_NAME, Actual : ${output.node.legalIdentities.map(Party::name)}" }
}, },
expect { output: NetworkMapCache.MapChange -> expect { output: NetworkMapCache.MapChange ->
require(output.node.legalIdentities.any { it.name == CHARLIE_NAME }) { "Expecting : ${CHARLIE_NAME}, Actual : ${output.node.legalIdentities.map(Party::name)}" } require(output.node.legalIdentities.any { it.name == CHARLIE_NAME }) { "Expecting : $CHARLIE_NAME, Actual : ${output.node.legalIdentities.map(Party::name)}" }
} }
) )
} }

11
client/jfx/src/main/kotlin/net/corda/client/jfx/model/ContractStateModel.kt
View File

@ -29,24 +29,23 @@ class ContractStateModel {
private val cashStatesDiff: Observable<Diff<Cash.State>> = contractStatesDiff.map { private val cashStatesDiff: Observable<Diff<Cash.State>> = contractStatesDiff.map {
Diff(it.added.filterCashStateAndRefs(), it.removed.filterCashStateAndRefs()) Diff(it.added.filterCashStateAndRefs(), it.removed.filterCashStateAndRefs())
} }
val cashStates: ObservableList<StateAndRef<Cash.State>> = cashStatesDiff.fold(FXCollections.observableArrayList()) { list: MutableList<StateAndRef<Cash.State>>, statesDiff -> val cashStates: ObservableList<StateAndRef<Cash.State>> = cashStatesDiff.fold(FXCollections.observableArrayList()) { list: MutableList<StateAndRef<Cash.State>>, (added, removed) ->
list.removeIf { it in statesDiff.removed } list.removeIf { it in removed }
list.addAll(statesDiff.added) list.addAll(added)
}.distinctBy { it.ref } }.distinctBy { it.ref }
val cash = cashStates.map { it.state.data.amount } val cash = cashStates.map { it.state.data.amount }
companion object { companion object {
private fun Collection<StateAndRef<ContractState>>.filterCashStateAndRefs(): List<StateAndRef<Cash.State>> { private fun Collection<StateAndRef<ContractState>>.filterCashStateAndRefs(): List<StateAndRef<Cash.State>> {
return this.map { stateAndRef -> return this.mapNotNull { stateAndRef ->
if (stateAndRef.state.data is Cash.State) { if (stateAndRef.state.data is Cash.State) {
// Kotlin doesn't unify here for some reason // Kotlin doesn't unify here for some reason
uncheckedCast<StateAndRef<ContractState>, StateAndRef<Cash.State>>(stateAndRef) uncheckedCast<StateAndRef<ContractState>, StateAndRef<Cash.State>>(stateAndRef)
} else { } else {
null null
} }
}.filterNotNull()
} }
} }
}
} }

11
client/jfx/src/main/kotlin/net/corda/client/jfx/model/Models.kt
View File

@ -1,15 +1,6 @@
package net.corda.client.jfx.model package net.corda.client.jfx.model
import javafx.beans.property.ObjectProperty
import javafx.beans.value.ObservableValue
import javafx.beans.value.WritableValue
import javafx.collections.ObservableList
import net.corda.core.internal.uncheckedCast import net.corda.core.internal.uncheckedCast
import org.reactfx.EventSink
import org.reactfx.EventStream
import rx.Observable
import rx.Observer
import rx.subjects.Subject
import java.util.* import java.util.*
import kotlin.reflect.KClass import kotlin.reflect.KClass
@ -74,7 +65,7 @@ object Models {
fun <M : Any> initModel(klass: KClass<M>) = modelStore.getOrPut(klass) { klass.java.newInstance() } fun <M : Any> initModel(klass: KClass<M>) = modelStore.getOrPut(klass) { klass.java.newInstance() }
fun <M : Any> get(klass: KClass<M>, origin: KClass<*>): M { fun <M : Any> get(klass: KClass<M>, origin: KClass<*>): M {
dependencyGraph.getOrPut(origin) { mutableSetOf<KClass<*>>() }.add(klass) dependencyGraph.getOrPut(origin) { mutableSetOf() }.add(klass)
val model = initModel(klass) val model = initModel(klass)
if (model.javaClass != klass.java) { if (model.javaClass != klass.java) {
throw IllegalStateException("Model stored as ${klass.qualifiedName} has type ${model.javaClass}") throw IllegalStateException("Model stored as ${klass.qualifiedName} has type ${model.javaClass}")

1
client/jfx/src/main/kotlin/net/corda/client/jfx/model/ModelsUtils.kt
View File

@ -11,7 +11,6 @@ import org.reactfx.EventStream
import rx.Observable import rx.Observable
import rx.Observer import rx.Observer
import rx.subjects.Subject import rx.subjects.Subject
import kotlin.reflect.KClass
inline fun <reified M : Any, T> observable(noinline observableProperty: (M) -> Observable<T>) = inline fun <reified M : Any, T> observable(noinline observableProperty: (M) -> Observable<T>) =
TrackedDelegate.ObservableDelegate(M::class, observableProperty) TrackedDelegate.ObservableDelegate(M::class, observableProperty)

4
client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt
View File

@ -85,8 +85,8 @@ class TransactionDataModel {
private val transactions by observable(NodeMonitorModel::transactions) private val transactions by observable(NodeMonitorModel::transactions)
private val collectedTransactions = transactions.recordInSequence().distinctBy { it.id } private val collectedTransactions = transactions.recordInSequence().distinctBy { it.id }
private val vaultUpdates by observable(NodeMonitorModel::vaultUpdates) private val vaultUpdates by observable(NodeMonitorModel::vaultUpdates)
private val stateMap = vaultUpdates.fold(FXCollections.observableHashMap<StateRef, StateAndRef<ContractState>>()) { map, update -> private val stateMap = vaultUpdates.fold(FXCollections.observableHashMap<StateRef, StateAndRef<ContractState>>()) { map, (consumed, produced) ->
val states = update.consumed + update.produced val states = consumed + produced
states.forEach { map[it.ref] = it } states.forEach { map[it.ref] = it }
} }

10
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AggregatedList.kt
View File

@ -70,11 +70,14 @@ class AggregatedList<A, E : Any, K : Any>(
override fun sourceChanged(c: ListChangeListener.Change<out E>) { override fun sourceChanged(c: ListChangeListener.Change<out E>) {
beginChange() beginChange()
while (c.next()) { while (c.next()) {
if (c.wasPermutated()) { when {
c.wasPermutated() -> {
// Permutation should not change aggregation // Permutation should not change aggregation
} else if (c.wasUpdated()) { }
c.wasUpdated() -> {
// Update should not change aggregation // Update should not change aggregation
} else { }
else -> {
for (removedSourceItem in c.removed) { for (removedSourceItem in c.removed) {
val removedPair = removeItem(removedSourceItem) val removedPair = removeItem(removedSourceItem)
if (removedPair != null) { if (removedPair != null) {
@ -89,6 +92,7 @@ class AggregatedList<A, E : Any, K : Any>(
} }
} }
} }
}
endChange() endChange()
} }

3
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AmountBindings.kt
View File

@ -6,6 +6,7 @@ import javafx.collections.ObservableList
import net.corda.client.jfx.model.ExchangeRate import net.corda.client.jfx.model.ExchangeRate
import net.corda.core.contracts.Amount import net.corda.core.contracts.Amount
import org.fxmisc.easybind.EasyBind import org.fxmisc.easybind.EasyBind
import org.fxmisc.easybind.monadic.MonadicBinding
import java.util.* import java.util.*
import java.util.stream.Collectors import java.util.stream.Collectors
@ -13,7 +14,7 @@ import java.util.stream.Collectors
* Utility bindings for the [Amount] type, similar in spirit to [Bindings] * Utility bindings for the [Amount] type, similar in spirit to [Bindings]
*/ */
object AmountBindings { object AmountBindings {
fun <T : Any> sum(amounts: ObservableList<Amount<T>>, token: T) = EasyBind.map( fun <T : Any> sum(amounts: ObservableList<Amount<T>>, token: T): MonadicBinding<Amount<T>> = EasyBind.map(
Bindings.createLongBinding({ Bindings.createLongBinding({
amounts.stream().collect(Collectors.summingLong { amounts.stream().collect(Collectors.summingLong {
require(it.token == token) require(it.token == token)

12
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AssociatedList.kt
View File

@ -21,13 +21,16 @@ class AssociatedList<K, out A, B>(
init { init {
sourceList.forEach { sourceList.forEach {
val key = toKey(it) val key = toKey(it)
backingMap.set(key, Pair(assemble(key, it), Unit)) backingMap[key] = Pair(assemble(key, it), Unit)
} }
sourceList.addListener { change: ListChangeListener.Change<out A> -> sourceList.addListener { change: ListChangeListener.Change<out A> ->
while (change.next()) { while (change.next()) {
if (change.wasPermutated()) { when {
} else if (change.wasUpdated()) { change.wasPermutated() -> {
} else { }
change.wasUpdated() -> {
}
else -> {
val removedSourceMap = change.removed.associateBy(toKey) val removedSourceMap = change.removed.associateBy(toKey)
val addedSourceMap = change.addedSubList.associateBy(toKey) val addedSourceMap = change.addedSubList.associateBy(toKey)
val removedMap = HashMap<K, B>() val removedMap = HashMap<K, B>()
@ -56,3 +59,4 @@ class AssociatedList<K, out A, B>(
} }
} }
} }
}

6
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ChosenList.kt
View File

@ -27,9 +27,7 @@ class ChosenList<E>(
private var currentList = chosenListObservable.value private var currentList = chosenListObservable.value
private val listener = object : ListChangeListener<E> { private val listener = ListChangeListener<E> { change -> fireChange(change) }
override fun onChanged(change: ListChangeListener.Change<out E>) = fireChange(change)
}
init { init {
chosenListObservable.addListener { _: Observable -> rechoose() } chosenListObservable.addListener { _: Observable -> rechoose() }
@ -39,7 +37,7 @@ class ChosenList<E>(
endChange() endChange()
} }
override fun get(index: Int) = currentList.get(index) override fun get(index: Int): E = currentList[index]
override val size: Int get() = currentList.size override val size: Int get() = currentList.size
private fun rechoose() { private fun rechoose() {

38
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ConcatenatedList.kt
View File

@ -52,10 +52,10 @@ class ConcatenatedList<A>(sourceList: ObservableList<ObservableList<A>>) : Trans
} }
private fun startingOffsetOf(listIndex: Int): Int { private fun startingOffsetOf(listIndex: Int): Int {
if (listIndex == 0) { return if (listIndex == 0) {
return 0 0
} else { } else {
return nestedIndexOffsets[listIndex - 1] nestedIndexOffsets[listIndex - 1]
} }
} }
@ -74,11 +74,11 @@ class ConcatenatedList<A>(sourceList: ObservableList<ObservableList<A>>) : Trans
// firstTouched is the result list index of the beginning of the permutation. // firstTouched is the result list index of the beginning of the permutation.
val firstTouched = startingOffset + change.from val firstTouched = startingOffset + change.from
// We first set the non-permuted indices. // We first set the non-permuted indices.
for (i in 0..firstTouched - 1) { for (i in 0 until firstTouched) {
permutation[i] = i permutation[i] = i
} }
// Then the permuted ones. // Then the permuted ones.
for (i in firstTouched..startingOffset + change.to - 1) { for (i in firstTouched until startingOffset + change.to) {
permutation[startingOffset + i] = change.getPermutation(i) permutation[startingOffset + i] = change.getPermutation(i)
} }
nextPermutation(firstTouched, startingOffset + change.to, permutation) nextPermutation(firstTouched, startingOffset + change.to, permutation)
@ -87,7 +87,7 @@ class ConcatenatedList<A>(sourceList: ObservableList<ObservableList<A>>) : Trans
// by the startingOffsetOf the nested list. // by the startingOffsetOf the nested list.
val listIndex = indexMap[wrapped]!!.first val listIndex = indexMap[wrapped]!!.first
val startingOffset = startingOffsetOf(listIndex) val startingOffset = startingOffsetOf(listIndex)
for (i in change.from..change.to - 1) { for (i in change.from until change.to) {
nextUpdate(startingOffset + i) nextUpdate(startingOffset + i)
} }
} else { } else {
@ -144,7 +144,7 @@ class ConcatenatedList<A>(sourceList: ObservableList<ObservableList<A>>) : Trans
val newSubNestedIndexOffsets = IntArray(change.to - change.from) val newSubNestedIndexOffsets = IntArray(change.to - change.from)
val firstTouched = if (change.from == 0) 0 else nestedIndexOffsets[change.from - 1] val firstTouched = if (change.from == 0) 0 else nestedIndexOffsets[change.from - 1]
var currentOffset = firstTouched var currentOffset = firstTouched
for (i in 0..change.to - change.from - 1) { for (i in 0 until change.to - change.from) {
currentOffset += source[change.from + i].size currentOffset += source[change.from + i].size
newSubNestedIndexOffsets[i] = currentOffset newSubNestedIndexOffsets[i] = currentOffset
} }
@ -152,24 +152,24 @@ class ConcatenatedList<A>(sourceList: ObservableList<ObservableList<A>>) : Trans
val concatenatedPermutation = IntArray(newSubNestedIndexOffsets.last()) val concatenatedPermutation = IntArray(newSubNestedIndexOffsets.last())
// Set the non-permuted part // Set the non-permuted part
var offset = 0 var offset = 0
for (i in 0..change.from - 1) { for (i in 0 until change.from) {
val nestedList = source[i] val nestedList = source[i]
for (j in offset..offset + nestedList.size - 1) { for (j in offset until offset + nestedList.size) {
concatenatedPermutation[j] = j concatenatedPermutation[j] = j
} }
offset += nestedList.size offset += nestedList.size
} }
// Now the permuted part // Now the permuted part
for (i in 0..newSubNestedIndexOffsets.size - 1) { for (i in 0 until newSubNestedIndexOffsets.size) {
val startingOffset = startingOffsetOf(change.from + i) val startingOffset = startingOffsetOf(change.from + i)
val permutedListIndex = change.getPermutation(change.from + i) val permutedListIndex = change.getPermutation(change.from + i)
val permutedOffset = (if (permutedListIndex == 0) 0 else newSubNestedIndexOffsets[permutedListIndex - 1]) val permutedOffset = (if (permutedListIndex == 0) 0 else newSubNestedIndexOffsets[permutedListIndex - 1])
for (j in 0..source[permutedListIndex].size - 1) { for (j in 0 until source[permutedListIndex].size) {
concatenatedPermutation[startingOffset + j] = permutedOffset + j concatenatedPermutation[startingOffset + j] = permutedOffset + j
} }
} }
// Record permuted offsets // Record permuted offsets
for (i in 0..newSubNestedIndexOffsets.size - 1) { for (i in 0 until newSubNestedIndexOffsets.size) {
nestedIndexOffsets[change.from + i] = newSubNestedIndexOffsets[i] nestedIndexOffsets[change.from + i] = newSubNestedIndexOffsets[i]
} }
nextPermutation(firstTouched, newSubNestedIndexOffsets.last(), concatenatedPermutation) nextPermutation(firstTouched, newSubNestedIndexOffsets.last(), concatenatedPermutation)
@ -238,7 +238,7 @@ class ConcatenatedList<A>(sourceList: ObservableList<ObservableList<A>>) : Trans
if (firstInvalidatedPosition < source.size) { if (firstInvalidatedPosition < source.size) {
val firstInvalid = firstInvalidatedPosition val firstInvalid = firstInvalidatedPosition
var offset = if (firstInvalid == 0) 0 else nestedIndexOffsets[firstInvalid - 1] var offset = if (firstInvalid == 0) 0 else nestedIndexOffsets[firstInvalid - 1]
for (i in firstInvalid..source.size - 1) { for (i in firstInvalid until source.size) {
offset += source[i].size offset += source[i].size
if (i < nestedIndexOffsets.size) { if (i < nestedIndexOffsets.size) {
nestedIndexOffsets[i] = offset nestedIndexOffsets[i] = offset
@ -256,10 +256,10 @@ class ConcatenatedList<A>(sourceList: ObservableList<ObservableList<A>>) : Trans
override val size: Int override val size: Int
get() { get() {
recalculateOffsets() recalculateOffsets()
if (nestedIndexOffsets.size > 0) { return if (nestedIndexOffsets.size > 0) {
return nestedIndexOffsets.last() nestedIndexOffsets.last()
} else { } else {
return 0 0
} }
} }
@ -273,17 +273,17 @@ class ConcatenatedList<A>(sourceList: ObservableList<ObservableList<A>>) : Trans
comparison = { offset -> compareValues(offset, index) } comparison = { offset -> compareValues(offset, index) }
) )
if (listIndex >= 0) { return if (listIndex >= 0) {
var nonEmptyListIndex = listIndex + 1 var nonEmptyListIndex = listIndex + 1
while (source[nonEmptyListIndex].isEmpty()) { while (source[nonEmptyListIndex].isEmpty()) {
nonEmptyListIndex++ nonEmptyListIndex++
} }
return source[nonEmptyListIndex][0] source[nonEmptyListIndex][0]
} else { } else {
// The element is in the range of this list // The element is in the range of this list
val rangeListIndex = -listIndex - 1 val rangeListIndex = -listIndex - 1
val subListOffset = index - startingOffsetOf(rangeListIndex) val subListOffset = index - startingOffsetOf(rangeListIndex)
return source[rangeListIndex][subListOffset] source[rangeListIndex][subListOffset]
} }
} }

4
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/FlattenedList.kt
View File

@ -55,7 +55,7 @@ class FlattenedList<A>(val sourceList: ObservableList<out ObservableValue<out A>
val from = c.from val from = c.from
val to = c.to val to = c.to
val permutation = IntArray(to, { c.getPermutation(it) }) val permutation = IntArray(to, { c.getPermutation(it) })
indexMap.replaceAll { _, pair -> Pair(permutation[pair.first], pair.second) } indexMap.replaceAll { _, (first, second) -> Pair(permutation[first], second) }
nextPermutation(from, to, permutation) nextPermutation(from, to, permutation)
} else if (c.wasUpdated()) { } else if (c.wasUpdated()) {
throw UnsupportedOperationException("FlattenedList doesn't support Update changes") throw UnsupportedOperationException("FlattenedList doesn't support Update changes")
@ -109,7 +109,7 @@ class FlattenedList<A>(val sourceList: ObservableList<out ObservableValue<out A>
assert(sourceList.size == indexMap.size) assert(sourceList.size == indexMap.size)
} }
override fun get(index: Int) = sourceList.get(index).value override fun get(index: Int): A = sourceList[index].value
override fun getSourceIndex(index: Int) = index override fun getSourceIndex(index: Int) = index

12
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/LeftOuterJoinedMap.kt
View File

@ -16,8 +16,8 @@ class LeftOuterJoinedMap<K : Any, A, B, C>(
) : ReadOnlyBackedObservableMapBase<K, C, SimpleObjectProperty<B?>>() { ) : ReadOnlyBackedObservableMapBase<K, C, SimpleObjectProperty<B?>>() {
init { init {
leftTable.forEach { entry -> leftTable.forEach { entry ->
val rightValueProperty = SimpleObjectProperty(rightTable.get(entry.key)) val rightValueProperty = SimpleObjectProperty(rightTable[entry.key])
backingMap.set(entry.key, Pair(assemble(entry.key, entry.value, rightValueProperty), rightValueProperty)) backingMap[entry.key] = Pair(assemble(entry.key, entry.value, rightValueProperty), rightValueProperty)
} }
leftTable.addListener { change: MapChangeListener.Change<out K, out A> -> leftTable.addListener { change: MapChangeListener.Change<out K, out A> ->
@ -29,10 +29,10 @@ class LeftOuterJoinedMap<K : Any, A, B, C>(
} }
if (change.wasAdded()) { if (change.wasAdded()) {
val rightValue = rightTable.get(change.key) val rightValue = rightTable[change.key]
val rightValueProperty = SimpleObjectProperty(rightValue) val rightValueProperty = SimpleObjectProperty(rightValue)
val newValue = assemble(change.key, change.valueAdded, rightValueProperty) val newValue = assemble(change.key, change.valueAdded, rightValueProperty)
backingMap.set(change.key, Pair(newValue, rightValueProperty)) backingMap[change.key] = Pair(newValue, rightValueProperty)
addedValue = newValue addedValue = newValue
} }
@ -40,11 +40,11 @@ class LeftOuterJoinedMap<K : Any, A, B, C>(
} }
rightTable.addListener { change: MapChangeListener.Change<out K, out B> -> rightTable.addListener { change: MapChangeListener.Change<out K, out B> ->
if (change.wasRemoved() && !change.wasAdded()) { if (change.wasRemoved() && !change.wasAdded()) {
backingMap.get(change.key)?.second?.set(null) backingMap[change.key]?.second?.set(null)
} }
if (change.wasAdded()) { if (change.wasAdded()) {
backingMap.get(change.key)?.second?.set(change.valueAdded) backingMap[change.key]?.second?.set(change.valueAdded)
} }
} }
} }

1
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MappedList.kt
View File

@ -5,7 +5,6 @@ import javafx.collections.ObservableList
import javafx.collections.transformation.TransformationList import javafx.collections.transformation.TransformationList
import java.util.* import java.util.*
/** /**
* This is a variant of [EasyBind.map] where the mapped list is backed, therefore the mapping function will only be run * This is a variant of [EasyBind.map] where the mapped list is backed, therefore the mapping function will only be run
* when an element is inserted or updated. * when an element is inserted or updated.

20
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ObservableUtilities.kt
View File

@ -42,10 +42,10 @@ fun <A, B> ObservableValue<out A>.map(function: (A) -> B): ObservableValue<B> =
* re-run the function. * re-run the function.
*/ */
fun <A, B> ObservableList<out A>.map(cached: Boolean = true, function: (A) -> B): ObservableList<B> { fun <A, B> ObservableList<out A>.map(cached: Boolean = true, function: (A) -> B): ObservableList<B> {
if (cached) { return if (cached) {
return MappedList(this, function) MappedList(this, function)
} else { } else {
return EasyBind.map(this, function) EasyBind.map(this, function)
} }
} }
@ -120,11 +120,7 @@ fun <A> ObservableList<out A>.filter(predicate: ObservableValue<(A) -> Boolean>)
*/ */
fun <A> ObservableList<out A?>.filterNotNull(): ObservableList<A> { fun <A> ObservableList<out A?>.filterNotNull(): ObservableList<A> {
//TODO This is a tactical work round for an issue with SAM conversion (https://youtrack.jetbrains.com/issue/ALL-1552) so that the M10 explorer works. //TODO This is a tactical work round for an issue with SAM conversion (https://youtrack.jetbrains.com/issue/ALL-1552) so that the M10 explorer works.
return uncheckedCast(uncheckedCast<Any, ObservableList<A?>>(this).filtered(object : Predicate<A?> { return uncheckedCast(uncheckedCast<Any, ObservableList<A?>>(this).filtered { t -> t != null })
override fun test(t: A?): Boolean {
return t != null
}
}))
} }
/** /**
@ -247,8 +243,8 @@ fun <A : Any, B : Any, C, K : Any> ObservableList<A>.leftOuterJoin(
assemble: (A, ObservableList<B>) -> C assemble: (A, ObservableList<B>) -> C
): ObservableList<C> { ): ObservableList<C> {
val joinedMap = leftOuterJoin(rightTable, leftToJoinKey, rightToJoinKey) val joinedMap = leftOuterJoin(rightTable, leftToJoinKey, rightToJoinKey)
return joinedMap.getObservableValues().map { pair -> return joinedMap.getObservableValues().map { (first, second) ->
pair.first.map { assemble(it, pair.second) } first.map { assemble(it, second) }
}.concatenate() }.concatenate()
} }
@ -271,11 +267,9 @@ fun <A : Any, B : Any, K : Any> ObservableList<A>.leftOuterJoin(
): ObservableMap<K, Pair<ObservableList<A>, ObservableList<B>>> { ): ObservableMap<K, Pair<ObservableList<A>, ObservableList<B>>> {
val leftTableMap = associateByAggregation(leftToJoinKey) val leftTableMap = associateByAggregation(leftToJoinKey)
val rightTableMap = rightTable.associateByAggregation(rightToJoinKey) val rightTableMap = rightTable.associateByAggregation(rightToJoinKey)
val joinedMap: ObservableMap<K, Pair<ObservableList<A>, ObservableList<B>>> = return LeftOuterJoinedMap(leftTableMap, rightTableMap) { _, left, rightValue ->
LeftOuterJoinedMap(leftTableMap, rightTableMap) { _, left, rightValue ->
Pair(left, ChosenList(rightValue.map { it ?: FXCollections.emptyObservableList() }, "ChosenList from leftOuterJoin")) Pair(left, ChosenList(rightValue.map { it ?: FXCollections.emptyObservableList() }, "ChosenList from leftOuterJoin"))
} }
return joinedMap
} }
fun <A> ObservableList<A>.getValueAt(index: Int): ObservableValue<A?> { fun <A> ObservableList<A>.getValueAt(index: Int): ObservableValue<A?> {

2
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReadOnlyBackedObservableMapBase.kt
View File

@ -46,7 +46,7 @@ open class ReadOnlyBackedObservableMapBase<K, A, B> : ObservableMap<K, A> {
override fun containsValue(value: A) = backingMap.any { it.value.first == value } override fun containsValue(value: A) = backingMap.any { it.value.first == value }
override fun get(key: K) = backingMap.get(key)?.first override fun get(key: K) = backingMap[key]?.first
override fun isEmpty() = backingMap.isEmpty() override fun isEmpty() = backingMap.isEmpty()

6
client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReplayedList.kt
View File

@ -33,14 +33,14 @@ class ReplayedList<A>(sourceList: ObservableList<A>) : TransformationList<A, A>(
} }
nextPermutation(from, to, permutation) nextPermutation(from, to, permutation)
} else if (c.wasUpdated()) { } else if (c.wasUpdated()) {
for (i in c.from..c.to - 1) { for (i in c.from until c.to) {
replayedList[i] = c.list[i] replayedList[i] = c.list[i]
nextUpdate(i) nextUpdate(i)
} }
} else { } else {
if (c.wasRemoved()) { if (c.wasRemoved()) {
val removePosition = c.from val removePosition = c.from
for (i in 0..c.removedSize - 1) { for (i in 0 until c.removedSize) {
replayedList.removeAt(removePosition) replayedList.removeAt(removePosition)
} }
nextRemove(c.from, c.removed) nextRemove(c.from, c.removed)
@ -48,7 +48,7 @@ class ReplayedList<A>(sourceList: ObservableList<A>) : TransformationList<A, A>(
if (c.wasAdded()) { if (c.wasAdded()) {
val addStart = c.from val addStart = c.from
val addEnd = c.to val addEnd = c.to
for (i in addStart..addEnd - 1) { for (i in addStart until addEnd) {
replayedList.add(i, c.list[i]) replayedList.add(i, c.list[i])
} }
nextAdd(addStart, addEnd) nextAdd(addStart, addEnd)

1
client/jfx/src/test/kotlin/net/corda/client/jfx/model/ExchangeRateModelTest.kt
View File

@ -22,6 +22,7 @@ class ExchangeRateModelTest {
assertTrue("$one != $another", { (one.toDecimal() - another.toDecimal()).abs() < BigDecimal(0.01) }) assertTrue("$one != $another", { (one.toDecimal() - another.toDecimal()).abs() < BigDecimal(0.01) })
} }
} }
@Test @Test
fun `perform fx testing`() { fun `perform fx testing`() {
val tenSwissies = Amount(10, BigDecimal.ONE, CHF) val tenSwissies = Amount(10, BigDecimal.ONE, CHF)

6
client/jfx/src/test/kotlin/net/corda/client/jfx/utils/AggregatedListTest.kt
View File

@ -9,9 +9,9 @@ import kotlin.test.fail
class AggregatedListTest { class AggregatedListTest {
lateinit var sourceList: ObservableList<Int> private lateinit var sourceList: ObservableList<Int>
lateinit var aggregatedList: ObservableList<Pair<Int, ObservableList<Int>>> private lateinit var aggregatedList: ObservableList<Pair<Int, ObservableList<Int>>>
lateinit var replayedList: ObservableList<Pair<Int, ObservableList<Int>>> private lateinit var replayedList: ObservableList<Pair<Int, ObservableList<Int>>>
@Before @Before
fun setup() { fun setup() {

17
client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ConcatenatedListTest.kt
View File

@ -24,14 +24,13 @@ class ConcatenatedListTest {
fun <A> ConcatenatedList<A>.checkInvariants() { fun <A> ConcatenatedList<A>.checkInvariants() {
assertEquals(nestedIndexOffsets.size, source.size) assertEquals(nestedIndexOffsets.size, source.size)
var currentOffset = 0 var currentOffset = 0
for (i in 0..source.size - 1) { for (i in 0 until source.size) {
currentOffset += source[i].size currentOffset += source[i].size
assertEquals(nestedIndexOffsets[i], currentOffset) assertEquals(nestedIndexOffsets[i], currentOffset)
} }
assertEquals(indexMap.size, source.size) assertEquals(indexMap.size, source.size)
for (entry in indexMap) { for ((wrapped, pair) in indexMap) {
val (wrapped, pair) = entry
val index = pair.first val index = pair.first
val foundListIndices = ArrayList<Int>() val foundListIndices = ArrayList<Int>()
source.forEachIndexed { i, list -> source.forEachIndexed { i, list ->
@ -124,11 +123,7 @@ class ConcatenatedListTest {
assertEquals(replayedList[2], "b") assertEquals(replayedList[2], "b")
assertEquals(replayedList[3], "c") assertEquals(replayedList[3], "c")
sourceList.sortWith(object : Comparator<ObservableList<String>> { sourceList.sortWith(Comparator<ObservableList<String>> { p0, p1 -> p0.size - p1.size })
override fun compare(p0: ObservableList<String>, p1: ObservableList<String>): Int {
return p0.size - p1.size
}
})
concatenatedList.checkInvariants() concatenatedList.checkInvariants()
assertEquals(replayedList.size, 4) assertEquals(replayedList.size, 4)
assertEquals(replayedList[0], "hello") assertEquals(replayedList[0], "hello")
@ -137,11 +132,7 @@ class ConcatenatedListTest {
assertEquals(replayedList[3], "b") assertEquals(replayedList[3], "b")
sourceList.add(0, FXCollections.observableArrayList("d", "e", "f")) sourceList.add(0, FXCollections.observableArrayList("d", "e", "f"))
sourceList.sortWith(object : Comparator<ObservableList<String>> { sourceList.sortWith(Comparator<ObservableList<String>> { p0, p1 -> p0.size - p1.size })
override fun compare(p0: ObservableList<String>, p1: ObservableList<String>): Int {
return p0.size - p1.size
}
})
concatenatedList.checkInvariants() concatenatedList.checkInvariants()
assertEquals(replayedList.size, 7) assertEquals(replayedList.size, 7)
assertEquals(replayedList[0], "hello") assertEquals(replayedList[0], "hello")

1
client/jfx/src/test/kotlin/net/corda/client/jfx/utils/MappedListTest.kt
View File

@ -34,7 +34,6 @@ class MappedListTest {
assertEquals(replayedList[0], 7) assertEquals(replayedList[0], 7)
assertEquals(replayedList[1], 5) assertEquals(replayedList[1], 5)
assertEquals(replayedList[2], 3) assertEquals(replayedList[2], 3)
} }
@Test @Test

4
client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ReplayedMap.kt
View File

@ -10,14 +10,14 @@ import kotlin.test.assertEquals
class ReplayedMap<K, A>(sourceMap: ObservableMap<K, A>) : ReadOnlyBackedObservableMapBase<K, A, Unit>() { class ReplayedMap<K, A>(sourceMap: ObservableMap<K, A>) : ReadOnlyBackedObservableMapBase<K, A, Unit>() {
init { init {
sourceMap.forEach { sourceMap.forEach {
backingMap.set(it.key, Pair(it.value, Unit)) backingMap[it.key] = Pair(it.value, Unit)
} }
sourceMap.addListener { change: MapChangeListener.Change<out K, out A> -> sourceMap.addListener { change: MapChangeListener.Change<out K, out A> ->
if (change.wasRemoved()) { if (change.wasRemoved()) {
assertEquals(backingMap.remove(change.key)!!.first, change.valueRemoved) assertEquals(backingMap.remove(change.key)!!.first, change.valueRemoved)
} }
if (change.wasAdded()) { if (change.wasAdded()) {
backingMap.set(change.key, Pair(change.valueAdded, Unit)) backingMap[change.key] = Pair(change.valueAdded, Unit)
} }
fireChange(change) fireChange(change)
} }

25
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt
View File

@ -1,10 +1,6 @@
package net.corda.client.rpc.internal package net.corda.client.rpc.internal
import co.paralleluniverse.common.util.SameThreadExecutor import co.paralleluniverse.common.util.SameThreadExecutor
import com.esotericsoftware.kryo.Kryo
import com.esotericsoftware.kryo.Serializer
import com.esotericsoftware.kryo.io.Input
import com.esotericsoftware.kryo.io.Output
import com.github.benmanes.caffeine.cache.Cache import com.github.benmanes.caffeine.cache.Cache
import com.github.benmanes.caffeine.cache.Caffeine import com.github.benmanes.caffeine.cache.Caffeine
import com.github.benmanes.caffeine.cache.RemovalCause import com.github.benmanes.caffeine.cache.RemovalCause
@ -34,18 +30,27 @@ import net.corda.nodeapi.internal.DeduplicationChecker
import org.apache.activemq.artemis.api.core.ActiveMQException import org.apache.activemq.artemis.api.core.ActiveMQException
import org.apache.activemq.artemis.api.core.RoutingType import org.apache.activemq.artemis.api.core.RoutingType
import org.apache.activemq.artemis.api.core.SimpleString import org.apache.activemq.artemis.api.core.SimpleString
import org.apache.activemq.artemis.api.core.client.*
import org.apache.activemq.artemis.api.core.client.ActiveMQClient.DEFAULT_ACK_BATCH_SIZE import org.apache.activemq.artemis.api.core.client.ActiveMQClient.DEFAULT_ACK_BATCH_SIZE
import org.apache.activemq.artemis.api.core.client.ClientConsumer
import org.apache.activemq.artemis.api.core.client.ClientMessage
import org.apache.activemq.artemis.api.core.client.ClientProducer
import org.apache.activemq.artemis.api.core.client.ClientSession
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory
import org.apache.activemq.artemis.api.core.client.FailoverEventType
import org.apache.activemq.artemis.api.core.client.ServerLocator
import rx.Notification import rx.Notification
import rx.Observable import rx.Observable
import rx.subjects.UnicastSubject import rx.subjects.UnicastSubject
import java.lang.reflect.InvocationHandler import java.lang.reflect.InvocationHandler
import java.lang.reflect.Method import java.lang.reflect.Method
import java.time.Instant
import java.util.* import java.util.*
import java.util.concurrent.* import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import java.util.concurrent.ScheduledExecutorService
import java.util.concurrent.ScheduledFuture
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.atomic.AtomicLong
import kotlin.reflect.jvm.javaMethod import kotlin.reflect.jvm.javaMethod
@ -152,7 +157,7 @@ class RPCClientProxyHandler(
private val serializationContextWithObservableContext = RpcClientObservableSerializer.createContext(serializationContext, observableContext) private val serializationContextWithObservableContext = RpcClientObservableSerializer.createContext(serializationContext, observableContext)
private fun createRpcObservableMap(): RpcObservableMap { private fun createRpcObservableMap(): RpcObservableMap {
val onObservableRemove = RemovalListener<InvocationId, UnicastSubject<Notification<*>>> { key, value, cause -> val onObservableRemove = RemovalListener<InvocationId, UnicastSubject<Notification<*>>> { key, _, cause ->
val observableId = key!! val observableId = key!!
val rpcCallSite = callSiteMap?.remove(observableId) val rpcCallSite = callSiteMap?.remove(observableId)
if (cause == RemovalCause.COLLECTED) { if (cause == RemovalCause.COLLECTED) {
@ -444,7 +449,7 @@ class RPCClientProxyHandler(
log.debug("Trying to connect using ${transport.params}") log.debug("Trying to connect using ${transport.params}")
try { try {
if (serverLocator != null && !serverLocator.isClosed) { if (!serverLocator.isClosed) {
sessionFactory = serverLocator.createSessionFactory(transport) sessionFactory = serverLocator.createSessionFactory(transport)
} else { } else {
log.warn("Stopping reconnect attempts.") log.warn("Stopping reconnect attempts.")

1
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/kryo/KryoClientSerializationScheme.kt
View File

@ -45,7 +45,6 @@ class KryoClientSerializationScheme : AbstractKryoSerializationScheme() {
}, },
if (classLoader != null) AMQP_P2P_CONTEXT.withClassLoader(classLoader) else AMQP_P2P_CONTEXT, if (classLoader != null) AMQP_P2P_CONTEXT.withClassLoader(classLoader) else AMQP_P2P_CONTEXT,
rpcClientContext = if (classLoader != null) KRYO_RPC_CLIENT_CONTEXT.withClassLoader(classLoader) else KRYO_RPC_CLIENT_CONTEXT) rpcClientContext = if (classLoader != null) KRYO_RPC_CLIENT_CONTEXT.withClassLoader(classLoader) else KRYO_RPC_CLIENT_CONTEXT)
} }
} }
} }

2
client/rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/StandaloneCordaRPClientTest.kt
View File

@ -218,7 +218,7 @@ class StandaloneCordaRPClientTest {
flowHandle.returnValue.get() flowHandle.returnValue.get()
val balance = rpcProxy.getCashBalance(USD) val balance = rpcProxy.getCashBalance(USD)
println("Balance: " + balance) println("Balance: $balance")
assertEquals(629.DOLLARS, balance) assertEquals(629.DOLLARS, balance)
} }

2
client/rpc/src/test/kotlin/net/corda/client/rpc/RPCConcurrencyTests.kt
View File

@ -49,7 +49,7 @@ class RPCConcurrencyTests : AbstractRPCTest() {
override fun newLatch(numberOfDowns: Int): Long { override fun newLatch(numberOfDowns: Int): Long {
val id = random63BitValue() val id = random63BitValue()
val latch = CountDownLatch(numberOfDowns) val latch = CountDownLatch(numberOfDowns)
latches.put(id, latch) latches[id] = latch
return id return id
} }

2
client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt
View File

@ -58,7 +58,7 @@ class RPCFailureTests {
} }
@Test @Test
fun `unserializable`() = rpc { fun unserializable() = rpc {
assertThatThrownBy { it.getUnserializable() }.isInstanceOf(KryoException::class.java) assertThatThrownBy { it.getUnserializable() }.isInstanceOf(KryoException::class.java)
} }

6
client/rpc/src/test/kotlin/net/corda/client/rpc/RepeatingBytesInputStream.kt
View File

@ -6,11 +6,11 @@ class RepeatingBytesInputStream(val bytesToRepeat: ByteArray, val numberOfBytes:
private var bytesLeft = numberOfBytes private var bytesLeft = numberOfBytes
override fun available() = bytesLeft override fun available() = bytesLeft
override fun read(): Int { override fun read(): Int {
if (bytesLeft == 0) { return if (bytesLeft == 0) {
return -1 -1
} else { } else {
bytesLeft-- bytesLeft--
return bytesToRepeat[(numberOfBytes - bytesLeft) % bytesToRepeat.size].toInt() bytesToRepeat[(numberOfBytes - bytesLeft) % bytesToRepeat.size].toInt()
} }
} }

2
confidential-identities/src/main/kotlin/net/corda/confidential/SwapIdentitiesFlow.kt
View File

@ -80,7 +80,7 @@ class SwapIdentitiesFlow(private val otherParty: Party,
// TODO: for increased privacy, we should create one anonymous key per output state. // TODO: for increased privacy, we should create one anonymous key per output state.
val identities = LinkedHashMap<Party, AnonymousParty>() val identities = LinkedHashMap<Party, AnonymousParty>()
if (serviceHub.myInfo.isLegalIdentity(otherParty)) { if (serviceHub.myInfo.isLegalIdentity(otherParty)) {
identities.put(otherParty, legalIdentityAnonymous.party.anonymise()) identities[otherParty] = legalIdentityAnonymous.party.anonymise()
} else { } else {
val otherSession = initiateFlow(otherParty) val otherSession = initiateFlow(otherParty)
val data = buildDataToSign(legalIdentityAnonymous) val data = buildDataToSign(legalIdentityAnonymous)

2
core/src/main/java/net/corda/core/crypto/Base58.java
View File

@ -83,7 +83,7 @@ public class Base58 {
* @throws AddressFormatException if the given string is not a valid base58 string * @throws AddressFormatException if the given string is not a valid base58 string
*/ */
public static byte[] decode(String input) throws AddressFormatException { public static byte[] decode(String input) throws AddressFormatException {
if (input.length() == 0) { if (input.isEmpty()) {
return new byte[0]; return new byte[0];
} }
// Convert the base58-encoded ASCII chars to a base58 byte sequence (base58 digits). // Convert the base58-encoded ASCII chars to a base58 byte sequence (base58 digits).

3
core/src/main/java/net/corda/core/flows/IdentifiableException.java
View File

@ -10,7 +10,8 @@ public interface IdentifiableException {
/** /**
* @return the ID of the error, or null if the error doesn't have it set (yet). * @return the ID of the error, or null if the error doesn't have it set (yet).
*/ */
default @Nullable Long getErrorId() { @Nullable
default Long getErrorId() {
return null; return null;
} }
} }

4
core/src/main/kotlin/net/corda/core/CordaOID.kt
View File

@ -8,10 +8,10 @@ object CordaOID {
/** Assigned to R3, see http://www.oid-info.com/cgi-bin/display?oid=1.3.6.1.4.1.50530&action=display */ /** Assigned to R3, see http://www.oid-info.com/cgi-bin/display?oid=1.3.6.1.4.1.50530&action=display */
const val R3_ROOT = "1.3.6.1.4.1.50530" const val R3_ROOT = "1.3.6.1.4.1.50530"
/** OIDs issued for the Corda platform */ /** OIDs issued for the Corda platform */
const val CORDA_PLATFORM = R3_ROOT + ".1" const val CORDA_PLATFORM = "$R3_ROOT.1"
/** /**
* Identifier for the X.509 certificate extension specifying the Corda role. See * Identifier for the X.509 certificate extension specifying the Corda role. See
* https://r3-cev.atlassian.net/wiki/spaces/AWG/pages/156860572/Certificate+identity+type+extension for details. * https://r3-cev.atlassian.net/wiki/spaces/AWG/pages/156860572/Certificate+identity+type+extension for details.
*/ */
const val X509_EXTENSION_CORDA_ROLE = CORDA_PLATFORM + ".1" const val X509_EXTENSION_CORDA_ROLE = "$CORDA_PLATFORM.1"
} }

10
core/src/main/kotlin/net/corda/core/concurrent/ConcurrencyUtils.kt
View File

@ -36,12 +36,12 @@ internal fun <V, W> firstOf(futures: Array<out CordaFuture<out V>>, log: Logger,
val winnerChosen = AtomicBoolean() val winnerChosen = AtomicBoolean()
futures.forEach { futures.forEach {
it.then { it.then {
if (winnerChosen.compareAndSet(false, true)) { when {
resultFuture.capture { handler(it) } winnerChosen.compareAndSet(false, true) -> resultFuture.capture { handler(it) }
} else if (it.isCancelled) { it.isCancelled -> {
// Do nothing. // Do nothing.
} else { }
it.match({}, { log.error(shortCircuitedTaskFailedMessage, it) }) else -> it.match({}, { log.error(shortCircuitedTaskFailedMessage, it) })
} }
} }
} }

1
core/src/main/kotlin/net/corda/core/context/InvocationContext.kt
View File

@ -77,7 +77,6 @@ data class Actor(val id: Id, val serviceId: AuthServiceId, val owningLegalIdenti
*/ */
@CordaSerializable @CordaSerializable
data class Id(val value: String) data class Id(val value: String)
} }
/** /**

4
core/src/main/kotlin/net/corda/core/context/Trace.kt
View File

@ -27,7 +27,7 @@ data class Trace(val invocationId: InvocationId, val sessionId: SessionId) {
class InvocationId(value: String, timestamp: Instant) : Id<String>(value, TYPE, timestamp) { class InvocationId(value: String, timestamp: Instant) : Id<String>(value, TYPE, timestamp) {
companion object { companion object {
private val TYPE = "Invocation" private const val TYPE = "Invocation"
/** /**
* Creates an invocation id using a [java.util.UUID] as value and [Instant.now] as timestamp. * Creates an invocation id using a [java.util.UUID] as value and [Instant.now] as timestamp.
@ -44,7 +44,7 @@ data class Trace(val invocationId: InvocationId, val sessionId: SessionId) {
class SessionId(value: String, timestamp: Instant) : Id<String>(value, TYPE, timestamp) { class SessionId(value: String, timestamp: Instant) : Id<String>(value, TYPE, timestamp) {
companion object { companion object {
private val TYPE = "Session" private const val TYPE = "Session"
/** /**
* Creates a session id using a [java.util.UUID] as value and [Instant.now] as timestamp. * Creates a session id using a [java.util.UUID] as value and [Instant.now] as timestamp.

2
core/src/main/kotlin/net/corda/core/contracts/Amount.kt
View File

@ -250,7 +250,7 @@ data class Amount<T : Any>(val quantity: Long, val displayTokenSize: BigDecimal,
val residualTokens = quantity - (commonTokensPerPartition * partitions) val residualTokens = quantity - (commonTokensPerPartition * partitions)
val splitAmount = Amount(commonTokensPerPartition, displayTokenSize, token) val splitAmount = Amount(commonTokensPerPartition, displayTokenSize, token)
val splitAmountPlusOne = Amount(commonTokensPerPartition + 1L, displayTokenSize, token) val splitAmountPlusOne = Amount(commonTokensPerPartition + 1L, displayTokenSize, token)
return (0..partitions - 1).map { if (it < residualTokens) splitAmountPlusOne else splitAmount }.toList() return (0 until partitions).map { if (it < residualTokens) splitAmountPlusOne else splitAmount }.toList()
} }
/** /**

2
core/src/main/kotlin/net/corda/core/contracts/ContractAttachment.kt
View File

@ -15,6 +15,6 @@ class ContractAttachment @JvmOverloads constructor (val attachment: Attachment,
val allContracts: Set<ContractClassName> get() = additionalContracts + contract val allContracts: Set<ContractClassName> get() = additionalContracts + contract
override fun toString(): String { override fun toString(): String {
return "ContractAttachment(attachment=${attachment.id}, contracts='${allContracts}', uploader='${uploader}')" return "ContractAttachment(attachment=${attachment.id}, contracts='$allContracts', uploader='$uploader')"
} }
} }

2
core/src/main/kotlin/net/corda/core/contracts/ContractsDSL.kt
View File

@ -20,7 +20,7 @@ import java.util.*
object Requirements { object Requirements {
/** Throws [IllegalArgumentException] if the given expression evaluates to false. */ /** Throws [IllegalArgumentException] if the given expression evaluates to false. */
@Suppress("NOTHING_TO_INLINE") // Inlining this takes it out of our committed ABI. @Suppress("NOTHING_TO_INLINE") // Inlining this takes it out of our committed ABI.
infix inline fun String.using(expr: Boolean) { inline infix fun String.using(expr: Boolean) {
if (!expr) throw IllegalArgumentException("Failed requirement: $this") if (!expr) throw IllegalArgumentException("Failed requirement: $this")
} }
} }

2
core/src/main/kotlin/net/corda/core/contracts/Structures.kt
View File

@ -196,7 +196,7 @@ data class Command<T : CommandData>(val value: T, val signers: List<PublicKey>)
constructor(data: T, key: PublicKey) : this(data, listOf(key)) constructor(data: T, key: PublicKey) : this(data, listOf(key))
private fun commandDataToString() = value.toString().let { if (it.contains("@")) it.replace('$', '.').split("@")[0] else it } private fun commandDataToString() = value.toString().let { if (it.contains("@")) it.replace('$', '.').split("@")[0] else it }
override fun toString() = "${commandDataToString()} with pubkeys ${signers.map { it.toStringShort() }.joinToString()}" override fun toString() = "${commandDataToString()} with pubkeys ${signers.joinToString { it.toStringShort() }}"
} }
/** A common move command for contract states which can change owner. */ /** A common move command for contract states which can change owner. */

6
core/src/main/kotlin/net/corda/core/contracts/TransactionVerificationException.kt
View File

@ -108,8 +108,10 @@ sealed class TransactionVerificationException(val txId: SecureHash, message: Str
/** Whether the inputs or outputs list contains an encumbrance issue, see [TransactionMissingEncumbranceException]. */ /** Whether the inputs or outputs list contains an encumbrance issue, see [TransactionMissingEncumbranceException]. */
@CordaSerializable @CordaSerializable
enum class Direction { enum class Direction {
/** Issue in the inputs list */ INPUT, /** Issue in the inputs list */
/** Issue in the outputs list */ OUTPUT INPUT,
/** Issue in the outputs list */
OUTPUT
} }
// We could revisit and throw this more appropriate type in a future release that uses targetVersion to // We could revisit and throw this more appropriate type in a future release that uses targetVersion to

14
core/src/main/kotlin/net/corda/core/crypto/CompositeKey.kt
View File

@ -100,7 +100,7 @@ class CompositeKey private constructor(val threshold: Int, children: List<NodeAn
// We can't print the node details, because doing so involves serializing the node, which we can't // We can't print the node details, because doing so involves serializing the node, which we can't
// do because of the cyclic graph. // do because of the cyclic graph.
require(!curVisitedMap.contains(node)) { "Cycle detected for CompositeKey" } require(!curVisitedMap.contains(node)) { "Cycle detected for CompositeKey" }
curVisitedMap.put(node, true) curVisitedMap[node] = true
node.cycleDetection(curVisitedMap) node.cycleDetection(curVisitedMap)
} }
} }
@ -116,7 +116,7 @@ class CompositeKey private constructor(val threshold: Int, children: List<NodeAn
fun checkValidity() { fun checkValidity() {
if (validated) return if (validated) return
val visitedMap = IdentityHashMap<CompositeKey, Boolean>() val visitedMap = IdentityHashMap<CompositeKey, Boolean>()
visitedMap.put(this, true) visitedMap[this] = true
cycleDetection(visitedMap) // Graph cycle testing on the root node. cycleDetection(visitedMap) // Graph cycle testing on the root node.
checkConstraints() checkConstraints()
for ((node, _) in children) { for ((node, _) in children) {
@ -271,15 +271,17 @@ class CompositeKey private constructor(val threshold: Int, children: List<NodeAn
fun build(threshold: Int? = null): PublicKey { fun build(threshold: Int? = null): PublicKey {
require(threshold == null || threshold > 0) require(threshold == null || threshold > 0)
val n = children.size val n = children.size
return if (n > 1) return when {
CompositeKey(threshold ?: children.map { (_, weight) -> weight }.sum(), children) n > 1 -> CompositeKey(threshold ?: children.map { (_, weight) -> weight }.sum(), children)
else if (n == 1) { n == 1 -> {
require(threshold == null || threshold == children.first().weight) require(threshold == null || threshold == children.first().weight)
{ "Trying to build invalid CompositeKey, threshold value different than weight of single child node." } { "Trying to build invalid CompositeKey, threshold value different than weight of single child node." }
// Returning the only child node which is [PublicKey] itself. We need to avoid single-key [CompositeKey] instances, // Returning the only child node which is [PublicKey] itself. We need to avoid single-key [CompositeKey] instances,
// as there are scenarios where developers expected the underlying key and its composite versions to be equivalent. // as there are scenarios where developers expected the underlying key and its composite versions to be equivalent.
children.first().node children.first().node
} else throw IllegalStateException("Trying to build CompositeKey without child nodes.") }
else -> throw IllegalStateException("Trying to build CompositeKey without child nodes.")
}
} }
} }
} }

6
core/src/main/kotlin/net/corda/core/crypto/MerkleTree.kt
View File

@ -48,8 +48,8 @@ sealed class MerkleTree {
* @return Tree root. * @return Tree root.
*/ */
private tailrec fun buildMerkleTree(lastNodesList: List<MerkleTree>): MerkleTree { private tailrec fun buildMerkleTree(lastNodesList: List<MerkleTree>): MerkleTree {
if (lastNodesList.size == 1) { return if (lastNodesList.size == 1) {
return lastNodesList[0] // Root reached. lastNodesList[0] // Root reached.
} else { } else {
val newLevelHashes: MutableList<MerkleTree> = ArrayList() val newLevelHashes: MutableList<MerkleTree> = ArrayList()
val n = lastNodesList.size val n = lastNodesList.size
@ -61,7 +61,7 @@ sealed class MerkleTree {
val combined = Node(newHash, left, right) val combined = Node(newHash, left, right)
newLevelHashes.add(combined) newLevelHashes.add(combined)
} }
return buildMerkleTree(newLevelHashes) buildMerkleTree(newLevelHashes)
} }
} }
} }

1
core/src/main/kotlin/net/corda/core/crypto/NullKeys.kt
View File

@ -18,5 +18,4 @@ object NullKeys {
/** A signature with a key and value of zero. Useful when you want a signature object that you know won't ever be used. */ /** A signature with a key and value of zero. Useful when you want a signature object that you know won't ever be used. */
val NULL_SIGNATURE = TransactionSignature(ByteArray(32), NullPublicKey, SignatureMetadata(1, -1)) val NULL_SIGNATURE = TransactionSignature(ByteArray(32), NullPublicKey, SignatureMetadata(1, -1))
} }

2
core/src/main/kotlin/net/corda/core/crypto/SignedData.kt
View File

@ -36,7 +36,7 @@ open class SignedData<T : Any>(val raw: SerializedBytes<T>, val sig: DigitalSign
* @throws IllegalArgumentException if the data is invalid. * @throws IllegalArgumentException if the data is invalid.
*/ */
@Throws(IllegalArgumentException::class) @Throws(IllegalArgumentException::class)
open protected fun verifyData(data: T) { protected open fun verifyData(data: T) {
// By default we accept anything // By default we accept anything
} }
} }

6
core/src/main/kotlin/net/corda/core/flows/AbstractStateReplacementFlow.kt
View File

@ -70,7 +70,7 @@ abstract class AbstractStateReplacementFlow {
val finalTx = stx + signatures val finalTx = stx + signatures
serviceHub.recordTransactions(finalTx) serviceHub.recordTransactions(finalTx)
return stx.resolveBaseTransaction(serviceHub).outRef<T>(0) return stx.resolveBaseTransaction(serviceHub).outRef(0)
} }
/** /**
@ -78,7 +78,7 @@ abstract class AbstractStateReplacementFlow {
* *
* @return the transaction * @return the transaction
*/ */
abstract protected fun assembleTx(): UpgradeTx protected abstract fun assembleTx(): UpgradeTx
/** /**
* Initiate sessions with parties we want signatures from. * Initiate sessions with parties we want signatures from.
@ -176,7 +176,7 @@ abstract class AbstractStateReplacementFlow {
* The proposal is returned if acceptable, otherwise a [StateReplacementException] is thrown. * The proposal is returned if acceptable, otherwise a [StateReplacementException] is thrown.
*/ */
@Throws(StateReplacementException::class) @Throws(StateReplacementException::class)
abstract protected fun verifyProposal(stx: SignedTransaction, proposal: Proposal<T>) protected abstract fun verifyProposal(stx: SignedTransaction, proposal: Proposal<T>)
private fun checkMySignatureRequired(stx: SignedTransaction) { private fun checkMySignatureRequired(stx: SignedTransaction) {
// TODO: use keys from the keyManagementService instead // TODO: use keys from the keyManagementService instead

16
core/src/main/kotlin/net/corda/core/flows/CollectSignaturesFlow.kt
View File

@ -78,7 +78,8 @@ class CollectSignaturesFlow @JvmOverloads constructor(val partiallySignedTx: Sig
} }
@Suspendable override fun call(): SignedTransaction { @Suspendable
override fun call(): SignedTransaction {
// Check the signatures which have already been provided and that the transaction is valid. // Check the signatures which have already been provided and that the transaction is valid.
// Usually just the Initiator and possibly an oracle would have signed at this point. // Usually just the Initiator and possibly an oracle would have signed at this point.
val myKeys: Iterable<PublicKey> = myOptionalKeys ?: listOf(ourIdentity.owningKey) val myKeys: Iterable<PublicKey> = myOptionalKeys ?: listOf(ourIdentity.owningKey)
@ -206,7 +207,8 @@ abstract class SignTransactionFlow(val otherSideSession: FlowSession,
fun tracker() = ProgressTracker(RECEIVING, VERIFYING, SIGNING) fun tracker() = ProgressTracker(RECEIVING, VERIFYING, SIGNING)
} }
@Suspendable override fun call(): SignedTransaction { @Suspendable
override fun call(): SignedTransaction {
progressTracker.currentStep = RECEIVING progressTracker.currentStep = RECEIVING
// Receive transaction and resolve dependencies, check sufficient signatures is disabled as we don't have all signatures. // Receive transaction and resolve dependencies, check sufficient signatures is disabled as we don't have all signatures.
val stx = subFlow(ReceiveTransactionFlow(otherSideSession, checkSufficientSignatures = false)) val stx = subFlow(ReceiveTransactionFlow(otherSideSession, checkSufficientSignatures = false))
@ -243,12 +245,13 @@ abstract class SignTransactionFlow(val otherSideSession: FlowSession,
return stx + mySignatures return stx + mySignatures
} }
@Suspendable private fun checkSignatures(stx: SignedTransaction) { @Suspendable
private fun checkSignatures(stx: SignedTransaction) {
// We set `ignoreUnrecognisedParties` to `true` in `groupPublicKeysByWellKnownParty`. This is because we don't // We set `ignoreUnrecognisedParties` to `true` in `groupPublicKeysByWellKnownParty`. This is because we don't
// need to recognise all keys, but just the initiator's. // need to recognise all keys, but just the initiator's.
val signingWellKnownIdentities = groupPublicKeysByWellKnownParty(serviceHub, stx.sigs.map(TransactionSignature::by), true) val signingWellKnownIdentities = groupPublicKeysByWellKnownParty(serviceHub, stx.sigs.map(TransactionSignature::by), true)
require(otherSideSession.counterparty in signingWellKnownIdentities) { require(otherSideSession.counterparty in signingWellKnownIdentities) {
"The Initiator of CollectSignaturesFlow must have signed the transaction. Found ${signingWellKnownIdentities}, expected ${otherSideSession}" "The Initiator of CollectSignaturesFlow must have signed the transaction. Found $signingWellKnownIdentities, expected $otherSideSession"
} }
val signed = stx.sigs.map { it.by } val signed = stx.sigs.map { it.by }
val allSigners = stx.tx.requiredSigningKeys val allSigners = stx.tx.requiredSigningKeys
@ -278,9 +281,10 @@ abstract class SignTransactionFlow(val otherSideSession: FlowSession,
*/ */
@Suspendable @Suspendable
@Throws(FlowException::class) @Throws(FlowException::class)
abstract protected fun checkTransaction(stx: SignedTransaction) protected abstract fun checkTransaction(stx: SignedTransaction)
@Suspendable private fun checkMySignaturesRequired(stx: SignedTransaction, signingKeys: Iterable<PublicKey>) { @Suspendable
private fun checkMySignaturesRequired(stx: SignedTransaction, signingKeys: Iterable<PublicKey>) {
require(signingKeys.all { it in stx.tx.requiredSigningKeys }) { require(signingKeys.all { it in stx.tx.requiredSigningKeys }) {
"A signature was requested for a key that isn't part of the required signing keys for transaction ${stx.id}" "A signature was requested for a key that isn't part of the required signing keys for transaction ${stx.id}"
} }

2
core/src/main/kotlin/net/corda/core/flows/FlowException.kt
View File

@ -26,6 +26,7 @@ open class FlowException(message: String?, cause: Throwable?) :
constructor(message: String?) : this(message, null) constructor(message: String?) : this(message, null)
constructor(cause: Throwable?) : this(cause?.toString(), cause) constructor(cause: Throwable?) : this(cause?.toString(), cause)
constructor() : this(null, null) constructor() : this(null, null)
var originalErrorId: Long? = null var originalErrorId: Long? = null
override fun getErrorId(): Long? = originalErrorId override fun getErrorId(): Long? = originalErrorId
} }
@ -40,5 +41,6 @@ class UnexpectedFlowEndException(message: String, cause: Throwable?, val origina
CordaRuntimeException(message, cause), IdentifiableException { CordaRuntimeException(message, cause), IdentifiableException {
constructor(message: String, cause: Throwable?) : this(message, cause, null) constructor(message: String, cause: Throwable?) : this(message, cause, null)
constructor(message: String) : this(message, null) constructor(message: String) : this(message, null)
override fun getErrorId(): Long? = originalErrorId override fun getErrorId(): Long? = originalErrorId
} }

3
core/src/main/kotlin/net/corda/core/flows/FlowInitiator.kt
View File

@ -50,7 +50,8 @@ sealed class FlowInitiator : Principal {
* class hierarchy (which is now deprecated). The returned object has less information than it could have, so * class hierarchy (which is now deprecated). The returned object has less information than it could have, so
* prefer to use fetch an invocation context directly if you can (e.g. in [net.corda.core.messaging.StateMachineInfo]) * prefer to use fetch an invocation context directly if you can (e.g. in [net.corda.core.messaging.StateMachineInfo])
*/ */
val invocationContext: InvocationContext get() { val invocationContext: InvocationContext
get() {
val unknownName = CordaX500Name("UNKNOWN", "UNKNOWN", "GB") val unknownName = CordaX500Name("UNKNOWN", "UNKNOWN", "GB")
var actor: Actor? = null var actor: Actor? = null
val origin: InvocationOrigin val origin: InvocationOrigin

3
core/src/main/kotlin/net/corda/core/identity/CordaX500Name.kt
View File

@ -118,7 +118,8 @@ data class CordaX500Name(val commonName: String?,
private var _x500Principal: X500Principal? = null private var _x500Principal: X500Principal? = null
/** Return the [X500Principal] equivalent of this name. */ /** Return the [X500Principal] equivalent of this name. */
val x500Principal: X500Principal get() { val x500Principal: X500Principal
get() {
return _x500Principal ?: X500Principal(this.x500Name.encoded).also { _x500Principal = it } return _x500Principal ?: X500Principal(this.x500Name.encoded).also { _x500Principal = it }
} }

1
core/src/main/kotlin/net/corda/core/internal/Emoji.kt
View File

@ -50,7 +50,6 @@ object Emoji {
@JvmStatic @JvmStatic
val CODE_WARNING_SIGN: String = codePointsString(0x26A0, 0xFE0F) val CODE_WARNING_SIGN: String = codePointsString(0x26A0, 0xFE0F)
/** /**
* When non-null, toString() methods are allowed to use emoji in the output as we're going to render them to a * When non-null, toString() methods are allowed to use emoji in the output as we're going to render them to a
* sufficiently capable text surface. * sufficiently capable text surface.

1
core/src/main/kotlin/net/corda/core/internal/FetchDataFlow.kt
View File

@ -134,7 +134,6 @@ sealed class FetchDataFlow<T : NamedByHash, in W : Any>(
} }
} }
/** /**
* Given a set of hashes either loads from from local storage or requests them from the other peer. Downloaded * Given a set of hashes either loads from from local storage or requests them from the other peer. Downloaded
* attachments are saved to local storage automatically. * attachments are saved to local storage automatically.

3
core/src/main/kotlin/net/corda/core/internal/FlowIORequest.kt
View File

@ -51,7 +51,8 @@ sealed class FlowIORequest<out R : Any> {
val shouldRetrySend: Boolean val shouldRetrySend: Boolean
) : FlowIORequest<Map<FlowSession, SerializedBytes<Any>>>() { ) : FlowIORequest<Map<FlowSession, SerializedBytes<Any>>>() {
override fun toString() = "SendAndReceive(${sessionToMessage.mapValues { (key, value) -> override fun toString() = "SendAndReceive(${sessionToMessage.mapValues { (key, value) ->
"$key=${value.hash}" }}, shouldRetrySend=$shouldRetrySend)" "$key=${value.hash}"
}}, shouldRetrySend=$shouldRetrySend)"
} }
/** /**

8
core/src/main/kotlin/net/corda/core/internal/FlowStateMachine.kt
View File

@ -3,10 +3,12 @@ package net.corda.core.internal
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.core.DoNotImplement import net.corda.core.DoNotImplement
import net.corda.core.concurrent.CordaFuture import net.corda.core.concurrent.CordaFuture
import net.corda.core.flows.*
import net.corda.core.identity.Party
import net.corda.core.identity.PartyAndCertificate
import net.corda.core.context.InvocationContext import net.corda.core.context.InvocationContext
import net.corda.core.flows.FlowLogic
import net.corda.core.flows.FlowSession
import net.corda.core.flows.FlowStackSnapshot
import net.corda.core.flows.StateMachineRunId
import net.corda.core.identity.Party
import net.corda.core.node.ServiceHub import net.corda.core.node.ServiceHub
import org.slf4j.Logger import org.slf4j.Logger

6
core/src/main/kotlin/net/corda/core/internal/LazyPool.kt
View File

@ -39,10 +39,10 @@ class LazyPool<A>(
lifeCycle.requireState(State.STARTED) lifeCycle.requireState(State.STARTED)
poolSemaphore.acquire() poolSemaphore.acquire()
val pooled = poolQueue.poll() val pooled = poolQueue.poll()
if (pooled == null) { return if (pooled == null) {
return newInstance() newInstance()
} else { } else {
return clearIfNeeded(pooled) clearIfNeeded(pooled)
} }
} }

2
core/src/main/kotlin/net/corda/core/internal/LazyStickyPool.kt
View File

@ -66,6 +66,6 @@ class LazyStickyPool<A : Any>(
} }
fun close(): Iterable<A> { fun close(): Iterable<A> {
return boxes.map { it.instance?.poll() }.filterNotNull() return boxes.mapNotNull { it.instance?.poll() }
} }
} }

2
core/src/main/kotlin/net/corda/core/internal/ProgressTracker.kt
View File

@ -1,3 +1,3 @@
package net.corda.core.internal package net.corda.core.internal
val STRUCTURAL_STEP_PREFIX = "Structural step change in child of " const val STRUCTURAL_STEP_PREFIX = "Structural step change in child of "

4
core/src/main/kotlin/net/corda/core/internal/X509EdDSAEngine.kt
View File

@ -43,9 +43,9 @@ class X509EdDSAEngine : Signature {
override fun engineGetParameters(): AlgorithmParameters = engine.parameters override fun engineGetParameters(): AlgorithmParameters = engine.parameters
override fun engineSetParameter(params: AlgorithmParameterSpec) = engine.setParameter(params) override fun engineSetParameter(params: AlgorithmParameterSpec) = engine.setParameter(params)
@Suppress("DEPRECATION") @Suppress("DEPRECATION", "OverridingDeprecatedMember")
override fun engineGetParameter(param: String): Any = engine.getParameter(param) override fun engineGetParameter(param: String): Any = engine.getParameter(param)
@Suppress("DEPRECATION") @Suppress("DEPRECATION", "OverridingDeprecatedMember")
override fun engineSetParameter(param: String, value: Any?) = engine.setParameter(param, value) override fun engineSetParameter(param: String, value: Any?) = engine.setParameter(param, value)
} }

2
core/src/main/kotlin/net/corda/core/internal/concurrent/CordaFutureImpl.kt
View File

@ -142,7 +142,7 @@ interface OpenFuture<V> : ValueOrException<V>, CordaFuture<V>
internal class CordaFutureImpl<V>(private val impl: CompletableFuture<V> = CompletableFuture()) : Future<V> by impl, OpenFuture<V> { internal class CordaFutureImpl<V>(private val impl: CompletableFuture<V> = CompletableFuture()) : Future<V> by impl, OpenFuture<V> {
companion object { companion object {
private val defaultLog = contextLogger() private val defaultLog = contextLogger()
internal val listenerFailedMessage = "Future listener failed:" internal const val listenerFailedMessage = "Future listener failed:"
} }
override fun set(value: V) = impl.complete(value) override fun set(value: V) = impl.complete(value)

1
core/src/main/kotlin/net/corda/core/messaging/FlowHandle.kt
View File

@ -54,7 +54,6 @@ interface FlowProgressHandle<A> : FlowHandle<A> {
override fun close() override fun close()
} }
@CordaSerializable @CordaSerializable
data class FlowHandleImpl<A>( data class FlowHandleImpl<A>(
override val id: StateMachineRunId, override val id: StateMachineRunId,

1
core/src/main/kotlin/net/corda/core/node/AppServiceHub.kt
View File

@ -26,5 +26,4 @@ interface AppServiceHub : ServiceHub {
* TODO it is assumed here that the flow object has an appropriate classloader. * TODO it is assumed here that the flow object has an appropriate classloader.
*/ */
fun <T> startTrackedFlow(flow: FlowLogic<T>): FlowProgressHandle<T> fun <T> startTrackedFlow(flow: FlowLogic<T>): FlowProgressHandle<T>
} }

3
core/src/main/kotlin/net/corda/core/node/NodeInfo.kt
View File

@ -31,7 +31,8 @@ data class NodeInfo(val addresses: List<NetworkHostAndPort>,
require(platformVersion > 0) { "Platform version must be at least 1" } require(platformVersion > 0) { "Platform version must be at least 1" }
} }
@Transient private var _legalIdentities: List<Party>? = null @Transient
private var _legalIdentities: List<Party>? = null
/** /**
* An ordered list of legal identities supported by this node. The node will always have at least one, so if you * An ordered list of legal identities supported by this node. The node will always have at least one, so if you

10
core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteriaUtils.kt
View File

@ -243,7 +243,7 @@ object Builder {
fun <R> Field.functionPredicate(predicate: ColumnPredicate<R>, groupByColumns: List<Column<Any, R>>? = null, orderBy: Sort.Direction? = null) = info().functionPredicate(predicate, groupByColumns, orderBy) fun <R> Field.functionPredicate(predicate: ColumnPredicate<R>, groupByColumns: List<Column<Any, R>>? = null, orderBy: Sort.Direction? = null) = info().functionPredicate(predicate, groupByColumns, orderBy)
fun <R> FieldInfo.functionPredicate(predicate: ColumnPredicate<R>, groupByColumns: List<Column<Any, R>>? = null, orderBy: Sort.Direction? = null) fun <R> FieldInfo.functionPredicate(predicate: ColumnPredicate<R>, groupByColumns: List<Column<Any, R>>? = null, orderBy: Sort.Direction? = null)
= CriteriaExpression.AggregateFunctionExpression(Column<Any, R>(this), predicate, groupByColumns, orderBy) = CriteriaExpression.AggregateFunctionExpression(Column(this), predicate, groupByColumns, orderBy)
fun <O, R : Comparable<R>> KProperty1<O, R?>.comparePredicate(operator: BinaryComparisonOperator, value: R) = predicate(compare(operator, value)) fun <O, R : Comparable<R>> KProperty1<O, R?>.comparePredicate(operator: BinaryComparisonOperator, value: R) = predicate(compare(operator, value))
@Deprecated("Does not support fields from a MappedSuperclass. Use equivalent on a FieldInfo.") @Deprecated("Does not support fields from a MappedSuperclass. Use equivalent on a FieldInfo.")
@ -367,7 +367,7 @@ object Builder {
@JvmStatic @JvmStatic
@JvmOverloads @JvmOverloads
fun <R> FieldInfo.sum(groupByColumns: List<FieldInfo>? = null, orderBy: Sort.Direction? = null) = fun <R> FieldInfo.sum(groupByColumns: List<FieldInfo>? = null, orderBy: Sort.Direction? = null) =
functionPredicate(ColumnPredicate.AggregateFunction<R>(AggregateFunctionType.SUM), groupByColumns?.map { Column<Any, R>(it) }, orderBy) functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.SUM), groupByColumns?.map { Column<Any, R>(it) }, orderBy)
fun <O, R> KProperty1<O, R?>.count() = functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.COUNT)) fun <O, R> KProperty1<O, R?>.count() = functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.COUNT))
@JvmStatic @JvmStatic
@ -387,7 +387,7 @@ object Builder {
@JvmStatic @JvmStatic
@JvmOverloads @JvmOverloads
fun <R> FieldInfo.avg(groupByColumns: List<FieldInfo>? = null, orderBy: Sort.Direction? = null) = fun <R> FieldInfo.avg(groupByColumns: List<FieldInfo>? = null, orderBy: Sort.Direction? = null) =
functionPredicate(ColumnPredicate.AggregateFunction<R>(AggregateFunctionType.AVG), groupByColumns?.map { Column<Any, R>(it) }, orderBy) functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.AVG), groupByColumns?.map { Column<Any, R>(it) }, orderBy)
fun <O, R> KProperty1<O, R?>.min(groupByColumns: List<KProperty1<O, R>>? = null, orderBy: Sort.Direction? = null) = fun <O, R> KProperty1<O, R?>.min(groupByColumns: List<KProperty1<O, R>>? = null, orderBy: Sort.Direction? = null) =
functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.MIN), groupByColumns?.map { Column(it) }, orderBy) functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.MIN), groupByColumns?.map { Column(it) }, orderBy)
@ -400,7 +400,7 @@ object Builder {
@JvmStatic @JvmStatic
@JvmOverloads @JvmOverloads
fun <R> FieldInfo.min(groupByColumns: List<FieldInfo>? = null, orderBy: Sort.Direction? = null) = fun <R> FieldInfo.min(groupByColumns: List<FieldInfo>? = null, orderBy: Sort.Direction? = null) =
functionPredicate(ColumnPredicate.AggregateFunction<R>(AggregateFunctionType.MIN), groupByColumns?.map { Column<Any, R>(it) }, orderBy) functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.MIN), groupByColumns?.map { Column<Any, R>(it) }, orderBy)
fun <O, R> KProperty1<O, R?>.max(groupByColumns: List<KProperty1<O, R>>? = null, orderBy: Sort.Direction? = null) = fun <O, R> KProperty1<O, R?>.max(groupByColumns: List<KProperty1<O, R>>? = null, orderBy: Sort.Direction? = null) =
functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.MAX), groupByColumns?.map { Column(it) }, orderBy) functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.MAX), groupByColumns?.map { Column(it) }, orderBy)
@ -413,7 +413,7 @@ object Builder {
@JvmStatic @JvmStatic
@JvmOverloads @JvmOverloads
fun <R> FieldInfo.max(groupByColumns: List<FieldInfo>? = null, orderBy: Sort.Direction? = null) = fun <R> FieldInfo.max(groupByColumns: List<FieldInfo>? = null, orderBy: Sort.Direction? = null) =
functionPredicate(ColumnPredicate.AggregateFunction<R>(AggregateFunctionType.MAX), groupByColumns?.map { Column<Any, R>(it) }, orderBy) functionPredicate(ColumnPredicate.AggregateFunction(AggregateFunctionType.MAX), groupByColumns?.map { Column<Any, R>(it) }, orderBy)
private fun Field.info(): FieldInfo = FieldInfo(name, declaringClass) private fun Field.info(): FieldInfo = FieldInfo(name, declaringClass)
} }

4
core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt
View File

@ -19,7 +19,7 @@ object CommonSchema
object CommonSchemaV1 : MappedSchema(schemaFamily = CommonSchema.javaClass, version = 1, mappedTypes = emptyList()) { object CommonSchemaV1 : MappedSchema(schemaFamily = CommonSchema.javaClass, version = 1, mappedTypes = emptyList()) {
@MappedSuperclass @MappedSuperclass
open class LinearState( class LinearState(
/** [ContractState] attributes */ /** [ContractState] attributes */
/** X500Name of participant parties **/ /** X500Name of participant parties **/
@ -44,7 +44,7 @@ object CommonSchemaV1 : MappedSchema(schemaFamily = CommonSchema.javaClass, vers
} }
@MappedSuperclass @MappedSuperclass
open class FungibleState( class FungibleState(
/** [ContractState] attributes */ /** [ContractState] attributes */
/** X500Name of participant parties **/ /** X500Name of participant parties **/

3
core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt
View File

@ -70,7 +70,8 @@ open class MappedSchema(schemaFamily: Class<*>,
* [StateRef] will be set to the correct value by the framework (there's no need to set during mapping generation by the state itself). * [StateRef] will be set to the correct value by the framework (there's no need to set during mapping generation by the state itself).
*/ */
@MappedSuperclass @MappedSuperclass
@CordaSerializable open class PersistentState(@EmbeddedId var stateRef: PersistentStateRef? = null) : StatePersistable @CordaSerializable
class PersistentState(@EmbeddedId var stateRef: PersistentStateRef? = null) : StatePersistable
/** /**
* Embedded [StateRef] representation used in state mapping. * Embedded [StateRef] representation used in state mapping.

8
core/src/main/kotlin/net/corda/core/transactions/ContractUpgradeTransactions.kt
View File

@ -212,17 +212,17 @@ data class ContractUpgradeLedgerTransaction(
* Outputs are computed by running the contract upgrade logic on input states. This is done eagerly so that the * Outputs are computed by running the contract upgrade logic on input states. This is done eagerly so that the
* transaction is verified during construction. * transaction is verified during construction.
*/ */
override val outputs: List<TransactionState<ContractState>> = inputs.map { input -> override val outputs: List<TransactionState<ContractState>> = inputs.map { (state) ->
// TODO: if there are encumbrance states in the inputs, just copy them across without modifying // TODO: if there are encumbrance states in the inputs, just copy them across without modifying
val upgradedState = upgradedContract.upgrade(input.state.data) val upgradedState = upgradedContract.upgrade(state.data)
val inputConstraint = input.state.constraint val inputConstraint = state.constraint
val outputConstraint = when (inputConstraint) { val outputConstraint = when (inputConstraint) {
is HashAttachmentConstraint -> HashAttachmentConstraint(upgradedContractAttachment.id) is HashAttachmentConstraint -> HashAttachmentConstraint(upgradedContractAttachment.id)
WhitelistedByZoneAttachmentConstraint -> WhitelistedByZoneAttachmentConstraint WhitelistedByZoneAttachmentConstraint -> WhitelistedByZoneAttachmentConstraint
else -> throw IllegalArgumentException("Unsupported input contract constraint $inputConstraint") else -> throw IllegalArgumentException("Unsupported input contract constraint $inputConstraint")
} }
// TODO: re-map encumbrance pointers // TODO: re-map encumbrance pointers
input.state.copy( state.copy(
data = upgradedState, data = upgradedState,
contract = upgradedContractClassName, contract = upgradedContractClassName,
constraint = outputConstraint constraint = outputConstraint

2
core/src/main/kotlin/net/corda/core/transactions/WireTransaction.kt
View File

@ -106,7 +106,7 @@ class WireTransaction(componentGroups: List<ComponentGroup>, val privacySalt: Pr
resolveIdentity: (PublicKey) -> Party?, resolveIdentity: (PublicKey) -> Party?,
resolveAttachment: (SecureHash) -> Attachment?, resolveAttachment: (SecureHash) -> Attachment?,
resolveStateRef: (StateRef) -> TransactionState<*>?, resolveStateRef: (StateRef) -> TransactionState<*>?,
resolveContractAttachment: (TransactionState<ContractState>) -> AttachmentId? @SuppressWarnings("unused") resolveContractAttachment: (TransactionState<ContractState>) -> AttachmentId?
): LedgerTransaction { ): LedgerTransaction {
return toLedgerTransactionInternal(resolveIdentity, resolveAttachment, resolveStateRef, null) return toLedgerTransactionInternal(resolveIdentity, resolveAttachment, resolveStateRef, null)
} }

2
core/src/main/kotlin/net/corda/core/utilities/EncodingUtils.kt
View File

@ -31,7 +31,6 @@ fun ByteArray.toBase64(): String = Base64.getEncoder().encodeToString(this)
/** Convert a byte array to a hex (Base16) capitalized encoded [String]. */ /** Convert a byte array to a hex (Base16) capitalized encoded [String]. */
fun ByteArray.toHex(): String = DatatypeConverter.printHexBinary(this) fun ByteArray.toHex(): String = DatatypeConverter.printHexBinary(this)
// [String] encoders and decoders // [String] encoders and decoders
/** Base58-String to the actual real [String], i.e. "JxF12TrwUP45BMd" -> "Hello World". */ /** Base58-String to the actual real [String], i.e. "JxF12TrwUP45BMd" -> "Hello World". */
@ -50,7 +49,6 @@ fun String.base64ToByteArray(): ByteArray = Base64.getDecoder().decode(this)
/** Hex-String to [ByteArray]. Accept any hex form (capitalized, lowercase, mixed). */ /** Hex-String to [ByteArray]. Accept any hex form (capitalized, lowercase, mixed). */
fun String.hexToByteArray(): ByteArray = DatatypeConverter.parseHexBinary(this) fun String.hexToByteArray(): ByteArray = DatatypeConverter.parseHexBinary(this)
// Encoding changers // Encoding changers
/** Encoding changer. Base58-[String] to Base64-[String], i.e. "SGVsbG8gV29ybGQ=" -> JxF12TrwUP45BMd" */ /** Encoding changer. Base58-[String] to Base64-[String], i.e. "SGVsbG8gV29ybGQ=" -> JxF12TrwUP45BMd" */

6
core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
View File

@ -106,8 +106,10 @@ interface VariablePropertyDelegate<T> : PropertyDelegate<T> {
@CordaSerializable @CordaSerializable
private class TransientProperty<out T> internal constructor(private val initialiser: () -> T) : PropertyDelegate<T> { private class TransientProperty<out T> internal constructor(private val initialiser: () -> T) : PropertyDelegate<T> {
@Transient private var initialised = false @Transient
@Transient private var value: T? = null private var initialised = false
@Transient
private var value: T? = null
@Synchronized @Synchronized
override operator fun getValue(thisRef: Any?, property: KProperty<*>): T { override operator fun getValue(thisRef: Any?, property: KProperty<*>): T {

4
core/src/main/kotlin/net/corda/core/utilities/ProgressTracker.kt
View File

@ -61,11 +61,11 @@ class ProgressTracker(vararg steps: Step) {
// Sentinel objects. Overrides equals() to survive process restarts and serialization. // Sentinel objects. Overrides equals() to survive process restarts and serialization.
object UNSTARTED : Step("Unstarted") { object UNSTARTED : Step("Unstarted") {
override fun equals(other: Any?) = other is UNSTARTED override fun equals(other: Any?) = other === UNSTARTED
} }
object DONE : Step("Done") { object DONE : Step("Done") {
override fun equals(other: Any?) = other is DONE override fun equals(other: Any?) = other === DONE
} }
@CordaSerializable @CordaSerializable

5
core/src/main/kotlin/net/corda/core/utilities/UntrustworthyData.kt
View File

@ -40,7 +40,6 @@ fun <T : Any> SerializedBytes<Any>.checkPayloadIs(type: Class<T>): Untrustworthy
} catch (ex: Exception) { } catch (ex: Exception) {
throw IllegalArgumentException("Payload invalid", ex) throw IllegalArgumentException("Payload invalid", ex)
} }
return type.castIfPossible(payloadData)?.let { UntrustworthyData(it) } ?: return type.castIfPossible(payloadData)?.let { UntrustworthyData(it) } ?: throw IllegalArgumentException("We were expecting a ${type.name} but we instead got a " +
throw IllegalArgumentException("We were expecting a ${type.name} but we instead got a " + "${payloadData.javaClass.name} ($payloadData)")
"${payloadData.javaClass.name} (${payloadData})")
} }

4
core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
View File

@ -25,7 +25,7 @@ public class FlowsInJavaTest {
private Party bob; private Party bob;
@Before @Before
public void setUp() throws Exception { public void setUp() {
aliceNode = mockNet.createPartyNode(TestConstants.ALICE_NAME); aliceNode = mockNet.createPartyNode(TestConstants.ALICE_NAME);
bobNode = mockNet.createPartyNode(TestConstants.BOB_NAME); bobNode = mockNet.createPartyNode(TestConstants.BOB_NAME);
bob = singleIdentity(bobNode.getInfo()); bob = singleIdentity(bobNode.getInfo());
@ -112,7 +112,7 @@ public class FlowsInJavaTest {
@Suspendable @Suspendable
@Override @Override
public Void call() throws FlowException { public Void call() {
FlowSession session = initiateFlow(otherParty); FlowSession session = initiateFlow(otherParty);
session.receive(Primitives.unwrap(receiveType)); session.receive(Primitives.unwrap(receiveType));
return null; return null;

2
core/src/test/kotlin/net/corda/core/contracts/StructuresTests.kt
View File

@ -41,7 +41,6 @@ class AttachmentTest {
} }
assertEquals(1, closeCalls) assertEquals(1, closeCalls)
} }
} }
class UniqueIdentifierTests { class UniqueIdentifierTests {
@ -73,5 +72,4 @@ class UniqueIdentifierTests {
assertEquals(ids[1], ids[2]) assertEquals(ids[1], ids[2])
assertEquals(ids[1].hashCode(), ids[2].hashCode()) assertEquals(ids[1].hashCode(), ids[2].hashCode())
} }
} }

1
core/src/test/kotlin/net/corda/core/crypto/X509NameConstraintsTest.kt
View File

@ -126,6 +126,5 @@ class X509NameConstraintsTest {
pathValidator.validate(certPath, params) pathValidator.validate(certPath, params)
true true
} }
} }
} }

3
core/src/test/kotlin/net/corda/core/flows/AttachmentTests.kt
View File

@ -3,7 +3,6 @@ package net.corda.core.flows
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.core.contracts.Attachment import net.corda.core.contracts.Attachment
import net.corda.core.crypto.SecureHash import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.sha256
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.internal.FetchAttachmentsFlow import net.corda.core.internal.FetchAttachmentsFlow
import net.corda.core.internal.FetchDataFlow import net.corda.core.internal.FetchDataFlow
@ -82,7 +81,7 @@ class AttachmentTests {
} }
@Test @Test
fun `missing`() { fun missing() {
val aliceNode = mockNet.createPartyNode(ALICE_NAME) val aliceNode = mockNet.createPartyNode(ALICE_NAME)
val bobNode = mockNet.createPartyNode(BOB_NAME) val bobNode = mockNet.createPartyNode(BOB_NAME)
aliceNode.registerInitiatedFlow(FetchAttachmentsResponse::class.java) aliceNode.registerInitiatedFlow(FetchAttachmentsResponse::class.java)

13
core/src/test/kotlin/net/corda/core/flows/CollectSignaturesFlowTests.kt
View File

@ -13,7 +13,11 @@ import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.node.internal.StartedNode import net.corda.node.internal.StartedNode
import net.corda.testing.contracts.DummyContract import net.corda.testing.contracts.DummyContract
import net.corda.testing.core.* import net.corda.testing.core.ALICE_NAME
import net.corda.testing.core.BOB_NAME
import net.corda.testing.core.CHARLIE_NAME
import net.corda.testing.core.TestIdentity
import net.corda.testing.core.singleIdentity
import net.corda.testing.internal.rigorousMock import net.corda.testing.internal.rigorousMock
import net.corda.testing.node.MockServices import net.corda.testing.node.MockServices
import net.corda.testing.node.internal.InternalMockNetwork import net.corda.testing.node.internal.InternalMockNetwork
@ -22,7 +26,6 @@ import net.corda.testing.node.internal.startFlow
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test
import kotlin.reflect.KClass
import kotlin.test.assertFailsWith import kotlin.test.assertFailsWith
class CollectSignaturesFlowTests { class CollectSignaturesFlowTests {
@ -76,9 +79,11 @@ class CollectSignaturesFlowTests {
@InitiatedBy(TestFlow.Initiator::class) @InitiatedBy(TestFlow.Initiator::class)
class Responder(private val otherSideSession: FlowSession) : FlowLogic<Unit>() { class Responder(private val otherSideSession: FlowSession) : FlowLogic<Unit>() {
@Suspendable override fun call() { @Suspendable
override fun call() {
val signFlow = object : SignTransactionFlow(otherSideSession) { val signFlow = object : SignTransactionFlow(otherSideSession) {
@Suspendable override fun checkTransaction(stx: SignedTransaction) = requireThat { @Suspendable
override fun checkTransaction(stx: SignedTransaction) = requireThat {
val tx = stx.tx val tx = stx.tx
val ltx = tx.toLedgerTransaction(serviceHub) val ltx = tx.toLedgerTransaction(serviceHub)
"There should only be one output state" using (tx.outputs.size == 1) "There should only be one output state" using (tx.outputs.size == 1)

2
core/src/test/kotlin/net/corda/core/identity/PartyTest.kt
View File

@ -9,7 +9,7 @@ import kotlin.test.assertNotEquals
class PartyTest { class PartyTest {
@Test @Test
fun `equality`() { fun equality() {
val key = entropyToKeyPair(BigInteger.valueOf(20170207L)).public val key = entropyToKeyPair(BigInteger.valueOf(20170207L)).public
val differentKey = entropyToKeyPair(BigInteger.valueOf(7201702L)).public val differentKey = entropyToKeyPair(BigInteger.valueOf(7201702L)).public
val anonymousParty = AnonymousParty(key) val anonymousParty = AnonymousParty(key)

1
core/src/test/kotlin/net/corda/core/internal/AbstractAttachmentTest.kt
View File

@ -11,7 +11,6 @@ import org.junit.Test
import java.nio.file.Files import java.nio.file.Files
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.Paths import java.nio.file.Paths
import kotlin.streams.toList
import kotlin.test.assertEquals import kotlin.test.assertEquals
class AbstractAttachmentTest { class AbstractAttachmentTest {

10
core/src/test/kotlin/net/corda/core/node/VaultUpdateTests.kt
View File

@ -14,7 +14,7 @@ import kotlin.test.assertFailsWith
class VaultUpdateTests { class VaultUpdateTests {
private companion object { private companion object {
val DUMMY_PROGRAM_ID = "net.corda.core.node.VaultUpdateTests.DummyContract" const val DUMMY_PROGRAM_ID = "net.corda.core.node.VaultUpdateTests.DummyContract"
val DUMMY_NOTARY = TestIdentity(DUMMY_NOTARY_NAME, 20).party val DUMMY_NOTARY = TestIdentity(DUMMY_NOTARY_NAME, 20).party
val emptyUpdate = Vault.Update(emptySet(), emptySet(), type = Vault.UpdateType.GENERAL) val emptyUpdate = Vault.Update(emptySet(), emptySet(), type = Vault.UpdateType.GENERAL)
} }
@ -58,7 +58,7 @@ class VaultUpdateTests {
@Test @Test
fun `nothing plus something is something`() { fun `nothing plus something is something`() {
val before = emptyUpdate val before = emptyUpdate
val after = before + Vault.Update<ContractState>(setOf(stateAndRef0, stateAndRef1), setOf(stateAndRef2, stateAndRef3)) val after = before + Vault.Update(setOf(stateAndRef0, stateAndRef1), setOf(stateAndRef2, stateAndRef3))
val expected = Vault.Update<ContractState>(setOf(stateAndRef0, stateAndRef1), setOf(stateAndRef2, stateAndRef3)) val expected = Vault.Update<ContractState>(setOf(stateAndRef0, stateAndRef1), setOf(stateAndRef2, stateAndRef3))
assertEquals(expected, after) assertEquals(expected, after)
} }
@ -66,7 +66,7 @@ class VaultUpdateTests {
@Test @Test
fun `something plus consume state 0 is something without state 0 output`() { fun `something plus consume state 0 is something without state 0 output`() {
val before = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef0, stateAndRef1)) val before = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef0, stateAndRef1))
val after = before + Vault.Update<ContractState>(setOf(stateAndRef0), setOf()) val after = before + Vault.Update(setOf(stateAndRef0), setOf())
val expected = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef1)) val expected = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef1))
assertEquals(expected, after) assertEquals(expected, after)
} }
@ -74,7 +74,7 @@ class VaultUpdateTests {
@Test @Test
fun `something plus produce state 4 is something with additional state 4 output`() { fun `something plus produce state 4 is something with additional state 4 output`() {
val before = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef0, stateAndRef1)) val before = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef0, stateAndRef1))
val after = before + Vault.Update<ContractState>(setOf(), setOf(stateAndRef4)) val after = before + Vault.Update(setOf(), setOf(stateAndRef4))
val expected = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef0, stateAndRef1, stateAndRef4)) val expected = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef0, stateAndRef1, stateAndRef4))
assertEquals(expected, after) assertEquals(expected, after)
} }
@ -82,7 +82,7 @@ class VaultUpdateTests {
@Test @Test
fun `something plus consume states 0 and 1, and produce state 4, is something without state 0 and 1 outputs and only state 4 output`() { fun `something plus consume states 0 and 1, and produce state 4, is something without state 0 and 1 outputs and only state 4 output`() {
val before = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef0, stateAndRef1)) val before = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef0, stateAndRef1))
val after = before + Vault.Update<ContractState>(setOf(stateAndRef0, stateAndRef1), setOf(stateAndRef4)) val after = before + Vault.Update(setOf(stateAndRef0, stateAndRef1), setOf(stateAndRef4))
val expected = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef4)) val expected = Vault.Update<ContractState>(setOf(stateAndRef2, stateAndRef3), setOf(stateAndRef4))
assertEquals(expected, after) assertEquals(expected, after)
} }

1
core/src/test/kotlin/net/corda/core/serialization/AttachmentSerializationTest.kt
View File

@ -42,6 +42,7 @@ private fun createAttachmentData(content: String) = ByteArrayOutputStream().appl
private fun Attachment.extractContent() = ByteArrayOutputStream().apply { extractFile("content", this) }.toString(UTF_8.name()) private fun Attachment.extractContent() = ByteArrayOutputStream().apply { extractFile("content", this) }.toString(UTF_8.name())
@SuppressWarnings("deprecation")
private fun StartedNode<*>.saveAttachment(content: String) = database.transaction { private fun StartedNode<*>.saveAttachment(content: String) = database.transaction {
attachments.importAttachment(createAttachmentData(content).inputStream()) attachments.importAttachment(createAttachmentData(content).inputStream())
} }

2
core/src/test/kotlin/net/corda/core/serialization/TransactionSerializationTests.kt
View File

@ -83,7 +83,7 @@ class TransactionSerializationTests {
stx.verifyRequiredSignatures() stx.verifyRequiredSignatures()
// Corrupt the data and ensure the signature catches the problem. // Corrupt the data and ensure the signature catches the problem.
val bytesField = stx.id::bytes.javaField?.apply { setAccessible(true) } val bytesField = stx.id::bytes.javaField?.apply { isAccessible = true }
val bytes = bytesField?.get(stx.id) as ByteArray val bytes = bytesField?.get(stx.id) as ByteArray
bytes[5] = bytes[5].inc() bytes[5] = bytes[5].inc()

13
core/src/test/kotlin/net/corda/core/transactions/CompatibleTransactionTests.kt
View File

@ -124,7 +124,8 @@ class CompatibleTransactionTests {
@Test @Test
fun `WireTransaction constructors and compatibility`() { fun `WireTransaction constructors and compatibility`() {
val wireTransactionOldConstructor = WireTransaction(inputs, attachments, outputs, commands, notary, timeWindow, privacySalt) val groups = WireTransaction.createComponentGroups(inputs, outputs, commands, attachments, notary, timeWindow)
val wireTransactionOldConstructor = WireTransaction(groups, privacySalt)
assertEquals(wireTransactionA, wireTransactionOldConstructor) assertEquals(wireTransactionA, wireTransactionOldConstructor)
// Malformed tx - attachments is not List<SecureHash>. For this example, we mistakenly added input-state (StateRef) serialised objects with ATTACHMENTS_GROUP.ordinal. // Malformed tx - attachments is not List<SecureHash>. For this example, we mistakenly added input-state (StateRef) serialised objects with ATTACHMENTS_GROUP.ordinal.
@ -490,7 +491,7 @@ class CompatibleTransactionTests {
// Remove both last signer (KEY1) and related command. // Remove both last signer (KEY1) and related command.
// Update partial Merkle tree for signers. // Update partial Merkle tree for signers.
val updatedFilteredComponentsNoLastCommandAndSigners = listOf(noLastCommandDataGroup, noLastSignerGroup) val updatedFilteredComponentsNoLastCommandAndSigners = listOf(noLastCommandDataGroup, noLastSignerGroup)
val ftxNoLastCommandAndSigners = ftxConstructor.invoke(key1CommandsFtx.id, updatedFilteredComponentsNoLastCommandAndSigners, key1CommandsFtx.groupHashes) as FilteredTransaction val ftxNoLastCommandAndSigners = ftxConstructor.invoke(key1CommandsFtx.id, updatedFilteredComponentsNoLastCommandAndSigners, key1CommandsFtx.groupHashes)
// verify() will pass as the transaction is well-formed. // verify() will pass as the transaction is well-formed.
ftxNoLastCommandAndSigners.verify() ftxNoLastCommandAndSigners.verify()
// checkCommandVisibility() will not pass, because checkAllComponentsVisible(ComponentGroupEnum.SIGNERS_GROUP) will fail. // checkCommandVisibility() will not pass, because checkAllComponentsVisible(ComponentGroupEnum.SIGNERS_GROUP) will fail.
@ -499,7 +500,7 @@ class CompatibleTransactionTests {
// Remove last signer for which there is no pointer from a visible commandData. This is the case of Key2. // Remove last signer for which there is no pointer from a visible commandData. This is the case of Key2.
// Do not change partial Merkle tree for signers. // Do not change partial Merkle tree for signers.
// This time the object can be constructed as there is no pointer mismatch. // This time the object can be constructed as there is no pointer mismatch.
val ftxNoLastSigner = ftxConstructor.invoke(key2CommandsFtx.id, updatedFilteredComponentsNoSignersKey2SamePMT, key2CommandsFtx.groupHashes) as FilteredTransaction val ftxNoLastSigner = ftxConstructor.invoke(key2CommandsFtx.id, updatedFilteredComponentsNoSignersKey2SamePMT, key2CommandsFtx.groupHashes)
// verify() will fail as we didn't change the partial Merkle tree. // verify() will fail as we didn't change the partial Merkle tree.
assertFailsWith<FilteredTransactionVerificationException> { ftxNoLastSigner.verify() } assertFailsWith<FilteredTransactionVerificationException> { ftxNoLastSigner.verify() }
// checkCommandVisibility() will not pass. // checkCommandVisibility() will not pass.
@ -507,7 +508,7 @@ class CompatibleTransactionTests {
// Remove last signer for which there is no pointer from a visible commandData. This is the case of Key2. // Remove last signer for which there is no pointer from a visible commandData. This is the case of Key2.
// Update partial Merkle tree for signers. // Update partial Merkle tree for signers.
val ftxNoLastSignerB = ftxConstructor.invoke(key2CommandsFtx.id, updatedFilteredComponentsNoSignersKey2, key2CommandsFtx.groupHashes) as FilteredTransaction val ftxNoLastSignerB = ftxConstructor.invoke(key2CommandsFtx.id, updatedFilteredComponentsNoSignersKey2, key2CommandsFtx.groupHashes)
// verify() will pass, the transaction is well-formed. // verify() will pass, the transaction is well-formed.
ftxNoLastSignerB.verify() ftxNoLastSignerB.verify()
// But, checkAllComponentsVisible() will not pass. // But, checkAllComponentsVisible() will not pass.
@ -532,14 +533,14 @@ class CompatibleTransactionTests {
val alterFilteredComponents = listOf(key1CommandsFtx.filteredComponentGroups[0], alterSignerGroup) val alterFilteredComponents = listOf(key1CommandsFtx.filteredComponentGroups[0], alterSignerGroup)
// Do not update groupHashes. // Do not update groupHashes.
val ftxAlterSigner = ftxConstructor.invoke(key1CommandsFtx.id, alterFilteredComponents, key1CommandsFtx.groupHashes) as FilteredTransaction val ftxAlterSigner = ftxConstructor.invoke(key1CommandsFtx.id, alterFilteredComponents, key1CommandsFtx.groupHashes)
// Visible components in signers group cannot be verified against their partial Merkle tree. // Visible components in signers group cannot be verified against their partial Merkle tree.
assertFailsWith<FilteredTransactionVerificationException> { ftxAlterSigner.verify() } assertFailsWith<FilteredTransactionVerificationException> { ftxAlterSigner.verify() }
// Also, checkAllComponentsVisible() will not pass (groupHash matching will fail). // Also, checkAllComponentsVisible() will not pass (groupHash matching will fail).
assertFailsWith<ComponentVisibilityException> { ftxAlterSigner.checkCommandVisibility(DUMMY_KEY_1.public) } assertFailsWith<ComponentVisibilityException> { ftxAlterSigner.checkCommandVisibility(DUMMY_KEY_1.public) }
// Update groupHashes. // Update groupHashes.
val ftxAlterSignerB = ftxConstructor.invoke(key1CommandsFtx.id, alterFilteredComponents, key1CommandsFtx.groupHashes.subList(0, 6) + alterMTree.hash) as FilteredTransaction val ftxAlterSignerB = ftxConstructor.invoke(key1CommandsFtx.id, alterFilteredComponents, key1CommandsFtx.groupHashes.subList(0, 6) + alterMTree.hash)
// Visible components in signers group cannot be verified against their partial Merkle tree. // Visible components in signers group cannot be verified against their partial Merkle tree.
assertFailsWith<FilteredTransactionVerificationException> { ftxAlterSignerB.verify() } assertFailsWith<FilteredTransactionVerificationException> { ftxAlterSignerB.verify() }
// Also, checkAllComponentsVisible() will not pass (top level Merkle tree cannot be verified against transaction's id). // Also, checkAllComponentsVisible() will not pass (top level Merkle tree cannot be verified against transaction's id).

2
core/src/test/kotlin/net/corda/core/transactions/TransactionEncumbranceTests.kt
View File

@ -22,7 +22,7 @@ import org.junit.Test
import java.time.Instant import java.time.Instant
import java.time.temporal.ChronoUnit import java.time.temporal.ChronoUnit
val TEST_TIMELOCK_ID = "net.corda.core.transactions.TransactionEncumbranceTests\$DummyTimeLock" const val TEST_TIMELOCK_ID = "net.corda.core.transactions.TransactionEncumbranceTests\$DummyTimeLock"
class TransactionEncumbranceTests { class TransactionEncumbranceTests {
private companion object { private companion object {

2
docs/source/example-code/src/main/java/net/corda/docs/FlowCookbookJava.java
View File

@ -466,7 +466,7 @@ public class FlowCookbookJava {
subFlow(new SendStateAndRefFlow(counterpartySession, dummyStates)); subFlow(new SendStateAndRefFlow(counterpartySession, dummyStates));
// On the receive side ... // On the receive side ...
List<StateAndRef<DummyState>> resolvedStateAndRef = subFlow(new ReceiveStateAndRefFlow<DummyState>(counterpartySession)); List<StateAndRef<DummyState>> resolvedStateAndRef = subFlow(new ReceiveStateAndRefFlow<>(counterpartySession));
// DOCEND 14 // DOCEND 14
try { try {

2
docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/contract/CommercialPaper.java
View File

@ -50,7 +50,7 @@ public class CommercialPaper implements Contract {
requireThat(require -> { requireThat(require -> {
require.using("the paper must have matured", time.isAfter(input.getMaturityDate())); require.using("the paper must have matured", time.isAfter(input.getMaturityDate()));
require.using("the received amount equals the face value", received == input.getFaceValue()); require.using("the received amount equals the face value", received == input.getFaceValue());
require.using("the paper must be destroyed", outputs.size() == 0); require.using("the paper must be destroyed", outputs.isEmpty());
require.using("the transaction is signed by the owner of the CP", cmd.getSigners().contains(input.getOwner().getOwningKey())); require.using("the transaction is signed by the owner of the CP", cmd.getSigners().contains(input.getOwner().getOwningKey()));
return null; return null;
}); });

3
docs/source/example-code/src/main/kotlin/net/corda/docs/CustomVaultQuery.kt
View File

@ -143,9 +143,8 @@ object TopupIssuerFlow {
// now invoke Cash subflow to Move issued assetType to issue requester // now invoke Cash subflow to Move issued assetType to issue requester
progressTracker.currentStep = TRANSFERRING progressTracker.currentStep = TRANSFERRING
val moveCashFlow = CashPaymentFlow(amount, issueTo, anonymous = false) val moveCashFlow = CashPaymentFlow(amount, issueTo, anonymous = false)
val moveTx = subFlow(moveCashFlow)
// NOTE: CashFlow PayCash calls FinalityFlow which performs a Broadcast (which stores a local copy of the txn to the ledger) // NOTE: CashFlow PayCash calls FinalityFlow which performs a Broadcast (which stores a local copy of the txn to the ledger)
return moveTx return subFlow(moveCashFlow)
} }
} }
} }

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

@ -23,7 +23,7 @@ enum class WorkflowState {
REJECTED REJECTED
} }
val TRADE_APPROVAL_PROGRAM_ID = "net.corda.docs.TradeApprovalContract" const val TRADE_APPROVAL_PROGRAM_ID = "net.corda.docs.TradeApprovalContract"
/** /**
* 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.

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

@ -4,7 +4,7 @@ import net.corda.core.contracts.CommandData
import net.corda.core.contracts.Contract import net.corda.core.contracts.Contract
import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.LedgerTransaction
val TEMPLATE_CONTRACT_ID = "com.template.TemplateContract" const val TEMPLATE_CONTRACT_ID = "com.template.TemplateContract"
open class TemplateContract : Contract { open class TemplateContract : Contract {
// A transaction is considered valid if the verify() function of the contract of each of the transaction's input // A transaction is considered valid if the verify() function of the contract of each of the transaction's input

18
docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
View File

@ -8,20 +8,12 @@ import net.corda.core.flows.FlowSession
import net.corda.core.flows.InitiatedBy import net.corda.core.flows.InitiatedBy
import net.corda.core.flows.InitiatingFlow import net.corda.core.flows.InitiatingFlow
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.messaging.MessageRecipients
import net.corda.core.serialization.deserialize
import net.corda.core.serialization.serialize
import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow
import net.corda.core.utilities.unwrap import net.corda.core.utilities.unwrap
import net.corda.node.services.messaging.Message import net.corda.testing.node.MockNetwork
import net.corda.node.services.statemachine.DataSessionMessage import net.corda.testing.node.StartedMockNode
import net.corda.node.services.statemachine.ExistingSessionMessage
import net.corda.testing.node.*
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule
import org.junit.Test
import org.junit.rules.ExpectedException import org.junit.rules.ExpectedException
class TutorialMockNetwork { class TutorialMockNetwork {
@ -53,9 +45,9 @@ class TutorialMockNetwork {
} }
} }
lateinit private var mockNet: MockNetwork private lateinit var mockNet: MockNetwork
lateinit private var nodeA: StartedMockNode private lateinit var nodeA: StartedMockNode
lateinit private var nodeB: StartedMockNode private lateinit var nodeB: StartedMockNode
@Rule @Rule
@JvmField @JvmField

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

@ -9,7 +9,7 @@ import net.corda.core.transactions.LedgerTransaction
import net.corda.core.contracts.* import net.corda.core.contracts.*
// Replace IOUContract's contract ID and definition with: // Replace IOUContract's contract ID and definition with:
val IOU_CONTRACT_ID = "com.template.IOUContract" const val IOU_CONTRACT_ID = "com.template.IOUContract"
class IOUContract : Contract { class IOUContract : Contract {
// Our Create command. // Our Create command.

16
docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/twoparty/flow.kt
View File

@ -4,19 +4,15 @@ package net.corda.docs.tutorial.twoparty
import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.fibers.Suspendable
import net.corda.core.contracts.Command import net.corda.core.contracts.Command
import net.corda.core.contracts.StateAndContract import net.corda.core.contracts.StateAndContract
import net.corda.core.flows.* import net.corda.core.flows.CollectSignaturesFlow
import net.corda.core.flows.FinalityFlow
import net.corda.core.flows.FlowLogic
import net.corda.core.flows.InitiatingFlow
import net.corda.core.flows.StartableByRPC
import net.corda.core.identity.Party import net.corda.core.identity.Party
import net.corda.core.messaging.CordaRPCOps
import net.corda.core.serialization.SerializationWhitelist
import net.corda.core.transactions.TransactionBuilder import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.ProgressTracker import net.corda.core.utilities.ProgressTracker
import net.corda.webserver.services.WebServerPluginRegistry
import java.util.function.Function
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.Produces
import javax.ws.rs.core.MediaType
import javax.ws.rs.core.Response
// DOCEND 01 // DOCEND 01
@InitiatingFlow @InitiatingFlow

5
docs/source/example-code/src/test/kotlin/net/corda/docs/CustomVaultQueryTest.kt
View File

@ -24,7 +24,6 @@ import net.corda.node.services.vault.VaultSchemaV1
import net.corda.testing.core.singleIdentity import net.corda.testing.core.singleIdentity
import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetwork
import net.corda.testing.node.StartedMockNode import net.corda.testing.node.StartedMockNode
import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatCode import org.assertj.core.api.Assertions.assertThatCode
import org.junit.After import org.junit.After
import org.junit.Assert import org.junit.Assert
@ -105,12 +104,12 @@ class CustomVaultQueryTest {
val balancesNodesA = nodeA.transaction { val balancesNodesA = nodeA.transaction {
nodeA.services.getCashBalances() nodeA.services.getCashBalances()
} }
println("BalanceA\n" + balancesNodesA) println("BalanceA\n$balancesNodesA")
val balancesNodesB = nodeB.transaction { val balancesNodesB = nodeB.transaction {
nodeB.services.getCashBalances() nodeB.services.getCashBalances()
} }
println("BalanceB\n" + balancesNodesB) println("BalanceB\n$balancesNodesB")
return Pair(balancesNodesA, balancesNodesB) return Pair(balancesNodesA, balancesNodesB)
} }

11
docs/source/example-code/src/test/kotlin/net/corda/docs/FxTransactionBuildTutorialTest.kt
View File

@ -4,15 +4,18 @@ import net.corda.core.identity.Party
import net.corda.core.toFuture import net.corda.core.toFuture
import net.corda.core.utilities.OpaqueBytes import net.corda.core.utilities.OpaqueBytes
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.finance.* import net.corda.finance.DOLLARS
import net.corda.finance.GBP
import net.corda.finance.POUNDS
import net.corda.finance.USD
import net.corda.finance.contracts.getCashBalances import net.corda.finance.contracts.getCashBalances
import net.corda.finance.flows.CashIssueFlow import net.corda.finance.flows.CashIssueFlow
import net.corda.finance.issuedBy
import net.corda.testing.core.singleIdentity import net.corda.testing.core.singleIdentity
import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetwork
import net.corda.testing.node.StartedMockNode import net.corda.testing.node.StartedMockNode
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Ignore
import org.junit.Test import org.junit.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
@ -71,8 +74,8 @@ class FxTransactionBuildTutorialTest {
nodeB.services.getCashBalances() nodeB.services.getCashBalances()
} }
println("BalanceA\n" + balancesA) println("BalanceA\n$balancesA")
println("BalanceB\n" + balancesB) println("BalanceB\n$balancesB")
// Verify the transfers occurred as expected // Verify the transfers occurred as expected
assertEquals(POUNDS(100), balancesA[GBP]) assertEquals(POUNDS(100), balancesA[GBP])
assertEquals(DOLLARS(1000 - 200), balancesA[USD]) assertEquals(DOLLARS(1000 - 200), balancesA[USD])

8
docs/source/example-code/src/test/kotlin/net/corda/docs/tutorial/testdsl/TutorialTestDSL.kt
View File

@ -3,7 +3,6 @@ package net.corda.docs.tutorial.testdsl
import com.nhaarman.mockito_kotlin.doReturn import com.nhaarman.mockito_kotlin.doReturn
import com.nhaarman.mockito_kotlin.whenever import com.nhaarman.mockito_kotlin.whenever
import net.corda.core.contracts.TransactionVerificationException import net.corda.core.contracts.TransactionVerificationException
import net.corda.core.crypto.generateKeyPair
import net.corda.core.identity.CordaX500Name import net.corda.core.identity.CordaX500Name
import net.corda.core.node.services.IdentityService import net.corda.core.node.services.IdentityService
import net.corda.core.utilities.days import net.corda.core.utilities.days
@ -14,11 +13,14 @@ import net.corda.finance.contracts.CommercialPaper
import net.corda.finance.contracts.ICommercialPaperState import net.corda.finance.contracts.ICommercialPaperState
import net.corda.finance.contracts.asset.CASH import net.corda.finance.contracts.asset.CASH
import net.corda.finance.contracts.asset.Cash import net.corda.finance.contracts.asset.Cash
import net.corda.testing.core.* import net.corda.testing.core.ALICE_NAME
import net.corda.testing.core.BOB_NAME
import net.corda.testing.core.DUMMY_NOTARY_NAME
import net.corda.testing.core.SerializationEnvironmentRule
import net.corda.testing.core.TestIdentity
import net.corda.testing.internal.rigorousMock import net.corda.testing.internal.rigorousMock
import net.corda.testing.node.MockServices import net.corda.testing.node.MockServices
import net.corda.testing.node.ledger import net.corda.testing.node.ledger
import net.corda.testing.node.makeTestIdentityService
import net.corda.testing.node.transaction import net.corda.testing.node.transaction
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test

1
experimental/behave/src/main/kotlin/net/corda/behave/database/DatabaseConfigurationTemplate.kt
View File

@ -9,5 +9,4 @@ open class DatabaseConfigurationTemplate {
protected open val config: (DatabaseConfiguration) -> String = { "" } protected open val config: (DatabaseConfiguration) -> String = { "" }
fun generate(config: DatabaseConfiguration) = config(config).trimMargin() fun generate(config: DatabaseConfiguration) = config(config).trimMargin()
} }

4
experimental/behave/src/main/kotlin/net/corda/behave/database/DatabaseConnection.kt
View File

@ -17,8 +17,8 @@ class DatabaseConnection(
fun open(): Connection { fun open(): Connection {
try { try {
val connectionProps = Properties() val connectionProps = Properties()
connectionProps.put("user", config.username) connectionProps["user"] = config.username
connectionProps.put("password", config.password) connectionProps["password"] = config.password
retry (5) { retry (5) {
conn = DriverManager.getConnection(connectionString, connectionProps) conn = DriverManager.getConnection(connectionString, connectionProps)
} }

1
experimental/behave/src/main/kotlin/net/corda/behave/database/DatabaseSettings.kt
View File

@ -63,5 +63,4 @@ class DatabaseSettings {
val template: DatabaseConfigurationTemplate val template: DatabaseConfigurationTemplate
get() = databaseConfigTemplate get() = databaseConfigTemplate
} }

2
experimental/behave/src/main/kotlin/net/corda/behave/database/DatabaseType.kt
View File

@ -44,7 +44,5 @@ enum class DatabaseType(val settings: DatabaseSettings) {
"postgresql" -> POSTGRES "postgresql" -> POSTGRES
else -> null else -> null
} }
} }
} }

Some files were not shown because too many files have changed in this diff Show More