From 531fc37c98a5960f2d5420fae6e439ada3d5d866 Mon Sep 17 00:00:00 2001 From: Tess Stoddard Date: Mon, 5 Jan 2026 15:13:24 -0700 Subject: [PATCH] fix: a couple p2p transfer fixes to match spec --- .../accessor/p2p_transfer/P2PTransferBaseAccessor.java | 6 +++--- .../p2p_transfer/RecurringP2PTransferBaseAccessor.java | 6 +++--- .../web/controller/P2PTransferDurationsController.java | 2 +- .../web/controller/P2PTransferFrequenciesController.java | 2 +- .../model/mdx/web/controller/P2PTransfersController.java | 6 +++--- .../web/controller/RecurringP2PTransfersController.java | 6 +++--- .../mdx/web/controller/P2PTransfersControllerTest.groovy | 8 ++++---- .../controller/RecurringP2PTransfersControllerTest.groovy | 8 ++++---- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/P2PTransferBaseAccessor.java b/mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/P2PTransferBaseAccessor.java index e72dd1e7..ff391d0e 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/P2PTransferBaseAccessor.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/P2PTransferBaseAccessor.java @@ -47,14 +47,14 @@ public AccessorResponse create(P2PTransfer p2pTransfer) { } /** - * Delete a P2P transfer + * Cancel a P2P transfer * * @param id * @return */ @GatewayAPI - @API(description = "Delete a P2P transfer") - public AccessorResponse delete(String id) { + @API(description = "Cancel a P2P transfer") + public AccessorResponse cancel(String id) { throw new AccessorMethodNotImplementedException(); } diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/RecurringP2PTransferBaseAccessor.java b/mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/RecurringP2PTransferBaseAccessor.java index 4f79a64f..6ebaee61 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/RecurringP2PTransferBaseAccessor.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/accessor/p2p_transfer/RecurringP2PTransferBaseAccessor.java @@ -42,14 +42,14 @@ public AccessorResponse 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 delete(String id) { + @API(description = "Cancel a recurring P2P transfer") + public AccessorResponse cancel(String id) { throw new AccessorMethodNotImplementedException(); } diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransferDurationsController.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransferDurationsController.java index b755c3f2..78a48a32 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransferDurationsController.java +++ b/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> list() { AccessorResponse> response = gateway().p2pTransfers().recurring().durations().list(); return new ResponseEntity<>(response.getResult().wrapped(), createMultiMapForResponse(response.getHeaders()), HttpStatus.OK); diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransferFrequenciesController.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransferFrequenciesController.java index cb9df6e1..78cfbf1a 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransferFrequenciesController.java +++ b/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> list() { AccessorResponse> response = gateway().p2pTransfers().recurring().frequencies().list(); return new ResponseEntity<>(response.getResult().wrapped(), createMultiMapForResponse(response.getHeaders()), HttpStatus.OK); diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransfersController.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransfersController.java index 1a6b754a..2861377d 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransfersController.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/P2PTransfersController.java @@ -21,9 +21,9 @@ public final ResponseEntity 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 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 response = gateway().p2pTransfers().cancel(p2pTransferId); return new ResponseEntity<>(createMultiMapForResponse(response.getHeaders()), HttpStatus.NO_CONTENT); } diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/RecurringP2PTransfersController.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/RecurringP2PTransfersController.java index a2692463..fe1df3d1 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/RecurringP2PTransfersController.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/RecurringP2PTransfersController.java @@ -21,9 +21,9 @@ public final ResponseEntity 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 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 response = gateway().p2pTransfers().recurring().cancel(p2pTransferId); return new ResponseEntity<>(createMultiMapForResponse(response.getHeaders()), HttpStatus.NO_CONTENT); } diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/P2PTransfersControllerTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/P2PTransfersControllerTest.groovy index ba8e4cdb..915ae9b2 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/P2PTransfersControllerTest.groovy +++ b/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()).when(p2pTransferGateway).delete(id) + doReturn(new AccessorResponse()).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"() { diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/RecurringP2PTransfersControllerTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/RecurringP2PTransfersControllerTest.groovy index d4b29539..8755f307 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/RecurringP2PTransfersControllerTest.groovy +++ b/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()).when(recurringP2PTransferGateway).delete(id) + doReturn(new AccessorResponse()).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"() {