[FSSDK-11544] review update

Author: junaed-optimizely

OptimizelySDK/Config/DatafileProjectConfig.cs

@@ -18,6 +18,7 @@
 #define USE_ODP
 #endif
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
@@ -219,9 +220,7 @@ private Dictionary<string, Dictionary<string, Variation>> _VariationIdMap
         /// <summary>
         /// Associative array of Holdout ID to Holdout(s) in the datafile
         /// </summary>
-        private Dictionary<string, Holdout> _HoldoutIdMap;
-
-        public Dictionary<string, Holdout> HoldoutIdMap => _HoldoutIdMap;
+        public Dictionary<string, Holdout> HoldoutIdMap { get; private set; }
 
         /// <summary>
         /// Associative array of experiment IDs that exist in any feature
@@ -345,7 +344,7 @@ private void Initialize()
                 f => f.Key, true);
             _RolloutIdMap = ConfigParser<Rollout>.GenerateMap(Rollouts,
                 r => r.Id.ToString(), true);
-            _HoldoutIdMap = ConfigParser<Holdout>.GenerateMap(Holdouts,
+            HoldoutIdMap = ConfigParser<Holdout>.GenerateMap(Holdouts,
                 h => h.Id, true);
 
             // Overwrite similar items in audience id map with typed audience id map.
@@ -807,15 +806,15 @@ public Holdout GetHoldout(string holdoutId)
                 return null;
             }
 
-            if (_HoldoutIdMap.ContainsKey(holdoutId))
+            if (HoldoutIdMap.ContainsKey(holdoutId))
             {
-                return _HoldoutIdMap[holdoutId];
+                return HoldoutIdMap[holdoutId];
             }
 
             var message = $@"Holdout ID ""{holdoutId}"" is not in datafile.";
             Logger.Log(LogLevel.ERROR, message);
             ErrorHandler.HandleError(
-                new InvalidExperimentException("Provided holdout is not in datafile."));
+                new InvalidHoldoutException("Provided holdout is not in datafile."));
             return null;
         }
 

OptimizelySDK/Entity/ExperimentCoreExtensions.cs

@@ -54,74 +54,5 @@ public static Variation GetVariationByKey(this IExperimentCore experimentCore, s
 
             return experimentCore.Variations.FirstOrDefault(v => v.Key == key);
         }
-
-        /// <summary>
-        /// Replace audience IDs with audience names in a condition string
-        /// </summary>
-        /// <param name="experimentCore">The experiment or holdout instance</param>
-        /// <param name="conditionString">String containing audience conditions</param>
-        /// <param name="audiencesMap">Map of audience ID to audience name</param>
-        /// <returns>String with audience IDs replaced by names</returns>
-        public static string ReplaceAudienceIdsWithNames(this IExperimentCore experimentCore,
-            string conditionString, System.Collections.Generic.Dictionary<string, string> audiencesMap)
-        {
-            if (string.IsNullOrEmpty(conditionString) || audiencesMap == null)
-            {
-                return conditionString ?? string.Empty;
-            }
-
-            const string beginWord = "AUDIENCE(";
-            const string endWord = ")";
-            var keyIdx = 0;
-            var audienceId = string.Empty;
-            var collect = false;
-            var replaced = string.Empty;
-
-            foreach (var ch in conditionString)
-            {
-                // Extract audience id in parenthesis (example: AUDIENCE("35") => "35")
-                if (collect)
-                {
-                    if (ch.ToString() == endWord)
-                    {
-                        // Output the extracted audienceId
-                        var audienceName = audiencesMap.ContainsKey(audienceId) ? audiencesMap[audienceId] : audienceId;
-                        replaced += $"\"{audienceName}\"";
-                        collect = false;
-                        audienceId = string.Empty;
-                    }
-                    else
-                    {
-                        audienceId += ch;
-                    }
-                    continue;
-                }
-
-                // Walk-through until finding a matching keyword "AUDIENCE("
-                if (ch == beginWord[keyIdx])
-                {
-                    keyIdx++;
-                    if (keyIdx == beginWord.Length)
-                    {
-                        keyIdx = 0;
-                        collect = true;
-                    }
-                    continue;
-                }
-                else
-                {
-                    if (keyIdx > 0)
-                    {
-                        replaced += beginWord.Substring(0, keyIdx);
-                    }
-                    keyIdx = 0;
-                }
-
-                // Pass through other characters
-                replaced += ch;
-            }
-
-            return replaced;
-        }
     }
 }

OptimizelySDK/Entity/Holdout.cs

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
@@ -179,6 +180,7 @@ public string AudienceConditionsString
             {
                 if (AudienceConditions == null)
                 {
+                    _audienceConditionsString = null;
                     return null;
                 }
 
@@ -265,20 +267,5 @@ public void GenerateVariationKeyMap()
         public bool IsActivated =>
             !string.IsNullOrEmpty(Status) && Status == STATUS_RUNNING;
 
-        /// <summary>
-        /// Serializes audiences with provided audience map for display purposes
-        /// </summary>
-        /// <param name="audiencesMap">Map of audience ID to audience name</param>
-        /// <returns>Serialized audience string with names</returns>
-        public string SerializeAudiences(Dictionary<string, string> audiencesMap)
-        {
-            if (AudienceConditions == null)
-            {
-                return string.Empty;
-            }
-
-            var serialized = AudienceConditionsString;
-            return this.ReplaceAudienceIdsWithNames(serialized, audiencesMap);
-        }
     }
 }

OptimizelySDK/Exceptions/OptimizelyException.cs

@@ -102,4 +102,10 @@ public class ParseException : OptimizelyException
         public ParseException(string message)
             : base(message) { }
     }
+    public class InvalidHoldoutException : OptimizelyException
+    {
+        public InvalidHoldoutException(string message)
+            : base(message) { }
+    }
 }
+

OptimizelySDK/Utils/HoldoutConfig.cs

@@ -159,7 +159,14 @@ public List<Holdout> GetHoldoutsForFlag(string flagId)
         /// <returns>The Holdout object if found, null otherwise</returns>
         public Holdout GetHoldout(string holdoutId)
         {
-            return _holdoutIdMap.ContainsKey(holdoutId) ? _holdoutIdMap[holdoutId] : null;
+            if (string.IsNullOrEmpty(holdoutId))
+            {
+                return null;
+            }
+
+            _holdoutIdMap.TryGetValue(holdoutId, out var holdout);
+
+            return holdout;
         }
 
         /// <summary>