fix: JSONModel definitions for all data models in the objective c sdk (#334)

oakbani · thomaszurkan-optimizely · commit b23829259580 · 2018-11-19T14:29:01.000-08:00
* Fix JSONModel definitions for all data models in the objective c sdk.

* Updates license
diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ConcurrentReposModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ConcurrentReposModel.h
@@ -7,7 +7,7 @@
 //
 /****************************************************************************
  * Modifications to JSONModel by Optimizely, Inc.                           *
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2017-2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -45,9 +45,10 @@
 @end
 
 @protocol ConcurrentModel;
+@class ConcurrentModel;
 
 @interface ConcurrentReposModel : OPTLYJSONModel
 
-@property (strong, nonatomic) NSMutableArray<ConcurrentModel>* repositories;
+@property (strong, nonatomic) NSMutableArray<ConcurrentModel *><ConcurrentModel>* repositories;
 
 @end
diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/DrugModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/DrugModel.h
@@ -4,7 +4,7 @@
 //
 /****************************************************************************
  * Modifications to JSONModel by Optimizely, Inc.                           *
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2017-2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -23,10 +23,11 @@
 @import OptimizelySDKCore;
 
 @protocol InteractionModel;
+@class InteractionModel;
 
 @interface DrugModel : OPTLYJSONModel
 
 @property NSString *brand_name;
-@property NSArray<InteractionModel> *interaction_list;
+@property NSArray<InteractionModel *><InteractionModel> *interaction_list;
 
 @end
diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ExtremeNestingModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ExtremeNestingModel.h
@@ -4,7 +4,7 @@
 //
 /****************************************************************************
  * Modifications to JSONModel by Optimizely, Inc.                           *
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2017-2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -23,9 +23,10 @@
 @import OptimizelySDKCore;
 
 @protocol DrugModel;
+@class DrugModel;
 
 @interface ExtremeNestingModel : OPTLYJSONModel
 
-@property NSArray<DrugModel> *drugs;
+@property NSArray<DrugModel *><DrugModel> *drugs;
 
 @end
diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/NestedModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/NestedModel.h
@@ -7,7 +7,7 @@
 //
 /****************************************************************************
  * Modifications to JSONModel by Optimizely, Inc.                           *
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2017-2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -30,7 +30,7 @@
 @interface NestedModel : OPTLYJSONModel
 
 @property (strong, nonatomic) ImageModel* singleImage;
-@property (strong, nonatomic) NSArray<ImageModel>* images;
+@property (strong, nonatomic) NSArray<ImageModel *><ImageModel>* images;
 @property (strong, nonatomic) NSDictionary<ImageModel>* imagesObject;
 
 @end
diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/PostsModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/PostsModel.h
@@ -7,7 +7,7 @@
 //
 /****************************************************************************
  * Modifications to JSONModel by Optimizely, Inc.                           *
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2017-2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -25,9 +25,10 @@
 @import OptimizelySDKCore;
 
 @protocol PostModel;
+@class PostModel;
 
 @interface PostsModel : OPTLYJSONModel
 
-@property (strong, nonatomic) NSArray<PostModel>* posts;
+@property (strong, nonatomic) NSArray<PostModel *><PostModel>* posts;
 
 @end
diff --git a/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ReposModel.h b/OptimizelySDKCore/OPTLYJSONModelTests/Models/Headers/ReposModel.h
@@ -7,7 +7,7 @@
 //
 /****************************************************************************
  * Modifications to JSONModel by Optimizely, Inc.                           *
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2017-2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -25,10 +25,11 @@
 @import OptimizelySDKCore;
 
 @protocol GitHubRepoModel;
+@class GitHubRepoModel;
 
 @interface ReposModel : OPTLYJSONModel
 
-@property (strong, nonatomic) NSMutableArray<GitHubRepoModel>* repositories;
+@property (strong, nonatomic) NSMutableArray<GitHubRepoModel *><GitHubRepoModel>* repositories;
 
 @end
 
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYAudience.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYAudience.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016,2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -32,7 +32,7 @@
 /// The audience name
 @property (nonatomic, strong) NSString *audienceName;
 /// Audience evaluator conditionals
-@property (nonatomic, strong) NSArray<OPTLYCondition> *conditions;
+@property (nonatomic, strong) NSArray<OPTLYCondition *><OPTLYCondition> *conditions;
 
 /// Override OPTLYJSONModel set conditions
 - (void)setConditionsWithNSString:(NSString *)string;
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYCondition.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYCondition.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016,2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -27,21 +27,21 @@
 
 @interface OPTLYCondition : NSObject
 
-+ (NSArray<OPTLYCondition> *)deserializeJSONArray:(NSArray *)jsonArray
++ (NSArray<OPTLYCondition *><OPTLYCondition> *)deserializeJSONArray:(NSArray *)jsonArray
                                             error:(NSError * __autoreleasing *)error;
-+ (NSArray<OPTLYCondition> *)deserializeJSONArray:(NSArray *)jsonArray;
++ (NSArray<OPTLYCondition *><OPTLYCondition> *)deserializeJSONArray:(NSArray *)jsonArray;
 
 @end
 
 @interface OPTLYAndCondition : NSObject <OPTLYCondition>
 
-@property (nonatomic, strong) NSArray<OPTLYCondition> *subConditions;
+@property (nonatomic, strong) NSArray<OPTLYCondition *><OPTLYCondition> *subConditions;
 
 @end
 
 @interface OPTLYOrCondition : NSObject <OPTLYCondition>
 
-@property (nonatomic, strong) NSArray<OPTLYCondition> *subConditions;
+@property (nonatomic, strong) NSArray<OPTLYCondition *><OPTLYCondition> *subConditions;
 
 @end
 
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYCondition.m b/OptimizelySDKCore/OptimizelySDKCore/OPTLYCondition.m
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016,2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -21,13 +21,13 @@
 
 @implementation OPTLYCondition
 
-+ (NSArray<OPTLYCondition> *)deserializeJSONArray:(NSArray *)jsonArray {
++ (NSArray<OPTLYCondition *><OPTLYCondition> *)deserializeJSONArray:(NSArray *)jsonArray {
     return [OPTLYCondition deserializeJSONArray:jsonArray error:nil];
 }
 
 // example jsonArray:
 //  [“and", [“or", [“or", {"name": "sample_attribute_key", "type": "custom_attribute", "value": “a”}], [“or", {"name": "sample_attribute_key", "type": "custom_attribute", "value": "b"}], [“or", {"name": "sample_attribute_key", "type": "custom_attribute", "value": "c"}]
-+ (NSArray<OPTLYCondition> *)deserializeJSONArray:(NSArray *)jsonArray
++ (NSArray<OPTLYCondition *><OPTLYCondition> *)deserializeJSONArray:(NSArray *)jsonArray
                                             error:(NSError * __autoreleasing *)error {
     
     // need to check if the jsonArray is actually an array, otherwise, something is wrong with the audience condition
@@ -44,7 +44,7 @@ @implementation OPTLYCondition
     if (jsonArray.count > 1 && [OPTLYBaseCondition isBaseConditionJSON:jsonArray[1]]) { //base case condition
         
         // generate all base conditions
-        NSMutableArray<OPTLYCondition> *conditions = (NSMutableArray<OPTLYCondition> *)[[NSMutableArray alloc] initWithCapacity:(jsonArray.count - 1)];
+        NSMutableArray<OPTLYCondition *><OPTLYCondition> *conditions = (NSMutableArray<OPTLYCondition *><OPTLYCondition> *)[[NSMutableArray alloc] initWithCapacity:(jsonArray.count - 1)];
         for (int i = 1; i < jsonArray.count; i++) {
             NSDictionary *info = jsonArray[i];
             NSError *err = nil;
@@ -62,10 +62,10 @@ @implementation OPTLYCondition
         // return an (And/Or/Not) Condition handling the base conditions
         NSObject<OPTLYCondition> *condition = [OPTLYCondition createConditionInstanceOfClass:jsonArray[0]
                                                                               withConditions:conditions];
-        return (NSArray<OPTLYCondition> *)@[condition];
+        return (NSArray<OPTLYCondition *><OPTLYCondition> *)@[condition];
     }
     else { // further condition arrays to deserialize
-        NSMutableArray<OPTLYCondition> *subConditions = (NSMutableArray<OPTLYCondition> *)[[NSMutableArray alloc] initWithCapacity:(jsonArray.count - 1)];
+        NSMutableArray<OPTLYCondition *><OPTLYCondition> *subConditions = (NSMutableArray<OPTLYCondition *><OPTLYCondition> *)[[NSMutableArray alloc] initWithCapacity:(jsonArray.count - 1)];
         for (int i = 1; i < jsonArray.count; i++) {
             NSError *err = nil;
             NSArray *deserializedJsonObject = [OPTLYCondition deserializeJSONArray:jsonArray[i] error:&err];
@@ -81,11 +81,11 @@ @implementation OPTLYCondition
         }
         NSObject<OPTLYCondition> *condition = [OPTLYCondition createConditionInstanceOfClass:jsonArray[0]
                                                                               withConditions:subConditions];
-        return (NSArray<OPTLYCondition> *)@[condition];
+        return (NSArray<OPTLYCondition *><OPTLYCondition> *)@[condition];
     }
 }
 
-+ (NSObject<OPTLYCondition> *)createConditionInstanceOfClass:(NSString *)conditionClass withConditions:(NSArray<OPTLYCondition> *)conditions {
++ (NSObject<OPTLYCondition> *)createConditionInstanceOfClass:(NSString *)conditionClass withConditions:(NSArray<OPTLYCondition *><OPTLYCondition> *)conditions {
     if ([conditionClass isEqualToString:OPTLYDatafileKeysAndCondition]) {
         OPTLYAndCondition *andCondition = [[OPTLYAndCondition alloc] init];
         andCondition.subConditions = conditions;
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYDecisionEventTicket.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYDecisionEventTicket.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016,2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -22,7 +22,7 @@
 
 // Model object representing a Decision Ticket sent when layer decision is made.
 
-@class OPTLYEventHeader, OPTLYEventDecision;
+@class OPTLYEventHeader, OPTLYEventDecision, OPTLYEventDecisionTicket, OPTLYEventFeature;
 @protocol OPTLYEventDecisionTicket, OPTLYEventFeature;
 
 @interface OPTLYDecisionEventTicket : OPTLYJSONModel
@@ -50,15 +50,15 @@
 // The layer affected by this decision
 @property (nonatomic, strong, nonnull) NSString *layerId;
 // Visitor-specific input to Client Decision Engine
-@property (nonatomic, strong, nullable) NSArray<OPTLYEventDecisionTicket, OPTLYOptional> *decisionTicket;
+@property (nonatomic, strong, nullable) NSArray<OPTLYEventDecisionTicket *><OPTLYEventDecisionTicket, OPTLYOptional> *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<OPTLYOptional> *visitorUUID;
 // Features attached to the user
-@property (nonatomic, strong, nonnull) NSArray<OPTLYEventFeature> *userFeatures;
+@property (nonatomic, strong, nonnull) NSArray<OPTLYEventFeature *><OPTLYEventFeature> *userFeatures;
 // If true, then the experience in this decision was held back at the global level
 @property (nonatomic, assign) BOOL isGlobalHoldback;
 // If true, then anonymize IP.
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecisionTicket.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDecisionTicket.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016,2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -24,14 +24,15 @@
 #endif
 
 @protocol OPTLYEventAudience;
+@class OPTLYEventAudience;
 
 @protocol OPTLYEventDecisionTicket
 @end
 
 @interface OPTLYEventDecisionTicket : OPTLYJSONModel
 
 // The audiences bucketed at decision time
-@property (nonatomic, strong, nullable) NSArray<OPTLYEventAudience, OPTLYOptional> *audiences;
+@property (nonatomic, strong, nullable) NSArray<OPTLYEventAudience *><OPTLYEventAudience, OPTLYOptional> *audiences;
 // Id (UUID or visitorId) used for bucketing
 @property (nonatomic, strong, nullable) NSString<OPTLYOptional> *bucketingId;
 
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventView.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventView.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016,2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -24,6 +24,7 @@
 // Model object for a view.
 
 @protocol OPTLYEventFeature;
+@class OPTLYEventFeature;
 
 @protocol OPTLYEventView
 @end
@@ -35,6 +36,6 @@
 // The timestamp when the containing view was activated.
 @property (nonatomic, strong, nullable) NSNumber<OPTLYOptional> *activatedTimestamp;
 // Features attached to the view.
-@property (nonatomic, strong, nullable) NSArray<OPTLYEventFeature, OPTLYOptional> *viewFeatures;
+@property (nonatomic, strong, nullable) NSArray<OPTLYEventFeature *><OPTLYEventFeature, OPTLYOptional> *viewFeatures;
 
 @end
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYExperiment.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYExperiment.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016,2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -21,7 +21,7 @@
     #import <OptimizelySDKCore/OPTLYJSONModelLib.h>
 #endif
 
-@class OPTLYVariation;
+@class OPTLYVariation, OPTLYTrafficAllocation, OPTLYVariation;
 @protocol OPTLYTrafficAllocation, OPTLYVariation;
 
 /**
@@ -46,11 +46,11 @@ NS_ASSUME_NONNULL_END
 /// The group ID the experiment belongs to.
 @property (nonatomic, strong, nullable) NSString<Ignore> *groupId;
 /// The experiment's traffic allocations.
-@property (nonatomic, strong, nonnull) NSArray<OPTLYTrafficAllocation> *trafficAllocations;
+@property (nonatomic, strong, nonnull) NSArray<OPTLYTrafficAllocation *><OPTLYTrafficAllocation> *trafficAllocations;
 /// An array of audience Ids for the experiment
 @property (nonatomic, strong, nonnull) NSArray<NSString *> *audienceIds;
 /// An array of variation Ids for the experiment
-@property (nonatomic, strong, nonnull) NSArray<OPTLYVariation> *variations;
+@property (nonatomic, strong, nonnull) NSArray<OPTLYVariation *><OPTLYVariation> *variations;
 /// A dictionary indicating the forced and control variation
 @property (nonatomic, strong, nonnull) NSDictionary<NSString *, NSString *> *forcedVariations;
 /// Personalization layer id
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYFeatureFlag.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYFeatureFlag.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2017-2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -37,7 +37,7 @@
 /// an NSArray of the IDs of the experiments the feature flag is attached to.
 @property (nonatomic, strong, nonnull) NSArray<NSString *> *experimentIds;
 /// an NSArray of the feature variables that are part of this feature
-@property (nonatomic, strong, nonnull) NSArray<OPTLYFeatureVariable> *variables;
+@property (nonatomic, strong, nonnull) NSArray<OPTLYFeatureVariable *><OPTLYFeatureVariable> *variables;
 /// an NSString to hold the group Id the feature belongs to.
 @property (nonatomic, strong, nullable) NSString<OPTLYOptional> *groupId;
 
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYGroup.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYGroup.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016,2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -22,6 +22,7 @@
 #endif
 
 @protocol OPTLYExperiment, OPTLYTrafficAllocation;
+@class OPTLYTrafficAllocation, OPTLYExperiment;
 /**
  * This class is a representation of an Optimizely Group.
  */
@@ -36,8 +37,8 @@
 /// The Group's policy.
 @property (nonatomic, strong) NSString *policy;
 /// The Group's traffic allocations.
-@property (nonatomic, strong) NSArray<OPTLYTrafficAllocation> *trafficAllocations;
+@property (nonatomic, strong) NSArray<OPTLYTrafficAllocation *><OPTLYTrafficAllocation> *trafficAllocations;
 /// The Group's experiments.
-@property (nonatomic, strong) NSArray<OPTLYExperiment> *experiments;
+@property (nonatomic, strong) NSArray<OPTLYExperiment *><OPTLYExperiment> *experiments;
 
 @end
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYRollout.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYRollout.h
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYVariation.h b/OptimizelySDKCore/OptimizelySDKCore/OPTLYVariation.h
diff --git a/OptimizelySDKCore/OptimizelySDKCoreTests/OPTLYConditionTest.m b/OptimizelySDKCore/OptimizelySDKCoreTests/OPTLYConditionTest.m
diff --git a/OptimizelySDKShared/OptimizelySDKShared/OPTLYManagerBase.m b/OptimizelySDKShared/OptimizelySDKShared/OPTLYManagerBase.m
diff --git a/OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerTest.m b/OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerTest.m
