Skip to content

Return null from GsonHelper array getters for a non-array property #4056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vasiliy-mikhailov wants to merge 1 commit into
base: develop
Choose a base branch
from
+29 −4
Open

Return null from GsonHelper array getters for a non-array property #4056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/GsonHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static float getAsPrimitiveFloat(JsonElement element) {
}

public static Integer[] getIntArray(JsonObject o, String string) {
JsonArray jsonArray = getAsJsonArray(o.getAsJsonArray(string));
JsonArray jsonArray = getAsJsonArray(o.get(string));
if (jsonArray == null) {
return null;
}
Expand All @@ -122,7 +122,7 @@ public static Integer[] getIntArray(JsonObject o, String string) {
}

public static String[] getStringArray(JsonObject o, String string) {
JsonArray jsonArray = getAsJsonArray(o.getAsJsonArray(string));
JsonArray jsonArray = getAsJsonArray(o.get(string));
if (jsonArray == null) {
return null;
}
Expand All @@ -136,7 +136,7 @@ public static String[] getStringArray(JsonObject o, String string) {
}

public static Long[] getLongArray(JsonObject o, String string) {
JsonArray jsonArray = getAsJsonArray(o.getAsJsonArray(string));
JsonArray jsonArray = getAsJsonArray(o.get(string));
if (jsonArray == null) {
return null;
}
Expand All @@ -150,7 +150,7 @@ public static Long[] getLongArray(JsonObject o, String string) {
}

public static JsonArray getAsJsonArray(JsonElement element) {
return element == null ? null : element.getAsJsonArray();
return (element == null || !element.isJsonArray()) ? null : element.getAsJsonArray();
}

/**
Expand Down
25 changes: 25 additions & 0 deletions weixin-java-common/src/test/java/me/chanjar/weixin/common/util/json/GsonHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,29 @@ public void testBuildSimpleJsonObject() {
System.out.println(GsonHelper.buildJsonObject(1, true, "jsonElement", new JsonObject()));
System.out.println(GsonHelper.buildJsonObject("num", 2, "string", "cde", "char", 'a', "bool", true));
}

/**
* If the JSON property exists but is NOT a JSON array (e.g. a plain string),
* getIntArray should return null gracefully rather than throwing ClassCastException.
*/
@Test
public void testGetIntArrayNonArrayProperty() {
JsonObject json = new JsonObject();
json.addProperty("items", "not-an-array");
assertThat(GsonHelper.getIntArray(json, "items")).isNull();
}

@Test
public void testGetStringArrayNonArrayProperty() {
JsonObject json = new JsonObject();
json.addProperty("items", 123);
assertThat(GsonHelper.getStringArray(json, "items")).isNull();
}

@Test
public void testGetLongArrayNonArrayProperty() {
JsonObject json = new JsonObject();
json.addProperty("items", "not-an-array");
assertThat(GsonHelper.getLongArray(json, "items")).isNull();
}
}