Removed live variables functionality. (#373)

Author: yasirfolio3

OptimizelySDKCore/OptimizelySDKCore.xcodeproj/project.pbxproj

@@ -81,14 +81,6 @@ extern NSString * const OPTLYDatafileKeysMatchTypeLessThan;
 extern NSString * const OPTLYDatafileKeysMatchTypeRegex;
 // Custom Attribute Condition Types
 extern NSString * const OPTLYDatafileKeysCustomAttributeConditionType;
-// Live Variables (DEPRECATED)
-extern NSString * const OPTLYDatafileKeysVariableId;
-extern NSString * const OPTLYDatafileKeysVariableKey;
-extern NSString * const OPTLYDatafileKeysVariableType;
-extern NSString * const OPTLYDatafileKeysVariableValue;
-// Variation Live Variable (DEPRECATED)
-extern NSString * const OPTLYDatafileKeysVariationVariableId;
-extern NSString * const OPTLYDatafileKeysVariationVariableValue;
 // User Profile Service (not in datafile yet)
 extern NSString * const OPTLYDatafileKeysUserProfileServiceUserId;
 extern NSString * const OPTLYDatafileKeysUserProfileServiceExperimentBucketMap;

OptimizelySDKCore/OptimizelySDKCore/OPTLYDatafileKeys.h

@@ -77,14 +77,6 @@
 NSString * const OPTLYDatafileKeysMatchTypeRegex = @"regex";
 // Custom Attribute Condition Types
 NSString * const OPTLYDatafileKeysCustomAttributeConditionType = @"custom_attribute";
-// Live Variables (DEPRECATED)
-NSString * const OPTLYDatafileKeysVariableId = @"id";
-NSString * const OPTLYDatafileKeysVariableKey = @"key";
-NSString * const OPTLYDatafileKeysVariableType = @"type";
-NSString * const OPTLYDatafileKeysVariableValue = @"defaultValue";
-// Variation Live Variable (DEPRECATED)
-NSString * const OPTLYDatafileKeysVariationVariableId = @"id";
-NSString * const OPTLYDatafileKeysVariationVariableValue = @"value";
 // User Profile Service (not in datafile yet)
 NSString * const OPTLYDatafileKeysUserProfileServiceUserId = @"user_id";
 NSString * const OPTLYDatafileKeysUserProfileServiceExperimentBucketMap = @"experiment_bucket_map";

OptimizelySDKCore/OptimizelySDKCore/OPTLYDatafileKeys.m

@@ -46,9 +46,6 @@ extern NSString * const OPTLYErrorHandlerMessagesTrafficAllocationUnknown;
 extern NSString * const OPTLYErrorHandlerMessagesEventDispatchFailed;
 extern NSString * const OPTLYErrorHandlerMessagesConfigInvalid;
 
-// Live Variables (DEPRECATED)
-extern NSString * const OPTLYErrorHandlerMessagesLiveVariableKeyUnknown;
-
 extern NSString * const OPTLYErrorHandlerMessagesManagerBuilderInvalid;
 
 extern NSString *const OPTLYErrorHandlerMessagesDataStoreDatabaseNoSavedEvents;

OptimizelySDKCore/OptimizelySDKCore/OPTLYErrorHandlerMessages.h

@@ -46,9 +46,6 @@
 NSString * const OPTLYErrorHandlerMessagesEventDispatchFailed = @"Event %@ failed to dispatch.";
 NSString * const OPTLYErrorHandlerMessagesConfigInvalid = @"Project config is nil or invalid.";
 
-// Live Variables (DEPRECATED)
-NSString * const OPTLYErrorHandlerMessagesLiveVariableKeyUnknown = @"Live variable key %@ is not in datafile."; // live variable key
-
 // Manager Errors
 NSString *const OPTLYErrorHandlerMessagesManagerBuilderInvalid = @"Provided OPTLYManagerBuilder object is invalid.";
 

OptimizelySDKCore/OptimizelySDKCore/OPTLYErrorHandlerMessages.m

@@ -163,15 +163,6 @@ extern NSString *const OPTLYLoggerMessagesEventDispatcherInvalidEvent;
 
 // error
 
-// ---- Live Variables ---- (DEPRECATED)
-// info
-extern NSString *const OPTLYLoggerMessagesVariableValue;
-extern NSString *const OPTLYLoggerMessagesNoVariationFoundForExperimentWithLiveVariable;
-// warning
-extern NSString *const OPTLYLoggerMessagesLiveVariablesDeprecated;
-extern NSString *const OPTLYLoggerMessagesNoExperimentsContainVariable;
-extern NSString *const OPTLYLoggerMessagesVariableUnknownForVariableKey;
-
 // ---- Manager ----
 // error
 extern NSString *const OPTLYLoggerMessagesManagerBuilderBlockNotValid;

OptimizelySDKCore/OptimizelySDKCore/OPTLYLoggerMessages.h

@@ -157,15 +157,6 @@
 NSString *const OPTLYLoggerMessagesEventDispatcherRemovedEvent = @"[EVENT DISPATCHER] %@ removed: %@ with error: %@"; //event type, event, error
 NSString *const OPTLYLoggerMessagesEventDispatcherInvalidEvent = @"[EVENT DISPATCHER] Invalid event.";
 
-// ---- Live Variables ---- (DEPRECATED)
-// info
-NSString *const OPTLYLoggerMessagesVariableValue = @"[LIVE VARIABLES] Variable %@ has value: %@.";
-NSString *const OPTLYLoggerMessagesNoVariationFoundForExperimentWithLiveVariable = @"[LIVE VARIABLES] Variation not found for user ID: %@ with experiment key: %@ containing live variable: %@.";
-// warning
-NSString *const OPTLYLoggerMessagesLiveVariablesDeprecated = @"[LIVE VARIABLES] Mobile 1.x Live Variables are DEPRECATED.  Please migrate to Full Stack 2.0 Feature Management.";
-NSString *const OPTLYLoggerMessagesNoExperimentsContainVariable = @"[LIVE VARIABLES] No experiment was found to contain variable key: %@.";
-NSString *const OPTLYLoggerMessagesVariableUnknownForVariableKey = @"[LIVE VARIABLES] Live variable not found for variable key: %@."; // live variable key
-
 // ---- Manager ----
 // error
 NSString *const OPTLYLoggerMessagesManagerBuilderBlockNotValid = @"[MANAGER] An Optimizely Manager Builder instance was not able to be initialized because the OPTLYManagerBuilderBlock was nil.";

OptimizelySDKCore/OptimizelySDKCore/OPTLYLoggerMessages.m

@@ -60,8 +60,6 @@ NS_ASSUME_NONNULL_END
 @property (nonatomic, strong, nonnull) NSArray<OPTLYAttribute *><OPTLYAttribute> *attributes;
 /// List of group objects
 @property (nonatomic, strong, nonnull) NSArray<OPTLYGroup *><OPTLYGroup> *groups;
-/// List of live variable objects (DEPRECATED)
-@property (nonatomic, strong, nonnull) NSArray<OPTLYVariable *><OPTLYVariable, OPTLYOptional> *variables;
 
 /// a comprehensive list of experiments that includes experiments being whitelisted (in Groups)
 @property (nonatomic, strong, nullable) NSArray<OPTLYExperiment *><OPTLYExperiment, OPTLYOptional> *allExperiments;
@@ -151,11 +149,6 @@ __attribute((deprecated("Use OPTLYProjectConfig initWithBuilder method instead."
  */
 - (nullable OPTLYAudience *)getAudienceForId:(nonnull NSString *)audienceId;
 
-/**
- * Get a variable for a given live variable key. (DEPRECATED)
- */
-- (nullable OPTLYVariable *)getVariableForVariableKey:(nonnull NSString *)variableKey;
-
 /**
  * Get forced variation for a given experiment key and user id.
  */

OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h

@@ -30,8 +30,6 @@
 #import "OPTLYVariation.h"
 #import "OPTLYFeatureFlag.h"
 #import "OPTLYRollout.h"
-// Live Variables (DEPRECATED)
-#import "OPTLYVariable.h"
 
 NSString * const kExpectedDatafileVersion = @"4";
 NSString * const kReservedAttributePrefix = @"$opt_";
@@ -54,9 +52,6 @@ @interface OPTLYProjectConfig()
 //    userId --> experimentId --> variationId
 @property (nonatomic, strong) NSMutableDictionary<NSString *, NSMutableDictionary *><Ignore> *forcedVariationMap;
 
-// Live Variables (DEPRECATED)
-@property (nonatomic, strong) NSDictionary<NSString *, OPTLYVariable *><Ignore> *variableKeyToVariableMap;
-
 @end
 
 @implementation OPTLYProjectConfig
@@ -294,16 +289,6 @@ - (OPTLYRollout *)getRolloutForId:(NSString *)rolloutId {
     return rollout;
 }
 
-// Live Variables (DEPRECATED)
-- (OPTLYVariable *)getVariableForVariableKey:(NSString *)variableKey {
-    OPTLYVariable *variable = self.variableKeyToVariableMap[variableKey];
-    if (!variable) {
-        NSString *logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesVariableUnknownForVariableKey, variableKey];
-        [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
-    }
-    return variable;
-}
-
 #pragma mark -- Forced Variation Methods --
 
 - (OPTLYVariation *)getForcedVariation:(nonnull NSString *)experimentKey
@@ -471,14 +456,6 @@ - (NSDictionary *)eventKeyToEventMap {
     return _groupIdToGroupMap;
 }
 
-// Live Variables (DEPRECATED)
-- (NSDictionary<NSString *, OPTLYVariable *> *)variableKeyToVariableMap {
-    if (!_variableKeyToVariableMap) {
-        _variableKeyToVariableMap = [self generateVariableKeyToVariableMap];
-    }
-    return _variableKeyToVariableMap;
-}
-
 //- (NSMutableDictionary<NSString *, NSMutableDictionary<NSString *, NSString *>> *)forcedVariationMap {
 - (NSMutableDictionary<NSString *, NSMutableDictionary *> *)forcedVariationMap {
     @synchronized (self) {
@@ -608,15 +585,6 @@ - (NSDictionary *)generateAttributeToKeyMap
     return [NSDictionary dictionaryWithDictionary:map];
 }
 
-// Live Variables (DEPRECATED)
-- (NSDictionary<NSString *, OPTLYVariable *> *)generateVariableKeyToVariableMap {
-    NSMutableDictionary *map = [[NSMutableDictionary alloc] init];
-    for (OPTLYVariable *variable in self.variables) {
-        map[variable.variableKey] = variable;
-    }
-    return [NSDictionary dictionaryWithDictionary:map];
-}
-
 # pragma mark - Helper Methods
 
 // TODO: Remove bucketer from parameters -- this is not needed

OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.m

@@ -21,11 +21,9 @@
     #import <OptimizelySDKCore/OPTLYJSONModelLib.h>
 #endif
 
-@class OPTLYVariableUsage, OPTLYVariationVariable;
+@class OPTLYVariableUsage;
 @protocol OPTLYVariableUsage;
 @protocol OPTLYVariation;
-// Live Variables (DEPRECATED)
-@protocol OPTLYVariationVariable;
 
 /**
  * This class is a representation of an Optimizely variation.
@@ -44,7 +42,4 @@
 /// Gets the variable usage instance for a given variable id
 - (nullable OPTLYVariableUsage *)getVariableUsageForVariableId:(nullable NSString *)variableId;
 
-/// The array containing the variation's live variable information -- variable ID and variable value. (DEPRECATED)
-@property (nonatomic, strong, nullable) NSArray<OPTLYVariationVariable *><OPTLYVariationVariable, OPTLYOptional> *variables;
-
 @end