Merge pull request #80 from paypay/PP-58998

PP-58998 - Updated pending payment refund api

Author: javidlulu

src/main/java/jp/ne/paypay/api/PendingPaymentApi.java

@@ -151,53 +151,7 @@ private Call cancelPendingOrderValidateBeforeCall(String merchantPaymentId) thro
      */
     public RefundDetails refundPayment(Refund refund) throws ApiException {
         ApiUtil.validateObject(validator, refund);
-        ApiResponse<RefundDetails> resp = refundPaymentWithHttpInfo(refund);
-        return resp.getData();
-    }
-
-    /**
-     * Refund a payment
-     *
-     * @param refund Refund
-     * @return ApiResponse&lt;PaymentDetails&gt;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     */
-    protected ApiResponse<RefundDetails> refundPaymentWithHttpInfo(Refund refund) throws ApiException {
-        Call call = refundPaymentCall(refund);
-        Type localVarReturnType = new TypeToken<RefundDetails>() {
-        }.getType();
-        return apiClient.execute(call, localVarReturnType, ApiNameConstants.REFUND_REQUEST_ORDER);
-    }
-
-    /**
-     * Build call for refundPayment
-     *
-     * @param refund Refund
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request payment object
-     */
-    private Call refundPaymentCall(Refund refund) throws ApiException {
-
-        String localVarPath = "/v1/requestOrder/refunds";
-        List<Pair> localVarQueryParams = new ArrayList<>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<>();
-        Map<String, String> localVarHeaderParams = new HashMap<>();
-        Map<String, Object> localVarFormParams = new HashMap<>();
-
-        final String[] localVarAccepts = {
-                ApiConstants.APPLICATION_JSON
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put(ApiConstants.ACCEPT, localVarAccept);
-
-        final String[] localVarContentTypes = {
-
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put(ApiConstants.CONTENT_TYPE, localVarContentType);
-        String[] localVarAuthNames = new String[]{ApiConstants.HMAC_AUTH};
-        apiClient.setReadTimeout(30);
-        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, refund, localVarHeaderParams, localVarFormParams, localVarAuthNames);
+        return paymentApi.refundPayment(refund);
     }
 
     /**

src/test/java/jp/ne/paypay/api/ApiClientTest.java

@@ -190,6 +190,11 @@ public void deserializeTest() throws ApiException {
         result = apiClient.deserialize(null, localVarReturnType);
         Assert.assertNull(result);
 
+        builder.header("content-disposition","filename=test.json");
+        response=builder.build();
+        result = apiClient.deserialize(response, localVarReturnType);
+        Assert.assertNotNull(result);
+        Assert.assertTrue(result.toString().endsWith(".json"));
     }
 
     @Test
@@ -245,8 +250,12 @@ public void handleResponseTest() throws ApiException, IOException {
         builder.body(ResponseBody.create(MediaType.parse("application/json"), json.serialize(notDataResponse)));
         response = builder.build();
         responseParameters.setResponse(response).setReturnType(localVarReturnType).setApiName("v2_createPayment");
-        Assert.assertThrows(ApiException.class, ()->apiClient.handleResponse(responseParameters));
-
+        try{
+            apiClient.handleResponse(responseParameters);
+        }catch(ApiException e){
+            Assert.assertEquals(e.getResolveUrl(),"https://developer.paypay.ne.jp/develop/resolve?api_name=v2_createPayment&code=UNAUTHORIZED&code_id=802001");
+            Assert.assertTrue(e.getResponseBody().contains("UNAUTHORIZED"));
+        }
     }
 
     @Test

src/test/java/jp/ne/paypay/api/PendingPaymentApiTest.java

@@ -160,7 +160,7 @@ public void refundPaymentTest() throws ApiException {
         refund.setStatus(RefundState.StatusEnum.CREATED);
         refundDetails.setData(refund);
         ApiResponse<RefundDetails> paymentDetailsApiResponse = new ApiResponse<>(00001, null, refundDetails);
-        Mockito.when(api.refundPaymentWithHttpInfo(refund)).thenReturn(paymentDetailsApiResponse);
+        Mockito.when(paymentApi.refundPaymentWithHttpInfo(refund)).thenReturn(paymentDetailsApiResponse);
         Assert.assertNotNull(refund.toString());
         RefundDetails response = api.refundPayment(refund);
         Assert.assertNotNull(response.toString());