README updated for API change, FlowTests.java adjustments for new APIs

Author: anixon604

Tokens/stockpaydividend/README.md

@@ -35,7 +35,7 @@ This Stock Exchange CorDapp includes:
 ### Keys to learn
 * Basic usage of TokenSDK
 * How the state of stock (ie. EvolvableToken) updates independently without stock holders involved
-* Use of `TokenSelection.generateMove()` and `MoveTokensUtilitiesKt.addMoveTokens()` to generate move of tokens
+* Use of `TokenSelection.generateMove()` and `MoveTokensUtilities.addMoveTokens()` to generate move of tokens
 * Adding observers in token transactions with TokenSDK
 
 *Note that some date constraint(eg. payday) is being commented out to make sure the sample can be ran smoothly

Tokens/stockpaydividend/workflows/src/test/java/net/corda/examples/stockpaydividend/FlowTests.java

@@ -4,7 +4,7 @@
 import com.r3.corda.lib.tokens.contracts.types.TokenPointer;
 import com.r3.corda.lib.tokens.contracts.types.TokenType;
 import com.r3.corda.lib.tokens.money.FiatCurrency;
-import com.r3.corda.lib.tokens.workflows.utilities.QueryUtilitiesKt;
+import com.r3.corda.lib.tokens.workflows.utilities.QueryUtilities;
 import net.corda.core.concurrent.CordaFuture;
 import net.corda.core.contracts.Amount;
 import net.corda.core.contracts.StateAndRef;
