From 935a60e60e717c4f3d376750f5ff585638af4c1a Mon Sep 17 00:00:00 2001
From: wangjoshuah <wangjoshuah@gmail.com>
Date: Tue, 11 Jul 2017 14:53:27 -0700
Subject: [PATCH] make status optional in the creation of live variables

---
 .../java/com/optimizely/ab/config/LiveVariable.java  |  7 ++++++-
 .../optimizely/ab/config/ValidProjectConfigV4.java   | 12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core-api/src/main/java/com/optimizely/ab/config/LiveVariable.java b/core-api/src/main/java/com/optimizely/ab/config/LiveVariable.java
index 4f6049282..74f656b6c 100644
--- a/core-api/src/main/java/com/optimizely/ab/config/LiveVariable.java
+++ b/core-api/src/main/java/com/optimizely/ab/config/LiveVariable.java
@@ -111,7 +111,12 @@ public LiveVariable(@JsonProperty("id") String id,
         this.id = id;
         this.key = key;
         this.defaultValue = defaultValue;
-        this.status = status;
+        if (status == null) {
+            this.status = VariableStatus.ACTIVE;
+        }
+        else {
+            this.status = status;
+        }
         this.type = type;
     }
 
diff --git a/core-api/src/test/java/com/optimizely/ab/config/ValidProjectConfigV4.java b/core-api/src/test/java/com/optimizely/ab/config/ValidProjectConfigV4.java
index ca7a76b62..1607e3d99 100644
--- a/core-api/src/test/java/com/optimizely/ab/config/ValidProjectConfigV4.java
+++ b/core-api/src/test/java/com/optimizely/ab/config/ValidProjectConfigV4.java
@@ -74,7 +74,7 @@ public class ValidProjectConfigV4 {
             VARIABLE_DOUBLE_VARIABLE_ID,
             VARIABLE_DOUBLE_VARIABLE_KEY,
             VARIABLE_DOUBLE_DEFAULT_VALUE,
-            LiveVariable.VariableStatus.ACTIVE,
+            null,
             LiveVariable.VariableType.DOUBLE
     );
     private static final FeatureFlag FEATURE_FLAG_SINGLE_VARIABLE_DOUBLE = new FeatureFlag(
@@ -95,7 +95,7 @@ public class ValidProjectConfigV4 {
             VARIABLE_INTEGER_VARIABLE_ID,
             VARIABLE_INTEGER_VARIABLE_KEY,
             VARIABLE_INTEGER_DEFAULT_VALUE,
-            LiveVariable.VariableStatus.ACTIVE,
+            null,
             LiveVariable.VariableType.INTEGER
     );
     private static final FeatureFlag FEATURE_FLAG_SINGLE_VARIABLE_INTEGER = new FeatureFlag(
@@ -116,7 +116,7 @@ public class ValidProjectConfigV4 {
             VARIABLE_BOOLEAN_VARIABLE_ID,
             VARIABLE_BOOLEAN_VARIABLE_KEY,
             VARIABLE_BOOLEAN_VARIABLE_DEFAULT_VALUE,
-            LiveVariable.VariableStatus.ACTIVE,
+            null,
             LiveVariable.VariableType.BOOLEAN
     );
     private static final FeatureFlag FEATURE_FLAG_SINGLE_VARIABLE_BOOLEAN = new FeatureFlag(
@@ -137,7 +137,7 @@ public class ValidProjectConfigV4 {
             VARIABLE_STRING_VARIABLE_ID,
             VARIABLE_STRING_VARIABLE_KEY,
             VARIABLE_STRING_VARIABLE_DEFAULT_VALUE,
-            LiveVariable.VariableStatus.ACTIVE,
+            null,
             LiveVariable.VariableType.STRING
     );
     private static final FeatureFlag FEATURE_FLAG_SINGLE_VARIABLE_STRING = new FeatureFlag(
@@ -158,7 +158,7 @@ public class ValidProjectConfigV4 {
             VARIABLE_FIRST_LETTER_ID,
             VARIABLE_FIRST_LETTER_KEY,
             VARIABLE_FIRST_LETTER_DEFAULT_VALUE,
-            LiveVariable.VariableStatus.ACTIVE,
+            null,
             LiveVariable.VariableType.STRING
     );
     private static final String         VARIABLE_REST_OF_NAME_ID = "4052219963";
@@ -168,7 +168,7 @@ public class ValidProjectConfigV4 {
             VARIABLE_REST_OF_NAME_ID,
             VARIABLE_REST_OF_NAME_KEY,
             VARIABLE_REST_OF_NAME_DEFAULT_VALUE,
-            LiveVariable.VariableStatus.ACTIVE,
+            null,
             LiveVariable.VariableType.STRING
     );
     private static final FeatureFlag FEATURE_FLAG_MULTI_VARIATE_FEATURE = new FeatureFlag(