Skip to content

Commit

Permalink
Accept null in arrays (#687)
Browse files Browse the repository at this point in the history
* changes to allow nulls in arrays

Signed-off-by: Karthik Subramanian <ksubramanian@scholastic.com>

* changes to allow nulls in arrays

Signed-off-by: Karthik Subramanian <ksubramanian@scholastic.com>

* updated changelog with correct PR

Signed-off-by: Karthik Subramanian <ksubramanian@scholastic.com>

* SpotlessJavaCheck violations fixed

Signed-off-by: Karthik Subramanian <ksubramanian@scholastic.com>

---------

Signed-off-by: Karthik Subramanian <ksubramanian@scholastic.com>
Co-authored-by: Karthik Subramanian <ksubramanian@scholastic.com>
(cherry picked from commit de8c2a9)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and Karthik Subramanian committed Oct 27, 2023
1 parent ff3916c commit bae7ffe
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### Dependencies

### Changed
Allow null values in arrays ([#687](https://github.com/opensearch-project/opensearch-java/pull/687))

### Deprecated

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,13 @@ public List<T> deserialize(JsonParser parser, JsonpMapper mapper, Event event) {
if (event == Event.START_ARRAY) {
List<T> result = new ArrayList<>();
while ((event = parser.next()) != Event.END_ARRAY) {
JsonpUtils.ensureAccepts(itemDeserializer, parser, event);
result.add(itemDeserializer.deserialize(parser, mapper, event));
// JSON null: add null unless the deserializer can handle it
if (event == Event.VALUE_NULL && !itemDeserializer.accepts(event)) {
result.add(null);
} else {
JsonpUtils.ensureAccepts(itemDeserializer, parser, event);
result.add(itemDeserializer.deserialize(parser, mapper, event));
}
}
return result;
} else {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package org.opensearch.client.opensearch.json;

import jakarta.json.stream.JsonParser;
import java.io.StringReader;
import java.util.List;
import org.junit.Test;
import org.opensearch.client.json.JsonpDeserializer;
import org.opensearch.client.opensearch._types.FieldValue;
import org.opensearch.client.opensearch.model.ModelTestCase;

public class JsonpDeserializerBaseTest extends ModelTestCase {

@Test
public void testNullArrayItem() {

String json = "[\"a\", null, \"c\"]";

// Types that don't accept null events should end up as null values in the list
{
JsonpDeserializer<String> stringDeser = JsonpDeserializer.stringDeserializer();
assertFalse(stringDeser.accepts(JsonParser.Event.VALUE_NULL));

JsonParser parser = mapper.jsonProvider().createParser(new StringReader(json));

List<String> stringList = JsonpDeserializer.arrayDeserializer(stringDeser).deserialize(parser, mapper);
assertEquals("a", stringList.get(0));
assertNull(stringList.get(1));
assertEquals("c", stringList.get(2));
}

// Types that do accept null events should end up as their null representation
{
assertTrue(FieldValue._DESERIALIZER.accepts(JsonParser.Event.VALUE_NULL));

JsonParser parser = mapper.jsonProvider().createParser(new StringReader(json));
List<FieldValue> valueList = JsonpDeserializer.arrayDeserializer(FieldValue._DESERIALIZER).deserialize(parser, mapper);

assertEquals("a", valueList.get(0)._get());
assertTrue(valueList.get(1).isNull());
assertEquals("c", valueList.get(2)._get());
}
}
}

0 comments on commit bae7ffe

Please sign in to comment.