From 428ad1d4a847fd7d464e41ec31aad73353802916 Mon Sep 17 00:00:00 2001 From: Tyler Prevost Date: Tue, 25 Sep 2018 10:16:19 -0700 Subject: [PATCH] Fix an issue where importing an Objective-C type called Optional causes LLDB to sometimes not be able to distinguish between Swift.Optional and OptimizelySDKiOS.Optional. (#274) --- .../OPTLYJSONModel/OPTLYJSONModel.h | 12 +++++------ .../OPTLYJSONModel/OPTLYJSONModel.m | 2 +- OptimizelySDKCore/OPTLYJSONModel/README.md | 4 ++-- .../OPTLYJSONModelTests/KeyMappingTests.m | 4 ++-- .../Models/Headers/ConcurrentReposModel.h | 2 +- .../Models/Headers/GitHubKeyMapRepoModel.h | 2 +- .../Models/Headers/GitHubRepoModel.h | 2 +- .../Headers/GitHubRepoModelForUSMapper.h | 2 +- .../Models/Headers/ImageModel.h | 2 +- .../Models/Headers/JSONTypesModel.h | 2 +- .../Models/Headers/OptionalPropModel.h | 2 +- .../Models/Headers/PostModel.h | 2 +- .../OPTLYJSONModelTests/NullTests.m | 4 ++-- .../OPTLYDecisionEventTicket.h | 18 ++++++++--------- .../OptimizelySDKCore/OPTLYEventAudience.h | 4 ++-- .../OptimizelySDKCore/OPTLYEventDecision.h | 4 ++-- .../OPTLYEventDecisionTicket.h | 4 ++-- .../OptimizelySDKCore/OPTLYEventFeature.h | 6 +++--- .../OptimizelySDKCore/OPTLYEventHeader.h | 4 ++-- .../OptimizelySDKCore/OPTLYEventLayerState.h | 20 +++++++++---------- .../OPTLYEventRelatedEvent.h | 4 ++-- .../OptimizelySDKCore/OPTLYEventView.h | 6 +++--- .../OptimizelySDKCore/OPTLYFeatureFlag.h | 2 +- .../OptimizelySDKCore/OPTLYProjectConfig.h | 10 +++++----- .../OptimizelySDKCore/OPTLYVariation.h | 4 ++-- 25 files changed, 64 insertions(+), 64 deletions(-) diff --git a/OptimizelySDKCore/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel.h b/OptimizelySDKCore/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel.h index e978b4fc4..dd8a6e598 100644 --- a/OptimizelySDKCore/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel.h +++ b/OptimizelySDKCore/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel.h @@ -57,16 +57,16 @@ DEPRECATED_ATTRIBUTE * Protocol for defining optional properties in a JSON Model class. Use like below to define * model properties that are not required to have values in the JSON input: * - * @property (strong, nonatomic) NSString<Optional> *propertyName; + * @property (strong, nonatomic) NSString<OPTLYOptional> *propertyName; * */ -@protocol Optional +@protocol OPTLYOptional @end /** * Make all objects compatible to avoid compiler warnings */ -@interface NSObject (OPTLYJSONModelPropertyCompatibility) +@interface NSObject (OPTLYJSONModelPropertyCompatibility) @end ///////////////////////////////////////////////////////////////////////////////////////////// @@ -250,11 +250,11 @@ DEPRECATED_ATTRIBUTE + (OPTLYJSONKeyMapper *)keyMapper; /** - * Indicates whether the property with the given name is Optional. - * To have a model with all of its properties being Optional just return YES. + * Indicates whether the property with the given name is OPTLYOptional. + * To have a model with all of its properties being OPTLYOptional just return YES. * This method returns by default NO, since the default behaviour is to have all properties required. * @param propertyName the name of the property - * @return a BOOL result indicating whether the property is optional + * @return a BOOL result indicating whether the property is OPTLYOptional */ + (BOOL)propertyIsOptional:(NSString *)propertyName; diff --git a/OptimizelySDKCore/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel.m b/OptimizelySDKCore/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel.m index 3ab2af207..8f88501fd 100644 --- a/OptimizelySDKCore/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel.m +++ b/OptimizelySDKCore/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel/OPTLYJSONModel.m @@ -607,7 +607,7 @@ -(void)__inspectProperties [scanner scanUpToString:@">" intoString: &protocolName]; - if ([protocolName isEqualToString:@"Optional"]) { + if ([protocolName isEqualToString:@"OPTLYOptional"]) { p.isOptional = YES; } else if([protocolName isEqualToString:@"Index"]) { #pragma GCC diagnostic push diff --git a/OptimizelySDKCore/OPTLYJSONModel/README.md b/OptimizelySDKCore/OPTLYJSONModel/README.md index b9b0dce56..a2bc92113 100644 --- a/OptimizelySDKCore/OPTLYJSONModel/README.md +++ b/OptimizelySDKCore/OPTLYJSONModel/README.md @@ -211,9 +211,9 @@ for OPTLYJSONModel to work, the protocol must be in place. ```objc @interface ProductModel : OPTLYJSONModel @property (nonatomic) NSInteger id; -@property (nonatomic) NSString *name; +@property (nonatomic) NSString *name; @property (nonatomic) float price; -@property (nonatomic) NSNumber *uuid; +@property (nonatomic) NSNumber *uuid; @end ``` diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/KeyMappingTests.m b/OptimizelySDKCore/OPTLYJSONModelTests/KeyMappingTests.m index 136f6b3f8..3fde56140 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/KeyMappingTests.m +++ b/OptimizelySDKCore/OPTLYJSONModelTests/KeyMappingTests.m @@ -39,9 +39,9 @@ @interface TestModel: OPTLYJSONModel @property (strong, nonatomic) NSString* text1; -@property (strong, nonatomic) NSString* text2; +@property (strong, nonatomic) NSString* text2; -@property (strong, nonatomic) NSString* text3; +@property (strong, nonatomic) NSString* text3; @end diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ConcurrentReposModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ConcurrentReposModel.h index 5eeb04642..5b39e2455 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ConcurrentReposModel.h +++ b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ConcurrentReposModel.h @@ -32,7 +32,7 @@ @property (assign, nonatomic) int watchers; @property (strong, nonatomic) NSString* owner; @property (assign, nonatomic) int forks; -@property (strong, nonatomic) NSString* language; +@property (strong, nonatomic) NSString* language; @property (assign, nonatomic) BOOL fork; @property (assign, nonatomic) double size; @property (assign, nonatomic) int followers; diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubKeyMapRepoModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubKeyMapRepoModel.h index df21f4fdf..1762aae0a 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubKeyMapRepoModel.h +++ b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubKeyMapRepoModel.h @@ -27,7 +27,7 @@ @interface GitHubKeyMapRepoModel : OPTLYJSONModel @property (strong, nonatomic) NSString* __description; -@property (strong, nonatomic) NSString* language; +@property (strong, nonatomic) NSString* language; #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubRepoModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubRepoModel.h index e1c024b01..d8da1a223 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubRepoModel.h +++ b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubRepoModel.h @@ -31,7 +31,7 @@ @property (assign, nonatomic) int watchers; @property (strong, nonatomic) NSString* owner; @property (assign, nonatomic) int forks; -@property (strong, nonatomic) NSString* language; +@property (strong, nonatomic) NSString* language; @property (assign, nonatomic) BOOL fork; @property (assign, nonatomic) double size; @property (assign, nonatomic) int followers; diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubRepoModelForUSMapper.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubRepoModelForUSMapper.h index cd914c91d..5a2635af8 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubRepoModelForUSMapper.h +++ b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/GitHubRepoModelForUSMapper.h @@ -30,6 +30,6 @@ @property (strong, nonatomic) NSDate* createdAt; @property (assign, nonatomic) int aVeryLongPropertyName; @property (strong, nonatomic) NSString* itemObject145; -@property (strong, nonatomic) NSString* itemObject176Details; +@property (strong, nonatomic) NSString* itemObject176Details; @end diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ImageModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ImageModel.h index ccbc6273a..625f56ecd 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ImageModel.h +++ b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ImageModel.h @@ -30,6 +30,6 @@ @property (strong, nonatomic) NSNumber* idImage; @property (strong, nonatomic) NSString* name; -@property (strong, nonatomic) CopyrightModel* copyright; +@property (strong, nonatomic) CopyrightModel* copyright; @end diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/JSONTypesModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/JSONTypesModel.h index 4930ef3f0..e1eb47e8d 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/JSONTypesModel.h +++ b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/JSONTypesModel.h @@ -34,6 +34,6 @@ @property (strong, nonatomic) NSMutableArray* dynamicList; @property (strong, nonatomic) NSDictionary* dictionary; @property (strong, nonatomic) NSMutableDictionary* dynamicDictionary; -@property (strong, nonatomic) NSString* notAvailable; +@property (strong, nonatomic) NSString* notAvailable; @end diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/OptionalPropModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/OptionalPropModel.h index 13f0ef3e9..c6b45d2cd 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/OptionalPropModel.h +++ b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/OptionalPropModel.h @@ -28,7 +28,7 @@ @interface OptionalPropModel : OPTLYJSONModel @property (assign, nonatomic) int fillerNumber; -@property (strong, nonatomic) NSString* notRequredProperty; +@property (strong, nonatomic) NSString* notRequredProperty; @property (strong, nonatomic) NSString* ignoredProperty; @property (assign, nonatomic) CGPoint notRequiredPoint; diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/PostModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/PostModel.h index 157f10724..16dbf1306 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/PostModel.h +++ b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/PostModel.h @@ -31,6 +31,6 @@ @property (strong, nonatomic) NSString* id; #pragma GCC diagnostic pop -@property (strong, nonatomic) NSString* name; +@property (strong, nonatomic) NSString* name; @end diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/NullTests.m b/OptimizelySDKCore/OPTLYJSONModelTests/NullTests.m index b21367459..b60e1f411 100644 --- a/OptimizelySDKCore/OPTLYJSONModelTests/NullTests.m +++ b/OptimizelySDKCore/OPTLYJSONModelTests/NullTests.m @@ -26,7 +26,7 @@ @import OptimizelySDKCore; @interface NullModelA : OPTLYJSONModel -@property (nonatomic) NSString *optional; +@property (nonatomic) NSString *optional; @property (nonatomic) NSString *required; @end @@ -34,7 +34,7 @@ @implementation NullModelA @end @interface NullModelB : OPTLYJSONModel -@property (nonatomic) NSString *prop; +@property (nonatomic) NSString *prop; @end @implementation NullModelB diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYDecisionEventTicket.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYDecisionEventTicket.h index 8350a8cb0..393306294 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYDecisionEventTicket.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYDecisionEventTicket.h @@ -30,33 +30,33 @@ //The time the decision was made. @property (nonatomic, assign) long long timestamp; // Revision of client DATA, corresponding to a stored snapshot -@property (nonatomic, strong, nullable) NSString *revision; +@property (nonatomic, strong, nullable) NSString *revision; // Unique ID shared by all events in the current activation cycle -@property (nonatomic, strong, nullable) NSString *activationId; +@property (nonatomic, strong, nullable) NSString *activationId; // GUID ID uniquely identifying the decision event triggering -@property (nonatomic, strong, nullable) NSString *decisionId; +@property (nonatomic, strong, nullable) NSString *decisionId; // GUID ID uniquely identifying the user’s current session -@property (nonatomic, strong, nullable) NSString *sessionId; +@property (nonatomic, strong, nullable) NSString *sessionId; // Project ID of the decision. @property (nonatomic, strong, nonnull) NSString *projectId; // Account ID of the decision. @property (nonatomic, strong, nonnull) NSString *accountId; // The type of client engine sending this event: ‘ios’, ‘android’, ‘js’. -@property (nonatomic, strong, nullable) NSString *clientEngine; +@property (nonatomic, strong, nullable) NSString *clientEngine; // The version of the client engine sending this event. -@property (nonatomic, strong, nullable) NSString *clientVersion; +@property (nonatomic, strong, nullable) NSString *clientVersion; // Event information taken from the http header instead of the payload -@property (nonatomic, strong, nullable) OPTLYEventHeader *header; +@property (nonatomic, strong, nullable) OPTLYEventHeader *header; // The layer affected by this decision @property (nonatomic, strong, nonnull) NSString *layerId; // Visitor-specific input to Client Decision Engine -@property (nonatomic, strong, nullable) NSArray *decisionTicket; +@property (nonatomic, strong, nullable) NSArray *decisionTicket; // Output of the Client Decision Engine @property (nonatomic, strong, nonnull) OPTLYEventDecision *decision; // The ID of the user @property (nonatomic, strong, nonnull) NSString *visitorId; // The unique user ID of the user (if available) -@property (nonatomic, strong, nullable) NSString *visitorUUID; +@property (nonatomic, strong, nullable) NSString *visitorUUID; // Features attached to the user @property (nonatomic, strong, nonnull) NSArray *userFeatures; // If true, then the experience in this decision was held back at the global level diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventAudience.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventAudience.h index 1be9d128f..eb2c21103 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventAudience.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventAudience.h @@ -29,8 +29,8 @@ @interface OPTLYEventAudience : OPTLYJSONModel // The ID of the audience -@property (nonatomic, strong, nullable) NSString *audienceId; +@property (nonatomic, strong, nullable) NSString *audienceId; // The audience’s name -@property (nonatomic, strong, nullable) NSString *name; +@property (nonatomic, strong, nullable) NSString *name; @end diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecision.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecision.h index c5e0877b8..394931078 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecision.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecision.h @@ -29,9 +29,9 @@ @interface OPTLYEventDecision : OPTLYJSONModel // ID of chosen experiment, null if visitor is not targeted for any experiments -@property (nonatomic, strong, nullable) NSString *experimentId; +@property (nonatomic, strong, nullable) NSString *experimentId; // ID of chosen variation, null if if visitor is not targeted for any experiments -@property (nonatomic, strong, nullable) NSString *variationId; +@property (nonatomic, strong, nullable) NSString *variationId; // If true, the chosen experience was held back at the layer level // TODO - Remove later when this ticket is completed: https://optimizely.atlassian.net/browse/NB-1493 @property (nonatomic, assign) BOOL isLayerHoldback; diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecisionTicket.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecisionTicket.h index 244005e37..f22d2dc7f 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecisionTicket.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecisionTicket.h @@ -31,8 +31,8 @@ @interface OPTLYEventDecisionTicket : OPTLYJSONModel // The audiences bucketed at decision time -@property (nonatomic, strong, nullable) NSArray *audiences; +@property (nonatomic, strong, nullable) NSArray *audiences; // Id (UUID or visitorId) used for bucketing -@property (nonatomic, strong, nullable) NSString *bucketingId; +@property (nonatomic, strong, nullable) NSString *bucketingId; @end diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventFeature.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventFeature.h index 0adeeaacf..3faf7df72 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventFeature.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventFeature.h @@ -33,11 +33,11 @@ NS_ASSUME_NONNULL_END @interface OPTLYEventFeature : OPTLYJSONModel // The ID of feature for non-custom features. Should be the GAE ID if it exists. -@property (nonatomic, strong, nullable) NSString *featureId; +@property (nonatomic, strong, nullable) NSString *featureId; // The name of the feature, which along with type uniquely identify the feature. -@property (nonatomic, strong, nullable) NSString *name; +@property (nonatomic, strong, nullable) NSString *name; // The type the feature, which along with name uniquely identifies the feature. -@property (nonatomic, strong, nullable) NSString *type; +@property (nonatomic, strong, nullable) NSString *type; // The value of the feature (supports: string, long, int, double, float, boolean) @property (nonatomic, strong, nonnull) id value; // If true, this feature will be indexed in the counting service. Otherwise it will just be logged diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventHeader.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventHeader.h index 144802a4c..f16dc6520 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventHeader.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventHeader.h @@ -31,8 +31,8 @@ // The IP address of the client @property (nonatomic, strong, nonnull) NSString *clientIp; // The user agent of the client. Null on mobile. -@property (nonatomic, strong, nullable) NSString *userAgent; +@property (nonatomic, strong, nullable) NSString *userAgent; // The referrer of the client. Null on mobile. -@property (nonatomic, strong, nullable) NSString *referer; +@property (nonatomic, strong, nullable) NSString *referer; @end diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventLayerState.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventLayerState.h index 2b4894758..37409eba4 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventLayerState.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventLayerState.h @@ -33,27 +33,27 @@ // The id of the layer state @property (nonatomic, strong, nonnull) NSString *layerId; // Visitor-specific input to Client Decision Engine -@property (nonatomic, strong, nullable) OPTLYEventDecisionTicket *decisionTicket; +@property (nonatomic, strong, nullable) OPTLYEventDecisionTicket *decisionTicket; // Output of the Client Decision Engine -@property (nonatomic, strong, nullable) OPTLYEventDecision *decision; +@property (nonatomic, strong, nullable) OPTLYEventDecision *decision; // The activationId when the decision was made -@property (nonatomic, strong, nullable) NSString *decisionActivationId; +@property (nonatomic, strong, nullable) NSString *decisionActivationId; // The sessionId when the decision was made -@property (nonatomic, strong, nullable) NSString *decisionSessionId; +@property (nonatomic, strong, nullable) NSString *decisionSessionId; // The timestamp when the decision was made -@property (nonatomic, strong, nullable) NSNumber *decisionTimestamp; +@property (nonatomic, strong, nullable) NSNumber *decisionTimestamp; // The generated UID for the DecisionEventTicketAvro logged when this decision was made. -@property (nonatomic, strong, nullable) NSString *decisionEventId; +@property (nonatomic, strong, nullable) NSString *decisionEventId; // Indicates whether any actions for this layer have trigged @property (nonatomic, assign) BOOL actionTriggered; // The activation ID when the action was last triggered -@property (nonatomic, strong, nullable) NSString *actionActivationId; +@property (nonatomic, strong, nullable) NSString *actionActivationId; // The session Id when the action was last triggered -@property (nonatomic, strong, nullable) NSString *actionSessionId; +@property (nonatomic, strong, nullable) NSString *actionSessionId; // The timestamp when the action was last triggered -@property (nonatomic, strong, nullable) NSNumber *actionTimestamp; +@property (nonatomic, strong, nullable) NSNumber *actionTimestamp; // The DATA revision of the layer definition in use when this layer was processed -@property (nonatomic, strong, nullable) NSString *revision; +@property (nonatomic, strong, nullable) NSString *revision; @end diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventRelatedEvent.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventRelatedEvent.h index 0393fc25b..d4425909e 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventRelatedEvent.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventRelatedEvent.h @@ -29,8 +29,8 @@ @interface OPTLYEventRelatedEvent : OPTLYJSONModel // The id of the related event -@property (nonatomic, strong, nullable) NSString *eventId; +@property (nonatomic, strong, nullable) NSString *eventId; // The type of the relationship to this event -@property (nonatomic, strong, nullable) NSString *relationship; +@property (nonatomic, strong, nullable) NSString *relationship; @end diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventView.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventView.h index 5c931b3d0..1eea654d6 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventView.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventView.h @@ -31,10 +31,10 @@ @interface OPTLYEventView : OPTLYJSONModel // The ID of the view containing this impression. -@property (nonatomic, strong, nullable) NSString *viewId; +@property (nonatomic, strong, nullable) NSString *viewId; // The timestamp when the containing view was activated. -@property (nonatomic, strong, nullable) NSNumber *activatedTimestamp; +@property (nonatomic, strong, nullable) NSNumber *activatedTimestamp; // Features attached to the view. -@property (nonatomic, strong, nullable) NSArray *viewFeatures; +@property (nonatomic, strong, nullable) NSArray *viewFeatures; @end diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYFeatureFlag.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYFeatureFlag.h index b74543fa1..2aecce833 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYFeatureFlag.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYFeatureFlag.h @@ -39,7 +39,7 @@ /// an NSArray of the feature variables that are part of this feature @property (nonatomic, strong, nonnull) NSArray *variables; /// an NSString to hold the group Id the feature belongs to. -@property (nonatomic, strong, nullable) NSString *groupId; +@property (nonatomic, strong, nullable) NSString *groupId; /** * Determines whether all the experiments in the feature flag belongs to the same mutex group diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h index 37f5c1980..550e87d19 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h @@ -45,9 +45,9 @@ NS_ASSUME_NONNULL_END /// Datafile Revision number @property (nonatomic, strong, nonnull) NSString *revision; /// Flag for IP anonymization -@property (nonatomic, strong, nonnull) NSNumber *anonymizeIP; +@property (nonatomic, strong, nonnull) NSNumber *anonymizeIP; /// Flag for Bot Filtering -@property (nonatomic, strong, nonnull) NSNumber *botFiltering; +@property (nonatomic, strong, nonnull) NSNumber *botFiltering; /// List of Optimizely Experiment objects @property (nonatomic, strong, nonnull) NSArray *experiments; /// List of Optimizely Event Type objects @@ -59,7 +59,7 @@ NS_ASSUME_NONNULL_END /// List of group objects @property (nonatomic, strong, nonnull) NSArray *groups; /// List of live variable objects (DEPRECATED) -@property (nonatomic, strong, nonnull) NSArray *variables; +@property (nonatomic, strong, nonnull) NSArray *variables; /// a comprehensive list of experiments that includes experiments being whitelisted (in Groups) @property (nonatomic, strong, nullable) NSArray *allExperiments; @@ -72,9 +72,9 @@ NS_ASSUME_NONNULL_END /// Returns the client version number @property (nonatomic, strong, readonly, nonnull) NSString *clientVersion; /// List of Optimizely Feature Flags objects -@property (nonatomic, strong, nonnull) NSArray *featureFlags; +@property (nonatomic, strong, nonnull) NSArray *featureFlags; /// List of Optimizely Rollouts objects -@property (nonatomic, strong, nonnull) NSArray *rollouts; +@property (nonatomic, strong, nonnull) NSArray *rollouts; /** * Initialize the Project Config from a builder block. diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYVariation.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYVariation.h index 8faafa909..c99fec078 100644 --- a/OptimizelySDKCore/OptimizelySDKCore/OPTLYVariation.h +++ b/OptimizelySDKCore/OptimizelySDKCore/OPTLYVariation.h @@ -37,7 +37,7 @@ /// The variation's Key. @property (nonatomic, strong, nonnull) NSString *variationKey; /// The array containing the variables usage instances that are part of this variation. -@property (nonatomic, strong, nullable) NSArray *variableUsageInstances; +@property (nonatomic, strong, nullable) NSArray *variableUsageInstances; /// Flag for Feature Toggle Ability @property (nonatomic, assign) BOOL featureEnabled; @@ -45,6 +45,6 @@ - (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 *variables; +@property (nonatomic, strong, nullable) NSArray *variables; @end