@@ -112,7 +112,7 @@ public void tearDown() {
     @Test
     public void issueTest() throws ExecutionException, InterruptedException {
         // Issue Stock
-        CordaFuture<String> future = company.startFlow(new IssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
+        CordaFuture<String> future = company.startFlow(new CreateAndIssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
         network.runNetwork();
         String stx = future.get();
 
@@ -131,7 +131,7 @@ public void issueTest() throws ExecutionException, InterruptedException {
     @Test
     public void moveTest() throws ExecutionException, InterruptedException {
         // Issue Stock
-        CordaFuture<String> future = company.startFlow(new IssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
+        CordaFuture<String> future = company.startFlow(new CreateAndIssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
         network.runNetwork();
         future.get();
 
@@ -143,15 +143,15 @@ public void moveTest() throws ExecutionException, InterruptedException {
         //Retrieve states from receiver
         List<StateAndRef<StockState>> receivedStockStatesPages = shareholder.getServices().getVaultService().queryBy(StockState.class).getStates();
         StockState receivedStockState = receivedStockStatesPages.get(0).getState().getData();
-        Amount<TokenPointer> receivedAmount = QueryUtilitiesKt.tokenBalance(shareholder.getServices().getVaultService(), receivedStockState.toPointer(receivedStockState.getClass()));
+        Amount<TokenType> receivedAmount = QueryUtilities.tokenBalance(shareholder.getServices().getVaultService(), receivedStockState.toPointer(receivedStockState.getClass()));
 
         //Check
         assertEquals(receivedAmount.getQuantity(), Long.valueOf(500).longValue());
 
         //Retrieve states from sender
         List<StateAndRef<StockState>> remainingStockStatesPages = company.getServices().getVaultService().queryBy(StockState.class).getStates();
         StockState remainingStockState = remainingStockStatesPages.get(0).getState().getData();
-        Amount<TokenPointer> remainingAmount = QueryUtilitiesKt.tokenBalance(company.getServices().getVaultService(), remainingStockState.toPointer(remainingStockState.getClass()));
+        Amount<TokenType> remainingAmount = QueryUtilities.tokenBalance(company.getServices().getVaultService(), remainingStockState.toPointer(remainingStockState.getClass()));
 
         //Check
         assertEquals(remainingAmount.getQuantity(), Long.valueOf(1500).longValue());
@@ -161,7 +161,7 @@ public void moveTest() throws ExecutionException, InterruptedException {
     @Test
     public void announceDividendTest() throws ExecutionException, InterruptedException {
         // Issue Stock
-        CordaFuture<String> future = company.startFlow(new IssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
+        CordaFuture<String> future = company.startFlow(new CreateAndIssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
         network.runNetwork();
         future.get();
 
@@ -199,7 +199,7 @@ public void announceDividendTest() throws ExecutionException, InterruptedExcepti
     @Test
     public void getStockUpdateTest() throws ExecutionException, InterruptedException {
         // Issue Stock
-        CordaFuture<String> future = company.startFlow(new IssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
+        CordaFuture<String> future = company.startFlow(new CreateAndIssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
         network.runNetwork();
         future.get();
 
@@ -214,7 +214,7 @@ public void getStockUpdateTest() throws ExecutionException, InterruptedException
         future.get();
 
         // Get Stock Update
-        future = shareholder.startFlow(new GetStockUpdate.Initiator(STOCK_SYMBOL));
+        future = shareholder.startFlow(new ClaimDividendReceivable.Initiator(STOCK_SYMBOL));
         network.runNetwork();
         future.get();
 
@@ -231,7 +231,7 @@ public void getStockUpdateTest() throws ExecutionException, InterruptedException
     @Test
     public void claimDividendTest() throws ExecutionException, InterruptedException {
         // Issue Stock
-        CordaFuture<String> future = company.startFlow(new IssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
+        CordaFuture<String> future = company.startFlow(new CreateAndIssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
         network.runNetwork();
         future.get();
 
@@ -245,11 +245,6 @@ public void claimDividendTest() throws ExecutionException, InterruptedException
         network.runNetwork();
         future.get();
 
-        // Shareholder claims Dividend
-        future = shareholder.startFlow(new GetStockUpdate.Initiator(STOCK_SYMBOL));
-        network.runNetwork();
-        future.get();
-
         // Shareholder claims Dividend
         future = shareholder.startFlow(new ClaimDividendReceivable.Initiator(STOCK_SYMBOL));
         network.runNetwork();
@@ -287,7 +282,7 @@ public void payDividendTest() throws ExecutionException, InterruptedException {
         future.get();
 
         // Issue Stock
-        future = company.startFlow(new IssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
+        future = company.startFlow(new CreateAndIssueStock(STOCK_SYMBOL, STOCK_NAME, STOCK_CURRENCY, STOCK_PRICE, ISSUING_STOCK_QUANTITY, notaryParty));
         network.runNetwork();
         future.get();
 
@@ -301,11 +296,6 @@ public void payDividendTest() throws ExecutionException, InterruptedException {
         network.runNetwork();
         future.get();
 
-        // Shareholder claims Dividend
-        future = shareholder.startFlow(new GetStockUpdate.Initiator(STOCK_SYMBOL));
-        network.runNetwork();
-        future.get();
-
         // Shareholder claims Dividend
         future = shareholder.startFlow(new ClaimDividendReceivable.Initiator(STOCK_SYMBOL));
         network.runNetwork();
@@ -331,7 +321,7 @@ public void payDividendTest() throws ExecutionException, InterruptedException {
 
         // Validates shareholder has received equivalent fiat currencies of the dividend
         TokenType fiatTokenType = FiatCurrency.Companion.getInstance(STOCK_CURRENCY);
-        Amount<TokenType> fiatAmount = QueryUtilitiesKt.tokenBalance(shareholder.getServices().getVaultService(), fiatTokenType);
+        Amount<TokenType> fiatAmount = QueryUtilities.tokenBalance(shareholder.getServices().getVaultService(), fiatTokenType);
         BigDecimal receivingDividend = BigDecimal.valueOf(BUYING_STOCK).multiply(STOCK_PRICE).multiply(ANNOUNCING_DIVIDEND);
         assertEquals(fiatAmount.getQuantity(), receivingDividend.movePointRight(2).longValue());