Spurious merge due to newlines.

garethj-msft · garethj-msft · commit 2a0358d9ee63 · 2016-06-07T18:00:02.000-07:00
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -1,4 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="xunit.runners" version="1.9.2" />
-</packages>
+</packages>
+
diff --git a/LICENSE b/LICENSE
@@ -22,4 +22,5 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
+
diff --git a/Templates/Android/BaseModel.template.tt b/Templates/Android/BaseModel.template.tt
@@ -19,11 +19,11 @@
         if (c is OdcmMethod) {
             return ((OdcmMethod)c).Class.Name.ToUpperFirstChar() + c.Name.Substring(c.Name.IndexOf(".") + 1).ToUpperFirstChar();
         } else if (c is OdcmProperty && c.AsOdcmProperty().IsCollection) {
-            return c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
-        } else if (c is OdcmProperty && c.AsOdcmProperty().Type is OdcmPrimitiveType) {
-            return ClassTypeName(c) + c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
+            return c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
+        } else if (c is OdcmProperty && c.AsOdcmProperty().Projection.Type is OdcmPrimitiveType) {
+            return ClassTypeName(c) + c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
         } else if (c is OdcmProperty) {
-            return c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
+            return c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
         }
         return c.Name.ToUpperFirstChar();
     }
@@ -394,7 +394,7 @@
         if (c is OdcmMethod) {
             return c.AsOdcmMethod().Class.Name.ToUpperFirstChar();
         } else if (c is OdcmProperty && c.AsOdcmProperty().Class is OdcmServiceClass) {
-            return c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
+            return c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
         } else if (c is OdcmProperty) {
             return c.AsOdcmProperty().Class.Name.ToUpperFirstChar();
         }
