优化代码,替换掉ToStringBuilder.reflectionToString相关代码

This commit is contained in:
Binary Wang
2018-11-02 11:18:56 +08:00
parent cd28a5b487
commit eab7dd398a
138 changed files with 670 additions and 731 deletions

View File

@@ -1,8 +1,5 @@
package com.github.binarywang.wxpay.bean.entpay;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.AllArgsConstructor;
@@ -11,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.annotation.Required;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
/**
* <pre>
@@ -50,7 +48,7 @@ public class EntPayQueryRequest extends BaseWxPayRequest {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
@Override

View File

@@ -1,8 +1,5 @@
package com.github.binarywang.wxpay.bean.entpay;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.AllArgsConstructor;
@@ -11,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.annotation.Required;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
/**
* <pre>
@@ -193,7 +191,7 @@ public class EntPayRequest extends BaseWxPayRequest {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
@Override

View File

@@ -4,11 +4,9 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import lombok.Data;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
/**
* 支付异步通知代金券详细.
@@ -40,6 +38,6 @@ public class WxPayOrderNotifyCoupon implements Serializable {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
}

View File

@@ -3,9 +3,6 @@ package com.github.binarywang.wxpay.bean.notify;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
import com.github.binarywang.wxpay.constant.WxPayConstants;
import com.github.binarywang.wxpay.converter.WxPayOrderNotifyResultConverter;
@@ -17,6 +14,7 @@ import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
/**
@@ -327,6 +325,6 @@ public class WxPayOrderNotifyResult extends BaseWxPayResult {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
}

View File

@@ -7,8 +7,6 @@ import javax.crypto.spec.SecretKeySpec;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
import com.github.binarywang.wxpay.constant.WxPayConstants;
@@ -19,6 +17,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
/**
@@ -90,7 +89,7 @@ public class WxPayRefundNotifyResult extends BaseWxPayResult implements Serializ
public static class ReqInfo {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
/**

View File

@@ -4,8 +4,6 @@ import java.io.Serializable;
import java.math.BigDecimal;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.exception.WxPayException;
@@ -15,6 +13,7 @@ import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.common.util.BeanUtils;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
import static com.github.binarywang.wxpay.constant.WxPayConstants.SignType.ALL_SIGN_TYPES;
@@ -178,7 +177,7 @@ public abstract class BaseWxPayRequest implements Serializable {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
/**

View File

@@ -14,8 +14,6 @@ import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -29,9 +27,11 @@ import com.github.binarywang.wxpay.util.SignUtils;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.GsonBuilder;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
/**
@@ -151,7 +151,7 @@ public abstract class BaseWxPayResult implements Serializable {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
/**

View File

@@ -2,11 +2,9 @@ package com.github.binarywang.wxpay.bean.result;
import java.io.Serializable;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import lombok.Data;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
/**
* 交易时间:2017-04-06 01:00:02 公众账号ID: 商户号: 子商户号:0 设备号:WEB 微信订单号: 商户订单号:2017040519091071873216 用户标识: 交易类型:NATIVE
@@ -22,7 +20,7 @@ public class WxPayBillBaseResult implements Serializable {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
/**

View File

@@ -3,11 +3,9 @@ package com.github.binarywang.wxpay.bean.result;
import java.io.Serializable;
import java.util.List;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import lombok.Data;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
/**
* The type Wx pay bill result.
@@ -21,7 +19,7 @@ public class WxPayBillResult implements Serializable {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
/**

View File

@@ -1,11 +1,10 @@
package com.github.binarywang.wxpay.bean.result;
import java.io.Serializable;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serializable;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
/**
* 记账时间:2018-02-01 04:21:23 微信支付业务单号:50000305742018020103387128253 资金流水单号:1900009231201802015884652186 业务名称:退款
@@ -20,19 +19,19 @@ public class WxPayFundFlowBaseResult implements Serializable {
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
/**
* 记账时间
* 记账时间.
*/
private String BillingTime;
/**
* 微信支付业务单号
* 微信支付业务单号.
*/
private String bizTransactionId;
/**
* 资金流水单号
* 资金流水单号.
*/
private String fundFlowId;
/**
@@ -40,31 +39,31 @@ public class WxPayFundFlowBaseResult implements Serializable {
*/
private String bizName;
/**
* 业务类型
* 业务类型.
*/
private String bizType;
/**
* 收支类型
* 收支类型.
*/
private String financialType;
/**
* 收支金额(元)
* 收支金额(元).
*/
private String financialFee;
/**
* 账户结余(元)
* 账户结余(元).
*/
private String AccountBalance;
/**
* 资金变更提交申请人
* 资金变更提交申请人.
*/
private String fundApplicant;
/**
* 备注
* 备注.
*/
private String memo;
/**
* 业务凭证号
* 业务凭证号.
*/
private String bizVoucherId;

View File

@@ -3,11 +3,9 @@ package com.github.binarywang.wxpay.bean.result;
import java.io.Serializable;
import java.util.List;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import lombok.Data;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
/**
* <pre>
@@ -19,16 +17,16 @@ import lombok.NoArgsConstructor;
*/
@Data
@NoArgsConstructor
public class WxPayFundFlowResult implements Serializable{
public class WxPayFundFlowResult implements Serializable {
private static final long serialVersionUID = 8371500036495349207L;
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
return WxGsonBuilder.create().toJson(this);
}
/**
* 资金流水返回对象
* 资金流水返回对象.
*/
private List<WxPayFundFlowBaseResult> wxPayFundFlowBaseResultList;