reformat code

binarywang · binarywang · commit 5bb6a24590b9 · 2016-11-28T17:39:27.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
@@ -297,6 +297,43 @@ public class WxMpXmlMessage implements Serializable {
   @XStreamAlias("DeviceStatus")
   private Integer deviceStatus;
 
+  public static WxMpXmlMessage fromXml(String xml) {
+    return XStreamTransformer.fromXml(WxMpXmlMessage.class, xml);
+  }
+
+  public static WxMpXmlMessage fromXml(InputStream is) {
+    return XStreamTransformer.fromXml(WxMpXmlMessage.class, is);
+  }
+
+  /**
+   * 从加密字符串转换
+   *
+   * @param encryptedXml
+   * @param wxMpConfigStorage
+   * @param timestamp
+   * @param nonce
+   * @param msgSignature
+   */
+  public static WxMpXmlMessage fromEncryptedXml(String encryptedXml,
+                                                WxMpConfigStorage wxMpConfigStorage, String timestamp, String nonce,
+                                                String msgSignature) {
+    WxMpCryptUtil cryptUtil = new WxMpCryptUtil(wxMpConfigStorage);
+    String plainText = cryptUtil.decrypt(msgSignature, timestamp, nonce,
+      encryptedXml);
+    return fromXml(plainText);
+  }
+
+  public static WxMpXmlMessage fromEncryptedXml(InputStream is,
+                                                WxMpConfigStorage wxMpConfigStorage, String timestamp, String nonce,
+                                                String msgSignature) {
+    try {
+      return fromEncryptedXml(IOUtils.toString(is, "UTF-8"), wxMpConfigStorage,
+        timestamp, nonce, msgSignature);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   public Integer getOpType() {
     return opType;
   }
@@ -611,43 +648,6 @@ public void setFromUser(String fromUser) {
     this.fromUser = fromUser;
   }
 
-  public static WxMpXmlMessage fromXml(String xml) {
-    return XStreamTransformer.fromXml(WxMpXmlMessage.class, xml);
-  }
-
-  public static WxMpXmlMessage fromXml(InputStream is) {
-    return XStreamTransformer.fromXml(WxMpXmlMessage.class, is);
-  }
-
-  /**
-   * 从加密字符串转换
-   *
-   * @param encryptedXml
-   * @param wxMpConfigStorage
-   * @param timestamp
-   * @param nonce
-   * @param msgSignature
-   */
-  public static WxMpXmlMessage fromEncryptedXml(String encryptedXml,
-                                                WxMpConfigStorage wxMpConfigStorage, String timestamp, String nonce,
-                                                String msgSignature) {
-    WxMpCryptUtil cryptUtil = new WxMpCryptUtil(wxMpConfigStorage);
-    String plainText = cryptUtil.decrypt(msgSignature, timestamp, nonce,
-        encryptedXml);
-    return fromXml(plainText);
-  }
-
-  public static WxMpXmlMessage fromEncryptedXml(InputStream is,
-                                                WxMpConfigStorage wxMpConfigStorage, String timestamp, String nonce,
-                                                String msgSignature) {
-    try {
-      return fromEncryptedXml(IOUtils.toString(is, "UTF-8"), wxMpConfigStorage,
-          timestamp, nonce, msgSignature);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   public String getStatus() {
     return this.status;
   }
@@ -757,7 +757,7 @@ public WxMpXmlMessage.SendLocationInfo getSendLocationInfo() {
   }
 
   public void setSendLocationInfo(
-      WxMpXmlMessage.SendLocationInfo sendLocationInfo) {
+    WxMpXmlMessage.SendLocationInfo sendLocationInfo) {
     this.sendLocationInfo = sendLocationInfo;
   }
 
@@ -793,27 +793,31 @@ public void setFromKfAccount(String fromKfAccount) {
     this.fromKfAccount = fromKfAccount;
   }
 
+  @Override
+  public String toString() {
+    return ToStringUtils.toSimpleString(this);
+  }
+
   @XStreamAlias("HardWare")
   public static class HardWare {
-    @Override
-    public String toString() {
-      return ToStringUtils.toSimpleString(this);
-    }
-
     /**
      * 消息展示，目前支持myrank(排行榜)
      */
     @XStreamAlias("MessageView")
     @XStreamConverter(value = XStreamCDataConverter.class)
     private String messageView;
-
     /**
      * 消息点击动作，目前支持ranklist(点击跳转排行榜)
      */
     @XStreamAlias("MessageAction")
     @XStreamConverter(value = XStreamCDataConverter.class)
     private String messageAction;
 
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
     public String getMessageView() {
       return messageView;
     }
@@ -833,19 +837,18 @@ public void setMessageAction(String messageAction) {
 
   @XStreamAlias("ScanCodeInfo")
   public static class ScanCodeInfo {
-    @Override
-    public String toString() {
-      return ToStringUtils.toSimpleString(this);
-    }
-
     @XStreamAlias("ScanType")
     @XStreamConverter(value = XStreamCDataConverter.class)
     private String scanType;
-
     @XStreamAlias("ScanResult")
     @XStreamConverter(value = XStreamCDataConverter.class)
     private String scanResult;
 
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
     /**
      * 扫描类型，一般是qrcode
      */
@@ -873,17 +876,16 @@ public void setScanResult(String scanResult) {
 
   @XStreamAlias("SendPicsInfo")
   public static class SendPicsInfo {
+    @XStreamAlias("PicList")
+    protected final List<Item> picList = new ArrayList<>();
+    @XStreamAlias("Count")
+    private Long count;
+
     @Override
     public String toString() {
       return ToStringUtils.toSimpleString(this);
     }
 
-    @XStreamAlias("Count")
-    private Long count;
-
-    @XStreamAlias("PicList")
-    protected final List<Item> picList = new ArrayList<>();
-
     public Long getCount() {
       return this.count;
     }
@@ -898,15 +900,15 @@ public List<Item> getPicList() {
 
     @XStreamAlias("item")
     public static class Item {
+      @XStreamAlias("PicMd5Sum")
+      @XStreamConverter(value = XStreamCDataConverter.class)
+      private String picMd5Sum;
+
       @Override
       public String toString() {
         return ToStringUtils.toSimpleString(this);
       }
 
-      @XStreamAlias("PicMd5Sum")
-      @XStreamConverter(value = XStreamCDataConverter.class)
-      private String picMd5Sum;
-
       public String getPicMd5Sum() {
         return this.picMd5Sum;
       }
@@ -985,9 +987,4 @@ public void setPoiname(String poiname) {
       this.poiname = poiname;
     }
   }
-
-  @Override
-  public String toString() {
-    return ToStringUtils.toSimpleString(this);
-  }
 }
