Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions gson/src/main/java/com/google/gson/JsonArray.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collector;
import org.jspecify.annotations.Nullable;

/**
* A class representing an array type in JSON. An array is a list of {@link JsonElement}s each of
Expand All @@ -40,6 +42,24 @@
* @author Joel Leitch
*/
public final class JsonArray extends JsonElement implements Iterable<JsonElement> {
private static final Collector<@Nullable JsonElement, JsonArray, JsonArray> COLLECTOR =
Collector.of(
JsonArray::new,
JsonArray::add,
(left, right) -> {
left.addAll(right);
return left;
});

/**
* Returns a {@link Collector} that accumulates {@link JsonElement}s into a {@code JsonArray}.
*
* @since $next-version$
*/
public static Collector<@Nullable JsonElement, ?, JsonArray> collector() {
return COLLECTOR;
}

private final ArrayList<JsonElement> elements;

/** Creates an empty JsonArray. */
Expand Down
28 changes: 28 additions & 0 deletions gson/src/test/java/com/google/gson/JsonArrayTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import com.google.common.testing.EqualsTester;
import com.google.gson.common.MoreAsserts;
import java.math.BigInteger;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.junit.Test;

/**
Expand Down Expand Up @@ -354,4 +356,30 @@ public void testToString() {
array.add(nestedObject);
assertThat(array.toString()).isEqualTo("[null,NaN,\"a\\u0000\",[\"\\\"\"],{\"n\\u0000\":1}]");
}

@Test
public void testCollector() {
JsonArray array =
Stream.of(new JsonPrimitive(1), new JsonArray(), null, new JsonObject())
.collect(JsonArray.collector());
assertThat(array).hasSize(4);
assertThat(array.get(0).getAsInt()).isEqualTo(1);
assertThat(array.get(1).isJsonArray()).isTrue();
assertThat(array.get(2).isJsonNull()).isTrue();
assertThat(array.get(3).isJsonObject()).isTrue();
}

@Test
public void testCollectorParallel() {
JsonArray array =
IntStream.range(0, 20)
.parallel()
.mapToObj(JsonPrimitive::new)
.collect(JsonArray.collector());

assertThat(array).hasSize(20);
for (int i = 0; i < array.size(); i++) {
assertThat(array.get(i).getAsInt()).isEqualTo(i);
}
}
}
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
Loading