reformat some code

binarywang · binarywang · commit dc33436d5128 · 2016-12-20T16:48:26.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCardGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCardGsonAdapter.java
@@ -1,16 +1,11 @@
 package me.chanjar.weixin.mp.util.json;
 
-import java.lang.reflect.Type;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
+import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.WxMpCard;
 
+import java.lang.reflect.Type;
+
 /**
  * Created by YuJian on 15/11/11.
  *
@@ -21,7 +16,7 @@ public class WxMpCardGsonAdapter implements JsonDeserializer<WxMpCard> {
 
   @Override
   public WxMpCard deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext
-      jsonDeserializationContext) throws JsonParseException {
+    jsonDeserializationContext) throws JsonParseException {
     WxMpCard card = new WxMpCard();
     JsonObject jsonObject = jsonElement.getAsJsonObject();
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCardResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCardResultGsonAdapter.java
@@ -1,18 +1,13 @@
 package me.chanjar.weixin.mp.util.json;
 
-import java.lang.reflect.Type;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
+import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
-
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.WxMpCard;
 import me.chanjar.weixin.mp.bean.result.WxMpCardResult;
 
+import java.lang.reflect.Type;
+
 /**
  * Created by YuJian on 15/11/11.
  *
@@ -32,8 +27,8 @@ public WxMpCardResult deserialize(JsonElement jsonElement, Type type, JsonDeseri
     cardResult.setUserCardStatus(GsonHelper.getString(jsonObject, "user_card_status"));
 
     WxMpCard card = WxMpGsonBuilder.INSTANCE.create().fromJson(jsonObject.get("card"),
-        new TypeToken<WxMpCard>() {
-        }.getType());
+      new TypeToken<WxMpCard>() {
+      }.getType());
 
     cardResult.setCard(card);
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
@@ -2,33 +2,12 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
-import me.chanjar.weixin.mp.bean.WxMpCard;
-import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
-import me.chanjar.weixin.mp.bean.WxMpMassNews;
-import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
-import me.chanjar.weixin.mp.bean.WxMpMassPreviewMessage;
-import me.chanjar.weixin.mp.bean.WxMpMassTagMessage;
-import me.chanjar.weixin.mp.bean.WxMpMassVideo;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialArticleUpdate;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
+import me.chanjar.weixin.mp.bean.*;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserCumulate;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserSummary;
-import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult;
-import me.chanjar.weixin.mp.bean.result.WxMpCardResult;
-import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
-import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialCountResult;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialFileBatchGetResult;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialNewsBatchGetResult;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult;
-import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
-import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
-import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult;
-import me.chanjar.weixin.mp.bean.result.WxMpUser;
-import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
-import me.chanjar.weixin.mp.bean.result.WxMpUserList;
+import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
+import me.chanjar.weixin.mp.bean.material.*;
+import me.chanjar.weixin.mp.bean.result.*;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateIndustry;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java
@@ -10,10 +10,17 @@
  * @author miller
  */
 public class WxMpIndustryGsonAdapter
