diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-18 22:32:58 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-18 22:32:58 +0200 |
commit | 7d54cd9ee6ad52836dfac4b584053a9fe7160b5b (patch) | |
tree | 23be90437474d3890786d1a81a1f69a6fb678bf6 /vespajlib/src | |
parent | 282ed72b5ad4bb44aa11b35ddd31b16c679db720 (diff) |
- Unify on the faster JsonRender. The default Value.toString has a very high initial cost as it is intended for large json structures.
Diffstat (limited to 'vespajlib/src')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/data/access/slime/SlimeAdapter.java | 21 | ||||
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java | 7 |
2 files changed, 14 insertions, 14 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/data/access/slime/SlimeAdapter.java b/vespajlib/src/main/java/com/yahoo/data/access/slime/SlimeAdapter.java index 010a015f288..0d4484a7136 100644 --- a/vespajlib/src/main/java/com/yahoo/data/access/slime/SlimeAdapter.java +++ b/vespajlib/src/main/java/com/yahoo/data/access/slime/SlimeAdapter.java @@ -33,17 +33,16 @@ public final class SlimeAdapter implements com.yahoo.data.access.Inspector { public boolean valid() { return inspector.valid(); } public com.yahoo.data.access.Type type() { - switch(inspector.type()) { - case NIX: return com.yahoo.data.access.Type.EMPTY; - case BOOL: return com.yahoo.data.access.Type.BOOL; - case LONG: return com.yahoo.data.access.Type.LONG; - case DOUBLE: return com.yahoo.data.access.Type.DOUBLE; - case STRING: return com.yahoo.data.access.Type.STRING; - case DATA: return com.yahoo.data.access.Type.DATA; - case ARRAY: return com.yahoo.data.access.Type.ARRAY; - case OBJECT: return com.yahoo.data.access.Type.OBJECT; - } - return com.yahoo.data.access.Type.EMPTY; + return switch (inspector.type()) { + case NIX -> com.yahoo.data.access.Type.EMPTY; + case BOOL -> com.yahoo.data.access.Type.BOOL; + case LONG -> com.yahoo.data.access.Type.LONG; + case DOUBLE -> com.yahoo.data.access.Type.DOUBLE; + case STRING -> com.yahoo.data.access.Type.STRING; + case DATA -> com.yahoo.data.access.Type.DATA; + case ARRAY -> com.yahoo.data.access.Type.ARRAY; + case OBJECT -> com.yahoo.data.access.Type.OBJECT; + }; } private boolean verify(Type okTypeA) { diff --git a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java index f30c3e66aab..5432e139918 100644 --- a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java +++ b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java @@ -1,15 +1,16 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.slime; -import ai.vespa.validation.Validation; import com.yahoo.io.AbstractByteWriter; import com.yahoo.io.ByteWriter; import com.yahoo.text.AbstractUtf8Array; import com.yahoo.text.Utf8; import com.yahoo.text.Utf8String; -import java.io.*; -import java.nio.charset.StandardCharsets; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.UncheckedIOException; import static ai.vespa.validation.Validation.requireInRange; import static java.nio.charset.StandardCharsets.UTF_8; |