From dc33436d5128c4a116da0d424abb0dc227e72c46 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 20 Dec 2016 16:48:26 +0800 Subject: [PATCH] reformat some code --- .../mp/util/json/WxMpCardGsonAdapter.java | 13 +++------ .../util/json/WxMpCardResultGsonAdapter.java | 15 ++++------ .../weixin/mp/util/json/WxMpGsonBuilder.java | 29 +++---------------- .../mp/util/json/WxMpIndustryGsonAdapter.java | 26 ++++++++--------- .../util/json/WxMpKefuMessageGsonAdapter.java | 2 +- .../json/WxMpMassUploadResultAdapter.java | 4 +-- .../mp/util/json/WxMpMassVideoAdapter.java | 2 -- .../WxMpMaterialNewsArticleGsonAdapter.java | 4 +-- .../json/WxMpOAuth2AccessTokenAdapter.java | 13 +++------ .../json/WxMpSemanticQueryResultAdapter.java | 4 +-- .../json/WxMpTemplateMessageGsonAdapter.java | 1 - .../json/WxMpUserCumulateGsonAdapter.java | 22 +++++--------- .../mp/util/json/WxMpUserGsonAdapter.java | 13 +++------ .../util/json/WxMpUserSummaryGsonAdapter.java | 20 +++++-------- .../mp/util/json/WxQrCodeTicketAdapter.java | 4 +-- 15 files changed, 54 insertions(+), 118 deletions(-) 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 index 33148577..022a59f1 100644 --- 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 { @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 index f595cf7c..9d786649 100644 --- 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 class WxMpCardResultGsonAdapter implements JsonDeserializer() { - }.getType()); + new TypeToken() { + }.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 index 37a39706..286778ad 100644 --- 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 @@ package me.chanjar.weixin.mp.util.json; 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 index 68106bb6..eb0972bc 100644 --- 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 @@ import java.lang.reflect.Type; * @author miller */ public class WxMpIndustryGsonAdapter - implements JsonSerializer, JsonDeserializer { + implements JsonSerializer, JsonDeserializer { + 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 class WxMpIndustryGsonAdapter @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 index abab87a1..56297ce2 100644 --- 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 class WxMpKefuMessageGsonAdapter implements JsonSerializer { @@ -37,5 +35,5 @@ public class WxMpMassUploadResultAdapter implements JsonDeserializer { 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 index b3791ec9..a74877f1 100644 --- 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 class WxMpMaterialNewsArticleGsonAdapter implements JsonSerializer { @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 index 2e354597..247182d2 100644 --- 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 me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult; import java.lang.reflect.Type; /** - * * @author Daniel Qian - * */ public class WxMpSemanticQueryResultAdapter implements JsonDeserializer { @@ -46,5 +44,5 @@ public class WxMpSemanticQueryResultAdapter implements JsonDeserializer { 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 class WxMpUserCumulateGsonAdapter implements JsonDeserializer { @Override @@ -43,7 +38,7 @@ public class WxMpUserGsonAdapter implements JsonDeserializer { 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 index 2e0791f8..b101e01f 100644 --- 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,19 +8,13 @@ */ 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 @@ -28,11 +22,11 @@ import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserSummary; public class WxMpUserSummaryGsonAdapter implements JsonDeserializer { 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 index c08614e5..bd1bbd90 100644 --- 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 me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; import java.lang.reflect.Type; /** - * * @author Daniel Qian - * */ public class WxQrCodeTicketAdapter implements JsonDeserializer { @@ -37,5 +35,5 @@ public class WxQrCodeTicketAdapter implements JsonDeserializer } return ticket; } - + }