Skip to content

Commit eab7dd3

Browse files
binarywangbinarywang
committed
优化代码，替换掉ToStringBuilder.reflectionToString相关代码
1 parent cd28a5b commit eab7dd3

File tree

138 files changed

+654
-715
lines changed

Some content is hidden

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

138 files changed

+654
-715
lines changed

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import java.io.Serializable;
44

5-
import org.apache.commons.lang3.builder.ToStringBuilder;
6-
import org.apache.commons.lang3.builder.ToStringStyle;
7-
85
import lombok.Data;
6+
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
97

108
/**
119
* 卡券Api签名.
@@ -37,6 +35,6 @@ public class WxCardApiSignature implements Serializable {
3735

3836
@Override
3937
public String toString() {
40-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
38+
return WxGsonBuilder.create().toJson(this);
4139
}
4240
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
import java.util.ArrayList;
88
import java.util.List;
99

10-
import org.apache.commons.lang3.builder.ToStringBuilder;
11-
import org.apache.commons.lang3.builder.ToStringStyle;
12-
1310
import lombok.Data;
1411
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
1512

@@ -49,7 +46,7 @@ public String toJson() {
4946

5047
@Override
5148
public String toString() {
52-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
49+
return this.toJson();
5350
}
5451

5552
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuButton.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import java.util.ArrayList;
55
import java.util.List;
66

7-
import org.apache.commons.lang3.builder.ToStringBuilder;
8-
import org.apache.commons.lang3.builder.ToStringStyle;
9-
107
import com.google.gson.annotations.SerializedName;
118
import lombok.Data;
9+
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
1210

1311
/**
1412
* menu button.
@@ -83,7 +81,7 @@ public class WxMenuButton implements Serializable {
8381

8482
@Override
8583
public String toString() {
86-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
84+
return WxGsonBuilder.create().toJson(this);
8785
}
8886

8987
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuRule.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import java.io.Serializable;
44

5-
import org.apache.commons.lang3.builder.ToStringBuilder;
6-
import org.apache.commons.lang3.builder.ToStringStyle;
7-
85
import com.google.gson.annotations.SerializedName;
96
import lombok.Data;
7+
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
108

119
/**
1210
* menu rule.
@@ -31,6 +29,6 @@ public class WxMenuRule implements Serializable {
3129

3230
@Override
3331
public String toString() {
34-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
32+
return WxGsonBuilder.create().toJson(this);
3533
}
3634
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java‎

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

33
import java.io.Serializable;
44

5-
import org.apache.commons.lang3.builder.ToStringBuilder;
6-
import org.apache.commons.lang3.builder.ToStringStyle;
7-
85
import lombok.Data;
96
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
107

@@ -28,7 +25,7 @@ public static WxMediaUploadResult fromJson(String json) {
2825

2926
@Override
3027
public String toString() {
31-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
28+
return WxGsonBuilder.create().toJson(this);
3229
}
3330

3431
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxGsonBuilder.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
import me.chanjar.weixin.common.error.WxError;
88
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
99

10+
/**
11+
* .
12+
* @author chanjarster
13+
*/
1014
public class WxGsonBuilder {
1115

12-
public static final GsonBuilder INSTANCE = new GsonBuilder();
16+
private static final GsonBuilder INSTANCE = new GsonBuilder();
1317

1418
static {
1519
INSTANCE.disableHtmlEscaping();

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpDepartmentServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public List<WxCpDepart> list(Long id) throws WxErrorException {
5656

5757
String responseContent = this.mainService.get(url, null);
5858
JsonElement tmpJsonElement = new JsonParser().parse(responseContent);
59-
return WxCpGsonBuilder.INSTANCE.create()
59+
return WxCpGsonBuilder.create()
6060
.fromJson(tmpJsonElement.getAsJsonObject().get("department"),
6161
new TypeToken<List<WxCpDepart>>() {
6262
}.getType()

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package me.chanjar.weixin.cp.api.impl;
22

3-
import com.google.gson.GsonBuilder;
43
import com.google.gson.JsonElement;
54
import com.google.gson.JsonObject;
65
import com.google.gson.JsonParser;
@@ -11,6 +10,7 @@
1110
import me.chanjar.weixin.cp.api.WxCpOAuth2Service;
1211
import me.chanjar.weixin.cp.api.WxCpService;
1312
import me.chanjar.weixin.cp.bean.WxCpUserDetail;
13+
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
1414

1515
/**
1616
* <pre>
@@ -87,6 +87,6 @@ public WxCpUserDetail getUserDetail(String userTicket) throws WxErrorException {
8787
JsonObject param = new JsonObject();
8888
param.addProperty("user_ticket", userTicket);
8989
String responseText = this.mainService.post(url, param.toString());
90-
return new GsonBuilder().create().fromJson(responseText, WxCpUserDetail.class);
90+
return WxCpGsonBuilder.create().fromJson(responseText, WxCpUserDetail.class);
9191
}
9292
}

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpTagServiceImpl.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package me.chanjar.weixin.cp.api.impl;
22

3-
import com.google.gson.*;
3+
import java.util.List;
4+
5+
import com.google.gson.JsonArray;
6+
import com.google.gson.JsonElement;
7+
import com.google.gson.JsonObject;
8+
import com.google.gson.JsonParser;
9+
import com.google.gson.JsonPrimitive;
410
import com.google.gson.reflect.TypeToken;
511
import me.chanjar.weixin.common.error.WxErrorException;
612
import me.chanjar.weixin.cp.api.WxCpService;
@@ -11,8 +17,6 @@
1117
import me.chanjar.weixin.cp.bean.WxCpUser;
1218
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
1319

14-
import java.util.List;
15-
1620
/**
1721
* <pre>
1822
* 标签管理接口
@@ -57,7 +61,7 @@ public List<WxCpTag> listAll() throws WxErrorException {
5761
String url = "https://qyapi.weixin.qq.com/cgi-bin/tag/list";
5862
String responseContent = this.mainService.get(url, null);
5963
JsonElement tmpJsonElement = new JsonParser().parse(responseContent);
60-
return WxCpGsonBuilder.INSTANCE.create()
64+
return WxCpGsonBuilder.create()
6165
.fromJson(
6266
tmpJsonElement.getAsJsonObject().get("taglist"),
6367
new TypeToken<List<WxCpTag>>() {
@@ -70,7 +74,7 @@ public List<WxCpUser> listUsersByTagId(String tagId) throws WxErrorException {
7074
String url = "https://qyapi.weixin.qq.com/cgi-bin/tag/get?tagid=" + tagId;
7175
String responseContent = this.mainService.get(url, null);
7276
JsonElement tmpJsonElement = new JsonParser().parse(responseContent);
73-
return WxCpGsonBuilder.INSTANCE.create()
77+
return WxCpGsonBuilder.create()
7478
.fromJson(
7579
tmpJsonElement.getAsJsonObject().get("userlist"),
7680
new TypeToken<List<WxCpUser>>() {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public List<WxCpUser> listByDepartment(Integer departId, Boolean fetchChild, Int
9090

9191
String responseContent = this.mainService.get(url, params);
9292
JsonElement tmpJsonElement = new JsonParser().parse(responseContent);
93-
return WxCpGsonBuilder.INSTANCE.create()
93+
return WxCpGsonBuilder.create()
9494
.fromJson(tmpJsonElement.getAsJsonObject().get("userlist"),
9595
new TypeToken<List<WxCpUser>>() {
9696
}.getType()
@@ -112,7 +112,7 @@ public List<WxCpUser> listSimpleByDepartment(Integer departId, Boolean fetchChil
112112

113113
String responseContent = this.mainService.get(url, params);
114114
JsonElement tmpJsonElement = new JsonParser().parse(responseContent);
115-
return WxCpGsonBuilder.INSTANCE.create()
115+
return WxCpGsonBuilder.create()
116116
.fromJson(
117117
tmpJsonElement.getAsJsonObject().get("userlist"),
118118
new TypeToken<List<WxCpUser>>() {

0 commit comments

Comments
 (0)