From 49aab18a355cbe9e016db16c0d4e9e222e30ee71 Mon Sep 17 00:00:00 2001 From: Kwok He Chu <105217051+Kwok-he-Chu@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:56:52 +0100 Subject: [PATCH] Remove my .NET habits --- .../java/com/adyen/ipp/api/InPersonPaymentsController.java | 6 +++--- .../main/java/com/adyen/ipp/service/PosAbortService.java | 2 +- .../main/java/com/adyen/ipp/service/PosPaymentService.java | 2 +- .../java/com/adyen/ipp/service/PosReversalService.java | 4 +--- .../com/adyen/ipp/service/PosTransactionStatusService.java | 7 +------ .../com/adyen/ipp/web/InPersonPaymentsWebController.java | 3 +-- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/in-person-payments-example/src/main/java/com/adyen/ipp/api/InPersonPaymentsController.java b/in-person-payments-example/src/main/java/com/adyen/ipp/api/InPersonPaymentsController.java index 2193c48..ba1d268 100644 --- a/in-person-payments-example/src/main/java/com/adyen/ipp/api/InPersonPaymentsController.java +++ b/in-person-payments-example/src/main/java/com/adyen/ipp/api/InPersonPaymentsController.java @@ -74,7 +74,7 @@ public ResponseEntity createPayment(@RequestBody CreatePa table.setPaymentStatus(PaymentStatus.PaymentInProgress); try { - var response = posPaymentService.sendPaymentRequestAsync(serviceId, poiId, saleId, request.getCurrency(), request.getAmount()); + var response = posPaymentService.sendPaymentRequest(serviceId, poiId, saleId, request.getCurrency(), request.getAmount()); if (response == null || response.getSaleToPOIResponse() == null || response.getSaleToPOIResponse().getPaymentResponse() == null) { table.setPaymentStatus(PaymentStatus.NotPaid); @@ -145,7 +145,7 @@ public ResponseEntity createReversal(@RequestBody Create } try { - var response = posReversalService.sendReversalRequestAsync(ReversalReasonType.MERCHANT_CANCEL, table.getPaymentStatusDetails().getSaleTransactionId(), table.getPaymentStatusDetails().getPoiTransactionId(), poiId, saleId); + var response = posReversalService.sendReversalRequest(ReversalReasonType.MERCHANT_CANCEL, table.getPaymentStatusDetails().getSaleTransactionId(), table.getPaymentStatusDetails().getPoiTransactionId(), poiId, saleId); if (response == null || response.getSaleToPOIResponse() == null || response.getSaleToPOIResponse().getReversalResponse() == null) { return ResponseEntity @@ -196,7 +196,7 @@ public ResponseEntity abort(@PathVariable String tableName) throws IOException, return ResponseEntity.notFound().build(); } - var abortResponse = posAbortService.sendAbortRequestAsync(table.getPaymentStatusDetails().getServiceId(), poiId, saleId); + var abortResponse = posAbortService.sendAbortRequest(table.getPaymentStatusDetails().getServiceId(), poiId, saleId); return ResponseEntity.ok().body(abortResponse); } catch (IOException | ApiException e) { diff --git a/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosAbortService.java b/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosAbortService.java index e6e8183..1e6f977 100644 --- a/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosAbortService.java +++ b/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosAbortService.java @@ -14,7 +14,7 @@ public class PosAbortService { @Autowired private TerminalCloudApiService terminalCloudAPIService; - public TerminalAPIResponse sendAbortRequestAsync(String serviceId, String poiId, String saleId) throws IOException, ApiException { + public TerminalAPIResponse sendAbortRequest(String serviceId, String poiId, String saleId) throws IOException, ApiException { TerminalAPIRequest request = getAbortRequest(serviceId, poiId, saleId); return terminalCloudAPIService.getTerminalCloudApi().sync(request); } diff --git a/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosPaymentService.java b/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosPaymentService.java index 487fa16..07c3670 100644 --- a/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosPaymentService.java +++ b/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosPaymentService.java @@ -25,7 +25,7 @@ public PosPaymentService() throws DatatypeConfigurationException { dataTypeFactory = DatatypeFactory.newInstance(); } - public TerminalAPIResponse sendPaymentRequestAsync(String serviceId, String poiId, String saleId, String currency, BigDecimal amount) throws IOException, ApiException { + public TerminalAPIResponse sendPaymentRequest(String serviceId, String poiId, String saleId, String currency, BigDecimal amount) throws IOException, ApiException { TerminalAPIRequest request = getPaymentRequest(serviceId, poiId, saleId, currency, amount); return terminalCloudAPIService.getTerminalCloudApi().sync(request); } diff --git a/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosReversalService.java b/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosReversalService.java index 743ec2c..a1480dc 100644 --- a/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosReversalService.java +++ b/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosReversalService.java @@ -11,9 +11,7 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import java.io.IOException; -import java.math.BigDecimal; import java.util.GregorianCalendar; -import java.util.UUID; @Service public class PosReversalService { @@ -26,7 +24,7 @@ public PosReversalService() throws DatatypeConfigurationException { dataTypeFactory = DatatypeFactory.newInstance(); } - public TerminalAPIResponse sendReversalRequestAsync(ReversalReasonType reversalReasonType, String saleTransactionId, String poiTransactionId, String poiId, String saleId) throws IOException, ApiException { + public TerminalAPIResponse sendReversalRequest(ReversalReasonType reversalReasonType, String saleTransactionId, String poiTransactionId, String poiId, String saleId) throws IOException, ApiException { TerminalAPIRequest request = getReversalRequest(reversalReasonType, saleTransactionId, poiTransactionId, poiId, saleId); return terminalCloudAPIService.getTerminalCloudApi().sync(request); } diff --git a/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosTransactionStatusService.java b/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosTransactionStatusService.java index ee799dc..b369617 100644 --- a/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosTransactionStatusService.java +++ b/in-person-payments-example/src/main/java/com/adyen/ipp/service/PosTransactionStatusService.java @@ -8,19 +8,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; import java.io.IOException; -import java.math.BigDecimal; -import java.util.GregorianCalendar; -import java.util.UUID; @Service public class PosTransactionStatusService { @Autowired private TerminalCloudApiService terminalCloudAPIService; - public TerminalAPIResponse sendTransactionStatusRequestAsync(String serviceId, String poiId, String saleId) throws IOException, ApiException { + public TerminalAPIResponse sendTransactionStatusRequest(String serviceId, String poiId, String saleId) throws IOException, ApiException { TerminalAPIRequest request = getTransactionStatusRequest(serviceId, poiId, saleId); return terminalCloudAPIService.getTerminalCloudApi().sync(request); } diff --git a/in-person-payments-example/src/main/java/com/adyen/ipp/web/InPersonPaymentsWebController.java b/in-person-payments-example/src/main/java/com/adyen/ipp/web/InPersonPaymentsWebController.java index 8c5a18b..5ce1c34 100644 --- a/in-person-payments-example/src/main/java/com/adyen/ipp/web/InPersonPaymentsWebController.java +++ b/in-person-payments-example/src/main/java/com/adyen/ipp/web/InPersonPaymentsWebController.java @@ -12,7 +12,6 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestParam; import java.io.IOException; @@ -60,7 +59,7 @@ public String transactionstatus(@PathVariable String tableName, Model model) thr return "transactionstatus"; } - var response = posTransactionStatusService.sendTransactionStatusRequestAsync(table.getPaymentStatusDetails().getServiceId(), applicationProperty.getPoiId(), applicationProperty.getSaleId()); + var response = posTransactionStatusService.sendTransactionStatusRequest(table.getPaymentStatusDetails().getServiceId(), applicationProperty.getPoiId(), applicationProperty.getSaleId()); if (response == null || response.getSaleToPOIResponse() == null ||