@@ -584,7 +584,7 @@ public {1} {2}{3}{4} {{";
 
 ";
 
-        foreach (var property in properties.Where(p => !p.Type.Name.Equals("Stream")))
+        foreach (var property in properties.Where(p => !p.Projection.Type.Name.Equals("Stream")))
         {
             var propertyName = property.Name.ToUpperFirstChar();
             var propertyType = "";
diff --git a/Templates/Android/generated/BaseClient.java.tt b/Templates/Android/generated/BaseClient.java.tt
@@ -65,7 +65,7 @@ foreach (var prop in model.EntityContainer.Properties)
     /**
      * Gets <#=TypeRequestBuilder(c)#>.
      *
-     * @return the <#=prop.Type.GetTypeString()#>.
+     * @return the <#=prop.Projection.Type.GetTypeString()#>.
      */
     public <#=ITypeRequestBuilder(prop)#> get<#=propertyName#>() {
         return new <#=TypeRequestBuilder(prop)#>(getServiceRoot() + "/<#=prop.Name#>", (<#=IClientType(c)#>)this, null);
diff --git a/Templates/Android/generated/BaseEntityStreamRequestBuilder.java.tt b/Templates/Android/generated/BaseEntityStreamRequestBuilder.java.tt
@@ -89,7 +89,7 @@ if (c.AsOdcmClass() != null)
 #>
 
 <#
-    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))
+    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))
     {
         var propName = prop.Name.ToCheckedCase();
 #>
diff --git a/Templates/Android/generated/IBaseClient.java.tt b/Templates/Android/generated/IBaseClient.java.tt
@@ -38,7 +38,7 @@ foreach (var prop in model.EntityContainer.Properties)
     /**
      * Gets <#=TypeRequestBuilder(c)#>.
      *
-     * @return the <#=prop.Type.GetTypeString()#>.
+     * @return the <#=prop.Projection.Type.GetTypeString()#>.
      */
     <#=ITypeRequestBuilder(prop)#> get<#=propertyName#>();
 <#
diff --git a/Templates/Android/generated/IBaseEntityStreamRequestBuilder.java.tt b/Templates/Android/generated/IBaseEntityStreamRequestBuilder.java.tt
@@ -65,7 +65,7 @@ if (c.AsOdcmClass() != null)
 #>
 
 <#
-    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))
+    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))
     {
         var propName = prop.Name.ToCheckedCase();
 #>
diff --git a/Templates/CSharp/Base/CollectionRequest.Base.template.tt b/Templates/CSharp/Base/CollectionRequest.Base.template.tt
@@ -70,7 +70,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =
 {
     if (!odcmProperty.LongDescriptionContains("readonly"))
     {
-        var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
+        var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
         var propertyType = this.GetPropertyTypeName(odcmProperty);
         
         var templateWriterHost = (CustomT4Host)Host;
@@ -106,7 +106,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("            this.Method = \"POST\";");
         
-        var entity = odcmProperty.Type.AsOdcmClass();
+        var entity = odcmProperty.Projection.Type.AsOdcmClass();
 
         if (entity != null && entity.IsAbstract)
         {
@@ -128,7 +128,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =
 
 public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)
 {
-    var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
+    var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
     var propertyType = this.GetPropertyTypeName(odcmProperty);
         
     var templateWriterHost = (CustomT4Host)Host;
diff --git a/Templates/CSharp/Base/ICollectionRequest.Base.template.tt b/Templates/CSharp/Base/ICollectionRequest.Base.template.tt
@@ -48,7 +48,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty)
 {
     if (!odcmProperty.LongDescriptionContains("readonly"))
     {
-        var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
+        var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
         var propertyType = this.GetPropertyTypeName(odcmProperty);
         
         var templateWriterHost = (CustomT4Host)Host;
@@ -82,7 +82,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty)
 
 public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)
 {
-    var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
+    var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
     var propertyType = this.GetPropertyTypeName(odcmProperty);
     
     var templateWriterHost = (CustomT4Host)Host;
diff --git a/Templates/CSharp/Base/SharedCSharp.template.tt b/Templates/CSharp/Base/SharedCSharp.template.tt
@@ -176,7 +176,7 @@ public string GetPropertyWithReferencesName(OdcmProperty odcmProperty)
 
 public string GetPropertyTypeName(OdcmProperty odcmProperty)
 {
-    return odcmProperty.Type.Name.ToCheckedCase();
+    return odcmProperty.Projection.Type.Name.ToCheckedCase();
 }
 
 public string GetPropertyReferenceTypeName(OdcmProperty odcmProperty)
diff --git a/Templates/CSharp/Requests/EntityClient.cs.tt b/Templates/CSharp/Requests/EntityClient.cs.tt
@@ -65,7 +65,7 @@ namespace <#=entityContainer.Namespace.GetNamespaceName()#>
         }
         else
         {
-            var requestBuilder = prop.Type.Name.ToCheckedCase() + "RequestBuilder";
+            var requestBuilder = prop.Projection.Type.Name.ToCheckedCase() + "RequestBuilder";
     #>
 
         /// <summary>
diff --git a/Templates/CSharp/Requests/EntityCollectionPage.cs.tt b/Templates/CSharp/Requests/EntityCollectionPage.cs.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty(); 
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity is OdcmPrimitiveType ? innerEntity.GetTypeString() : innerEntity.Name.ToCheckedCase();
 var entityCollectionRequest = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionRequest");
 var entityCollectionPage = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionPage");
diff --git a/Templates/CSharp/Requests/EntityCollectionRequest.cs.tt b/Templates/CSharp/Requests/EntityCollectionRequest.cs.tt
@@ -3,7 +3,7 @@
 <#@ include file="CollectionRequest.Base.template.tt"#>
 <#
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity.Name.ToCheckedCase();
 var collectionRequest = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionRequest");
 var collectionResponse = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionResponse");
diff --git a/Templates/CSharp/Requests/EntityCollectionWithReferencesPage.cs.tt b/Templates/CSharp/Requests/EntityCollectionWithReferencesPage.cs.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty(); 
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity is OdcmPrimitiveType ? innerEntity.GetTypeString() : innerEntity.Name.ToCheckedCase();
 var entityCollectionRequest = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionWithReferencesRequest");
 var entityCollectionPage = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionWithReferencesPage");
diff --git a/Templates/CSharp/Requests/EntityCollectionWithReferencesRequest.cs.tt b/Templates/CSharp/Requests/EntityCollectionWithReferencesRequest.cs.tt
@@ -3,7 +3,7 @@
 <#@ include file="CollectionRequest.Base.template.tt"#>
 <#
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity.Name.ToCheckedCase();
 var collectionRequest = this.GetPropertyCollectionWithReferencesRequestName(prop);
 
diff --git a/Templates/CSharp/Requests/IEntityClient.cs.tt b/Templates/CSharp/Requests/IEntityClient.cs.tt
@@ -34,7 +34,7 @@ namespace <#=entityContainer.Namespace.GetNamespaceName()#>
         else
         {
         
-        var propType = prop.Type.Name.ToCheckedCase();
+        var propType = prop.Projection.Type.Name.ToCheckedCase();
     #>
 
         /// <summary>
diff --git a/Templates/CSharp/Requests/IEntityCollectionPage.cs.tt b/Templates/CSharp/Requests/IEntityCollectionPage.cs.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty(); 
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity is OdcmPrimitiveType ? innerEntity.GetTypeString() : innerEntity.Name.ToCheckedCase();
 var entityCollectionRequest = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionRequest");
 var entityCollectionPage = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionPage");
diff --git a/Templates/CSharp/Requests/IEntityCollectionRequest.cs.tt b/Templates/CSharp/Requests/IEntityCollectionRequest.cs.tt
@@ -3,7 +3,7 @@
 <#@ include file="ICollectionRequest.Base.template.tt"#>
 <#
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity.Name.ToCheckedCase();
 var collectionRequest = this.GetPropertyCollectionRequestName(prop);
 var collectionResponse = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionResponse");
diff --git a/Templates/CSharp/Requests/IEntityCollectionWithReferencesPage.cs.tt b/Templates/CSharp/Requests/IEntityCollectionWithReferencesPage.cs.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty(); 
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity.Name.ToCheckedCase();
 var entityCollectionRequest = this.GetPropertyCollectionWithReferencesRequestName(prop);
 var entityCollectionPage = string.Concat(this.GetEntityNameString(prop.Class), prop.Name.ToCheckedCase(), "CollectionWithReferencesPage");
diff --git a/Templates/CSharp/Requests/MethodCollectionResponse.cs.tt b/Templates/CSharp/Requests/MethodCollectionResponse.cs.tt
@@ -38,7 +38,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>
                 if (!property.LongDescriptionContains("ignorableCollection"))
                 {
                     var propertyName = property.Name.Substring(property.Name.IndexOf('.') + 1).ToCheckedCase();
-                    var propertyType = property.Type.GetTypeString();
+                    var propertyType = property.Projection.Type.GetTypeString();
         #>
 
         /// <summary>
diff --git a/Templates/JavaScript/src/entity_types.coffee.tt b/Templates/JavaScript/src/entity_types.coffee.tt
@@ -89,7 +89,8 @@ entityTypesData =
 <#
       foreach(var navProp in navProperties)
       {
-        var navPropType = navProp.IsCollection ? "Collection(" + navProp.Type.FullName + ")" : navProp.Type.FullName;
+        var fullName = navProp.Projection.Type.FullName;
+        var navPropType = navProp.IsCollection ? "Collection(" + fullName + ")" : fullName;
 #>
       <#= navProp.Name #>:
         type: '<#= navPropType #>'
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
diff --git a/Templates/ObjC/Requests/EntityRequestBuilder.m.tt b/Templates/ObjC/Requests/EntityRequestBuilder.m.tt
diff --git a/Templates/ObjC/Requests/MethodRequest.m.tt b/Templates/ObjC/Requests/MethodRequest.m.tt
diff --git a/Templates/ObjC/Requests/ODataEntities.h.tt b/Templates/ObjC/Requests/ODataEntities.h.tt
diff --git a/Templates/ObjC/Requests/StreamRequest.m.tt b/Templates/ObjC/Requests/StreamRequest.m.tt
diff --git a/src/GraphODataTemplateWriter/.config/TemplateWriterSettings.json b/src/GraphODataTemplateWriter/.config/TemplateWriterSettings.json
diff --git a/src/GraphODataTemplateWriter/CodeHelpers/Android/TypeHelperAndroid.cs b/src/GraphODataTemplateWriter/CodeHelpers/Android/TypeHelperAndroid.cs

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ foreach (var prop in model.EntityContainer.Properties)`
`65`	`65`	`/**`
`66`	`66`	`* Gets <#=TypeRequestBuilder(c)#>.`
`67`	`67`	`*`
`68`		`- * @return the <#=prop.Type.GetTypeString()#>.`
	`68`	`+ * @return the <#=prop.Projection.Type.GetTypeString()#>.`
`69`	`69`	`*/`
`70`	`70`	`public <#=ITypeRequestBuilder(prop)#> get<#=propertyName#>() {`
`71`	`71`	`return new <#=TypeRequestBuilder(prop)#>(getServiceRoot() + "/<#=prop.Name#>", (<#=IClientType(c)#>)this, null);`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ if (c.AsOdcmClass() != null)`
`89`	`89`	`#>`
`90`	`90`
`91`	`91`	`<#`
`92`		`- foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))`
	`92`	`+ foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))`
`93`	`93`	`{`
`94`	`94`	`var propName = prop.Name.ToCheckedCase();`
`95`	`95`	`#>`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ foreach (var prop in model.EntityContainer.Properties)`
`38`	`38`	`/**`
`39`	`39`	`* Gets <#=TypeRequestBuilder(c)#>.`
`40`	`40`	`*`
`41`		`- * @return the <#=prop.Type.GetTypeString()#>.`
	`41`	`+ * @return the <#=prop.Projection.Type.GetTypeString()#>.`
`42`	`42`	`*/`
`43`	`43`	`<#=ITypeRequestBuilder(prop)#> get<#=propertyName#>();`
`44`	`44`	`<#`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ if (c.AsOdcmClass() != null)`
`65`	`65`	`#>`
`66`	`66`
`67`	`67`	`<#`
`68`		`- foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))`
	`68`	`+ foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))`
`69`	`69`	`{`
`70`	`70`	`var propName = prop.Name.ToCheckedCase();`
`71`	`71`	`#>`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =`
`70`	`70`	`{`
`71`	`71`	`if (!odcmProperty.LongDescriptionContains("readonly"))`
`72`	`72`	`{`
`73`		`- var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
	`73`	`+ var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
`74`	`74`	`var propertyType = this.GetPropertyTypeName(odcmProperty);`
`75`	`75`
`76`	`76`	`var templateWriterHost = (CustomT4Host)Host;`
`@@ -106,7 +106,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =`
`106`	`106`	`stringBuilder.Append(Environment.NewLine);`
`107`	`107`	`stringBuilder.Append(" this.Method = \"POST\";");`
`108`	`108`
`109`		`- var entity = odcmProperty.Type.AsOdcmClass();`
	`109`	`+ var entity = odcmProperty.Projection.Type.AsOdcmClass();`
`110`	`110`
`111`	`111`	`if (entity != null && entity.IsAbstract)`
`112`	`112`	`{`
`@@ -128,7 +128,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =`
`128`	`128`
`129`	`129`	`public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)`
`130`	`130`	`{`
`131`		`- var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
	`131`	`+ var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
`132`	`132`	`var propertyType = this.GetPropertyTypeName(odcmProperty);`
`133`	`133`
`134`	`134`	`var templateWriterHost = (CustomT4Host)Host;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty)`
`48`	`48`	`{`
`49`	`49`	`if (!odcmProperty.LongDescriptionContains("readonly"))`
`50`	`50`	`{`
`51`		`- var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
	`51`	`+ var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
`52`	`52`	`var propertyType = this.GetPropertyTypeName(odcmProperty);`
`53`	`53`
`54`	`54`	`var templateWriterHost = (CustomT4Host)Host;`
`@@ -82,7 +82,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty)`
`82`	`82`
`83`	`83`	`public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)`
`84`	`84`	`{`
`85`		`- var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
	`85`	`+ var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
`86`	`86`	`var propertyType = this.GetPropertyTypeName(odcmProperty);`
`87`	`87`
`88`	`88`	`var templateWriterHost = (CustomT4Host)Host;`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public string GetPropertyWithReferencesName(OdcmProperty odcmProperty)`
`176`	`176`
`177`	`177`	`public string GetPropertyTypeName(OdcmProperty odcmProperty)`
`178`	`178`	`{`
`179`		`- return odcmProperty.Type.Name.ToCheckedCase();`
	`179`	`+ return odcmProperty.Projection.Type.Name.ToCheckedCase();`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`public string GetPropertyReferenceTypeName(OdcmProperty odcmProperty)`