Skip to content

Throw JsonSyntaxException for null element in primitive array #3118

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

Closed
jdymitarai wants to merge 1 commit into from
Closed

Throw JsonSyntaxException for null element in primitive array #3118

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: 8 additions & 0 deletions gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.google.gson.internal.bind;

import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.internal.GsonTypes;
Expand Down Expand Up @@ -73,6 +74,13 @@ public Object read(JsonReader in) throws IOException {
in.beginArray();
while (in.hasNext()) {
E instance = componentTypeAdapter.read(in);
if (componentType.isPrimitive() && instance == null) {
throw new JsonSyntaxException(
"null is not a valid "
+ componentType.getName()
+ "[] element; at path "
+ in.getPreviousPath());
}
list.add(instance);
}
in.endArray();
Expand Down
53 changes: 53 additions & 0 deletions gson/src/test/java/com/google/gson/functional/ArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSyntaxException;
import com.google.gson.common.TestTypes.BagOfPrimitives;
import com.google.gson.common.TestTypes.ClassWithObjects;
import com.google.gson.reflect.TypeToken;
Expand Down Expand Up @@ -101,6 +102,58 @@ public void testNullsInArrayDeserialization() {
assertThat(target).asList().containsAnyIn(expected);
}

@Test
public void testNullsInPrimitiveArrayDeserialization() {
var e = assertThrows(JsonSyntaxException.class, () -> gson.fromJson("[1,null,3]", int[].class));
assertThat(e).hasMessageThat().isEqualTo("null is not a valid int[] element; at path $[1]");

e =
assertThrows(
JsonSyntaxException.class, () -> gson.fromJson("[true,null,false]", boolean[].class));
assertThat(e).hasMessageThat().isEqualTo("null is not a valid boolean[] element; at path $[1]");

e =
assertThrows(
JsonSyntaxException.class, () -> gson.fromJson("[1.0,null,2.0]", double[].class));
assertThat(e).hasMessageThat().isEqualTo("null is not a valid double[] element; at path $[1]");

e = assertThrows(JsonSyntaxException.class, () -> gson.fromJson("[1,null,2]", long[].class));
assertThat(e).hasMessageThat().isEqualTo("null is not a valid long[] element; at path $[1]");

e =
assertThrows(
JsonSyntaxException.class, () -> gson.fromJson("['a',null,'b']", char[].class));
assertThat(e).hasMessageThat().isEqualTo("null is not a valid char[] element; at path $[1]");

e = assertThrows(JsonSyntaxException.class, () -> gson.fromJson("[1,null,2]", byte[].class));
assertThat(e).hasMessageThat().isEqualTo("null is not a valid byte[] element; at path $[1]");

e = assertThrows(JsonSyntaxException.class, () -> gson.fromJson("[1,null,2]", short[].class));
assertThat(e).hasMessageThat().isEqualTo("null is not a valid short[] element; at path $[1]");

e =
assertThrows(
JsonSyntaxException.class, () -> gson.fromJson("[1.0,null,2.0]", float[].class));
assertThat(e).hasMessageThat().isEqualTo("null is not a valid float[] element; at path $[1]");

// Multidimensional array: null inner element
e =
assertThrows(
JsonSyntaxException.class, () -> gson.fromJson("[[1,null],[2,3]]", int[][].class));
assertThat(e).hasMessageThat().isEqualTo("null is not a valid int[] element; at path $[0][1]");
}

@Test
public void testNullsInBoxedAndMultidimensionalArray() {
Integer[] boxed = gson.fromJson("[1,null,3]", Integer[].class);
assertThat(boxed).asList().containsExactly(1, null, 3).inOrder();

int[][] multi = gson.fromJson("[[1,2],null]", int[][].class);
assertThat(multi).hasLength(2);
assertThat(multi[0]).isEqualTo(new int[] {1, 2});
assertThat(multi[1]).isNull();
}

@Test
public void testSingleNullInArraySerialization() {
BagOfPrimitives[] array = new BagOfPrimitives[1];
Expand Down