Merge pull request #11 from CyberSource/Bug-Fixes-17-Dec-Release

bug fixes

Author: gnongsie

src/main/java/Api/CaptureApi.java

@@ -22,7 +22,7 @@
 import Invokers.ProgressRequestBody;
 import Invokers.ProgressResponseBody;
 
-import com.cybersource.authsdk.core.MerchantConfig;
+
 import com.google.gson.reflect.TypeToken;
 
 import java.io.IOException;
@@ -61,14 +61,13 @@ public void setApiClient(ApiClient apiClient) {
     /**
      * Build call for capturePayment
      * @param capturePaymentRequest  (required)
-     * @param merchantConfig  (merchant details)
      * @param id The payment ID returned from a previous payment request. This ID links the capture to the payment.  (required)
      * @param progressListener Progress listener
      * @param progressRequestListener Progress request listener
      * @return Call to execute
      * @throws ApiException If fail to serialize the request body object
      */
-    public com.squareup.okhttp.Call capturePaymentCall(CapturePaymentRequest capturePaymentRequest,MerchantConfig merchantConfig, String id, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    public com.squareup.okhttp.Call capturePaymentCall(CapturePaymentRequest capturePaymentRequest, String id, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = capturePaymentRequest;
 
         // create path and map variables
@@ -88,7 +87,7 @@ public com.squareup.okhttp.Call capturePaymentCall(CapturePaymentRequest capture
         if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
         final String[] localVarContentTypes = {
-            "application/json"
+            "application/json;charset=utf-8"
         };
         final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
         localVarHeaderParams.put("Content-Type", localVarContentType);
@@ -106,11 +105,11 @@ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Ch
         }
 
         String[] localVarAuthNames = new String[] {  };
-        return apiClient.buildCall(localVarPath, "POST", merchantConfig, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
     @SuppressWarnings("rawtypes")
-    private com.squareup.okhttp.Call capturePaymentValidateBeforeCall(CapturePaymentRequest capturePaymentRequest,MerchantConfig merchantConfig, String id, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call capturePaymentValidateBeforeCall(CapturePaymentRequest capturePaymentRequest, String id, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
 
         // verify the required parameter 'capturePaymentRequest' is set
         if (capturePaymentRequest == null) {
@@ -123,7 +122,7 @@ private com.squareup.okhttp.Call capturePaymentValidateBeforeCall(CapturePayment
         }
 
 
-        com.squareup.okhttp.Call call = capturePaymentCall(capturePaymentRequest,merchantConfig, id, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = capturePaymentCall(capturePaymentRequest, id, progressListener, progressRequestListener);
         return call;
 
 
@@ -136,27 +135,25 @@ private com.squareup.okhttp.Call capturePaymentValidateBeforeCall(CapturePayment
      * Capture a Payment
      * Include the payment ID in the POST request to capture the payment amount.
      * @param capturePaymentRequest  (required)
-     * @param merchantConfig  (merchant details)
      * @param id The payment ID returned from a previous payment request. This ID links the capture to the payment.  (required)
      * @return PtsV2PaymentsCapturesPost201Response
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public PtsV2PaymentsCapturesPost201Response capturePayment(CapturePaymentRequest capturePaymentRequest,MerchantConfig merchantConfig, String id) throws ApiException {
-        ApiResponse<PtsV2PaymentsCapturesPost201Response> resp = capturePaymentWithHttpInfo(capturePaymentRequest,merchantConfig, id);
+    public PtsV2PaymentsCapturesPost201Response capturePayment(CapturePaymentRequest capturePaymentRequest, String id) throws ApiException {
+        ApiResponse<PtsV2PaymentsCapturesPost201Response> resp = capturePaymentWithHttpInfo(capturePaymentRequest, id);
         return resp.getData();
     }
 
     /**
      * Capture a Payment
      * Include the payment ID in the POST request to capture the payment amount.
      * @param capturePaymentRequest  (required)
-     * @param merchantConfig  (merchant details)
      * @param id The payment ID returned from a previous payment request. This ID links the capture to the payment.  (required)
      * @return ApiResponse&lt;PtsV2PaymentsCapturesPost201Response&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<PtsV2PaymentsCapturesPost201Response> capturePaymentWithHttpInfo(CapturePaymentRequest capturePaymentRequest,MerchantConfig merchantConfig, String id) throws ApiException {
-        com.squareup.okhttp.Call call = capturePaymentValidateBeforeCall(capturePaymentRequest,merchantConfig, id, null, null);
+    public ApiResponse<PtsV2PaymentsCapturesPost201Response> capturePaymentWithHttpInfo(CapturePaymentRequest capturePaymentRequest, String id) throws ApiException {
+        com.squareup.okhttp.Call call = capturePaymentValidateBeforeCall(capturePaymentRequest, id, null, null);
         Type localVarReturnType = new TypeToken<PtsV2PaymentsCapturesPost201Response>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -165,13 +162,12 @@ public ApiResponse<PtsV2PaymentsCapturesPost201Response> capturePaymentWithHttpI
      * Capture a Payment (asynchronously)
      * Include the payment ID in the POST request to capture the payment amount.
      * @param capturePaymentRequest  (required)
-     * @param merchantConfig  (merchant details)
      * @param id The payment ID returned from a previous payment request. This ID links the capture to the payment.  (required)
      * @param callback The callback to be executed when the API call finishes
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call capturePaymentAsync(CapturePaymentRequest capturePaymentRequest,MerchantConfig merchantConfig, String id, final ApiCallback<PtsV2PaymentsCapturesPost201Response> callback) throws ApiException {
+    public com.squareup.okhttp.Call capturePaymentAsync(CapturePaymentRequest capturePaymentRequest, String id, final ApiCallback<PtsV2PaymentsCapturesPost201Response> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -192,7 +188,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
             };
         }
 
-        com.squareup.okhttp.Call call = capturePaymentValidateBeforeCall(capturePaymentRequest,merchantConfig, id, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = capturePaymentValidateBeforeCall(capturePaymentRequest, id, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<PtsV2PaymentsCapturesPost201Response>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;

src/main/java/Api/CreditApi.java

@@ -22,7 +22,6 @@
 import Invokers.ProgressRequestBody;
 import Invokers.ProgressResponseBody;
 
-import com.cybersource.authsdk.core.MerchantConfig;
 import com.google.gson.reflect.TypeToken;
 
 import java.io.IOException;
@@ -61,13 +60,12 @@ public void setApiClient(ApiClient apiClient) {
     /**
      * Build call for createCredit
      * @param createCreditRequest  (required)
-     * @param merchantConfig  (merchant details)
      * @param progressListener Progress listener
      * @param progressRequestListener Progress request listener
      * @return Call to execute
      * @throws ApiException If fail to serialize the request body object
      */
-    public com.squareup.okhttp.Call createCreditCall(CreateCreditRequest createCreditRequest,MerchantConfig merchantConfig, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    public com.squareup.okhttp.Call createCreditCall(CreateCreditRequest createCreditRequest, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = createCreditRequest;
 
         // create path and map variables
@@ -86,7 +84,7 @@ public com.squareup.okhttp.Call createCreditCall(CreateCreditRequest createCredi
         if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
 
         final String[] localVarContentTypes = {
-            "application/json"
+            "application/json;charset=utf-8"
         };
         final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
         localVarHeaderParams.put("Content-Type", localVarContentType);
@@ -104,19 +102,19 @@ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Ch
         }
 
         String[] localVarAuthNames = new String[] {  };
-        return apiClient.buildCall(localVarPath, "POST", merchantConfig, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
     }
 
     @SuppressWarnings("rawtypes")
-    private com.squareup.okhttp.Call createCreditValidateBeforeCall(CreateCreditRequest createCreditRequest,MerchantConfig merchantConfig, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call createCreditValidateBeforeCall(CreateCreditRequest createCreditRequest, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
 
         // verify the required parameter 'createCreditRequest' is set
         if (createCreditRequest == null) {
             throw new ApiException("Missing the required parameter 'createCreditRequest' when calling createCredit(Async)");
         }
 
 
-        com.squareup.okhttp.Call call = createCreditCall(createCreditRequest,merchantConfig, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = createCreditCall(createCreditRequest, progressListener, progressRequestListener);
         return call;
 
 
@@ -129,25 +127,23 @@ private com.squareup.okhttp.Call createCreditValidateBeforeCall(CreateCreditRequ
      * Process a Credit
      * POST to the credit resource to credit funds to a specified credit card.
      * @param createCreditRequest  (required)
-     *@param merchantConfig  (merchant details)
      * @return PtsV2CreditsPost201Response
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public PtsV2CreditsPost201Response createCredit(CreateCreditRequest createCreditRequest,MerchantConfig merchantConfig) throws ApiException {
-        ApiResponse<PtsV2CreditsPost201Response> resp = createCreditWithHttpInfo(createCreditRequest,merchantConfig);
+    public PtsV2CreditsPost201Response createCredit(CreateCreditRequest createCreditRequest) throws ApiException {
+        ApiResponse<PtsV2CreditsPost201Response> resp = createCreditWithHttpInfo(createCreditRequest);
         return resp.getData();
     }
 
     /**
      * Process a Credit
      * POST to the credit resource to credit funds to a specified credit card.
      * @param createCreditRequest  (required)
-     * @param merchantConfig  (merchant details)
      * @return ApiResponse&lt;PtsV2CreditsPost201Response&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<PtsV2CreditsPost201Response> createCreditWithHttpInfo(CreateCreditRequest createCreditRequest,MerchantConfig merchantConfig) throws ApiException {
-        com.squareup.okhttp.Call call = createCreditValidateBeforeCall(createCreditRequest,merchantConfig, null, null);
+    public ApiResponse<PtsV2CreditsPost201Response> createCreditWithHttpInfo(CreateCreditRequest createCreditRequest) throws ApiException {
+        com.squareup.okhttp.Call call = createCreditValidateBeforeCall(createCreditRequest, null, null);
         Type localVarReturnType = new TypeToken<PtsV2CreditsPost201Response>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -156,12 +152,11 @@ public ApiResponse<PtsV2CreditsPost201Response> createCreditWithHttpInfo(CreateC
      * Process a Credit (asynchronously)
      * POST to the credit resource to credit funds to a specified credit card.
      * @param createCreditRequest  (required)
-     * @param merchantConfig  (merchant details)
      * @param callback The callback to be executed when the API call finishes
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call createCreditAsync(CreateCreditRequest createCreditRequest,MerchantConfig merchantConfig, final ApiCallback<PtsV2CreditsPost201Response> callback) throws ApiException {
+    public com.squareup.okhttp.Call createCreditAsync(CreateCreditRequest createCreditRequest, final ApiCallback<PtsV2CreditsPost201Response> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -182,7 +177,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
             };
         }
 
-        com.squareup.okhttp.Call call = createCreditValidateBeforeCall(createCreditRequest,merchantConfig, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = createCreditValidateBeforeCall(createCreditRequest, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<PtsV2CreditsPost201Response>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;