[FSSDK-11544] duplicate logic adjustment

Author: junaed-optimizely

OptimizelySDK.Tests/ProjectConfigTest.cs

@@ -1369,13 +1369,6 @@ public void TestHoldoutDeserialization_FromDatafile()
 
             Assert.IsNotNull(datafileProjectConfig.Holdouts);
             Assert.AreEqual(3, datafileProjectConfig.Holdouts.Length);
-            Assert.IsNotNull(datafileProjectConfig.HoldoutIdMap);
-            Assert.AreEqual(3, datafileProjectConfig.HoldoutIdMap.Count);
-
-            // Verify specific holdouts are present
-            Assert.IsTrue(datafileProjectConfig.HoldoutIdMap.ContainsKey("holdout_global_1"));
-            Assert.IsTrue(datafileProjectConfig.HoldoutIdMap.ContainsKey("holdout_included_1"));
-            Assert.IsTrue(datafileProjectConfig.HoldoutIdMap.ContainsKey("holdout_excluded_1"));
         }
 
         [Test]
@@ -1451,8 +1444,6 @@ public void TestMissingHoldoutsField_BackwardCompatibility()
 
             Assert.IsNotNull(datafileProjectConfig.Holdouts);
             Assert.AreEqual(0, datafileProjectConfig.Holdouts.Length);
-            Assert.IsNotNull(datafileProjectConfig.HoldoutIdMap);
-            Assert.AreEqual(0, datafileProjectConfig.HoldoutIdMap.Count);
 
             // Methods should still work with empty holdouts
             var holdouts = datafileProjectConfig.GetHoldoutsForFlag("any_flag");

OptimizelySDK/Config/DatafileProjectConfig.cs

@@ -216,11 +216,6 @@ private Dictionary<string, Dictionary<string, Variation>> _VariationIdMap
 
         public Dictionary<string, Rollout> RolloutIdMap => _RolloutIdMap;
 
-        /// <summary>
-        /// Associative array of Holdout ID to Holdout(s) in the datafile
-        /// </summary>
-        public Dictionary<string, Holdout> HoldoutIdMap { get; private set; }
-
         /// <summary>
         /// Associative array of experiment IDs that exist in any feature
         /// for checking that experiment is a feature experiment.
@@ -343,8 +338,6 @@ private void Initialize()
                 f => f.Key, true);
             _RolloutIdMap = ConfigParser<Rollout>.GenerateMap(Rollouts,
                 r => r.Id.ToString(), true);
-            HoldoutIdMap = ConfigParser<Holdout>.GenerateMap(Holdouts,
-                h => h.Id, true);
 
             // Overwrite similar items in audience id map with typed audience id map.
             var typedAudienceIdMap = ConfigParser<Audience>.GenerateMap(TypedAudiences,
@@ -795,25 +788,7 @@ public Rollout GetRolloutFromId(string rolloutId)
         /// <returns>Holdout Entity corresponding to the holdout ID or null if ID is invalid</returns>
         public Holdout GetHoldout(string holdoutId)
         {
-#if NET35 || NET40
-            if (string.IsNullOrEmpty(holdoutId) || string.IsNullOrEmpty(holdoutId.Trim()))
-#else
-            if (string.IsNullOrWhiteSpace(holdoutId))
-#endif
-            {
-                return null;
-            }
-
-            if (HoldoutIdMap.ContainsKey(holdoutId))
-            {
-                return HoldoutIdMap[holdoutId];
-            }
-
-            var message = $@"Holdout ID ""{holdoutId}"" is not in datafile.";
-            Logger.Log(LogLevel.ERROR, message);
-            ErrorHandler.HandleError(
-                new InvalidHoldoutException("Provided holdout is not in datafile."));
-            return null;
+            return _holdoutConfig.GetHoldout(holdoutId);
         }
 
         /// <summary>

OptimizelySDK/ProjectConfig.cs

@@ -128,11 +128,6 @@ public interface ProjectConfig
         /// </summary>
         Dictionary<string, Rollout> RolloutIdMap { get; }
 
-        /// <summary>
-        /// Associative array of Holdout ID to Holdout(s) in the datafile
-        /// </summary>
-        Dictionary<string, Holdout> HoldoutIdMap { get; }
-
         /// <summary>
         /// Associative dictionary of Flag to Variation key and Variation in the datafile
         /// </summary>