CS-2170: Renamed response and types

Author: kc-sabal

src/main/java/co/dapi/ACH.java

@@ -1,7 +1,7 @@
 package co.dapi;
 
-import co.dapi.response.CreatePullResponse;
-import co.dapi.response.GetPullResponse;
+import co.dapi.response.CreateACHPullResponse;
+import co.dapi.response.GetACHPullResponse;
 import co.dapi.types.UserInput;
 import com.google.gson.JsonSyntaxException;
 
@@ -17,7 +17,7 @@ public ACH(Config config) {
         this.config = config;
     }
 
-    public CreatePullResponse createPull(PullTransfer transfer, String accessToken, String userSecret, String operationID, UserInput[] userInputs) throws IOException {
+    public CreateACHPullResponse createPull(PullTransfer transfer, String accessToken, String userSecret, String operationID, UserInput[] userInputs) throws IOException {
 
         // Create the request body of this call
         CreatePullRequest bodyObj = new CreatePullRequest(transfer, this.config.getAppSecret(), userSecret,
@@ -35,9 +35,9 @@ public CreatePullResponse createPull(PullTransfer transfer, String accessToken,
 
 
         // Convert the got response to the wanted response type
-        CreatePullResponse resp = null;
+        CreateACHPullResponse resp = null;
         try {
-            resp = DapiRequest.jsonAgent.fromJson(respJson, CreatePullResponse.class);
+            resp = DapiRequest.jsonAgent.fromJson(respJson, CreateACHPullResponse.class);
         } catch (JsonSyntaxException e) {
             // Empty catch, cause the handling code is below
         }
@@ -46,13 +46,13 @@ public CreatePullResponse createPull(PullTransfer transfer, String accessToken,
         if (resp == null || (resp.getStatus() == null && !resp.getType().isPresent())) {
             // If the got response wasn't a JSON string, resp will be null, and if
             // it didn't have the 'status' field, getStatus() will return null.
-            return new CreatePullResponse("UNEXPECTED_RESPONSE", "Unexpected response body");
+            return new CreateACHPullResponse("UNEXPECTED_RESPONSE", "Unexpected response body");
         }
 
         return resp;
     }
 
-    public GetPullResponse getPull(String accessToken, String userSecret, String operationID, UserInput[] userInputs) throws IOException {
+    public GetACHPullResponse getPull(String accessToken, String userSecret, String operationID, UserInput[] userInputs) throws IOException {
 
         // Create the request body of this call
         GetPullRequest bodyObj = new GetPullRequest(this.config.getAppSecret(), userSecret, operationID, userInputs);
@@ -68,9 +68,9 @@ public GetPullResponse getPull(String accessToken, String userSecret, String ope
         String respJson = DapiRequest.Do(bodyJson, DapiRequest.Dapi_URL + "/v2" + bodyObj.action, headers);
 
         // Convert the got response to the wanted response type
-        GetPullResponse resp = null;
+        GetACHPullResponse resp = null;
         try {
-            resp = DapiRequest.jsonAgent.fromJson(respJson, GetPullResponse.class);
+            resp = DapiRequest.jsonAgent.fromJson(respJson, GetACHPullResponse.class);
         } catch (JsonSyntaxException e) {
             // Empty catch, cause the handling code is below
         }
@@ -79,7 +79,7 @@ public GetPullResponse getPull(String accessToken, String userSecret, String ope
         if (resp == null || (resp.getStatus() == null && !resp.getType().isPresent())) {
             // If the got response wasn't a JSON string, resp will be null, and if
             // it didn't have the 'status' field, getStatus() will return null.
-            return new GetPullResponse("UNEXPECTED_RESPONSE", "Unexpected response body");
+            return new GetACHPullResponse("UNEXPECTED_RESPONSE", "Unexpected response body");
         }
 
         return resp;

src/main/java/co/dapi/DapiApp.java

@@ -308,10 +308,10 @@ public GetAccountsMetadataResponse getAccountsMetadata(String accessToken, Strin
      * @param userSecret  retrieved from the user login.
      * @param operationID retrieved from the previous call's response.
      * @param userInputs  built from the previous call's response, and the required user input.
-     * @return an {@link CreatePullResponse}.
+     * @return an {@link CreateACHPullResponse}.
      * @throws IOException in case of trouble happened while executing the request or reading the response.
      */
-    public CreatePullResponse createACHPull(ACH.PullTransfer transfer, String accessToken, String userSecret, String operationID, UserInput[] userInputs) throws IOException {
+    public CreateACHPullResponse createACHPull(ACH.PullTransfer transfer, String accessToken, String userSecret, String operationID, UserInput[] userInputs) throws IOException {
         return this.ach.createPull(transfer, accessToken, userSecret, operationID, userInputs);
     }
 
@@ -323,10 +323,10 @@ public CreatePullResponse createACHPull(ACH.PullTransfer transfer, String access
      * @param userSecret  retrieved from the user login.
      * @param operationID OperationID of the createACHPull request
      * @param userInputs  built from the previous call's response, and the required user input.
-     * @return an {@link GetPullResponse}.
+     * @return an {@link GetACHPullResponse}.
      * @throws IOException in case of trouble happened while executing the request or reading the response.
      */
-    public GetPullResponse getACHPull(String accessToken, String userSecret, String operationID, UserInput[] userInputs) throws IOException {
+    public GetACHPullResponse getACHPull(String accessToken, String userSecret, String operationID, UserInput[] userInputs) throws IOException {
         return this.ach.getPull(accessToken, userSecret, operationID, userInputs);
     }
 

src/main/java/co/dapi/response/CreateACHPullResponse.java

@@ -0,0 +1,11 @@
+package co.dapi.response;
+
+public class CreateACHPullResponse extends BaseResponse {
+    CreateACHPullResponse() {
+        super();
+    }
+
+    public CreateACHPullResponse(String errType, String errMsg) {
+        super(errType, errMsg);
+    }
+}

src/main/java/co/dapi/response/CreatePullResponse.java

@@ -0,0 +1,21 @@
+package co.dapi.response;
+
+import co.dapi.types.ACHPullTransferInfo;
+
+import java.util.Optional;
+
+public class GetACHPullResponse extends BaseResponse {
+    private ACHPullTransferInfo transfer;
+
+    GetACHPullResponse() {
+        super();
+    }
+
+    public GetACHPullResponse(String errType, String errMsg) {
+        super(errType, errMsg);
+    }
+
+    public Optional<ACHPullTransferInfo> getTransfer() {
+        return Optional.ofNullable(transfer);
+    }
+}

src/main/java/co/dapi/response/GetACHPullResponse.java

@@ -1,11 +1,11 @@
 package co.dapi.types;
 
-public class PullTransfer {
+public class ACHPullTransferInfo {
     private final Float amount;
     private final String status;
     private final Currency currency;
 
-    public PullTransfer(Float amount, String status, Currency currency) {
+    public ACHPullTransferInfo(Float amount, String status, Currency currency) {
         this.amount = amount;
         this.status = status;
         this.currency = currency;