diff options
Diffstat (limited to 'vespajlib/src/test')
| -rw-r--r-- | vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java | 18 | ||||
| -rw-r--r-- | vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java | 9 |
2 files changed, 13 insertions, 14 deletions
diff --git a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java index 19862e874d6..e1aafca8d22 100644 --- a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java +++ b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java @@ -1,11 +1,11 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.slime; +import ai.vespa.json.Jackson; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -38,12 +38,13 @@ public class JsonBenchmark { try { for (int i=0; i < numIterations; i++) { - JsonParser jsonParser = jsonFactory.createParser(json); - JsonToken array = jsonParser.nextToken(); - for (JsonToken token = jsonParser.nextToken(); ! JsonToken.END_ARRAY.equals(token); token = jsonParser.nextToken()) { - if (JsonToken.FIELD_NAME.equals(token) && "weight".equals(jsonParser.getCurrentName())) { - token = jsonParser.nextToken(); - count += jsonParser.getLongValue(); + try (JsonParser jsonParser = jsonFactory.createParser(json)) { + JsonToken array = jsonParser.nextToken(); + for (JsonToken token = jsonParser.nextToken(); !JsonToken.END_ARRAY.equals(token); token = jsonParser.nextToken()) { + if (JsonToken.FIELD_NAME.equals(token) && "weight".equals(jsonParser.getCurrentName())) { + token = jsonParser.nextToken(); + count += jsonParser.getLongValue(); + } } } } @@ -54,11 +55,10 @@ public class JsonBenchmark { } private static long benchmarkJacksonTree(byte [] json, int numIterations) { long count = 0; - ObjectMapper mapper = new ObjectMapper(); // use the ObjectMapper to read the json string and create a tree try { for (int i=0; i < numIterations; i++) { - JsonNode node = mapper.readTree(json); + JsonNode node = Jackson.mapper().readTree(json); for(JsonNode item : node) { count += item.get("weight").asLong(); } diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java index 2be61de0bfa..147cb402cb3 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java @@ -2,8 +2,8 @@ package com.yahoo.tensor.serialization; +import ai.vespa.json.Jackson; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.io.GrowableByteBuffer; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; @@ -25,8 +25,8 @@ import static org.junit.Assert.assertTrue; public class SerializationTestCase { - private static String testPath = "eval/src/apps/make_tensor_binary_format_test_spec/test_spec.json"; - private static List<String> tests = new ArrayList<>(); + private static final String testPath = "eval/src/apps/make_tensor_binary_format_test_spec/test_spec.json"; + private static final List<String> tests = new ArrayList<>(); @Before public void loadTests() throws IOException { @@ -46,8 +46,7 @@ public class SerializationTestCase { @Test public void testSerialization() throws IOException { for (String test : tests) { - ObjectMapper mapper = new ObjectMapper(); - JsonNode node = mapper.readTree(test); + JsonNode node = Jackson.mapper().readTree(test); if (node.has("tensor") && node.has("binary")) { System.out.println("Running test: " + test); |