Entity collection properties to use NSArray instead of MSCollection

Author: kevklam

Templates/ObjC/Base/SharedObjC.template.tt

@@ -29,7 +29,7 @@ private string GetObjCTypeIdentifier(OdcmObject o, bool getUnderlyingType=false)
         OdcmProperty prop=(OdcmProperty)o;
         if(prop.IsCollection && !getUnderlyingType)
         {
-            return GetStaticCollectionObject();
+            return @"NSArray";
         }
 
         return GetObjCTypeIdentifier(prop.Type,getUnderlyingType);
@@ -113,7 +113,7 @@ private string GetJsonToObjCExpressionConversion(string expr,OdcmProperty prop)
     if(prop.Type is OdcmEntityClass || prop.Type is OdcmMediaClass || prop.Type is OdcmComplexClass)
     {
         return String.Format(
-        @"[[{0} alloc] initWithDictionary: {1} ]",
+        @"[[{0} alloc] initWithDictionary: {1}]",
         GetObjCTypeIdentifier(prop,true),
         expr);
     }
@@ -169,23 +169,21 @@ private string GetHydratedIVarFromDictionary(OdcmProperty prop)
     if(prop.IsCollection)
     {
         return String.Format(@"
-    NSMutableArray *{0}Collection = [NSMutableArray array];
-    NSArray *{0}s = self.dictionary[@""{1}""];
+    NSMutableArray *{0}Result = [NSMutableArray array];
+    NSArray *{0} = self.dictionary[@""{1}""];
 
-    if ([{0}s isKindOfClass:[NSArray class]]){{
-        for (id {0} in {0}s){{
-            [{0}Collection addObject:{2}];
-         }}
+    if ([{0} isKindOfClass:[NSArray class]]){{
+        for (id {2} in {0}){{
+            [{0}Result addObject:{3}];
+        }}
     }}
 
-    if ([{0}Collection count] > 0){{
-        _{0} = [[{3} alloc] initWithArray:{0}Collection nextLink:self.dictionary[@""@nextLink""] additionalData:self.dictionary];
-    }}
+    _{0} = {0}Result;
         ",
         GetObjCProperty(prop),
         prop.Name,
-        GetJsonToObjCExpressionConversion(GetObjCProperty(prop), prop),
-        GetStaticCollectionObject());
+        prop.Type.Name.ToLowerFirstChar(),
+        GetJsonToObjCExpressionConversion(prop.Type.Name.ToLowerFirstChar(), prop));
     }
 
     return String.Format(@"_{0} = {1};",GetObjCProperty(prop),GetHydratedPropertyFromDictionary(prop));

Templates/ObjC/Models/ComplexType.h.tt

@@ -9,7 +9,6 @@ var baseEntity = entity.Base;
 <#=writer.GetImportsClass(entity.Properties)#>
 
 #import "<#=GetObjCTypeIdentifier(baseEntity)#>.h"
-#import "<#=GetStaticCollectionObject()#>.h"
 
 @interface <#=GetObjCTypeIdentifier(entity)#> : <#=GetObjCTypeIdentifier(baseEntity)#>
 

Templates/ObjC/Models/EntityType.h.tt

@@ -6,15 +6,10 @@ var entity = host.CurrentType.AsOdcmClass();
 var baseEntity = entity.Base;
 
 IEnumerable<string> extraClasses = null;
-if (entity.Properties.Any(prop => prop.IsCollection))
-{
-   extraClasses = new List<string> { GetStaticCollectionObject() };
-}
 #>
 <#=writer.GetImportsClass(entity.Properties, extraClasses:extraClasses)#>
 
 #import "<#=GetObjCTypeIdentifier(baseEntity)#>.h"
-#import "<#=GetStaticCollectionObject()#>.h"
 
 @interface <#=GetObjCTypeIdentifier(entity)#> : <#=GetObjCTypeIdentifier(baseEntity)#>
 
@@ -33,7 +28,7 @@ foreach(var prop in entity.Properties.Where(prop => GetObjCTypeIdentifier(prop)!
   <#
 }
 
-foreach (var prop in entity.Properties.Where(prop => prop.IsCollection && !prop.LongDescriptionContains("not-enumerable")))
+foreach (var prop in entity.Properties.Where(prop => prop.IsCollection && prop.LongDescriptionContains("enumerable")))
 {
 #>
 - (<#=GetObjCTypeForVarDeclaration(prop,true)#>) <#=GetObjCProperty(prop)#>:(NSInteger)index;

Templates/ObjC/Models/EntityType.m.tt

@@ -66,14 +66,14 @@ foreach(var prop in entity.Properties.Where(prop => GetObjCTypeIdentifier(prop)!
     PropertySetterImplementation(prop);
 }
 
-foreach(var prop in entity.Properties.Where(prop => prop.IsCollection && !prop.LongDescriptionContains("not-enumerable")))
+foreach(var prop in entity.Properties.Where(prop => prop.IsCollection && prop.LongDescriptionContains("enumerable")))
 {
 #>
 - (<#=GetObjCTypeForVarDeclaration(prop,true)#>) <#=GetObjCProperty(prop)#>:(NSInteger)index
 {
    <#=GetObjCTypeForVarDeclaration(prop,true)#> <#=GetObjCProperty(prop)#> = nil;
-   if (self.<#=GetObjCProperty(prop)#>.value){
-       <#=GetObjCProperty(prop)#> = self.<#=GetObjCProperty(prop)#>.value[index];
+   if (self.<#=GetObjCProperty(prop)#>) {
+       <#=GetObjCProperty(prop)#> = self.<#=GetObjCProperty(prop)#>[index];
    }
    return <#=GetObjCProperty(prop)#>;
 }

Templates/ObjC/Requests/EntityCollectionRequest.h.tt

@@ -30,7 +30,7 @@ if (innerEntityType.Equals(propName))
 
 typedef void (^<#=innerEntityType#>CompletionHandler)(<#=innerEntityType#> *response, NSError *error);
 
-typedef void (^<#=propName + collectionNamer#>CompletionHandler)(<#=writer.GetStaticCodePrefix() + "Collection"#> *response, <#=propRequest#> *nextRequest, NSError *error);
+typedef void (^<#=propName + collectionNamer#>CompletionHandler)(<#=writer.GetStaticCodePrefix()#>Collection *response, <#=propRequest#> *nextRequest, NSError *error);
 
 @interface <#=propRequest#> : <#=writer.GetStaticCodePrefix()#>CollectionRequest