Changes to ObjC template to move from deprecated 'Type' to using 'Projection'

Robert Anderson · Robert Anderson · commit ef6c9d3afb5c · 2016-04-22T10:21:40.000-07:00
diff --git a/Templates/ObjC/Base/SharedObjC.template.tt b/Templates/ObjC/Base/SharedObjC.template.tt
@@ -32,7 +32,7 @@ private string GetObjCTypeIdentifier(OdcmObject o, bool getUnderlyingType=false)
             return @"NSArray";
         }
 
-        return GetObjCTypeIdentifier(prop.Type,getUnderlyingType);
+        return GetObjCTypeIdentifier(prop.Projection.Type,getUnderlyingType);
     }
     else if(o is OdcmType)
     {
@@ -113,7 +113,9 @@ private string GetJsonToObjCExpressionConversion(string expr,OdcmProperty prop)
         GetObjCTypeIdentifier(prop,true));
     }
 
-    if(prop.Type is OdcmEntityClass || prop.Type is OdcmMediaClass || prop.Type is OdcmComplexClass)
+    var type = prop.Projection.Type;
+
+    if(type is OdcmEntityClass || type is OdcmMediaClass || type is OdcmComplexClass)
     {
         return String.Format(
         @"[[{0} alloc] initWithDictionary: {1}]",
@@ -124,7 +126,7 @@ private string GetJsonToObjCExpressionConversion(string expr,OdcmProperty prop)
     return String.Format(
     @"[{0} {1}]",
     expr,
-    prop.Type.GetNSNumberValueMethod());
+    type.GetNSNumberValueMethod());
 }
 
 private string GetHydratedPropertyFromDictionary(OdcmProperty prop)
@@ -156,7 +158,7 @@ private string GetObjCToJsonConvertibleExpressionConversion(OdcmType type, bool
 
 private string GetObjCToJsonConvertibleExpressionConversion(OdcmProperty prop,string val)
 {
-    return GetObjCToJsonConvertibleExpressionConversion(prop.Type, prop.IsCollection, val);
+    return GetObjCToJsonConvertibleExpressionConversion(prop.Projection.Type, prop.IsCollection, val);
 }
 
 private string SetDictionaryPropertyInJsonConvertibleForm(OdcmProperty prop, string val)
@@ -185,8 +187,8 @@ private string GetHydratedIVarFromDictionary(OdcmProperty prop)
         ",
         GetObjCProperty(prop),
         prop.Name,
-        prop.Type.Name.ToLowerFirstChar(),
-        GetJsonToObjCExpressionConversion(prop.Type.Name.ToLowerFirstChar(), prop));
+        prop.Projection.Type.Name.ToLowerFirstChar(),
+        GetJsonToObjCExpressionConversion(prop.Projection.Type.Name.ToLowerFirstChar(), prop));
     }
 
     return String.Format(@"_{0} = {1};",GetObjCProperty(prop),GetHydratedPropertyFromDictionary(prop));
