diff options
author | Bjørn Christian Seime <bjorncs@vespa.ai> | 2024-02-29 10:37:54 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@vespa.ai> | 2024-02-29 10:37:54 +0100 |
commit | b98feee09bc97bcf4dcaf3e51ec9514f79b76d5b (patch) | |
tree | ab0ccd0bc22c38160dc941ddad209e12624bcf8e /vespajlib/src/main | |
parent | 83096e38fcfdf9fa8af28cd0de7dd8183ddf13e9 (diff) |
Don't use optional variants for primitive types
Diffstat (limited to 'vespajlib/src/main')
-rw-r--r-- | vespajlib/src/main/java/ai/vespa/json/Json.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vespajlib/src/main/java/ai/vespa/json/Json.java b/vespajlib/src/main/java/ai/vespa/json/Json.java index da7aae06e8d..5cb04e30e56 100644 --- a/vespajlib/src/main/java/ai/vespa/json/Json.java +++ b/vespajlib/src/main/java/ai/vespa/json/Json.java @@ -16,8 +16,6 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.OptionalDouble; -import java.util.OptionalLong; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -71,14 +69,14 @@ public class Json implements Iterable<Json> { return asString(); } - public OptionalLong asOptionalLong() { return isMissing() ? OptionalLong.empty() : OptionalLong.of(asLong()); } + public Optional<Long> asOptionalLong() { return isMissing() ? Optional.empty() : Optional.of(asLong()); } public long asLong() { requireType(Type.LONG, Type.DOUBLE); return inspector.asLong(); } public long asLong(long defaultValue) { if (isMissing()) return defaultValue; return asLong(); } - public OptionalDouble asOptionalDouble() { return isMissing() ? OptionalDouble.empty() : OptionalDouble.of(asDouble()); } + public Optional<Double> asOptionalDouble() { return isMissing() ? Optional.empty() : Optional.of(asDouble()); } public double asDouble() { requireType(Type.LONG, Type.DOUBLE); return inspector.asDouble(); } public double asDouble(double defaultValue) { if (isMissing()) return defaultValue; |