tidy UpdateChatFlow

workflows/src/main/java/com/r3/developers/csdetemplate/utxoexample/workflows/CreateNewChatFlow.java

@@ -15,6 +15,7 @@ import net.corda.v5.ledger.utxo.transaction.UtxoSignedTransaction;
 import net.corda.v5.ledger.utxo.transaction.UtxoTransactionBuilder;
 import net.corda.v5.membership.MemberInfo;
 import net.corda.v5.membership.NotaryInfo;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,11 +48,11 @@ public class CreateNewChatFlow implements RPCStartableFlow {
     @CordaInject
     public FlowEngine flowEngine;
 
-//    @NotNull
+
     @Suspendable
     @Override
 //    public String call(@NotNull RPCRequestData requestBody) throws IllegalArgumentException {
-    public String call(RPCRequestData requestBody) {
+    public String call( RPCRequestData requestBody) {
         log.info("CreateNewChatFlow.call() called");
 
 

workflows/src/main/java/com/r3/developers/csdetemplate/utxoexample/workflows/FinalizeChatResponderFlow.java

@@ -16,9 +16,9 @@ import org.slf4j.LoggerFactory;
 import static com.r3.developers.csdetemplate.utxoexample.workflows.ResponderValidationHelpers.checkForBannedWords;
 import static com.r3.developers.csdetemplate.utxoexample.workflows.ResponderValidationHelpers.checkMessageFromMatchesCounterparty;
 
-@InitiatedBy(protocol = "append-chat-protocol")
+@InitiatedBy(protocol = "finalize-chat-protocol")
-public class AppendChatResponderFlow implements ResponderFlow {
+public class FinalizeChatResponderFlow implements ResponderFlow {
-    private final static Logger log = LoggerFactory.getLogger(AppendChatResponderFlow.class);
+    private final static Logger log = LoggerFactory.getLogger(FinalizeChatResponderFlow.class);
 
     @CordaInject
     public UtxoLedgerService utxoLedgerService;

workflows/src/main/java/com/r3/developers/csdetemplate/utxoexample/workflows/FinalizeChatSubFlow.java

@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Arrays;
 import java.util.List;
 
-@InitiatingFlow(protocol = "append-chat-protocol")
+@InitiatingFlow(protocol = "finalize-chat-protocol")
 public class FinalizeChatSubFlow implements SubFlow<String> {
 
     public FinalizeChatSubFlow(UtxoSignedTransaction signedTransaction, MemberX500Name otherMember) {

workflows/src/main/java/com/r3/developers/csdetemplate/utxoexample/workflows/UpdateChatFlow.java

@@ -10,6 +10,7 @@ import net.corda.v5.application.marshalling.JsonMarshallingService;
 import net.corda.v5.application.membership.MemberLookup;
 import net.corda.v5.application.messaging.FlowMessaging;
 import net.corda.v5.base.annotations.Suspendable;
+import net.corda.v5.base.exceptions.CordaRuntimeException;
 import net.corda.v5.ledger.common.NotaryLookup;
 import net.corda.v5.ledger.utxo.StateAndRef;
 import net.corda.v5.ledger.utxo.UtxoLedgerService;
@@ -27,6 +28,7 @@ import java.util.stream.Collectors;
 
 import static com.r3.developers.csdetemplate.utilities.CorDappHelpers.findAndExpectExactlyOne;
 import static java.util.Objects.*;
+import static java.util.stream.Collectors.toList;
 
 public class UpdateChatFlow implements RPCStartableFlow {
 
@@ -41,16 +43,17 @@ public class UpdateChatFlow implements RPCStartableFlow {
     @CordaInject
     public UtxoLedgerService ledgerService;
 
-    @CordaInject
+//    @CordaInject
-    public NotaryLookup notaryLookup;
+//    public NotaryLookup notaryLookup;
-
+//
-    @CordaInject
+//    @CordaInject
-    public FlowMessaging flowMessaging;
+//    public FlowMessaging flowMessaging;
 
     @CordaInject
     public FlowEngine flowEngine;
 
-    @NotNull
+
+//    @NotNull   // this is a jetbrains annotation - we don't want to depend on jet brains packages.
     @Suspendable
     @Override
     public String call(RPCRequestData requestBody) {
@@ -61,24 +64,33 @@ public class UpdateChatFlow implements RPCStartableFlow {
              UpdateChatFlowArgs flowArgs = requestBody.getRequestBodyAs(jsonMarshallingService, UpdateChatFlowArgs.class);
 
             // Look up state (this is very inefficient)
-            StateAndRef<ChatState> stateAndRef = findAndExpectExactlyOne(
+            // Removing this because it's an unnecessary level of abstraction, as it's an example for all abilities of programmer
-                    ledgerService.findUnconsumedStatesByType(ChatState.class),
+            // we want it to be as straight forward as possible.
-                    sAndR -> sAndR.getState().getContractState().getId().equals(flowArgs.getId()),
+            // Also it's inconsistent with code below it.
-                    "Multiple or zero Chat states with id " + flowArgs.getId() + " found"
+//            StateAndRef<ChatState> stateAndRef = findAndExpectExactlyOne(
-            );
+//                    ledgerService.findUnconsumedStatesByType(ChatState.class),
+//                    sAndR -> sAndR.getState().getContractState().getId().equals(flowArgs.getId()),
+//                    "Multiple or zero Chat states with id " + flowArgs.getId() + " found"
+//            );
+
+            List<StateAndRef<ChatState>> chatStates = ledgerService.findUnconsumedStatesByType(ChatState.class);
+            List<StateAndRef<ChatState>> chatStatesWithId = chatStates.stream()
+                    .filter(sar -> sar.getState().getContractState().getId() == flowArgs.getId()).collect(toList());
+            if (chatStatesWithId.size() != 1) throw new CordaRuntimeException("Multiple or zero Chat states with id " + flowArgs.id + " found");
+            StateAndRef<ChatState> stateAndRef = chatStatesWithId.get(0);
+
 
             MemberInfo myInfo = memberLookup.myInfo();
             ChatState state = stateAndRef.getState().getContractState();
 
             List<MemberInfo> members = state.getParticipants().stream().map(
                     it -> requireNonNull(memberLookup.lookup(it), "Member not found from Key")
-            ).collect(Collectors.toList());
+            ).collect(toList());
 
             // Now we want to check that there is only one member other than ourselves in the chat.
             members.remove(myInfo);
-            if(members.size() != 1) {
+            if(members.size() != 1) throw new RuntimeException("Should be only one participant other than the initiator");
-                throw new RuntimeException("Should be only one participant other than the initiator");
+
-            }
             MemberInfo otherMember = members.get(0);
 
             ChatState newChatState = state.updateMessage(myInfo.getName(), flowArgs.getMessage());