updated unit tests

Author: l-trotta

java-client/src/main/java/co/elastic/clients/json/jackson/Jackson3JsonProvider.java

@@ -34,6 +34,7 @@
 import jakarta.json.stream.JsonGeneratorFactory;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParserFactory;
+import tools.jackson.core.ObjectReadContext;
 import tools.jackson.core.json.JsonFactory;
 
 import java.io.InputStream;
@@ -102,17 +103,17 @@ private class ParserFactory implements JsonParserFactory {
 
         @Override
         public JsonParser createParser(Reader reader) {
-            return new Jackson3JsonpParser(jsonFactory.createParser(reader), mapper);
+            return new Jackson3JsonpParser(mapper.objectMapper().createParser(reader), mapper);
         }
 
         @Override
         public JsonParser createParser(InputStream in) {
-            return new Jackson3JsonpParser(jsonFactory.createParser(in), mapper);
+            return new Jackson3JsonpParser(mapper.objectMapper().createParser(in), mapper);
         }
 
         @Override
         public JsonParser createParser(InputStream in, Charset charset) {
-            return new Jackson3JsonpParser(jsonFactory.createParser(new InputStreamReader(in, charset)),
+            return new Jackson3JsonpParser(mapper.objectMapper().createParser(new InputStreamReader(in, charset)),
                 mapper);
         }
 

java-client/src/main/java/co/elastic/clients/json/jackson/Jackson3JsonpGenerator.java

@@ -50,7 +50,7 @@ public static class Buffering extends Jackson3JsonpGenerator implements Bufferin
         private final Jackson3JsonpMapper mapper;
 
         public Buffering(Jackson3JsonpMapper mapper) {
-            super(new TokenBuffer(mapper.objectMapper()._serializationContext(), false));
+            super(TokenBuffer.forGeneration()); // TODO probably not
             this.mapper = mapper;
         }
 

java-client/src/main/java/co/elastic/clients/json/jackson/Jackson3JsonpMapper.java

@@ -70,7 +70,10 @@ private static JsonMapper configure(JsonMapper builder) {
         // Accept single objects as collections. This is useful in the context of Elasticsearch since
         // Lucene has no concept of multivalued field and fields with a single value will be returned
         // as a single object even if other instances of the same field have multiple values.
-        return builder.rebuild().enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY).build();
+        return builder.rebuild()
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+            .disable(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)
+            .build();
     }
 
     @Override

java-client/src/test/java/co/elastic/clients/json/jackson/Jackson3JsonBufferTest.java

@@ -0,0 +1,70 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.json.jackson;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Test;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.util.TokenBuffer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Jackson3JsonBufferTest {
+
+  private Jackson3JsonpMapper mapper() {
+    return new Jackson3JsonpMapper(new JsonMapper());
+  }
+
+  @Test
+  public void testToString_rendersJson() {
+    TokenBuffer buffer = TokenBuffer.forGeneration();
+    buffer.writeStartObject();
+    buffer.writeStringProperty("foo", "bar");
+    buffer.writeNumberProperty("baz", 42);
+    buffer.writeEndObject();
+
+    Jackson3JsonBuffer jsonBuffer = new Jackson3JsonBuffer(buffer, mapper());
+    String json = jsonBuffer.toString();
+    assertTrue(json.contains("\"foo\":\"bar\""));
+    assertTrue(json.contains("\"baz\":42"));
+    assertTrue(json.startsWith("{") && json.endsWith("}"));
+  }
+
+  @Test
+  public void testToString_emptyBuffer() {
+    TokenBuffer buffer = TokenBuffer.forGeneration();
+    Jackson3JsonBuffer jsonBuffer = new Jackson3JsonBuffer(buffer, mapper());
+    String json = jsonBuffer.toString();
+    assertEquals(StringUtils.EMPTY, json.trim());
+  }
+
+  @Test
+  public void testToString_invalidBuffer() {
+    TokenBuffer buffer = TokenBuffer.forGeneration();
+
+    // Write some invalid JSON (start object but don't close)
+    buffer.writeStartObject();
+    Jackson3JsonBuffer jsonBuffer = new Jackson3JsonBuffer(buffer, mapper());
+    String json = jsonBuffer.toString();
+    // Should not throw, but may contain error or partial output
+    assertTrue(json.startsWith("{"));
+  }
+}

java-client/src/test/java/co/elastic/clients/json/jackson/Jackson3JsonValueParserTest.java

@@ -0,0 +1,77 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.json.jackson;
+
+import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpUtils;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonParser;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.StringReader;
+import java.util.Map;
+
+public class Jackson3JsonValueParserTest extends Assertions {
+
+    public static class Data {
+        public Map<String, Object> data;
+    }
+
+    @Test
+    public void testFloatsShouldDeserializeAsFloats() throws Exception {
+        // When using Jackson to target a map of objects, values with a decimal separator
+        // should deserialize as a double even if they fit in an int or long.
+        // See https://github.com/elastic/elasticsearch-java/issues/156
+
+        String json = "{\"data\": {\"value\": 1.4778125E7, \"value2\": 1.4778125E7 }}";
+        JsonpMapper mapper = new Jackson3JsonpMapper();
+
+        {
+            JsonParser parser = mapper.jsonProvider().createParser(new StringReader(json));
+            Data data = mapper.deserialize(parser, Data.class);
+
+            Double d = (Double) data.data.get("value");
+            assertEquals(1.4778125E7, d, 0.001);
+        }
+
+        {
+            // Test with buffering used in union resolution
+            JsonParser parser = mapper.jsonProvider().createParser(new StringReader(json));
+            parser.next();
+            JsonObject object = parser.getObject();
+
+            // Test equals/hashcode
+            JsonValue v = object.getJsonObject("data").get("value");
+            JsonValue v2 = object.getJsonObject("data").get("value2");
+
+            assertEquals(v.hashCode(), v2.hashCode());
+            assertEquals(v, v2);
+
+            parser = JsonpUtils.jsonValueParser(object, mapper);
+            Data data = mapper.deserialize(parser, Data.class);
+
+            Double d = (Double) data.data.get("value");
+            assertEquals(1.4778125E7, d, 0.001);
+        }
+
+    }
+}

java-client/src/test/java/co/elastic/clients/json/jackson/Jackson3JsonpGeneratorTest.java

@@ -0,0 +1,90 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.json.jackson;
+
+import jakarta.json.Json;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonGenerator;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.StringWriter;
+
+public class Jackson3JsonpGeneratorTest extends Assertions {
+
+    @Test
+    public void testWrite(){
+        StringWriter sw = new StringWriter();
+        JsonGenerator generator = new Jackson3JsonpMapper().jsonProvider().createGenerator(sw);
+
+        generator.writeStartObject();
+
+        // Boolean
+        generator.write("bool1", true);
+        generator.writeKey("bool2");
+        generator.write(false);
+
+        // String
+        generator.write("str1", "foo");
+        generator.writeKey("str2");
+        generator.write("bar");
+
+        // Integer
+        generator.write("int1", 42);
+        generator.writeKey("int2");
+        generator.write(1337);
+
+        // Long
+        generator.write("long1", 123456789012345L);
+        generator.writeKey("long2");
+        generator.write(123456789012345L);
+
+        generator.write("double1", 0.001);
+        generator.writeKey("double2");
+        generator.write(12345.6789);
+
+        // JsonValue
+        JsonValue jsonValue = Json.createObjectBuilder()
+            .add("bool", true)
+            .add("str", "foo")
+            .add("int", 42)
+            .add("long", 123456789012345L)
+            .add("double", 12345.6789)
+            .build();
+
+        generator.write("value", jsonValue);
+
+        generator.close();
+
+        assertEquals("{" +
+            "\"bool1\":true," +
+            "\"bool2\":false," +
+            "\"str1\":\"foo\"," +
+            "\"str2\":\"bar\"," +
+            "\"int1\":42," +
+            "\"int2\":1337," +
+            "\"long1\":123456789012345," +
+            "\"long2\":123456789012345," +
+            "\"double1\":0.001," +
+            "\"double2\":12345.6789," +
+            "\"value\":{\"bool\":true,\"str\":\"foo\",\"int\":42,\"long\":123456789012345,\"double\":12345.6789}" +
+            "}", sw.toString());
+    }
+}