Merge with master

1 files changed, 41 insertions, 0 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/lang/SettableOptional.java b/vespajlib/src/main/java/com/yahoo/lang/SettableOptional.java
new file mode 100644
index 00000000000..00ff06b8f01
--- /dev/null
+++ b/vespajlib/src/main/java/com/yahoo/lang/SettableOptional.java
@@ -0,0 +1,41 @@
+package com.yahoo.lang;
+
+import java.util.NoSuchElementException;
+import java.util.Optional;
+
+/**
+ * An optional which contains a settable value
+ *
+ * @author bratseth
+ */
+public final class SettableOptional<T> {
+
+    private T value = null;
+
+    /** Creates a new empty settable optional */
+    public SettableOptional() {}
+
+    /** Creates a new settable optional with the given value */
+    public SettableOptional(T value) { this.value = value; }
+
+    public boolean isPresent() {
+        return value != null;
+    }
+
+    public T get() {
+        if (value == null)
+            throw new NoSuchElementException("No value present");
+        return value;
+    }
+
+    public void set(T value) {
+        this.value = value;
+    }
+    
+    public Optional<T> asOptional() {
+        if (value == null) return Optional.empty();
+        return Optional.of(value);
+    }
+
+}
+