Formatting fixes, updated version to 1.4.2

Author: incarnate

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.ewaypayments</groupId>
     <artifactId>eway-rapid-java</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <packaging>jar</packaging>
 
     <name>eWAY Rapid API Library</name>

src/main/java/com/eway/payment/rapid/sdk/message/convert/DirectPaymentToTransStatusConverter.java

@@ -16,14 +16,12 @@ public TransactionStatus doConvert(DirectPaymentResponse response) throws RapidS
         TransactionStatus status = new TransactionStatus();
         status.setBeagleScore(response.getBeagleScore() != null ? response.getBeagleScore() : 0.0);
         status.setCaptured(Boolean.parseBoolean(response.getTransactionCaptured()));
-        
-        if (response.getFraudAction() == null || response.getFraudAction().equalsIgnoreCase("0") || response.getFraudAction() == "")
-            {
-                status.setFraudAction(FraudAction.valueOf(FraudAction.NotChallenged.name()));
-            }
-            else {
-                status.setFraudAction(FraudAction.valueOf(response.getFraudAction()));
-            }
+
+        if (response.getFraudAction() == null || response.getFraudAction().equalsIgnoreCase("0") || response.getFraudAction().isEmpty()) {
+            status.setFraudAction(FraudAction.valueOf(FraudAction.NotChallenged.name()));
+        } else {
+            status.setFraudAction(FraudAction.valueOf(response.getFraudAction()));
+        }
 
         status.setProcessingDetails(getProcessingDetails(response));
 

src/main/java/com/eway/payment/rapid/sdk/message/convert/InternalTransactionToStatusConverter.java

@@ -25,20 +25,16 @@ public TransactionStatus doConvert(Transaction transaction) throws RapidSdkExcep
         transactionStatus.setCaptured(transaction.getTransactionCaptured());
 
         transactionStatus.setProcessingDetails(getProcessingDetails(transaction));
-        
-       try {
-                if (transaction.getFraudAction() == null || transaction.getFraudAction().equalsIgnoreCase("0")|| transaction.getFraudAction() == "")
-                {
-                    transactionStatus.setFraudAction(FraudAction.valueOf(FraudAction.NotChallenged.name()));
-                }
-                else{
 
-                    transactionStatus.setFraudAction(FraudAction.valueOf(transaction.getFraudAction()));
-                }
-
-            } catch (Exception e) {
-                throw new ParameterInvalidException("Invalid Transaction Fraud Action: " + transaction.getFraudAction());
-         }
+        try {
+            if (transaction.getFraudAction() == null || transaction.getFraudAction().equalsIgnoreCase("0") || transaction.getFraudAction().isEmpty()) {
+                transactionStatus.setFraudAction(FraudAction.valueOf(FraudAction.NotChallenged.name()));
+            } else {
+                transactionStatus.setFraudAction(FraudAction.valueOf(transaction.getFraudAction()));
+            }
+        } catch (Exception e) {
+            throw new ParameterInvalidException("Invalid Transaction Fraud Action: " + transaction.getFraudAction());
+        }
 
         if (!StringUtils.isBlank(transaction.getTransactionID())) {
             try {
@@ -73,13 +69,13 @@ private ProcessingDetails getProcessingDetails(Transaction response) {
 
     private BeagleVerifyStatus getBeagleVerification(String code) {
         if ("0".equalsIgnoreCase(code)) {
-                return BeagleVerifyStatus.NotVerified;
+            return BeagleVerifyStatus.NotVerified;
         } else if ("1".equalsIgnoreCase(code)) {
-                return BeagleVerifyStatus.Attempted;
+            return BeagleVerifyStatus.Attempted;
         } else if ("2".equalsIgnoreCase(code)) {
-                return BeagleVerifyStatus.Verified;
+            return BeagleVerifyStatus.Verified;
         } else if ("3".equalsIgnoreCase(code)) {
-                return BeagleVerifyStatus.Failed;
+            return BeagleVerifyStatus.Failed;
         }
         return null;
     }

src/main/java/com/eway/payment/rapid/sdk/message/convert/response/CancelAuthorisationToRefundConverter.java

@@ -25,7 +25,6 @@ public RefundResponse doConvert(CancelAuthorisationResponse cancel) throws Rapid
         TransactionStatus status = new TransactionStatus();
         status.setStatus(cancel.getTransactionStatus());
         ProcessingDetails detail = new ProcessingDetails();
-        detail.setResponseCode(cancel.getErrors());
         detail.setResponseCode(cancel.getResponseCode());
         status.setProcessingDetails(detail);
         status.setTransactionID(Integer.parseInt(cancel.getTransactionID()));

src/main/resources/rapid-api.properties

@@ -1,3 +1,3 @@
 global.rapid.rest.production.url = https://api.ewaypayments.com
 global.rapid.rest.sandbox.url = https://api.sandbox.ewaypayments.com
-rapid.sdk.user.agent = eWAY SDK Java 1.4.1
+rapid.sdk.user.agent = eWAY SDK Java 1.4.2