Expose a JDBC connection (session) via the ServiceHub for generic JDB… (#1000)

* Expose a JDBC connection (session) via the ServiceHub for generic JDBC usage. * Updated documentation. * Fix failing JUnit following rebase from master. * JDBC session Tutorial WIP * Fix broken JUnits following update to consumeCash() using observable event update as return. * Fixed broken JUnits. * Refactoring createSession() into new CordaPersistence class following rebase from master. * Updated fully working example. * Minor updates following feedback from MH. * Fixed compiler error following rebase. * Fixes following rebase from master. * Further updates and clarifications to documentation.
2025-06-19 07:38:22 +00:00 · 2017-08-04 09:26:27 +01:00
parent 818cbce789
commit 014387162d
12 changed files with 368 additions and 38 deletions
--- a/docs/source/example-code/src/test/kotlin/net/corda/docs/CustomVaultQueryTest.kt
+++ b/docs/source/example-code/src/test/kotlin/net/corda/docs/CustomVaultQueryTest.kt
@ -0,0 +1,100 @@
+package net.corda.docs
+
+import net.corda.contracts.getCashBalances
+import net.corda.core.contracts.*
+import net.corda.core.getOrThrow
+import net.corda.core.node.services.ServiceInfo
+import net.corda.core.utilities.OpaqueBytes
+import net.corda.flows.CashIssueFlow
+import net.corda.node.services.network.NetworkMapService
+import net.corda.node.services.transactions.ValidatingNotaryService
+import net.corda.testing.DUMMY_NOTARY
+import net.corda.testing.DUMMY_NOTARY_KEY
+import net.corda.testing.node.MockNetwork
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import java.util.*
+
+class CustomVaultQueryTest {
+
+    lateinit var mockNet: MockNetwork
+    lateinit var notaryNode: MockNetwork.MockNode
+    lateinit var nodeA: MockNetwork.MockNode
+    lateinit var nodeB: MockNetwork.MockNode
+
+    @Before
+    fun setup() {
+        mockNet = MockNetwork(threadPerNode = true)
+        val notaryService = ServiceInfo(ValidatingNotaryService.type)
+        notaryNode = mockNet.createNode(
+                legalName = DUMMY_NOTARY.name,
+                overrideServices = mapOf(notaryService to DUMMY_NOTARY_KEY),
+                advertisedServices = *arrayOf(ServiceInfo(NetworkMapService.type), notaryService))
+        nodeA = mockNet.createPartyNode(notaryNode.network.myAddress)
+        nodeB = mockNet.createPartyNode(notaryNode.network.myAddress)
+
+        nodeA.registerInitiatedFlow(TopupIssuerFlow.TopupIssuer::class.java)
+        nodeA.installCordaService(CustomVaultQuery.Service::class.java)
+    }
+
+    @After
+    fun cleanUp() {
+        mockNet.stopNodes()
+    }
+
+    @Test
+    fun `test custom vault query`() {
+        // issue some cash in several currencies
+        issueCashForCurrency(POUNDS(1000))
+        issueCashForCurrency(DOLLARS(900))
+        issueCashForCurrency(SWISS_FRANCS(800))
+        val (cashBalancesOriginal, _) = getBalances()
+
+        // top up all currencies (by double original)
+        topUpCurrencies()
+        val (cashBalancesAfterTopup, _) = getBalances()
+
+        Assert.assertEquals(cashBalancesOriginal[GBP]?.times(2), cashBalancesAfterTopup[GBP])
+        Assert.assertEquals(cashBalancesOriginal[USD]?.times(2)  , cashBalancesAfterTopup[USD])
+        Assert.assertEquals(cashBalancesOriginal[CHF]?.times( 2), cashBalancesAfterTopup[CHF])
+    }
+
+    private fun issueCashForCurrency(amountToIssue: Amount<Currency>) {
+        // Use NodeA as issuer and create some dollars
+        val flowHandle1 = nodeA.services.startFlow(CashIssueFlow(amountToIssue,
+                OpaqueBytes.of(0x01),
+                nodeA.info.legalIdentity,
+                notaryNode.info.notaryIdentity,
+                false))
+        // Wait for the flow to stop and print
+        flowHandle1.resultFuture.getOrThrow()
+    }
+
+    private fun topUpCurrencies() {
+        val flowHandle1 = nodeA.services.startFlow(TopupIssuerFlow.TopupIssuanceRequester(
+                nodeA.info.legalIdentity,
+                OpaqueBytes.of(0x01),
+                nodeA.info.legalIdentity,
+                notaryNode.info.notaryIdentity))
+        flowHandle1.resultFuture.getOrThrow()
+    }
+
+    private fun getBalances(): Pair<Map<Currency, Amount<Currency>>, Map<Currency, Amount<Currency>>> {
+        // Print out the balances
+        val balancesNodesA =
+            nodeA.database.transaction {
+                nodeA.services.getCashBalances()
+            }
+        println("BalanceA\n" + balancesNodesA)
+
+        val balancesNodesB =
+            nodeB.database.transaction {
+                nodeB.services.getCashBalances()
+            }
+        println("BalanceB\n" + balancesNodesB)
+
+        return Pair(balancesNodesA, balancesNodesB)
+    }
+}