tidied MyFirstFlow classes
This commit is contained in:
		
							parent
							
								
									de9f94e9b2
								
							
						
					
					
						commit
						50c613ad9f
					
				@ -7,6 +7,10 @@ import net.corda.v5.base.types.MemberX500Name;
 | 
				
			|||||||
// send it from one virtual node to another.
 | 
					// send it from one virtual node to another.
 | 
				
			||||||
@CordaSerializable
 | 
					@CordaSerializable
 | 
				
			||||||
public class Message {
 | 
					public class Message {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private MemberX500Name sender;
 | 
				
			||||||
 | 
					    private String message;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public Message(MemberX500Name sender, String message) {
 | 
					    public Message(MemberX500Name sender, String message) {
 | 
				
			||||||
        this.sender = sender;
 | 
					        this.sender = sender;
 | 
				
			||||||
        this.message = message;
 | 
					        this.message = message;
 | 
				
			||||||
@ -20,6 +24,5 @@ public class Message {
 | 
				
			|||||||
        return message;
 | 
					        return message;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public MemberX500Name sender;
 | 
					
 | 
				
			||||||
    public String message;
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -58,7 +58,7 @@ public class MyFirstFlow implements RPCStartableFlow {
 | 
				
			|||||||
        MyFirstFlowStartArgs flowArgs = requestBody.getRequestBodyAs(jsonMarshallingService, MyFirstFlowStartArgs.class);
 | 
					        MyFirstFlowStartArgs flowArgs = requestBody.getRequestBodyAs(jsonMarshallingService, MyFirstFlowStartArgs.class);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Obtain the MemberX500Name of the counterparty.
 | 
					        // Obtain the MemberX500Name of the counterparty.
 | 
				
			||||||
        MemberX500Name otherMember = flowArgs.otherMember;
 | 
					        MemberX500Name otherMember = flowArgs.getOtherMember();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Get our identity from the MemberLookup service.
 | 
					        // Get our identity from the MemberLookup service.
 | 
				
			||||||
        MemberX500Name ourIdentity = memberLookup.myInfo().getName();
 | 
					        MemberX500Name ourIdentity = memberLookup.myInfo().getName();
 | 
				
			||||||
@ -67,7 +67,7 @@ public class MyFirstFlow implements RPCStartableFlow {
 | 
				
			|||||||
        Message message = new Message(otherMember, "Hello from " + ourIdentity + ".");
 | 
					        Message message = new Message(otherMember, "Hello from " + ourIdentity + ".");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Log the message to be sent.
 | 
					        // Log the message to be sent.
 | 
				
			||||||
        log.info("MFF: message.message: " + message.message);
 | 
					        log.info("MFF: message.message: " + message.getMessage());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Start a flow session with the otherMember using the FlowMessaging service.
 | 
					        // Start a flow session with the otherMember using the FlowMessaging service.
 | 
				
			||||||
        // The otherMember's virtual node will run the corresponding MyFirstFlowResponder responder flow.
 | 
					        // The otherMember's virtual node will run the corresponding MyFirstFlowResponder responder flow.
 | 
				
			||||||
@ -82,16 +82,15 @@ public class MyFirstFlow implements RPCStartableFlow {
 | 
				
			|||||||
        // The return value of a RPCStartableFlow must always be a String. This will be passed
 | 
					        // The return value of a RPCStartableFlow must always be a String. This will be passed
 | 
				
			||||||
        // back as the REST RPC response when the status of the flow is queried on Corda, or as the return
 | 
					        // back as the REST RPC response when the status of the flow is queried on Corda, or as the return
 | 
				
			||||||
        // value from the flow when testing using the simulator.
 | 
					        // value from the flow when testing using the simulator.
 | 
				
			||||||
        return response.message;
 | 
					        return response.getMessage();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
RequestBody for triggering the flow via http-rpc:
 | 
					RequestBody for triggering the flow via http-rpc:
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    "clientRequestId": "r1",
 | 
					    "clientRequestId": "r1",
 | 
				
			||||||
    "flowClassName": "com.r3.developers.csdetemplate.workflows.MyFirstFlow",
 | 
					    "flowClassName": "com.r3.developers.csdetemplate.flowexample.workflows.MyFirstFlow",
 | 
				
			||||||
    "requestData": {
 | 
					    "requestData": {
 | 
				
			||||||
        "otherMember":"CN=Bob, OU=Test Dept, O=R3, L=London, C=GB"
 | 
					        "otherMember":"CN=Bob, OU=Test Dept, O=R3, L=London, C=GB"
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
				
			|||||||
@ -44,7 +44,7 @@ public class MyFirstFlowResponder implements ResponderFlow {
 | 
				
			|||||||
        Message receivedMessage = session.receive(Message.class);
 | 
					        Message receivedMessage = session.receive(Message.class);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Log the message as a proxy for performing some useful operation on it.
 | 
					        // Log the message as a proxy for performing some useful operation on it.
 | 
				
			||||||
        log.info("MFF: Message received from " + receivedMessage.sender + ":" + receivedMessage.message);
 | 
					        log.info("MFF: Message received from " + receivedMessage.getSender() + ":" + receivedMessage.getMessage());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Get our identity from the MemberLookup service.
 | 
					        // Get our identity from the MemberLookup service.
 | 
				
			||||||
        MemberX500Name ourIdentity = memberLookup.myInfo().getName();
 | 
					        MemberX500Name ourIdentity = memberLookup.myInfo().getName();
 | 
				
			||||||
@ -54,19 +54,9 @@ public class MyFirstFlowResponder implements ResponderFlow {
 | 
				
			|||||||
                "Hello " + session.getCounterparty().getCommonName() + ", best wishes from " + ourIdentity.getCommonName());
 | 
					                "Hello " + session.getCounterparty().getCommonName() + ", best wishes from " + ourIdentity.getCommonName());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Log the response to be sent.
 | 
					        // Log the response to be sent.
 | 
				
			||||||
        log.info("MFF: response.message: " + response.message);
 | 
					        log.info("MFF: response.message: " + response.getMessage());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Send the response via the send method on the flow session
 | 
					        // Send the response via the send method on the flow session
 | 
				
			||||||
        session.send(response);
 | 
					        session.send(response);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
RequestBody for triggering the flow via http-rpc:
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    "clientRequestId": "r1",
 | 
					 | 
				
			||||||
    "flowClassName": "com.r3.developers.csdetemplate.MyFirstFlow",
 | 
					 | 
				
			||||||
    "requestData": {
 | 
					 | 
				
			||||||
        "otherMember":"CN=Bob, OU=Test Dept, O=R3, L=London, C=GB"
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
@ -4,12 +4,16 @@ import net.corda.v5.base.types.MemberX500Name;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
// A class to hold the arguments required to start the flow
 | 
					// A class to hold the arguments required to start the flow
 | 
				
			||||||
public class MyFirstFlowStartArgs {
 | 
					public class MyFirstFlowStartArgs {
 | 
				
			||||||
    public MemberX500Name otherMember;
 | 
					    private MemberX500Name otherMember;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // The JSON Marshalling Service, which handles serialisation, needs this constructor.
 | 
				
			||||||
 | 
					    public MyFirstFlowStartArgs() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public MyFirstFlowStartArgs(MemberX500Name otherMember) {
 | 
					    public MyFirstFlowStartArgs(MemberX500Name otherMember) {
 | 
				
			||||||
        this.otherMember = otherMember;
 | 
					        this.otherMember = otherMember;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // The JSON Marshalling Service, which handles serialisation, needs this constructor.
 | 
					    public MemberX500Name getOtherMember() {
 | 
				
			||||||
    public MyFirstFlowStartArgs() {}
 | 
					        return otherMember;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user