Skip to content

Commit 3f94ec3

Browse files
binarywangbinarywang
committed
删除不稳定的ToStringUtils自定义类
1 parent a81a8b2 commit 3f94ec3

File tree

69 files changed

+616
-531
lines changed

Some content is hidden

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

69 files changed

+616
-531
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package me.chanjar.weixin.common.bean;
22

3-
import lombok.Data;
4-
import me.chanjar.weixin.common.util.ToStringUtils;
5-
63
import java.io.Serializable;
74

5+
import org.apache.commons.lang3.builder.ToStringBuilder;
6+
import org.apache.commons.lang3.builder.ToStringStyle;
7+
8+
import lombok.Data;
9+
810
/**
911
* 卡券Api签名.
1012
*
@@ -35,7 +37,6 @@ public class WxCardApiSignature implements Serializable {
3537

3638
@Override
3739
public String toString() {
38-
return ToStringUtils.toSimpleString(this);
40+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
3941
}
40-
4142
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package me.chanjar.weixin.common.bean.menu;
22

3-
import lombok.Data;
4-
import me.chanjar.weixin.common.util.ToStringUtils;
5-
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
6-
73
import java.io.InputStream;
84
import java.io.InputStreamReader;
95
import java.io.Serializable;
106
import java.nio.charset.StandardCharsets;
117
import java.util.ArrayList;
128
import java.util.List;
139

10+
import org.apache.commons.lang3.builder.ToStringBuilder;
11+
import org.apache.commons.lang3.builder.ToStringStyle;
12+
13+
import lombok.Data;
14+
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
15+
1416
/**
1517
* 菜单（公众号和企业号共用的）.
1618
*
@@ -47,7 +49,7 @@ public String toJson() {
4749

4850
@Override
4951
public String toString() {
50-
return ToStringUtils.toSimpleString(this);
52+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
5153
}
5254

5355
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package me.chanjar.weixin.common.bean.menu;
22

3-
import com.google.gson.annotations.SerializedName;
4-
import lombok.Data;
5-
import me.chanjar.weixin.common.util.ToStringUtils;
6-
73
import java.io.Serializable;
84
import java.util.ArrayList;
95
import java.util.List;
106

7+
import org.apache.commons.lang3.builder.ToStringBuilder;
8+
import org.apache.commons.lang3.builder.ToStringStyle;
9+
10+
import com.google.gson.annotations.SerializedName;
11+
import lombok.Data;
12+
1113
@Data
1214
public class WxMenuButton implements Serializable {
1315
private static final long serialVersionUID = -1070939403109776555L;
@@ -76,7 +78,7 @@ public class WxMenuButton implements Serializable {
7678

7779
@Override
7880
public String toString() {
79-
return ToStringUtils.toSimpleString(this);
81+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
8082
}
8183

8284
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package me.chanjar.weixin.common.bean.menu;
22

3+
import java.io.Serializable;
4+
5+
import org.apache.commons.lang3.builder.ToStringBuilder;
6+
import org.apache.commons.lang3.builder.ToStringStyle;
7+
38
import com.google.gson.annotations.SerializedName;
49
import lombok.Data;
5-
import me.chanjar.weixin.common.util.ToStringUtils;
6-
7-
import java.io.Serializable;
810

911
@Data
1012
public class WxMenuRule implements Serializable {
@@ -24,6 +26,6 @@ public class WxMenuRule implements Serializable {
2426

2527
@Override
2628
public String toString() {
27-
return ToStringUtils.toSimpleString(this);
29+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
2830
}
2931
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package me.chanjar.weixin.common.bean.result;
22

3+
import java.io.Serializable;
4+
5+
import org.apache.commons.lang3.builder.ToStringBuilder;
6+
import org.apache.commons.lang3.builder.ToStringStyle;
7+
38
import lombok.Data;
4-
import me.chanjar.weixin.common.util.ToStringUtils;
59
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
610

7-
import java.io.Serializable;
8-
911
@Data
1012
public class WxMediaUploadResult implements Serializable {
1113
private static final long serialVersionUID = 330834334738622341L;
@@ -21,7 +23,7 @@ public static WxMediaUploadResult fromJson(String json) {
2123

2224
@Override
2325
public String toString() {
24-
return ToStringUtils.toSimpleString(this);
26+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
2527
}
2628

2729
}

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

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpInviteResult.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package me.chanjar.weixin.cp.bean;
22

3+
import java.io.Serializable;
4+
import java.util.Collections;
5+
import java.util.List;
6+
7+
import org.apache.commons.lang3.StringUtils;
8+
import org.apache.commons.lang3.builder.ToStringBuilder;
9+
import org.apache.commons.lang3.builder.ToStringStyle;
10+
311
import com.google.common.base.Splitter;
412
import com.google.gson.annotations.SerializedName;
513
import lombok.Data;
6-
import me.chanjar.weixin.common.util.ToStringUtils;
714
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
8-
import org.apache.commons.lang3.StringUtils;
9-
10-
import java.io.Serializable;
11-
import java.util.Collections;
12-
import java.util.List;
1315

1416
/**
1517
* 邀请成员的结果对象类.
@@ -23,7 +25,7 @@ public class WxCpInviteResult implements Serializable {
2325

2426
@Override
2527
public String toString() {
26-
return ToStringUtils.toSimpleString(this);
28+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
2729
}
2830

2931
public static WxCpInviteResult fromJson(String json) {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessageSendResult.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package me.chanjar.weixin.cp.bean;
22

3+
import java.io.Serializable;
4+
import java.util.Collections;
5+
import java.util.List;
6+
7+
import org.apache.commons.lang3.StringUtils;
8+
import org.apache.commons.lang3.builder.ToStringBuilder;
9+
import org.apache.commons.lang3.builder.ToStringStyle;
10+
311
import com.google.common.base.Splitter;
412
import com.google.gson.annotations.SerializedName;
513
import lombok.Data;
6-
import me.chanjar.weixin.common.util.ToStringUtils;
714
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
8-
import org.apache.commons.lang3.StringUtils;
9-
10-
import java.io.Serializable;
11-
import java.util.Collections;
12-
import java.util.List;
1315

1416
/**
1517
* 消息发送结果对象类.
@@ -23,7 +25,7 @@ public class WxCpMessageSendResult implements Serializable {
2325

2426
@Override
2527
public String toString() {
26-
return ToStringUtils.toSimpleString(this);
28+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
2729
}
2830

2931
public static WxCpMessageSendResult fromJson(String json) {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTagAddOrRemoveUsersResult.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package me.chanjar.weixin.cp.bean;
22

3+
import java.io.Serializable;
4+
import java.util.Collections;
5+
import java.util.List;
6+
7+
import org.apache.commons.lang3.StringUtils;
8+
import org.apache.commons.lang3.builder.ToStringBuilder;
9+
import org.apache.commons.lang3.builder.ToStringStyle;
10+
311
import com.google.common.base.Splitter;
412
import com.google.gson.annotations.SerializedName;
513
import lombok.Data;
6-
import me.chanjar.weixin.common.util.ToStringUtils;
714
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
8-
import org.apache.commons.lang3.StringUtils;
9-
10-
import java.io.Serializable;
11-
import java.util.Collections;
12-
import java.util.List;
1315

1416
/**
1517
* 为标签添加或移除用户结果对象类.
@@ -23,7 +25,7 @@ public class WxCpTagAddOrRemoveUsersResult implements Serializable {
2325

2426
@Override
2527
public String toString() {
26-
return ToStringUtils.toSimpleString(this);
28+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
2729
}
2830

2931
public static WxCpTagAddOrRemoveUsersResult fromJson(String json) {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
package me.chanjar.weixin.cp.bean;
22

3+
import java.io.IOException;
4+
import java.io.InputStream;
5+
import java.io.Serializable;
6+
import java.util.ArrayList;
7+
import java.util.List;
8+
9+
import org.apache.commons.io.IOUtils;
10+
import org.apache.commons.lang3.builder.ToStringBuilder;
11+
import org.apache.commons.lang3.builder.ToStringStyle;
12+
313
import com.thoughtworks.xstream.annotations.XStreamAlias;
414
import com.thoughtworks.xstream.annotations.XStreamConverter;
515
import lombok.Data;
616
import me.chanjar.weixin.common.api.WxConsts;
7-
import me.chanjar.weixin.common.util.ToStringUtils;
817
import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
918
import me.chanjar.weixin.cp.config.WxCpConfigStorage;
1019
import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil;
1120
import me.chanjar.weixin.cp.util.xml.XStreamTransformer;
12-
import org.apache.commons.io.IOUtils;
13-
14-
import java.io.IOException;
15-
import java.io.InputStream;
16-
import java.io.Serializable;
17-
import java.util.ArrayList;
18-
import java.util.List;
1921

2022
/**
2123
* <pre>
@@ -233,7 +235,7 @@ public void setMsgType(String msgType) {
233235

234236
@Override
235237
public String toString() {
236-
return ToStringUtils.toSimpleString(this);
238+
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
237239
}
238240

239241
@Data

0 commit comments

Comments
 (0)