Additional json decoding tests and bugfix

Author: swallez

java-client/src/main/java/co/elastic/clients/json/JsonDataImpl.java

@@ -58,7 +58,9 @@ public JsonValue toJson(JsonpMapper mapper) {
  "' that cannot be converted to a JsonValue without a mapper");
  }
 
- return getParser(mapper).getValue();
+ final JsonParser parser = getParser(mapper);
+ parser.next(); // move to first event
+ return parser.getValue();
  }
 
  @Override

java-client/src/main/java/co/elastic/clients/json/JsonpDeserializer.java

@@ -19,6 +19,7 @@
 
 package co.elastic.clients.json;
 
+import co.elastic.clients.util.TriFunction;
 import jakarta.json.JsonValue;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParser.Event;
@@ -62,7 +63,8 @@ default boolean accepts(Event event) {
  */
  default V deserialize(JsonParser parser, JsonpMapper mapper) {
  JsonParser.Event event = parser.next();
- if (event == JsonParser.Event.VALUE_NULL) {
+ // JSON null: return null unless the deserializer can handle it
+ if (event == JsonParser.Event.VALUE_NULL && !accepts(Event.VALUE_NULL)) {
  return null;
  }
  JsonpUtils.ensureAccepts(this, parser, event);
@@ -113,6 +115,15 @@ public T deserialize(JsonParser parser, JsonpMapper mapper, Event event) {
  };
  }
 
+ static <T> JsonpDeserializer<T> of(EnumSet<Event> acceptedEvents, TriFunction<JsonParser, JsonpMapper, JsonParser.Event, T> fn) {
+ return new JsonpDeserializerBase<T>(acceptedEvents) {
+ @Override
+ public T deserialize(JsonParser parser, JsonpMapper mapper, Event event) {
+ return fn.apply(parser, mapper, event);
+ }
+ };
+ }
+
  static <T> JsonpDeserializer<T> lazy(Supplier<JsonpDeserializer<T>> ctor) {
  return new LazyDeserializer<>(ctor);
  }

java-client/src/main/java/co/elastic/clients/json/JsonpDeserializerBase.java

@@ -125,7 +125,8 @@ public Integer deserialize(JsonParser parser, JsonpMapper mapper, Event event) {
 
  static final JsonpDeserializer<Boolean> BOOLEAN =
  new JsonpDeserializerBase<Boolean>(
- EnumSet.of(Event.VALUE_FALSE, Event.VALUE_TRUE, Event.VALUE_STRING)
+ EnumSet.of(Event.VALUE_FALSE, Event.VALUE_TRUE, Event.VALUE_STRING),
+ EnumSet.of(Event.VALUE_FALSE, Event.VALUE_TRUE)
  ) {
  @Override
  public Boolean deserialize(JsonParser parser, JsonpMapper mapper, Event event) {
@@ -183,7 +184,7 @@ public Double deserialize(JsonParser parser, JsonpMapper mapper, Event event) {
  static final JsonpDeserializer<Number> NUMBER =
  new JsonpDeserializerBase<Number>(
  EnumSet.of(Event.VALUE_NUMBER, Event.VALUE_STRING),
- EnumSet.of(Event.VALUE_STRING)
+ EnumSet.of(Event.VALUE_NUMBER)
  ) {
  @Override
  public Number deserialize(JsonParser parser, JsonpMapper mapper, Event event) {

java-client/src/main/java/co/elastic/clients/json/JsonpUtils.java

@@ -95,23 +95,6 @@ public static void skipValue(JsonParser parser, Event event) {
  }
  }
 
- /**
- * Throws a {@link JsonParsingException} because some unknown property name was encountered
- */
- public static void unknownKey(JsonParser parser, String keyName) {
- throw new JsonParsingException("Unknown property '" + keyName + "'", parser.getLocation());
- }
-
- public static String ensureSingleVariant(JsonParser parser, String variant1, String variant2) {
- if (variant1 != null && variant2 != null) {
- throw new JsonParsingException(
- "Only one variant can be specified, found '" + variant1 + "' and '" + variant2 + "'",
- parser.getLocation()
- );
- }
- return variant2;
- }
-
  public static <T> T buildVariant(JsonParser parser, ObjectBuilder<T> builder) {
  if (builder == null) {
  throw new JsonParsingException("No variant found" , parser.getLocation());

java-client/src/test/java/co/elastic/clients/elasticsearch/end_to_end/RequestTest.java

@@ -44,8 +44,8 @@
 import co.elastic.clients.elasticsearch.model.ModelTestCase;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.jsonb.JsonbJsonpMapper;
-import co.elastic.clients.transport.endpoints.BooleanResponse;
 import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.endpoints.BooleanResponse;
 import co.elastic.clients.transport.rest_client.RestClientTransport;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;

java-client/src/test/java/co/elastic/clients/elasticsearch/experiments/ClientTests.java

@@ -28,7 +28,6 @@
 import co.elastic.clients.transport.Endpoint;
 import org.junit.Test;
 
-
 import java.io.IOException;
 import java.util.Collections;
 

java-client/src/test/java/co/elastic/clients/elasticsearch/experiments/api/DateMathTimeUnit.java

@@ -19,8 +19,8 @@
 
 package co.elastic.clients.elasticsearch.experiments.api;
 
-import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonEnum;
+import co.elastic.clients.json.JsonpDeserializer;
 
 public enum DateMathTimeUnit implements JsonEnum {
 

java-client/src/test/java/co/elastic/clients/elasticsearch/experiments/api/query2/Query.java

@@ -19,16 +19,16 @@
 
 package co.elastic.clients.elasticsearch.experiments.api.query2;
 
+import co.elastic.clients.elasticsearch.experiments.UnionVariant;
 import co.elastic.clients.json.BuildFunctionDeserializer;
+import co.elastic.clients.json.JsonEnum;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ObjectBuilder;
-import co.elastic.clients.json.JsonEnum;
 import co.elastic.clients.util.TaggedUnion;
 import co.elastic.clients.util.TaggedUnionUtils;
-import co.elastic.clients.elasticsearch.experiments.UnionVariant;
 import jakarta.json.JsonValue;
 import jakarta.json.stream.JsonGenerator;
 

java-client/src/test/java/co/elastic/clients/elasticsearch/experiments/containers/SomeUnion.java

@@ -33,14 +33,14 @@ interface VariantB {
  }
 */
 
+import co.elastic.clients.json.JsonEnum;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ObjectBuilder;
-import co.elastic.clients.json.JsonEnum;
 import co.elastic.clients.util.TaggedUnion;
 import co.elastic.clients.util.TaggedUnionUtils;
 import jakarta.json.stream.JsonGenerator;

java-client/src/test/java/co/elastic/clients/elasticsearch/json/JsonDataTest.java

@@ -22,6 +22,8 @@
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.jsonb.JsonbJsonpMapper;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonParser;
 import org.junit.Assert;
@@ -73,4 +75,15 @@ public void testSerialize() {
 
  assertEquals(json, sw.toString());
  }
+
+ @Test
+ public void testConvert() {
+
+ JsonData json = JsonData.of("foo");
+
+ final JsonValue value = json.toJson(new JsonbJsonpMapper());
+
+ assertEquals(JsonValue.ValueType.STRING, value.getValueType());
+ assertEquals("foo", ((JsonString)value).getString());
+ }
 }