-    implements JsonSerializer<WxMpTemplateIndustry>, JsonDeserializer<WxMpTemplateIndustry> {
+  implements JsonSerializer<WxMpTemplateIndustry>, JsonDeserializer<WxMpTemplateIndustry> {
+  private static WxMpTemplateIndustry.Industry convertFromJson(JsonObject json) {
+    WxMpTemplateIndustry.Industry industry = new WxMpTemplateIndustry.Industry();
+    industry.setFirstClass(GsonHelper.getString(json, "first_class"));
+    industry.setSecondClass(GsonHelper.getString(json, "second_class"));
+    return industry;
+  }
+
   @Override
   public JsonElement serialize(WxMpTemplateIndustry wxMpIndustry, Type type,
-      JsonSerializationContext jsonSerializationContext) {
+                               JsonSerializationContext jsonSerializationContext) {
     JsonObject json = new JsonObject();
     json.addProperty("industry_id1", wxMpIndustry.getPrimaryIndustry().getId());
     json.addProperty("industry_id2", wxMpIndustry.getSecondIndustry().getId());
@@ -22,22 +29,15 @@ public JsonElement serialize(WxMpTemplateIndustry wxMpIndustry, Type type,
 
   @Override
   public WxMpTemplateIndustry deserialize(JsonElement jsonElement, Type type,
-      JsonDeserializationContext jsonDeserializationContext)
-      throws JsonParseException {
+                                          JsonDeserializationContext jsonDeserializationContext)
+    throws JsonParseException {
     WxMpTemplateIndustry wxMpIndustry = new WxMpTemplateIndustry();
     JsonObject primaryIndustry = jsonElement.getAsJsonObject()
-        .get("primary_industry").getAsJsonObject();
+      .get("primary_industry").getAsJsonObject();
     wxMpIndustry.setPrimaryIndustry(convertFromJson(primaryIndustry));
     JsonObject secondaryIndustry = jsonElement.getAsJsonObject()
-        .get("secondary_industry").getAsJsonObject();
+      .get("secondary_industry").getAsJsonObject();
     wxMpIndustry.setSecondIndustry(convertFromJson(secondaryIndustry));
     return wxMpIndustry;
   }
-
-  private static WxMpTemplateIndustry.Industry convertFromJson(JsonObject json) {
-    WxMpTemplateIndustry.Industry industry = new WxMpTemplateIndustry.Industry();
-    industry.setFirstClass(GsonHelper.getString(json, "first_class"));
-    industry.setSecondClass(GsonHelper.getString(json, "second_class"));
-    return industry;
-  }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpKefuMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpKefuMessageGsonAdapter.java
@@ -87,7 +87,7 @@ public JsonElement serialize(WxMpKefuMessage message, Type typeOfSrc, JsonSerial
       messageJson.add("wxcard", wxcard);
     }
 
-    if (StringUtils.isNotBlank(message.getKfAccount())){
+    if (StringUtils.isNotBlank(message.getKfAccount())) {
       JsonObject newsJsonObject = new JsonObject();
       newsJsonObject.addProperty("kf_account", message.getKfAccount());
       messageJson.add("customservice", newsJsonObject);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassUploadResultAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassUploadResultAdapter.java
@@ -15,9 +15,7 @@
 import java.lang.reflect.Type;
 
 /**
- * 
  * @author Daniel Qian
- *
  */
 public class WxMpMassUploadResultAdapter implements JsonDeserializer<WxMpMassUploadResult> {
 
@@ -37,5 +35,5 @@ public WxMpMassUploadResult deserialize(JsonElement json, Type typeOfT, JsonDese
     }
     return uploadResult;
   }
-  
+
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassVideoAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassVideoAdapter.java
@@ -17,9 +17,7 @@
 import java.lang.reflect.Type;
 
 /**
- * 
  * @author Daniel Qian
- *
  */
 public class WxMpMassVideoAdapter implements JsonSerializer<WxMpMassVideo> {
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java
@@ -21,7 +21,7 @@ public JsonElement serialize(WxMpMaterialNews.WxMpMaterialNewsArticle article, T
     JsonObject articleJson = new JsonObject();
 
     articleJson.addProperty("thumb_media_id", article.getThumbMediaId());
-    articleJson.addProperty("thumb_url",article.getThumbUrl());
+    articleJson.addProperty("thumb_url", article.getThumbUrl());
     articleJson.addProperty("title", article.getTitle());
     articleJson.addProperty("content", article.getContent());
     if (null != article.getAuthor()) {
@@ -70,7 +70,7 @@ public WxMpMaterialNews.WxMpMaterialNewsArticle deserialize(JsonElement jsonElem
       article.setThumbMediaId(GsonHelper.getAsString(thumbMediaId));
     }
     JsonElement thumbUrl = articleInfo.get("thumb_url");
-    if(thumbUrl != null && !thumbUrl.isJsonNull()) {
+    if (thumbUrl != null && !thumbUrl.isJsonNull()) {
       article.setThumbUrl(GsonHelper.getAsString(thumbUrl));
     }
     JsonElement showCoverPic = articleInfo.get("show_cover_pic");
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java
@@ -1,21 +1,16 @@
 package me.chanjar.weixin.mp.util.json;
 
-import java.lang.reflect.Type;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
+import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 
+import java.lang.reflect.Type;
+
 public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer<WxMpOAuth2AccessToken> {
 
   @Override
   public WxMpOAuth2AccessToken deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws
-      JsonParseException {
+    JsonParseException {
     WxMpOAuth2AccessToken accessToken = new WxMpOAuth2AccessToken();
     JsonObject accessTokenJsonObject = json.getAsJsonObject();
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSemanticQueryResultAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSemanticQueryResultAdapter.java
@@ -15,9 +15,7 @@
 import java.lang.reflect.Type;
 
 /**
- * 
  * @author Daniel Qian
- *
  */
 public class WxMpSemanticQueryResultAdapter implements JsonDeserializer<WxMpSemanticQueryResult> {
 
@@ -46,5 +44,5 @@ public WxMpSemanticQueryResult deserialize(JsonElement json, Type typeOfT, JsonD
     }
     return result;
   }
-  
+
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java
@@ -12,7 +12,6 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserCumulateGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserCumulateGsonAdapter.java
@@ -8,29 +8,21 @@
  */
 package me.chanjar.weixin.mp.util.json;
 
-import java.lang.reflect.Type;
-import java.text.ParseException;
-
-import org.apache.commons.lang3.time.FastDateFormat;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
+import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserCumulate;
+import org.apache.commons.lang3.time.FastDateFormat;
+
+import java.lang.reflect.Type;
+import java.text.ParseException;
 
 /**
- * 
  * @author Daniel Qian
- *
  */
 public class WxMpUserCumulateGsonAdapter implements JsonDeserializer<WxDataCubeUserCumulate> {
 
   private static final FastDateFormat DATE_FORMAT = FastDateFormat
-      .getInstance("yyyy-MM-dd");
+    .getInstance("yyyy-MM-dd");
 
   @Override
   public WxDataCubeUserCumulate deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
@@ -49,5 +41,5 @@ public WxDataCubeUserCumulate deserialize(JsonElement json, Type typeOfT, JsonDe
     return cumulate;
 
   }
-  
+
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
@@ -8,17 +8,12 @@
  */
 package me.chanjar.weixin.mp.util.json;
 
-import java.lang.reflect.Type;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
+import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 
+import java.lang.reflect.Type;
+
 public class WxMpUserGsonAdapter implements JsonDeserializer<WxMpUser> {
 
   @Override
@@ -43,7 +38,7 @@ public WxMpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
     wxMpUser.setGroupId(GsonHelper.getInteger(o, "groupid"));
     wxMpUser.setTagIds(GsonHelper.getIntArray(o, "tagid_list"));
     wxMpUser.setSexId(sexId);
-    if(new Integer(1).equals(sexId)) {
+    if (new Integer(1).equals(sexId)) {
       wxMpUser.setSex("男");
     } else if (new Integer(2).equals(sexId)) {
       wxMpUser.setSex("女");
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserSummaryGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserSummaryGsonAdapter.java
@@ -8,31 +8,25 @@
  */
 package me.chanjar.weixin.mp.util.json;
 
-import java.lang.reflect.Type;
-import java.text.ParseException;
-
-import org.apache.commons.lang3.time.FastDateFormat;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
+import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserSummary;
+import org.apache.commons.lang3.time.FastDateFormat;
+
+import java.lang.reflect.Type;
+import java.text.ParseException;
 
 /**
  * @author Daniel Qian
  */
 public class WxMpUserSummaryGsonAdapter implements JsonDeserializer<WxDataCubeUserSummary> {
 
   private static final FastDateFormat DATE_FORMAT = FastDateFormat
-      .getInstance("yyyy-MM-dd");
+    .getInstance("yyyy-MM-dd");
 
   @Override
   public WxDataCubeUserSummary deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-      throws JsonParseException {
+    throws JsonParseException {
     WxDataCubeUserSummary summary = new WxDataCubeUserSummary();
     JsonObject summaryJsonObject = json.getAsJsonObject();
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxQrCodeTicketAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxQrCodeTicketAdapter.java
@@ -15,9 +15,7 @@
 import java.lang.reflect.Type;
 
 /**
- * 
  * @author Daniel Qian
- *
  */
 public class WxQrCodeTicketAdapter implements JsonDeserializer<WxMpQrCodeTicket> {
 
@@ -37,5 +35,5 @@ public WxMpQrCodeTicket deserialize(JsonElement json, Type typeOfT, JsonDeserial
     }
     return ticket;
   }
-  
+
 }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public JsonElement serialize(WxMpKefuMessage message, Type typeOfSrc, JsonSerial`
`87`	`87`	`messageJson.add("wxcard", wxcard);`
`88`	`88`	`}`
`89`	`89`
`90`		`- if (StringUtils.isNotBlank(message.getKfAccount())){`
	`90`	`+ if (StringUtils.isNotBlank(message.getKfAccount())) {`
`91`	`91`	`JsonObject newsJsonObject = new JsonObject();`
`92`	`92`	`newsJsonObject.addProperty("kf_account", message.getKfAccount());`
`93`	`93`	`messageJson.add("customservice", newsJsonObject);`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,7 @@`
`15`	`15`	`import java.lang.reflect.Type;`
`16`	`16`
`17`	`17`	`/**`
`18`		`- *`
`19`	`18`	`* @author Daniel Qian`
`20`		`- *`
`21`	`19`	`*/`
`22`	`20`	`public class WxMpMassUploadResultAdapter implements JsonDeserializer<WxMpMassUploadResult> {`
`23`	`21`
`@@ -37,5 +35,5 @@ public WxMpMassUploadResult deserialize(JsonElement json, Type typeOfT, JsonDese`
`37`	`35`	`}`
`38`	`36`	`return uploadResult;`
`39`	`37`	`}`
`40`		`-`
	`38`	`+`
`41`	`39`	`}`