change name: matchrule to matchRule

enli2222 · Dec 22, 2015 · 6b522da · 6b522da
1 parent 8d87609
commit 6b522da
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java
@@ -19,7 +19,7 @@ public class WxMenu implements Serializable {
 
   private List<WxMenuButton> buttons = new ArrayList<WxMenuButton>();
 
-  private WxMenuRule matchrule;
+  private WxMenuRule matchRule;
 
   public List<WxMenuButton> getButtons() {
     return buttons;
@@ -29,12 +29,12 @@ public void setButtons(List<WxMenuButton> buttons) {
     this.buttons = buttons;
   }
 
-  public WxMenuRule getMatchrule() {
-    return matchrule;
+  public WxMenuRule getMatchRule() {
+    return matchRule;
   }
 
-  public void setMatchrule(WxMenuRule matchrule) {
-    this.matchrule = matchrule;
+  public void setMatchRule(WxMenuRule matchRule) {
+    this.matchRule = matchRule;
   }
 
   public String toJson() {

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
@@ -39,9 +39,9 @@ public JsonElement serialize(WxMenu menu, Type typeOfSrc, JsonSerializationConte
     }
     json.add("button", buttonArray);
 
-    if (menu.getMatchrule() != null) {
-    	Gson gson = new Gson();
-    	json.add("matchrule", gson.toJsonTree(menu.getMatchrule()));
+    if (menu.getMatchRule() != null) {
+      Gson gson = new Gson();
+      json.add("matchrule", gson.toJsonTree(menu.getMatchRule()));
     }
 
     return json;

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
@@ -230,7 +230,7 @@ public void customMessageSend(WxMpCustomMessage message) throws WxErrorException
   }
 
   public void menuCreate(WxMenu menu) throws WxErrorException {
-    if (menu.getMatchrule() != null) {
+    if (menu.getMatchRule() != null) {
       String url = "https://api.weixin.qq.com/cgi-bin/menu/addconditional";
       execute(new SimplePostRequestExecutor(), url, menu.toJson());
     } else {