BuildBody() refactored

guangling.zgl · guangling.zgl · commit fddb9725a41d · 2020-11-11T14:52:47.000+08:00
diff --git a/ams-dotnet/src/com/alipay/ams/api/DefaultAlipayClient.cs b/ams-dotnet/src/com/alipay/ams/api/DefaultAlipayClient.cs
@@ -44,7 +44,6 @@ public  TAMSResponse Execute<TAMSResponse>(request.AMSRequest<TAMSResponse> requ
                 requestMessage.Headers.Add(header.Key, header.Value);
             }
 
-            Console.WriteLine("Request --> " + body);
             requestMessage.Content = new ByteArrayContent(Encoding.UTF8.GetBytes(body));
             requestMessage.Content.Headers.Add("Content-Type", "application/json; charset=UTF-8");
 
diff --git a/ams-dotnet/src/com/alipay/ams/api/entities/PaymentMethod.cs b/ams-dotnet/src/com/alipay/ams/api/entities/PaymentMethod.cs
@@ -7,6 +7,11 @@ namespace com.alipay.ams.api.entities
 {
     public class PaymentMethod
     {
+        public PaymentMethod(String paymentMethodType)
+        {
+            this.PaymentMethodType = paymentMethodType;
+        }
+
         [JsonPropertyNameAttribute("paymentMethodType")]
         public String PaymentMethodType { get; set; }
         [JsonPropertyNameAttribute("paymentMethodId")]
diff --git a/ams-dotnet/src/com/alipay/ams/api/entities/WalletPaymentMethodType.cs b/ams-dotnet/src/com/alipay/ams/api/entities/WalletPaymentMethodType.cs
@@ -0,0 +1,25 @@
+﻿namespace com.alipay.ams.api.entities
+{
+    public enum WalletPaymentMethodType
+    {
+        TRUEMONEY,
+
+        ALIPAY_HK,
+
+        TNG,
+
+        ALIPAY_CN,
+
+        GCASH,
+
+        DANA,
+
+        KAKAOPAY,
+
+        BKASH,
+
+        EASYPAISA,
+
+        CONNECT_WALLET
+    }
+}
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/AMSRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/AMSRequest.cs
@@ -1,16 +1,33 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using com.alipay.ams.api.response;
 using com.alipay.ams.util;
 
 namespace com.alipay.ams.api.request
 {
     public abstract class AMSRequest<TAMSResponse>
-        where TAMSResponse:AMSResponse
+        where TAMSResponse : AMSResponse
     {
+        protected JsonSerializerOptions options = new JsonSerializerOptions
+        {
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            IgnoreNullValues = true,
+            WriteIndented = true
+        };
+
+        public AMSRequest() {
+            options.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase));
+        }
+
         public abstract string GetRequestURI();
 
-        public abstract String BuildBody();
+        public virtual String BuildBody()
+        {
+            validate();
+            return JsonSerializer.Serialize(this, this.GetType(), options);
+        }
 
         public abstract void validate();
 
@@ -46,6 +63,12 @@ public Dictionary<string, string> BuildRequestHeader(string clientId, string age
         protected Dictionary<string, string> GetExtraHeaders() {
             return null;
         }
+
+
+        public override string ToString()
+        {
+            return JsonSerializer.Serialize(this, this.GetType(), options);
+        }
     }
 
     
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/CommonPaymentRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/CommonPaymentRequest.cs
@@ -9,9 +9,8 @@ namespace com.alipay.ams.api.request
 {
     public class CommonPaymentRequest : AMSRequest<CommonPaymentResponse>
     {
-
         [JsonPropertyNameAttribute("productCode")]
-        public string ProductCodeType { get; set; }
+        public ProductCodeType ProductCodeType { get; set; }
 
         [JsonPropertyNameAttribute("paymentRequestId")]
         public string PaymentRequestId { get; set; }
@@ -61,15 +60,6 @@ public class CommonPaymentRequest : AMSRequest<CommonPaymentResponse>
         [JsonPropertyNameAttribute("creditPayPlan")]
         public CreditPayPlan CreditPayPlan { get; set; }
 
-
-
-        public override string BuildBody()
-        {
-
-            validate();
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/payments/pay";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/PaymentCancelRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/PaymentCancelRequest.cs
@@ -13,15 +13,6 @@ public class PaymentCancelRequest : AMSRequest<PaymentCancelResponse>
         [JsonPropertyNameAttribute("paymentRequestId")]
         public string PaymentRequestId { get; set; }
 
-
-        public override string BuildBody()
-        {
-
-            validate();
-
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/payments/cancel";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/PaymentCreateRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/PaymentCreateRequest.cs
@@ -28,15 +28,6 @@ public class PaymentCreateRequest : AMSRequest<PaymentCreateResponse>
         [JsonPropertyNameAttribute("paymentNotifyUrl")]
         public string PaymentNotifyUrl { get; set; }
 
-
-
-        public override string BuildBody()
-        {
-
-            validate();
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/payments/create";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/PaymentInquiryRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/PaymentInquiryRequest.cs
@@ -13,15 +13,6 @@ public class PaymentInquiryRequest : AMSRequest<PaymentInquiryResponse>
         [JsonPropertyNameAttribute("paymentRequestId")]
         public string PaymentRequestId { get; set; }
 
-
-        public override string BuildBody()
-        {
-
-            validate();
-
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/payments/inquiryPayment";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/PaymentRefundRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/PaymentRefundRequest.cs
@@ -30,17 +30,6 @@ public class PaymentRefundRequest : AMSRequest<PaymentRefundResponse>
         [JsonPropertyNameAttribute("isAsyncRefund")]
         public bool IsAsyncRefund { get; set; }
 
-
-
-
-        public override string BuildBody()
-        {
-
-            validate();
-
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/payments/refund";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/auth/AlipayAuthApplyTokenRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/auth/AlipayAuthApplyTokenRequest.cs
@@ -23,12 +23,6 @@ public class AlipayAuthApplyTokenRequest : AMSRequest<AlipayAuthApplyTokenRespon
         [JsonPropertyNameAttribute("refreshToken")]
         public String RefreshToken { get; set; }
 
-        public override string BuildBody()
-        {
-            validate();
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/authorizations/applyToken";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/auth/AlipayAuthConsultRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/auth/AlipayAuthConsultRequest.cs
@@ -36,14 +36,6 @@ public class AlipayAuthConsultRequest : AMSRequest<AlipayAuthConsultResponse>
         [JsonPropertyNameAttribute("osVersion")]
         public String OsVersion { get; set; }
 
-
-        public override string BuildBody()
-        {
-            validate();
-            return JsonSerializer.Serialize(this);
-
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/authorizations/consult";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/auth/AlipayAuthRevokeTokenRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/auth/AlipayAuthRevokeTokenRequest.cs
@@ -14,12 +14,6 @@ public class AlipayAuthRevokeTokenRequest : AMSRequest<AlipayAuthRevokeTokenResp
         [JsonPropertyNameAttribute("accessToken")]
         public String AccessToken { get; set; }
 
-        public override string BuildBody()
-        {
-            validate();
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/authorizations/revoke";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/users/AlipayInitAuthenticationRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/users/AlipayInitAuthenticationRequest.cs
@@ -24,13 +24,6 @@ public class AlipayInitAuthenticationRequest : AMSRequest<AlipayInitAuthenticati
         [JsonPropertyNameAttribute("userIdentityValue")]
         public String UserIdentityValue { get; set; }
 
-
-        public override string BuildBody()
-        {
-            validate();
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/users/initAuthentication";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/users/AlipayUserQueryInfoRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/users/AlipayUserQueryInfoRequest.cs
@@ -11,12 +11,6 @@ public class AlipayUserQueryInfoRequest : AMSRequest<AlipayUserQueryInfoResponse
         [JsonPropertyNameAttribute("accessToken")]
         public String AccessToken { get; set; }
 
-        public override string BuildBody()
-        {
-            validate();
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/users/inquiryUserInfo";
diff --git a/ams-dotnet/src/com/alipay/ams/api/request/users/AlipayVerifyAuthenticationRequest.cs b/ams-dotnet/src/com/alipay/ams/api/request/users/AlipayVerifyAuthenticationRequest.cs
@@ -18,12 +18,6 @@ public class AlipayVerifyAuthenticationRequest : AMSRequest<AlipayVerifyAuthenti
         [JsonPropertyNameAttribute("authenticationType")]
         public String AuthenticationValue { get; set; }
 
-        public override string BuildBody()
-        {
-            validate();
-            return JsonSerializer.Serialize(this);
-        }
-
         public override string GetRequestURI()
         {
             return "/ams/api/v1/users/verifyAuthentication";
diff --git a/ams-dotnet/src/com/alipay/ams/api/response/AMSResponse.cs b/ams-dotnet/src/com/alipay/ams/api/response/AMSResponse.cs
@@ -14,6 +14,18 @@ public abstract class AMSResponse
         [JsonPropertyNameAttribute("result")]
         public Result Result { get; set; }
 
+        protected JsonSerializerOptions options = new JsonSerializerOptions
+        {
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            IgnoreNullValues = true,
+            WriteIndented = true
+        };
+
+        public AMSResponse()
+        {
+            options.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase));
+        }
+
         public static TAMSResponse ParseResponse<TAMSResponse>(HttpResponseMessage ret, string requestURI, string clientId, string alipayPublicKey)
         {
             switch(ret.StatusCode)
@@ -51,5 +63,10 @@ public static TAMSResponse ParseResponse<TAMSResponse>(HttpResponseMessage ret,
             }            
         }
 
+        public override string ToString()
+        {
+            return JsonSerializer.Serialize(this, this.GetType(), options);
+        }
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ public TAMSResponse Execute<TAMSResponse>(request.AMSRequest<TAMSResponse> requ`
`44`	`44`	`requestMessage.Headers.Add(header.Key, header.Value);`
`45`	`45`	`}`
`46`	`46`
`47`		`- Console.WriteLine("Request --> " + body);`
`48`	`47`	`requestMessage.Content = new ByteArrayContent(Encoding.UTF8.GetBytes(body));`
`49`	`48`	`requestMessage.Content.Headers.Add("Content-Type", "application/json; charset=UTF-8");`
`50`	`49`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,11 @@ namespace com.alipay.ams.api.entities`
`7`	`7`	`{`
`8`	`8`	`public class PaymentMethod`
`9`	`9`	`{`
	`10`	`+ public PaymentMethod(String paymentMethodType)`
	`11`	`+ {`
	`12`	`+ this.PaymentMethodType = paymentMethodType;`
	`13`	`+ }`
	`14`	`+`
`10`	`15`	`[JsonPropertyNameAttribute("paymentMethodType")]`
`11`	`16`	`public String PaymentMethodType { get; set; }`
`12`	`17`	`[JsonPropertyNameAttribute("paymentMethodId")]`