1 files changed, 23 insertions, 0 deletions
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/Environment.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/Environment.scala
new file mode 100644
index 00000000000..98671e2addf
--- /dev/null
+++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/Environment.scala
@@ -0,0 +1,23 @@
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.container.standalone
+
+/**
+ * @author tonytv
+ * TODO: copied from standalone-container. Move to separate lib module instead.
+ */
+object Environment {
+  def optionalYinstVariable(name: String) = {
+    env(name.replace(".", "__")).
+      orElse(systemProperty(name)) //for unit testing
+  }
+
+  def yinstVariable(name: String) = {
+    optionalYinstVariable(name).
+      getOrElse {
+      throw new IllegalStateException("Environment variable not set: " + name)
+    }
+  }
+
+  def env(name: String) = Option(System.getenv(name))
+  def systemProperty(name: String) = Option(System.getProperty(name))
+}