fix: a couple p2p transfer fixes to match spec

Author: Tess Stoddard

mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/P2PTransferBaseAccessor.java

@@ -47,14 +47,14 @@ public AccessorResponse<P2PTransfer> create(P2PTransfer p2pTransfer) {
   }
 
   /**
-   * Delete a P2P transfer
+   * Cancel a P2P transfer
    *
    * @param id
    * @return
    */
   @GatewayAPI
-  @API(description = "Delete a P2P transfer")
-  public AccessorResponse<Void> delete(String id) {
+  @API(description = "Cancel a P2P transfer")
+  public AccessorResponse<Void> cancel(String id) {
     throw new AccessorMethodNotImplementedException();
   }
 

mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/RecurringP2PTransferBaseAccessor.java

@@ -42,14 +42,14 @@ public AccessorResponse<RecurringP2PTransfer> create(RecurringP2PTransfer p2pTra
   }
 
   /**
-   * Delete a recurring P2P transfer
+   * Cancel a recurring P2P transfer
    *
    * @param id
    * @return
    */
   @GatewayAPI
-  @API(description = "Delete a recurring P2P transfer")
-  public AccessorResponse<Void> delete(String id) {
+  @API(description = "Cancel a recurring P2P transfer")
+  public AccessorResponse<Void> cancel(String id) {
     throw new AccessorMethodNotImplementedException();
   }
 

mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransferDurationsController.java

@@ -13,7 +13,7 @@
 @RestController
 @RequestMapping(value = "{clientId}", produces = BaseController.MDX_MEDIA)
 public class P2PTransferDurationsController extends BaseController {
-  @RequestMapping(value = "/users/{userId}/recurring_p2p_transfers/durations", method = RequestMethod.GET)
+  @RequestMapping(value = "/recurring_p2p_transfers/durations", method = RequestMethod.GET)
   public final ResponseEntity<MdxList<Duration>> list() {
     AccessorResponse<MdxList<Duration>> response = gateway().p2pTransfers().recurring().durations().list();
     return new ResponseEntity<>(response.getResult().wrapped(), createMultiMapForResponse(response.getHeaders()), HttpStatus.OK);

mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransferFrequenciesController.java

@@ -13,7 +13,7 @@
 @RestController
 @RequestMapping(value = "{clientId}", produces = BaseController.MDX_MEDIA)
 public class P2PTransferFrequenciesController extends BaseController {
-  @RequestMapping(value = "/users/{userId}/recurring_p2p_transfers/frequencies", method = RequestMethod.GET)
+  @RequestMapping(value = "/recurring_p2p_transfers/frequencies", method = RequestMethod.GET)
   public final ResponseEntity<MdxList<Frequency>> list() {
     AccessorResponse<MdxList<Frequency>> response = gateway().p2pTransfers().recurring().frequencies().list();
     return new ResponseEntity<>(response.getResult().wrapped(), createMultiMapForResponse(response.getHeaders()), HttpStatus.OK);

mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransfersController.java

@@ -21,9 +21,9 @@ public final ResponseEntity<P2PTransfer> create(@RequestBody P2PTransfer p2pTran
     return new ResponseEntity<>(response.getResult().wrapped(), createMultiMapForResponse(response.getHeaders()), HttpStatus.OK);
   }
 
-  @RequestMapping(value = "/users/{userId}/p2p_transfers/{id}", method = RequestMethod.DELETE)
-  public final ResponseEntity<?> delete(@PathVariable("id") String p2pTransferId) {
-    AccessorResponse<Void> response = gateway().p2pTransfers().delete(p2pTransferId);
+  @RequestMapping(value = "/users/{userId}/p2p_transfers/{id}/cancel", method = RequestMethod.PUT)
+  public final ResponseEntity<?> cancel(@PathVariable("id") String p2pTransferId) {
+    AccessorResponse<Void> response = gateway().p2pTransfers().cancel(p2pTransferId);
     return new ResponseEntity<>(createMultiMapForResponse(response.getHeaders()), HttpStatus.NO_CONTENT);
   }
 

mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/RecurringP2PTransfersController.java

@@ -21,9 +21,9 @@ public final ResponseEntity<RecurringP2PTransfer> create(@RequestBody RecurringP
     return new ResponseEntity<>(response.getResult().wrapped(), createMultiMapForResponse(response.getHeaders()), HttpStatus.OK);
   }
 
-  @RequestMapping(value = "/users/{userId}/recurring_p2p_transfers/{id}", method = RequestMethod.DELETE)
-  public final ResponseEntity<?> delete(@PathVariable("id") String p2pTransferId) {
-    AccessorResponse<Void> response = gateway().p2pTransfers().recurring().delete(p2pTransferId);
+  @RequestMapping(value = "/users/{userId}/recurring_p2p_transfers/{id}/cancel", method = RequestMethod.PUT)
+  public final ResponseEntity<?> cancel(@PathVariable("id") String p2pTransferId) {
+    AccessorResponse<Void> response = gateway().p2pTransfers().recurring().cancel(p2pTransferId);
     return new ResponseEntity<>(createMultiMapForResponse(response.getHeaders()), HttpStatus.NO_CONTENT);
   }
 

mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/P2PTransfersControllerTest.groovy

@@ -45,18 +45,18 @@ class P2PTransfersControllerTest extends Specification {
     verify(p2pTransferGateway).create(p2pTransfer) || true
   }
 
-  def "delete interacts with gateway"() {
+  def "cancel interacts with gateway"() {
     given:
     BaseController.setGateway(gateway)
     def id = "transfer-1234"
-    doReturn(new AccessorResponse<Void>()).when(p2pTransferGateway).delete(id)
+    doReturn(new AccessorResponse<Void>()).when(p2pTransferGateway).cancel(id)
 
     when:
-    def result = subject.delete(id)
+    def result = subject.cancel(id)
 
     then:
     HttpStatus.NO_CONTENT == result.statusCode
-    verify(p2pTransferGateway).delete(id) || true
+    verify(p2pTransferGateway).cancel(id) || true
   }
 
   def "get interacts with gateway"() {

mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/RecurringP2PTransfersControllerTest.groovy

@@ -51,18 +51,18 @@ class RecurringP2PTransfersControllerTest extends Specification {
     verify(recurringP2PTransferGateway).create(p2pTransfer) || true
   }
 
-  def "delete interacts with gateway"() {
+  def "cancel interacts with gateway"() {
     given:
     BaseController.setGateway(gateway)
     def id = "transfer-1234"
-    doReturn(new AccessorResponse<Void>()).when(recurringP2PTransferGateway).delete(id)
+    doReturn(new AccessorResponse<Void>()).when(recurringP2PTransferGateway).cancel(id)
 
     when:
-    def result = subject.delete(id)
+    def result = subject.cancel(id)
 
     then:
     HttpStatus.NO_CONTENT == result.statusCode
-    verify(recurringP2PTransferGateway).delete(id) || true
+    verify(recurringP2PTransferGateway).cancel(id) || true
   }
 
   def "get interacts with gateway"() {