Skip to content

Commit 2cca317

Browse files
committed
using lombok builder pattern
1 parent c991468 commit 2cca317

File tree

137 files changed

+1298
-4462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1298
-4462
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ https://mvnrepository.com/artifact/com.alipay.global.sdk/global-open-sdk-java
1212
<dependency>
1313
<groupId>com.alipay.global.sdk</groupId>
1414
<artifactId>global-open-sdk-java</artifactId>
15-
<version>2.0.23</version>
15+
<version>2.0.24</version>
1616
</dependency>
1717
```
1818

pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.alipay.global.sdk</groupId>
55
<artifactId>global-open-sdk-java</artifactId>
66
<packaging>jar</packaging>
7-
<version>2.0.23</version>
7+
<version>2.0.24</version>
88
<name>global-open-sdk-java</name>
99
<url>https://github.com/alipay/global-open-sdk-java</url>
1010
<description>
@@ -69,6 +69,13 @@
6969
<artifactId>fastjson</artifactId>
7070
<version>1.2.83</version>
7171
</dependency>
72+
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
73+
<dependency>
74+
<groupId>org.projectlombok</groupId>
75+
<artifactId>lombok</artifactId>
76+
<version>1.18.30</version>
77+
<scope>provided</scope>
78+
</dependency>
7279
</dependencies>
7380

7481
<build>

src/main/java/com/alipay/global/api/example/PayNotifyListener.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@
1111

1212
public class PayNotifyListener {
1313

14-
public void acceptNotify(HttpRequest request, HttpResponse response){
14+
public void acceptNotify(HttpRequest request, HttpResponse response) {
1515

1616
InputStream inputStream = request.getInputStream();
17-
String reqBody = read(inputStream);
17+
String reqBody = read(inputStream);
1818

1919
PayNotifyRequest payNotifyRequest = JSON.parseObject(reqBody, PayNotifyRequest.class);
2020

21-
if(!PaymentNotifyType.PAYMENT_RESULT.equals(payNotifyRequest.getNotifyType())){
21+
if (!PaymentNotifyType.PAYMENT_RESULT.equals(payNotifyRequest.getNotifyType())) {
2222
return;
2323
}
24-
Result resultInfo = payNotifyRequest.getResultInfo();
24+
Result resultInfo = payNotifyRequest.getResultInfo();
2525
String paymentRequestId = payNotifyRequest.getPaymentRequestId();
2626
ResultStatusType resultStatus = resultInfo.getResultStatus();
2727

2828
boolean isAcceptSuccess = false;
29-
if(ResultStatusType.S.equals(resultStatus)){
29+
if (ResultStatusType.S.equals(resultStatus)) {
3030
// TODO Update the record status to success by paymentRequestId
3131
isAcceptSuccess = true;
32-
} else if(ResultStatusType.F.equals(resultStatus)){
32+
} else if (ResultStatusType.F.equals(resultStatus)) {
3333
// TODO Update the record status to fail by paymentRequestId
3434
isAcceptSuccess = true;
3535
} else {
3636
// TODO Notify exception, contact tech support
37-
return ;
37+
return;
3838
}
3939

40-
Result result = new Result("SUCCESS", "success", ResultStatusType.S);
41-
if(!isAcceptSuccess){
42-
result = new Result("PROCESS_FAIL", "failure", ResultStatusType.F);
40+
Result result = new Result("SUCCESS", ResultStatusType.S, "success");
41+
if (!isAcceptSuccess) {
42+
result = new Result("PROCESS_FAIL", ResultStatusType.F, "failure");
4343
}
4444
try {
4545
PayNotifyResponse payNotifyResponse = new PayNotifyResponse();
@@ -50,7 +50,7 @@ public void acceptNotify(HttpRequest request, HttpResponse response){
5050

5151
}
5252

53-
public String read(InputStream inputStream){
53+
public String read(InputStream inputStream) {
5454

5555
return null;
5656
}

src/main/java/com/alipay/global/api/example/RiskDecideDemoCode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public static void buildRiskDecideRequest(RiskDecideRequest request) {
196196
buyer.setReferenceBuyerId("test12345678");
197197
buyer.setBuyerPhoneNo("12345678912");
198198
buyer.setBuyerEmail("[email protected]");
199-
buyer.setAccountVerified(true);
199+
buyer.setIsAccountVerified(true);
200200
buyer.setSuccessfulOrderCount(100);
201201
UserName buyerName = new UserName();
202202
buyerName.setFirstName("Dehua");

src/main/java/com/alipay/global/api/example/excutable/CashierExecutableDemoCode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private static void cashierPay(){
9595

9696
// set auth capture payment mode
9797
PaymentFactor paymentFactor = new PaymentFactor();
98-
paymentFactor.setAuthorization(true);
98+
paymentFactor.setIsAuthorization(true);
9999
alipayPayRequest.setPaymentFactor(paymentFactor);
100100

101101
// replace to your notify url

src/main/java/com/alipay/global/api/example/excutable/CashierPayExecutableDemoCode.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public static void executePayWithCard() {
143143

144144
// set auth capture payment mode
145145
PaymentFactor paymentFactor = new PaymentFactor();
146-
paymentFactor.setAuthorization(true);
146+
paymentFactor.setIsAuthorization(true);
147147
alipayPayRequest.setPaymentFactor(paymentFactor);
148148

149149
// replace to your notify url
@@ -216,7 +216,7 @@ public static void executePayWithBlik() {
216216

217217
// set auth capture payment mode
218218
PaymentFactor paymentFactor = new PaymentFactor();
219-
paymentFactor.setAuthorization(true);
219+
paymentFactor.setIsAuthorization(true);
220220
alipayPayRequest.setPaymentFactor(paymentFactor);
221221

222222
// replace to your notify url
@@ -268,7 +268,7 @@ public static void executePaymentSessionCreateWithCard(){
268268

269269
// set auth capture payment mode
270270
PaymentFactor paymentFactor = new PaymentFactor();
271-
paymentFactor.setAuthorization(true);
271+
paymentFactor.setIsAuthorization(true);
272272
alipayPaymentSessionRequest.setPaymentFactor(paymentFactor);
273273

274274
// replace to your orderId
Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,18 @@
11
package com.alipay.global.api.model;
22

3+
import lombok.AllArgsConstructor;
4+
import lombok.Builder;
5+
import lombok.Data;
6+
import lombok.NoArgsConstructor;
7+
8+
@Data
9+
@Builder
10+
@NoArgsConstructor
11+
@AllArgsConstructor
312
public class Result {
413

5-
private String resultCode;
14+
private String resultCode;
615
private ResultStatusType resultStatus;
7-
private String resultMessage;
8-
9-
public Result(String resultCode, String resultMessage,ResultStatusType resultStatus){
10-
this.resultCode = resultCode;
11-
this.resultMessage = resultMessage;
12-
this.resultStatus = resultStatus;
13-
}
14-
15-
public Result() {
16-
}
17-
18-
public String getResultCode() {
19-
return resultCode;
20-
}
21-
22-
public void setResultCode(String resultCode) {
23-
this.resultCode = resultCode;
24-
}
25-
26-
public ResultStatusType getResultStatus() {
27-
return resultStatus;
28-
}
29-
30-
public void setResultStatus(ResultStatusType resultStatus) {
31-
this.resultStatus = resultStatus;
32-
}
33-
34-
public String getResultMessage() {
35-
return resultMessage;
36-
}
37-
38-
public void setResultMessage(String resultMessage) {
39-
this.resultMessage = resultMessage;
40-
}
16+
private String resultMessage;
4117

4218
}

src/main/java/com/alipay/global/api/model/ResultStatusType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
public enum ResultStatusType {
44

5-
S,F,U;
5+
S, F, U;
66

77
}

src/main/java/com/alipay/global/api/model/ams/AcquirerInfo.java

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
*/
55
package com.alipay.global.api.model.ams;
66

7+
import lombok.AllArgsConstructor;
8+
import lombok.Builder;
9+
import lombok.Data;
10+
import lombok.NoArgsConstructor;
11+
12+
@Data
13+
@Builder
14+
@NoArgsConstructor
15+
@AllArgsConstructor
716
public class AcquirerInfo {
817

918
private String acquirerName;
@@ -18,51 +27,4 @@ public class AcquirerInfo {
1827

1928
private String acquirerResultMessage;
2029

21-
public String getAcquirerName() {
22-
return acquirerName;
23-
}
24-
25-
public void setAcquirerName(String acquirerName) {
26-
this.acquirerName = acquirerName;
27-
}
28-
29-
public String getReferenceRequestId() {
30-
return referenceRequestId;
31-
}
32-
33-
public void setReferenceRequestId(String referenceRequestId) {
34-
this.referenceRequestId = referenceRequestId;
35-
}
36-
37-
public String getAcquirerTransactionId() {
38-
return acquirerTransactionId;
39-
}
40-
41-
public void setAcquirerTransactionId(String acquirerTransactionId) {
42-
this.acquirerTransactionId = acquirerTransactionId;
43-
}
44-
45-
public String getAcquirerMerchantId() {
46-
return acquirerMerchantId;
47-
}
48-
49-
public void setAcquirerMerchantId(String acquirerMerchantId) {
50-
this.acquirerMerchantId = acquirerMerchantId;
51-
}
52-
53-
public String getAcquirerResultCode() {
54-
return acquirerResultCode;
55-
}
56-
57-
public void setAcquirerResultCode(String acquirerResultCode) {
58-
this.acquirerResultCode = acquirerResultCode;
59-
}
60-
61-
public String getAcquirerResultMessage() {
62-
return acquirerResultMessage;
63-
}
64-
65-
public void setAcquirerResultMessage(String acquirerResultMessage) {
66-
this.acquirerResultMessage = acquirerResultMessage;
67-
}
6830
}
Lines changed: 9 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
package com.alipay.global.api.model.ams;
22

3+
import lombok.AllArgsConstructor;
4+
import lombok.Builder;
5+
import lombok.Data;
6+
import lombok.NoArgsConstructor;
7+
8+
@Data
9+
@Builder
10+
@NoArgsConstructor
11+
@AllArgsConstructor
312
public class Address {
413

514
private String region;
@@ -10,60 +19,4 @@ public class Address {
1019
private String zipCode;
1120
private String label;
1221

13-
public String getLabel() {
14-
return label;
15-
}
16-
17-
public void setLabel(String label) {
18-
this.label = label;
19-
}
20-
21-
public String getRegion() {
22-
return region;
23-
}
24-
25-
public void setRegion(String region) {
26-
this.region = region;
27-
}
28-
29-
public String getState() {
30-
return state;
31-
}
32-
33-
public void setState(String state) {
34-
this.state = state;
35-
}
36-
37-
public String getCity() {
38-
return city;
39-
}
40-
41-
public void setCity(String city) {
42-
this.city = city;
43-
}
44-
45-
public String getAddress1() {
46-
return address1;
47-
}
48-
49-
public void setAddress1(String address1) {
50-
this.address1 = address1;
51-
}
52-
53-
public String getAddress2() {
54-
return address2;
55-
}
56-
57-
public void setAddress2(String address2) {
58-
this.address2 = address2;
59-
}
60-
61-
public String getZipCode() {
62-
return zipCode;
63-
}
64-
65-
public void setZipCode(String zipCode) {
66-
this.zipCode = zipCode;
67-
}
68-
6922
}

0 commit comments

Comments
 (0)