@@ -248,7 +250,7 @@ private void PropertyGetterImplementation(OdcmProperty prop)
 - (<#=GetObjCTypeForVarDeclaration(prop)#>) <#=GetObjCPropertyGetter(prop)#>
 {
 <#+
-    if(IsObjCTypeSameAsJsonType(prop.Type))
+    if(IsObjCTypeSameAsJsonType(prop.Projection.Type))
     {
 #>
     return self.dictionary[@"<#=prop.Name#>"];
@@ -287,7 +289,7 @@ private void PropertySetterImplementation(OdcmProperty prop)
 - (void) <#=GetObjCPropertySetter(prop)#>: (<#=GetObjCTypeForVarDeclaration(prop)#>) val
 {
 <#+
-    if(IsObjCTypeSameAsJsonType(prop.Type))
+    if(IsObjCTypeSameAsJsonType(prop.Projection.Type))
     {
 #>
     self.dictionary[@"<#=prop.Name#>"] = val;
diff --git a/Templates/ObjC/Requests/EntityClient.h.tt b/Templates/ObjC/Requests/EntityClient.h.tt
@@ -12,7 +12,7 @@ foreach(var prop in containerProps)
 {
     var propName = writer.GetPrefix() + prop.Name.ToUpperFirstChar();
     classes.Add(propName + "CollectionRequestBuilder;");
-    classes.Add(writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "RequestBuilder;");
+    classes.Add(writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "RequestBuilder;");
 }
 
 foreach(var propertyClass in classes)
diff --git a/Templates/ObjC/Requests/EntityClient.m.tt b/Templates/ObjC/Requests/EntityClient.m.tt
@@ -15,7 +15,7 @@ var containerProps = model.EntityContainer.Properties;
 foreach(var prop in containerProps)
 {
     var propName = writer.GetPrefix() + prop.Name.ToUpperFirstChar();
-    var propType = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar();
+    var propType = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar();
 
 	if(prop.IsCollection())
 	{
@@ -24,12 +24,12 @@ foreach(var prop in containerProps)
 -(<#=propName#>CollectionRequestBuilder *)<#=prop.Name#>
 {
     return [[<#=propName#>CollectionRequestBuilder alloc] initWithURL:[self.baseURL URLByAppendingPathComponent:@"<#=prop.Name#>"] 
-             <#=prop.Type.GetTypeString().ToSpaces()#><#="CollectionRequestBuilder alloc]     ".ToSpaces()#>client:self];
+             <#=prop.Projection.Type.GetTypeString().ToSpaces()#><#="CollectionRequestBuilder alloc]     ".ToSpaces()#>client:self];
 }
 
--(<#=propType#>RequestBuilder*)<#=prop.Name#>:(NSString*)<#=prop.Type.Name#>
+-(<#=propType#>RequestBuilder*)<#=prop.Name#>:(NSString*)<#=prop.Projection.Type.Name#>
 {
-    return [[self <#=prop.Name#>] <#=prop.Type.Name#>:<#=prop.Type.Name#>];
+    return [[self <#=prop.Name#>] <#=prop.Projection.Type.Name#>:<#=prop.Type.Name#>];
 }
 
 <#
@@ -40,7 +40,7 @@ foreach(var prop in containerProps)
     -(<#=propType#>RequestBuilder *) <#=prop.Name#>
     {
     return [[<#=propType#>RequestBuilder alloc] initWithURL:[self.baseURL URLByAppendingPathComponent:@"<#=prop.Name#>"] 
-             <#=prop.Type.GetTypeString().ToSpaces()#><#="RequestBuilder alloc]     ".ToSpaces()#>client:self];
+             <#=prop.Projection.Type.GetTypeString().ToSpaces()#><#="RequestBuilder alloc]     ".ToSpaces()#>client:self];
     }
 <#
     }
diff --git a/Templates/ObjC/Requests/EntityCollectionRequest.h.tt b/Templates/ObjC/Requests/EntityCollectionRequest.h.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var isServiceES = prop.Class.Kind == OdcmClassKind.Service;
 
 var collectionNamer = prop.IsReference() ? ((collectionReference)?"CollectionReferences":"CollectionWithReferences") : "Collection";
diff --git a/Templates/ObjC/Requests/EntityCollectionRequest.m.tt b/Templates/ObjC/Requests/EntityCollectionRequest.m.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var isServiceES = prop.Class.Kind == OdcmClassKind.Service;
 
 var collectionNamer = prop.IsReference() ? ((collectionReference)?"CollectionReferences":"CollectionWithReferences") : "Collection";
diff --git a/Templates/ObjC/Requests/EntityCollectionRequestBuilder.h.tt b/Templates/ObjC/Requests/EntityCollectionRequestBuilder.h.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = writer.GetPrefix() + innerEntity.Name.ToUpperFirstChar();
 var isServiceES = prop.Class.Kind == OdcmClassKind.Service;
 
diff --git a/Templates/ObjC/Requests/EntityCollectionRequestBuilder.m.tt b/Templates/ObjC/Requests/EntityCollectionRequestBuilder.m.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var isServiceES = prop.Class.Kind == OdcmClassKind.Service;
 
 var collectionNamer = prop.IsReference() ? ((collectionReference)?"CollectionReferences":"CollectionWithReferences") : "Collection";
diff --git a/Templates/ObjC/Requests/EntityRequest.h.tt b/Templates/ObjC/Requests/EntityRequest.h.tt
@@ -14,7 +14,7 @@ if(!withReference && !entityReference)
 foreach(var prop in entity.NavigationProperties())
 {
 	var fetcher = string.Empty;
-	fetcher = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "RequestBuilder";
+	fetcher = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "RequestBuilder";
 
 	if(!clasess.Contains(fetcher)) clasess.Add(fetcher);
 
diff --git a/Templates/ObjC/Requests/EntityRequestBuilder.h.tt b/Templates/ObjC/Requests/EntityRequestBuilder.h.tt
@@ -27,7 +27,7 @@ if(!withReference && !entityReference)
 foreach(var prop in entity.NavigationProperties())
 {
     var fetcher = string.Empty;
-    fetcher = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "RequestBuilder";
+    fetcher = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "RequestBuilder";
 
     if(!classes.Contains(fetcher)) classes.Add(fetcher);
 
@@ -57,9 +57,9 @@ foreach(var prop in entity.GetProperties(typeName:"Stream"))
     }
 }
 
-foreach(var prop in entity.Properties.Where( prop => prop.Type is OdcmMediaClass))
+foreach(var prop in entity.Properties.Where(prop => prop.Projection.Type is OdcmMediaClass))
 {
-    var streamRequest = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "StreamRequest";
+    var streamRequest = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "StreamRequest";
     if (!classes.Contains(streamRequest))
     {
         classes.Add(streamRequest);
@@ -77,10 +77,10 @@ foreach(var func in entity.Methods)
 }
 
 foreach(var complexType in entity.Properties.Where(prop => prop.LongDescriptionContains("navigable") ||
-                                                           prop.Type.LongDescriptionContains("navigable"))
-                                            .Where(prop => prop.Type is OdcmClass))
+                                                           prop.Projection.Type.LongDescriptionContains("navigable"))
+                                            .Where(prop => prop.Projection.Type is OdcmClass))
 {
-    var requestType = writer.GetPrefix() + complexType.Type.Name.ToUpperFirstChar() + "RequestBuilder";
+    var requestType = writer.GetPrefix() + complexType.Projection.Type.Name.ToUpperFirstChar() + "RequestBuilder";
     if (!classes.Contains(requestType))
     {
         classes.Add(requestType);
@@ -133,19 +133,19 @@ if(!withReference && !entityReference)
 foreach(var prop in entity.NavigationProperties())
 {
 	var propInstanceName = prop.Name.ToLowerFirstChar();
-	var innerPropTypeName = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar();
+	var innerPropTypeName = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar();
 	var innerPropTypeRequestName = innerPropTypeName + "RequestBuilder";
 	
     if(prop.IsCollection)
     {
 		var collectionNamer = prop.IsReference() ? "CollectionWithReferences" : "Collection";
 		var collectionRequestName = writer.GetPrefix() + prop.Class.Name.ToUpperFirstChar() + prop.Name.ToUpperFirstChar() + collectionNamer + "RequestBuilder";
-		var innerPropInstanceName = prop.Type.Name.ToLowerFirstChar();
+		var innerPropInstanceName = prop.Projection.Type.Name.ToLowerFirstChar();
 #>
 - (<#=collectionRequestName#> *)<#=propInstanceName#>;
 
 <#
-        if (!(prop.Type is OdcmComplexClass) || prop.LongDescriptionContains("queryable"))
+        if (!(prop.Projection.Type is OdcmComplexClass) || prop.LongDescriptionContains("queryable"))
         {
 #>
 - (<#=innerPropTypeRequestName#> *)<#=propInstanceName#>:(NSString *)<#=innerPropInstanceName#>;
@@ -162,11 +162,11 @@ foreach(var prop in entity.NavigationProperties())
     }
 }
 foreach(var complexType in entity.Properties.Where(prop => prop.LongDescriptionContains("navigable") ||
-                                                           prop.Type.LongDescriptionContains("navigable"))
-                                            .Where(prop => prop.Type is OdcmClass))
+                                                           prop.Projection.Type.LongDescriptionContains("navigable"))
+                                            .Where(prop => prop.Projection.Type is OdcmClass))
 {
 #>
-- (<#=writer.GetPrefix() + complexType.Type.Name.ToUpperFirstChar()#>RequestBuilder *) <#=complexType.Name#>;
+- (<#=writer.GetPrefix() + complexType.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder *) <#=complexType.Name#>;
 
 <#
 }
@@ -182,10 +182,10 @@ foreach(var prop in entity.GetProperties(typeName:"Stream"))
 
 <#
 }
-foreach(var prop in entity.Properties.Where( prop => prop.Type is OdcmMediaClass))
+foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is OdcmMediaClass))
 {
     var propName = prop.Name.ToUpperFirstChar();
-    var propRequestName = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "StreamRequest";
+    var propRequestName = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "StreamRequest";
 #>
 - (<#=propRequestName#> *) <#=propName.ToLowerFirstChar()#>ValueWithOptions:(NSArray *)options;
 
diff --git a/Templates/ObjC/Requests/EntityRequestBuilder.m.tt b/Templates/ObjC/Requests/EntityRequestBuilder.m.tt
@@ -24,8 +24,8 @@ foreach(var prop in entity.NavigationProperties())
         var propTypeName = writer.GetPrefix() + prop.Name.ToUpperFirstChar();
         var collectionNamer = prop.IsReference() ? "CollectionWithReferences" : "Collection";
         var collectionRequestName = writer.GetPrefix() + prop.Class.Name.ToUpperFirstChar() + prop.Name.ToUpperFirstChar() + collectionNamer +"RequestBuilder";
-        var innerPropTypeName = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar();
-        var innerPropInstanceName = prop.Type.Name.ToLowerFirstChar();
+        var innerPropTypeName = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar();
+        var innerPropInstanceName = prop.Projection.Type.Name.ToLowerFirstChar();
         var innerPropTypeRequestName = innerPropTypeName + "RequestBuilder";
 
 #>
@@ -37,7 +37,7 @@ foreach(var prop in entity.NavigationProperties())
 }
 
 <#
-        if (!(prop.Type is OdcmComplexClass) || prop.LongDescriptionContains("queryable"))
+        if (!(prop.Projection.Type is OdcmComplexClass) || prop.LongDescriptionContains("queryable"))
         {
 #>
 - (<#=innerPropTypeRequestName#> *)<#=propInstanceName#>:(NSString *)<#=innerPropInstanceName#>
@@ -52,23 +52,23 @@ foreach(var prop in entity.NavigationProperties())
     else
     {
 #>
--(<#=writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar()#>RequestBuilder *)<#=prop.Name#>
+-(<#=writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder *)<#=prop.Name#>
 {
-    return [[<#=writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar()#>RequestBuilder alloc] initWithURL:[self.requestURL URLByAppendingPathComponent:@"<#=prop.Name#>"] client:self.client];
+    return [[<#=writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder alloc] initWithURL:[self.requestURL URLByAppendingPathComponent:@"<#=prop.Name#>"] client:self.client];
 
 }
 
 <#
     }
 }
 foreach (var complexType in entity.Properties.Where(prop => prop.LongDescriptionContains("navigable") ||
-                                                            prop.Type.LongDescriptionContains("navigable"))
-                                             .Where(prop => prop.Type is OdcmClass))
+                                                            prop.Projection.Type.LongDescriptionContains("navigable"))
+                                             .Where(prop => prop.Projection.Type is OdcmClass))
 {
 #>
--(<#=writer.GetPrefix() + complexType.Type.Name.ToUpperFirstChar()#>RequestBuilder *)<#=complexType.Name#>
+-(<#=writer.GetPrefix() + complexType.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder *)<#=complexType.Name#>
 {
-    return [[<#=writer.GetPrefix() + complexType.Type.Name.ToUpperFirstChar()#>RequestBuilder alloc] initWithURL:[self.requestURL URLByAppendingPathComponent:@"<#=complexType.Name#>"] client:self.client];
+    return [[<#=writer.GetPrefix() + complexType.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder alloc] initWithURL:[self.requestURL URLByAppendingPathComponent:@"<#=complexType.Name#>"] client:self.client];
 
 }
 
@@ -95,10 +95,10 @@ foreach(var prop in entity.GetProperties(typeName:"Stream"))
 
 }
 
-foreach(var prop in entity.Properties.Where( prop => prop.Type is OdcmMediaClass))
+foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is OdcmMediaClass))
 {
     var propName = prop.Name.ToUpperFirstChar();
-    var propRequestName = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "StreamRequest";
+    var propRequestName = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "StreamRequest";
 #>
 - (<#=propRequestName#> *) <#=propName.ToLowerFirstChar()#>ValueWithOptions:(NSArray *)options
 {
diff --git a/Templates/ObjC/Requests/MethodRequest.m.tt b/Templates/ObjC/Requests/MethodRequest.m.tt
@@ -15,7 +15,7 @@ if (func.ReturnType != null)
     if (returnTypeObject != null && returnTypeObject.Properties.Any(prop => prop.IsCollection && prop.Name.Contains("values")))
     {
         var valuesProperty = returnTypeObject.Properties.First(prop => prop.IsCollection);
-        returnType = writer.GetPrefix() + valuesProperty.Type.Name.ToUpperFirstChar();
+        returnType = writer.GetPrefix() + valuesProperty.Projection.Type.Name.ToUpperFirstChar();
     }
 }
 else
diff --git a/Templates/ObjC/Requests/ODataEntities.h.tt b/Templates/ObjC/Requests/ODataEntities.h.tt
@@ -16,7 +16,7 @@ foreach(var et in model.GetMediaEntityTypes())
 
 foreach(var es in entitySet)
 {
-    if (es.IsCollection() && !(es.Type is OdcmPrimitiveType) && !es.IsEnum())
+    if (es.IsCollection() && !(es.Projection.Type is OdcmPrimitiveType) && !es.IsEnum())
     {
         classes.Add("#import \"" + writer.GetPrefix() + es.Class.Name.ToUpperFirstChar() + es.Name.ToUpperFirstChar() + "CollectionRequestBuilder.h\"");
         classes.Add("#import \"" + writer.GetPrefix() + es.Class.Name.ToUpperFirstChar() + es.Name.ToUpperFirstChar() + "CollectionRequest.h\"");
@@ -30,7 +30,7 @@ foreach(var et in entityTypes)
 
     foreach(var prop in et.NavigationProperties())
     {
-        if (!(prop.Type is OdcmPrimitiveType) && !prop.IsEnum())
+        if (!(prop.Projection.Type is OdcmPrimitiveType) && !prop.IsEnum())
         {
             if (prop.IsCollection())
             {
@@ -50,14 +50,15 @@ foreach(var et in entityTypes)
             }
             else
             {
-                 classes.Add("#import \"" + writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "RequestBuilder.h\"");
-                 classes.Add("#import \"" + writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "Request.h\"");
+                 var typeName = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar();
+                 classes.Add("#import \"" + typeName + "RequestBuilder.h\"");
+                 classes.Add("#import \"" + typeName + "Request.h\"");
                  if(prop.IsReference())
                  {
-                     classes.Add("#import \"" + writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "WithReferenceRequestBuilder.h\"");
-                     classes.Add("#import \"" + writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "WithReferenceRequest.h\"");
-                     classes.Add("#import \"" + writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "ReferenceRequestBuilder.h\"");
-                     classes.Add("#import \"" + writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "ReferenceRequest.h\"");
+                     classes.Add("#import \"" + typeName + "WithReferenceRequestBuilder.h\"");
+                     classes.Add("#import \"" + typeName + "WithReferenceRequest.h\"");
+                     classes.Add("#import \"" + typeName + "ReferenceRequestBuilder.h\"");
+                     classes.Add("#import \"" + typeName + "ReferenceRequest.h\"");
                  }
             }
         }
@@ -80,10 +81,10 @@ foreach(var et in entityTypes)
     }
 
     foreach(var complexType in et.Properties.Where(prop => prop.LongDescriptionContains("navigable") ||
-                                                           prop.Type.LongDescriptionContains("navigable"))
-                                            .Where(prop => prop.Type is OdcmClass))
+                                                           prop.Projection.Type.LongDescriptionContains("navigable"))
+                                            .Where(prop => prop.Projection.Type is OdcmClass))
     {
-        var baseName = writer.GetPrefix() + complexType.Type.Name.ToUpperFirstChar();
+        var baseName = writer.GetPrefix() + complexType.Projection.Type.Name.ToUpperFirstChar();
         classes.Add("#import \"" + baseName + "RequestBuilder.h\"");
         classes.Add("#import \"" + baseName + "Request.h\"");
     }
@@ -92,7 +93,7 @@ foreach(var et in entityTypes)
 
 foreach(var complexType in model.GetComplexTypes())
 {
-    foreach(var prop in complexType.GetProperties().Where(prop => prop.IsCollection && !(prop.Type is OdcmPrimitiveType) && !prop.IsEnum() && !prop.LongDescriptionContains("ignorableCollection")))
+    foreach(var prop in complexType.GetProperties().Where(prop => prop.IsCollection && !(prop.Projection.Type is OdcmPrimitiveType) && !prop.IsEnum() && !prop.LongDescriptionContains("ignorableCollection")))
     {
         var baseName = writer.GetPrefix() + prop.Class.Name.ToUpperFirstChar() + prop.Name.ToUpperFirstChar();
         if(!prop.IsReference())
diff --git a/Templates/ObjC/Requests/StreamRequest.m.tt b/Templates/ObjC/Requests/StreamRequest.m.tt
@@ -10,7 +10,7 @@ if(host.CurrentType is OdcmProperty)
 {
     var prop = host.CurrentType.AsOdcmProperty();
     className = writer.GetPrefix() + prop.Class.Name.ToUpperFirstChar();
-    propName = className + prop.Name.ToUpperFirstChar() + ((prop.Type is OdcmMediaClass)?"Stream":"") + "Request";
+    propName = className + prop.Name.ToUpperFirstChar() + ((prop.Projection.Type is OdcmMediaClass)?"Stream":"") + "Request";
 }
 else
 {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ private string GetObjCTypeIdentifier(OdcmObject o, bool getUnderlyingType=false)`
`32`	`32`	`return @"NSArray";`
`33`	`33`	`}`
`34`	`34`
`35`		`- return GetObjCTypeIdentifier(prop.Type,getUnderlyingType);`
	`35`	`+ return GetObjCTypeIdentifier(prop.Projection.Type,getUnderlyingType);`
`36`	`36`	`}`
`37`	`37`	`else if(o is OdcmType)`
`38`	`38`	`{`
`@@ -113,7 +113,9 @@ private string GetJsonToObjCExpressionConversion(string expr,OdcmProperty prop)`
`113`	`113`	`GetObjCTypeIdentifier(prop,true));`
`114`	`114`	`}`
`115`	`115`
`116`		`- if(prop.Type is OdcmEntityClass \|\| prop.Type is OdcmMediaClass \|\| prop.Type is OdcmComplexClass)`
	`116`	`+ var type = prop.Projection.Type;`
	`117`	`+`
	`118`	`+ if(type is OdcmEntityClass \|\| type is OdcmMediaClass \|\| type is OdcmComplexClass)`
`117`	`119`	`{`
`118`	`120`	`return String.Format(`
`119`	`121`	`@"[[{0} alloc] initWithDictionary: {1}]",`
`@@ -124,7 +126,7 @@ private string GetJsonToObjCExpressionConversion(string expr,OdcmProperty prop)`
`124`	`126`	`return String.Format(`
`125`	`127`	`@"[{0} {1}]",`
`126`	`128`	`expr,`
`127`		`- prop.Type.GetNSNumberValueMethod());`
	`129`	`+ type.GetNSNumberValueMethod());`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`private string GetHydratedPropertyFromDictionary(OdcmProperty prop)`
`@@ -156,7 +158,7 @@ private string GetObjCToJsonConvertibleExpressionConversion(OdcmType type, bool`
`156`	`158`
`157`	`159`	`private string GetObjCToJsonConvertibleExpressionConversion(OdcmProperty prop,string val)`
`158`	`160`	`{`
`159`		`- return GetObjCToJsonConvertibleExpressionConversion(prop.Type, prop.IsCollection, val);`
	`161`	`+ return GetObjCToJsonConvertibleExpressionConversion(prop.Projection.Type, prop.IsCollection, val);`
`160`	`162`	`}`
`161`	`163`
`162`	`164`	`private string SetDictionaryPropertyInJsonConvertibleForm(OdcmProperty prop, string val)`
`@@ -185,8 +187,8 @@ private string GetHydratedIVarFromDictionary(OdcmProperty prop)`
`185`	`187`	`",`
`186`	`188`	`GetObjCProperty(prop),`
`187`	`189`	`prop.Name,`
`188`		`- prop.Type.Name.ToLowerFirstChar(),`
`189`		`- GetJsonToObjCExpressionConversion(prop.Type.Name.ToLowerFirstChar(), prop));`
	`190`	`+ prop.Projection.Type.Name.ToLowerFirstChar(),`
	`191`	`+ GetJsonToObjCExpressionConversion(prop.Projection.Type.Name.ToLowerFirstChar(), prop));`
`190`	`192`	`}`
`191`	`193`
`192`	`194`	`return String.Format(@"_{0} = {1};",GetObjCProperty(prop),GetHydratedPropertyFromDictionary(prop));`
`@@ -248,7 +250,7 @@ private void PropertyGetterImplementation(OdcmProperty prop)`
`248`	`250`	`- (<#=GetObjCTypeForVarDeclaration(prop)#>) <#=GetObjCPropertyGetter(prop)#>`
`249`	`251`	`{`
`250`	`252`	`<#+`
`251`		`- if(IsObjCTypeSameAsJsonType(prop.Type))`
	`253`	`+ if(IsObjCTypeSameAsJsonType(prop.Projection.Type))`
`252`	`254`	`{`
`253`	`255`	`#>`
`254`	`256`	`return self.dictionary[@"<#=prop.Name#>"];`
`@@ -287,7 +289,7 @@ private void PropertySetterImplementation(OdcmProperty prop)`
`287`	`289`	`- (void) <#=GetObjCPropertySetter(prop)#>: (<#=GetObjCTypeForVarDeclaration(prop)#>) val`
`288`	`290`	`{`
`289`	`291`	`<#+`
`290`		`- if(IsObjCTypeSameAsJsonType(prop.Type))`
	`292`	`+ if(IsObjCTypeSameAsJsonType(prop.Projection.Type))`
`291`	`293`	`{`
`292`	`294`	`#>`
`293`	`295`	`self.dictionary[@"<#=prop.Name#>"] = val;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ foreach(var prop in containerProps)`
`12`	`12`	`{`
`13`	`13`	`var propName = writer.GetPrefix() + prop.Name.ToUpperFirstChar();`
`14`	`14`	`classes.Add(propName + "CollectionRequestBuilder;");`
`15`		`- classes.Add(writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "RequestBuilder;");`
	`15`	`+ classes.Add(writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "RequestBuilder;");`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`foreach(var propertyClass in classes)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ var containerProps = model.EntityContainer.Properties;`
`15`	`15`	`foreach(var prop in containerProps)`
`16`	`16`	`{`
`17`	`17`	`var propName = writer.GetPrefix() + prop.Name.ToUpperFirstChar();`
`18`		`- var propType = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar();`
	`18`	`+ var propType = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar();`
`19`	`19`
`20`	`20`	`if(prop.IsCollection())`
`21`	`21`	`{`
`@@ -24,12 +24,12 @@ foreach(var prop in containerProps)`
`24`	`24`	`-(<#=propName#>CollectionRequestBuilder *)<#=prop.Name#>`
`25`	`25`	`{`
`26`	`26`	`return [[<#=propName#>CollectionRequestBuilder alloc] initWithURL:[self.baseURL URLByAppendingPathComponent:@"<#=prop.Name#>"]`
`27`		`- <#=prop.Type.GetTypeString().ToSpaces()#><#="CollectionRequestBuilder alloc] ".ToSpaces()#>client:self];`
	`27`	`+ <#=prop.Projection.Type.GetTypeString().ToSpaces()#><#="CollectionRequestBuilder alloc] ".ToSpaces()#>client:self];`
`28`	`28`	`}`
`29`	`29`
`30`		`--(<#=propType#>RequestBuilder)<#=prop.Name#>:(NSString)<#=prop.Type.Name#>`
	`30`	`+-(<#=propType#>RequestBuilder)<#=prop.Name#>:(NSString)<#=prop.Projection.Type.Name#>`
`31`	`31`	`{`
`32`		`- return [[self <#=prop.Name#>] <#=prop.Type.Name#>:<#=prop.Type.Name#>];`
	`32`	`+ return [[self <#=prop.Name#>] <#=prop.Projection.Type.Name#>:<#=prop.Type.Name#>];`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`<#`
`@@ -40,7 +40,7 @@ foreach(var prop in containerProps)`
`40`	`40`	`-(<#=propType#>RequestBuilder *) <#=prop.Name#>`
`41`	`41`	`{`
`42`	`42`	`return [[<#=propType#>RequestBuilder alloc] initWithURL:[self.baseURL URLByAppendingPathComponent:@"<#=prop.Name#>"]`
`43`		`- <#=prop.Type.GetTypeString().ToSpaces()#><#="RequestBuilder alloc] ".ToSpaces()#>client:self];`
	`43`	`+ <#=prop.Projection.Type.GetTypeString().ToSpaces()#><#="RequestBuilder alloc] ".ToSpaces()#>client:self];`
`44`	`44`	`}`
`45`	`45`	`<#`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ if(!withReference && !entityReference)`
`14`	`14`	`foreach(var prop in entity.NavigationProperties())`
`15`	`15`	`{`
`16`	`16`	`var fetcher = string.Empty;`
`17`		`- fetcher = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "RequestBuilder";`
	`17`	`+ fetcher = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "RequestBuilder";`
`18`	`18`
`19`	`19`	`if(!clasess.Contains(fetcher)) clasess.Add(fetcher);`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ if(!withReference && !entityReference)`
`27`	`27`	`foreach(var prop in entity.NavigationProperties())`
`28`	`28`	`{`
`29`	`29`	`var fetcher = string.Empty;`
`30`		`- fetcher = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "RequestBuilder";`
	`30`	`+ fetcher = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "RequestBuilder";`
`31`	`31`
`32`	`32`	`if(!classes.Contains(fetcher)) classes.Add(fetcher);`
`33`	`33`
`@@ -57,9 +57,9 @@ foreach(var prop in entity.GetProperties(typeName:"Stream"))`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`-foreach(var prop in entity.Properties.Where( prop => prop.Type is OdcmMediaClass))`
	`60`	`+foreach(var prop in entity.Properties.Where(prop => prop.Projection.Type is OdcmMediaClass))`
`61`	`61`	`{`
`62`		`- var streamRequest = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "StreamRequest";`
	`62`	`+ var streamRequest = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "StreamRequest";`
`63`	`63`	`if (!classes.Contains(streamRequest))`
`64`	`64`	`{`
`65`	`65`	`classes.Add(streamRequest);`
`@@ -77,10 +77,10 @@ foreach(var func in entity.Methods)`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`foreach(var complexType in entity.Properties.Where(prop => prop.LongDescriptionContains("navigable") \|\|`
`80`		`- prop.Type.LongDescriptionContains("navigable"))`
`81`		`- .Where(prop => prop.Type is OdcmClass))`
	`80`	`+ prop.Projection.Type.LongDescriptionContains("navigable"))`
	`81`	`+ .Where(prop => prop.Projection.Type is OdcmClass))`
`82`	`82`	`{`
`83`		`- var requestType = writer.GetPrefix() + complexType.Type.Name.ToUpperFirstChar() + "RequestBuilder";`
	`83`	`+ var requestType = writer.GetPrefix() + complexType.Projection.Type.Name.ToUpperFirstChar() + "RequestBuilder";`
`84`	`84`	`if (!classes.Contains(requestType))`
`85`	`85`	`{`
`86`	`86`	`classes.Add(requestType);`
`@@ -133,19 +133,19 @@ if(!withReference && !entityReference)`
`133`	`133`	`foreach(var prop in entity.NavigationProperties())`
`134`	`134`	`{`
`135`	`135`	`var propInstanceName = prop.Name.ToLowerFirstChar();`
`136`		`- var innerPropTypeName = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar();`
	`136`	`+ var innerPropTypeName = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar();`
`137`	`137`	`var innerPropTypeRequestName = innerPropTypeName + "RequestBuilder";`
`138`	`138`
`139`	`139`	`if(prop.IsCollection)`
`140`	`140`	`{`
`141`	`141`	`var collectionNamer = prop.IsReference() ? "CollectionWithReferences" : "Collection";`
`142`	`142`	`var collectionRequestName = writer.GetPrefix() + prop.Class.Name.ToUpperFirstChar() + prop.Name.ToUpperFirstChar() + collectionNamer + "RequestBuilder";`
`143`		`- var innerPropInstanceName = prop.Type.Name.ToLowerFirstChar();`
	`143`	`+ var innerPropInstanceName = prop.Projection.Type.Name.ToLowerFirstChar();`
`144`	`144`	`#>`
`145`	`145`	`- (<#=collectionRequestName#> *)<#=propInstanceName#>;`
`146`	`146`
`147`	`147`	`<#`
`148`		`- if (!(prop.Type is OdcmComplexClass) \|\| prop.LongDescriptionContains("queryable"))`
	`148`	`+ if (!(prop.Projection.Type is OdcmComplexClass) \|\| prop.LongDescriptionContains("queryable"))`
`149`	`149`	`{`
`150`	`150`	`#>`
`151`	`151`	`- (<#=innerPropTypeRequestName#> )<#=propInstanceName#>:(NSString )<#=innerPropInstanceName#>;`
`@@ -162,11 +162,11 @@ foreach(var prop in entity.NavigationProperties())`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`foreach(var complexType in entity.Properties.Where(prop => prop.LongDescriptionContains("navigable") \|\|`
`165`		`- prop.Type.LongDescriptionContains("navigable"))`
`166`		`- .Where(prop => prop.Type is OdcmClass))`
	`165`	`+ prop.Projection.Type.LongDescriptionContains("navigable"))`
	`166`	`+ .Where(prop => prop.Projection.Type is OdcmClass))`
`167`	`167`	`{`
`168`	`168`	`#>`
`169`		`-- (<#=writer.GetPrefix() + complexType.Type.Name.ToUpperFirstChar()#>RequestBuilder *) <#=complexType.Name#>;`
	`169`	`+- (<#=writer.GetPrefix() + complexType.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder *) <#=complexType.Name#>;`
`170`	`170`
`171`	`171`	`<#`
`172`	`172`	`}`
`@@ -182,10 +182,10 @@ foreach(var prop in entity.GetProperties(typeName:"Stream"))`
`182`	`182`
`183`	`183`	`<#`
`184`	`184`	`}`
`185`		`-foreach(var prop in entity.Properties.Where( prop => prop.Type is OdcmMediaClass))`
	`185`	`+foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is OdcmMediaClass))`
`186`	`186`	`{`
`187`	`187`	`var propName = prop.Name.ToUpperFirstChar();`
`188`		`- var propRequestName = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "StreamRequest";`
	`188`	`+ var propRequestName = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "StreamRequest";`
`189`	`189`	`#>`
`190`	`190`	`- (<#=propRequestName#> ) <#=propName.ToLowerFirstChar()#>ValueWithOptions:(NSArray )options;`
`191`	`191`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ foreach(var prop in entity.NavigationProperties())`
`24`	`24`	`var propTypeName = writer.GetPrefix() + prop.Name.ToUpperFirstChar();`
`25`	`25`	`var collectionNamer = prop.IsReference() ? "CollectionWithReferences" : "Collection";`
`26`	`26`	`var collectionRequestName = writer.GetPrefix() + prop.Class.Name.ToUpperFirstChar() + prop.Name.ToUpperFirstChar() + collectionNamer +"RequestBuilder";`
`27`		`- var innerPropTypeName = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar();`
`28`		`- var innerPropInstanceName = prop.Type.Name.ToLowerFirstChar();`
	`27`	`+ var innerPropTypeName = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar();`
	`28`	`+ var innerPropInstanceName = prop.Projection.Type.Name.ToLowerFirstChar();`
`29`	`29`	`var innerPropTypeRequestName = innerPropTypeName + "RequestBuilder";`
`30`	`30`
`31`	`31`	`#>`
`@@ -37,7 +37,7 @@ foreach(var prop in entity.NavigationProperties())`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`<#`
`40`		`- if (!(prop.Type is OdcmComplexClass) \|\| prop.LongDescriptionContains("queryable"))`
	`40`	`+ if (!(prop.Projection.Type is OdcmComplexClass) \|\| prop.LongDescriptionContains("queryable"))`
`41`	`41`	`{`
`42`	`42`	`#>`
`43`	`43`	`- (<#=innerPropTypeRequestName#> )<#=propInstanceName#>:(NSString )<#=innerPropInstanceName#>`
`@@ -52,23 +52,23 @@ foreach(var prop in entity.NavigationProperties())`
`52`	`52`	`else`
`53`	`53`	`{`
`54`	`54`	`#>`
`55`		`--(<#=writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar()#>RequestBuilder *)<#=prop.Name#>`
	`55`	`+-(<#=writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder *)<#=prop.Name#>`
`56`	`56`	`{`
`57`		`- return [[<#=writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar()#>RequestBuilder alloc] initWithURL:[self.requestURL URLByAppendingPathComponent:@"<#=prop.Name#>"] client:self.client];`
	`57`	`+ return [[<#=writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder alloc] initWithURL:[self.requestURL URLByAppendingPathComponent:@"<#=prop.Name#>"] client:self.client];`
`58`	`58`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`<#`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`foreach (var complexType in entity.Properties.Where(prop => prop.LongDescriptionContains("navigable") \|\|`
`65`		`- prop.Type.LongDescriptionContains("navigable"))`
`66`		`- .Where(prop => prop.Type is OdcmClass))`
	`65`	`+ prop.Projection.Type.LongDescriptionContains("navigable"))`
	`66`	`+ .Where(prop => prop.Projection.Type is OdcmClass))`
`67`	`67`	`{`
`68`	`68`	`#>`
`69`		`--(<#=writer.GetPrefix() + complexType.Type.Name.ToUpperFirstChar()#>RequestBuilder *)<#=complexType.Name#>`
	`69`	`+-(<#=writer.GetPrefix() + complexType.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder *)<#=complexType.Name#>`
`70`	`70`	`{`
`71`		`- return [[<#=writer.GetPrefix() + complexType.Type.Name.ToUpperFirstChar()#>RequestBuilder alloc] initWithURL:[self.requestURL URLByAppendingPathComponent:@"<#=complexType.Name#>"] client:self.client];`
	`71`	`+ return [[<#=writer.GetPrefix() + complexType.Projection.Type.Name.ToUpperFirstChar()#>RequestBuilder alloc] initWithURL:[self.requestURL URLByAppendingPathComponent:@"<#=complexType.Name#>"] client:self.client];`
`72`	`72`
`73`	`73`	`}`
`74`	`74`
`@@ -95,10 +95,10 @@ foreach(var prop in entity.GetProperties(typeName:"Stream"))`
`95`	`95`
`96`	`96`	`}`
`97`	`97`
`98`		`-foreach(var prop in entity.Properties.Where( prop => prop.Type is OdcmMediaClass))`
	`98`	`+foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is OdcmMediaClass))`
`99`	`99`	`{`
`100`	`100`	`var propName = prop.Name.ToUpperFirstChar();`
`101`		`- var propRequestName = writer.GetPrefix() + prop.Type.Name.ToUpperFirstChar() + "StreamRequest";`
	`101`	`+ var propRequestName = writer.GetPrefix() + prop.Projection.Type.Name.ToUpperFirstChar() + "StreamRequest";`
`102`	`102`	`#>`
`103`	`103`	`- (<#=propRequestName#> ) <#=propName.ToLowerFirstChar()#>ValueWithOptions:(NSArray )options`
`104`	`104`	`{`