使用lombok的@DaTa注解简化mp模块的所有bean类

binarywang · binarywang · commit 5db97256858d · 2017-10-25T14:45:51.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/request/WxMpKfAccountRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/request/WxMpKfAccountRequest.java
@@ -1,13 +1,15 @@
 package me.chanjar.weixin.mp.bean.kefu.request;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.Builder;
 import lombok.Data;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.io.Serializable;
 
 @Data
+@Builder
 public class WxMpKfAccountRequest implements Serializable {
   private static final long serialVersionUID = -5451863610674856927L;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessage.java
@@ -3,11 +3,15 @@
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
+import java.io.Serializable;
+
 @XStreamAlias("xml")
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
   private static final long serialVersionUID = -4159937804975448945L;
 
@@ -20,7 +24,8 @@ public WxMpXmlOutMusicMessage() {
 
   @XStreamAlias("Music")
   @Data
-  public static class Music {
+  public static class Music implements Serializable {
+    private static final long serialVersionUID = -5492592401691895334L;
 
     @XStreamAlias("Title")
     @XStreamConverter(value = XStreamCDataConverter.class)
@@ -41,7 +46,46 @@ public static class Music {
     @XStreamAlias("HQMusicUrl")
     @XStreamConverter(value = XStreamCDataConverter.class)
     private String hqMusicUrl;
+  }
+
+  public String getTitle() {
+    return this.music.title;
+  }
+
+  public void setTitle(String title) {
+    this.music.title = title;
+  }
+
+  public String getDescription() {
+    return this.music.description;
+  }
+
+  public void setDescription(String description) {
+    this.music.description = description;
+  }
+
+  public String getThumbMediaId() {
+    return this.music.thumbMediaId;
+  }
+
+  public void setThumbMediaId(String thumbMediaId) {
+    this.music.thumbMediaId = thumbMediaId;
+  }
+
+  public String getMusicUrl() {
+    return this.music.musicUrl;
+  }
+
+  public void setMusicUrl(String musicUrl) {
+    this.music.musicUrl = musicUrl;
+  }
+
+  public String getHqMusicUrl() {
+    return this.music.hqMusicUrl;
+  }
 
+  public void setHqMusicUrl(String hqMusicUrl) {
+    this.music.hqMusicUrl = hqMusicUrl;
   }
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVideoMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVideoMessage.java
@@ -3,13 +3,15 @@
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
 import java.io.Serializable;
 
 @XStreamAlias("xml")
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
   private static final long serialVersionUID = 1745902309380113978L;
 
@@ -39,4 +41,27 @@ public static class Video implements Serializable {
 
   }
 
+  public String getMediaId() {
+    return this.video.mediaId;
+  }
+
+  public void setMediaId(String mediaId) {
+    this.video.mediaId = mediaId;
+  }
+
+  public String getTitle() {
+    return this.video.title;
+  }
+
+  public void setTitle(String title) {
+    this.video.title = title;
+  }
+
+  public String getDescription() {
+    return this.video.description;
+  }
+
+  public void setDescription(String description) {
+    this.video.description = description;
+  }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java
@@ -3,6 +3,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
+import lombok.Builder;
 import lombok.Data;
 import me.chanjar.weixin.common.annotation.Required;
 import me.chanjar.weixin.common.util.ToStringUtils;
@@ -21,6 +22,7 @@
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 @Data
+@Builder
 public class WxMpStoreBaseInfo implements Serializable {
   private static final long serialVersionUID = 829577606838118218L;
 
@@ -98,7 +100,8 @@ public class WxMpStoreBaseInfo implements Serializable {
    */
   @Required
   @SerializedName("offset_type")
-  private Integer offsetType = 1;
+  @Builder.Default
+  private final Integer offsetType = 1;
   /**
    * longitude
    * 门店所在地理位置的经度
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.bean.template;
 
+import lombok.Builder;
 import lombok.Data;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
@@ -11,6 +12,7 @@
  * 参考 http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751277&token=&lang=zh_CN 发送模板消息接口部分
  */
 @Data
+@Builder
 public class WxMpTemplateMessage implements Serializable {
   private static final long serialVersionUID = 5063374783759519418L;
 
@@ -42,9 +44,11 @@ public class WxMpTemplateMessage implements Serializable {
   /**
    * 模板数据
    */
-  private List<WxMpTemplateData> data = new ArrayList<>();
+  @Builder.Default
+  private final List<WxMpTemplateData> data = new ArrayList<>();
 
-  public WxMpTemplateMessage() {
+  public void addWxMpTemplateData(WxMpTemplateData datum) {
+    this.data.add(datum);
   }
 
   public String toJson() {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/MusicBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/MusicBuilder.java
@@ -47,8 +47,8 @@ public MusicBuilder description(String description) {
     return this;
   }
 
-  public MusicBuilder thumbMediaId(String thumb_media_id) {
-    this.thumbMediaId = thumb_media_id;
+  public MusicBuilder thumbMediaId(String thumbMediaId) {
+    this.thumbMediaId = thumbMediaId;
     return this;
   }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/VideoBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/VideoBuilder.java
@@ -32,9 +32,9 @@ public VideoBuilder mediaId(String mediaId) {
   public WxMpXmlOutVideoMessage build() {
     WxMpXmlOutVideoMessage m = new WxMpXmlOutVideoMessage();
     setCommon(m);
-    m.setTitle(this.title);
-    m.setDescription(this.description);
-    m.setMediaId(this.mediaId);
+    m.getVideo().setTitle(this.title);
+    m.getVideo().setDescription(this.description);
+    m.getVideo().setMediaId(this.mediaId);
     return m;
   }
 
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessageTest.java
@@ -86,7 +86,7 @@ public void testFromXml() {
     assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");
     assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");
     assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");
-    assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");
+    assertEquals(wxMessage.getSendLocationInfo().getPoiName(), "wo de poi");
   }
 
   public void testFromXml2() {
@@ -167,7 +167,7 @@ public void testFromXml2() {
     assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");
     assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");
     assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");
-    assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");
+    assertEquals(wxMessage.getSendLocationInfo().getPoiName(), "wo de poi");
   }
 
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessageTest.java
@@ -13,7 +13,7 @@ public void test() {
     m.setHqMusicUrl("hQMusicUrl");
     m.setMusicUrl("musicUrl");
     m.setThumbMediaId("thumbMediaId");
-    m.setCreateTime(1122l);
+    m.setCreateTime(1122L);
     m.setFromUserName("fromUser");
     m.setToUserName("toUser");
 
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfoTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfoTest.java
@@ -145,8 +145,8 @@ public void testFromJson() throws Exception {
     WxMpCurrentAutoReplyInfo autoReplyInfo = WxMpCurrentAutoReplyInfo.fromJson(json);
 
     assertNotNull(autoReplyInfo);
-    assertTrue(autoReplyInfo.getAddFriendReplyOpen());
-    assertTrue(autoReplyInfo.getAutoReplyOpen());
+    assertTrue(autoReplyInfo.getIsAddFriendReplyOpen());
+    assertTrue(autoReplyInfo.getIsAutoReplyOpen());
     assertNotNull(autoReplyInfo.getAddFriendAutoReplyInfo());
     assertNotNull(autoReplyInfo.getMessageDefaultAutoReplyInfo());
     assertTrue(autoReplyInfo.getKeywordAutoReplyInfo().getList().size() > 0);

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ public MusicBuilder description(String description) {`
`47`	`47`	`return this;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public MusicBuilder thumbMediaId(String thumb_media_id) {`
`51`		`- this.thumbMediaId = thumb_media_id;`
	`50`	`+ public MusicBuilder thumbMediaId(String thumbMediaId) {`
	`51`	`+ this.thumbMediaId = thumbMediaId;`
`52`	`52`	`return this;`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public void testFromXml() {`
`86`	`86`	`assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");`
`87`	`87`	`assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");`
`88`	`88`	`assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");`
`89`		`- assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");`
	`89`	`+ assertEquals(wxMessage.getSendLocationInfo().getPoiName(), "wo de poi");`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`public void testFromXml2() {`
`@@ -167,7 +167,7 @@ public void testFromXml2() {`
`167`	`167`	`assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");`
`168`	`168`	`assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");`
`169`	`169`	`assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");`
`170`		`- assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");`
	`170`	`+ assertEquals(wxMessage.getSendLocationInfo().getPoiName(), "wo de poi");`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`}`