fixes #2835: omit the ODataIdContainer from model builder, change the serializer (#2836)

xuzhg · web-flow · commit a9d851a1fb67 · 2024-05-06T14:10:33.000-07:00
* fixes #2835: omit the ODataIdContainer from model builder, change the serializer * remove unused test * Address the comments * fix the null reference
diff --git a/src/Microsoft.AspNet.OData.Shared/Builder/ODataConventionModelBuilder.cs b/src/Microsoft.AspNet.OData.Shared/Builder/ODataConventionModelBuilder.cs
@@ -551,7 +551,11 @@ private void MapStructuralType(StructuralTypeConfiguration structuralType)
                 bool isCollection;
                 IEdmTypeConfiguration mappedType;
 
-                PropertyKind propertyKind = GetPropertyType(property, out isCollection, out mappedType);
+                PropertyKind propertyKind = GetPropertyType(property, out isCollection, out mappedType, out bool mapped);
+                if (!mapped)
+                {
+                    continue;
+                }
 
                 if (propertyKind == PropertyKind.Primitive || propertyKind == PropertyKind.Complex || propertyKind == PropertyKind.Enum)
                 {
@@ -694,41 +698,52 @@ private void MapStructuralProperty(StructuralTypeConfiguration type, PropertyInf
 
         // figures out the type of the property (primitive, complex, navigation) and the corresponding edm type if we have seen this type
         // earlier or the user told us about it.
-        private PropertyKind GetPropertyType(PropertyInfo property, out bool isCollection, out IEdmTypeConfiguration mappedType)
+        private PropertyKind GetPropertyType(PropertyInfo property, out bool isCollection, out IEdmTypeConfiguration mappedType, out bool mapped)
         {
             Contract.Assert(property != null);
 
+            mapped = true;
+            mappedType = null;
+            isCollection = false;
+
+            if (typeof(ODataIdContainer).IsAssignableFrom(property.PropertyType))
+            {
+                mapped = false;
+                return (PropertyKind)(int.MaxValue);
+            }
+
             // IDictionary<string, object> is used as a container to save/retrieve dynamic properties for an open type.
             // It is different from other collections (for example, IEnumerable<T> or IDictionary<string, int>)
             // which are used as navigation properties.
             if (typeof(IDictionary<string, object>).IsAssignableFrom(property.PropertyType))
             {
-                mappedType = null;
-                isCollection = false;
                 return PropertyKind.Dynamic;
             }
 
             // IODataInstanceAnnotationContainer is used as a container to save/retrieve instance annotation properties for a CLR type.
             // It is different from other collections (for example, IDictionary<string,IDictionary<string, int>>)          
             if (typeof(IODataInstanceAnnotationContainer).IsAssignableFrom(property.PropertyType))
             {
-                mappedType = null;
-                isCollection = false;
-
                 return PropertyKind.InstanceAnnotations;
             }
 
             PropertyKind propertyKind;
             if (TryGetPropertyTypeKind(property.PropertyType, out mappedType, out propertyKind))
             {
-                isCollection = false;
                 return propertyKind;
             }
 
             Type elementType;
             if (TypeHelper.IsCollection(property.PropertyType, out elementType))
             {
                 isCollection = true;
+
+                if (typeof(ODataIdContainer).IsAssignableFrom(elementType))
+                {
+                    mapped = false;
+                    return (PropertyKind)(int.MaxValue);
+                }
+
                 if (TryGetPropertyTypeKind(elementType, out mappedType, out propertyKind))
                 {
                     return propertyKind;
diff --git a/src/Microsoft.AspNet.OData.Shared/DeltaSetOfT.cs b/src/Microsoft.AspNet.OData.Shared/DeltaSetOfT.cs
@@ -66,7 +66,7 @@ public DeltaSet<TStructuralType> Patch(ICollection<TStructuralType> originalColl
         }
 
         /// <summary>
-        /// Asnchronously patch a DeltaSet, a collection for Delta<typeparamref name="TStructuralType"/>.
+        /// Asynchronously patch a DeltaSet, a collection for Delta<typeparamref name="TStructuralType"/>.
         /// </summary>
         /// <param name="originalCollection">Original collection of the type which needs to be updated.</param>
         /// <returns>A task representing a DeltaSet response.</returns>
@@ -104,7 +104,7 @@ public async Task<DeltaSet<TStructuralType>> PatchAsync(ODataAPIHandler<TStructu
         /// <param name="apiHandlerFactory">API Handler Factory.</param>
         /// <returns>DeltaSet response.</returns>
         public DeltaSet<TStructuralType> Patch(ODataAPIHandler<TStructuralType> apiHandlerOfT, ODataAPIHandlerFactory apiHandlerFactory)
-        {         
+        {
             Debug.Assert(apiHandlerOfT != null, "apiHandlerOfT != null");
 
             return CopyChangedValues(apiHandlerOfT, apiHandlerFactory);
diff --git a/src/Microsoft.AspNet.OData.Shared/Formatter/Deserialization/ODataResourceDeserializerHelpers.cs b/src/Microsoft.AspNet.OData.Shared/Formatter/Deserialization/ODataResourceDeserializerHelpers.cs
@@ -257,7 +257,7 @@ internal static void ApplyODataIdContainer(object resource, ODataResourceWrapper
             if (path.EdmType.AsElementType() is IEdmEntityType entityType)
             {
                 //Setting Odataid , for POCO classes, as a property in the POCO object itself(if user has OdataIDContainer property),
-                //for Delta and EdmEntity object setting as an added property ODataIdcontianer in those classes
+                //for Delta and EdmEntity object setting as an added property ODataIdContainer in those classes
                 ODataPath odataPath = new ODataPath(path.Segments);
 
                 // if there is no Id on the resource, try to compute one from path
@@ -286,6 +286,7 @@ internal static void ApplyODataIdContainer(object resource, ODataResourceWrapper
                     }
                     else
                     {
+                        // TODO: the logic to use the first 'ODataIdContainer' property as the container looks simple and error
                         PropertyInfo containerPropertyInfo = EdmLibHelpers.GetClrType(entityType, readContext.Model).GetProperties().FirstOrDefault(x => x.PropertyType == typeof(ODataIdContainer));
                         if (containerPropertyInfo != null)
                         {
diff --git a/src/Microsoft.AspNet.OData.Shared/Formatter/EdmLibHelpers.cs b/src/Microsoft.AspNet.OData.Shared/Formatter/EdmLibHelpers.cs
@@ -291,17 +291,20 @@ public static Type GetClrType(IEdmType edmType, IEdmModel edmModel, IWebApiAssem
             }
 
             string typeName = edmSchemaType.FullName();
-            IEnumerable<Type> matchingTypes = GetMatchingTypes(typeName, assembliesResolver);
 
-            if (matchingTypes.Count() > 1)
+            // Calling "ToList()" to avoid multiple enumerates.
+            IList<Type> matchingTypes = GetMatchingTypes(typeName, assembliesResolver).ToList();
+
+            if (matchingTypes.Count > 1)
             {
                 throw Error.Argument("edmTypeReference", SRResources.MultipleMatchingClrTypesForEdmType,
-                    typeName, String.Join(",", matchingTypes.Select(type => type.AssemblyQualifiedName)));
+                    typeName, String.Join(",", matchingTypes.Select(t => t.AssemblyQualifiedName)));
             }
 
-            edmModel.SetAnnotationValue<ClrTypeAnnotation>(edmSchemaType, new ClrTypeAnnotation(matchingTypes.SingleOrDefault()));
+            Type clrType = matchingTypes.Count == 0 ? null : matchingTypes[0];
+            edmModel.SetAnnotationValue(edmSchemaType, new ClrTypeAnnotation(clrType));
 
-            return matchingTypes.SingleOrDefault();
+            return clrType;
         }
 
         public static bool IsNotFilterable(IEdmProperty edmProperty, IEdmProperty pathEdmProperty,
diff --git a/src/Microsoft.AspNet.OData.Shared/Formatter/Serialization/ODataResourceSerializer.cs b/src/Microsoft.AspNet.OData.Shared/Formatter/Serialization/ODataResourceSerializer.cs
@@ -697,7 +697,11 @@ internal void WriteDeltaComplexProperties(SelectExpandNode selectExpandNode,
             Contract.Assert(resourceContext != null);
             Contract.Assert(writer != null);
 
-            IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);
+            IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);
+            if (complexProperties == null)
+            {
+                return;
+            }
 
             foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> complexProperty in complexProperties)
             {
@@ -781,7 +785,11 @@ internal async Task WriteDeltaComplexPropertiesAsync(SelectExpandNode selectExpa
             Contract.Assert(resourceContext != null);
             Contract.Assert(writer != null);
 
-            IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);
+            IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);
+            if (complexProperties == null)
+            {
+                return;
+            }
 
             foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> complexProperty in complexProperties)
             {
@@ -1643,7 +1651,11 @@ private void WriteComplexProperties(SelectExpandNode selectExpandNode, ResourceC
             Contract.Assert(resourceContext != null);
             Contract.Assert(writer != null);
 
-            IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);
+            IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);
+            if (complexProperties == null)
+            {
+                return;
+            }
 
             foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> selectedComplex in complexProperties)
             {
@@ -1666,7 +1678,11 @@ private async Task WriteComplexPropertiesAsync(SelectExpandNode selectExpandNode
             Contract.Assert(resourceContext != null);
             Contract.Assert(writer != null);
 
-            IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);
+            IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);
+            if (complexProperties == null)
+            {
+                return;
+            }
 
             foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> selectedComplex in complexProperties)
             {
@@ -1734,7 +1750,7 @@ private async Task WriteStreamPropertiesAsync(SelectExpandNode selectExpandNode,
             }
         }
 
-        private IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> GetPropertiesToWrite(SelectExpandNode selectExpandNode, ResourceContext resourceContext)
+        private static IDictionary<IEdmStructuralProperty, PathSelectItem> GetPropertiesToWrite(SelectExpandNode selectExpandNode, ResourceContext resourceContext)
         {
             IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = selectExpandNode.SelectedComplexTypeProperties;
 
@@ -1748,26 +1764,23 @@ private IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> GetPro
                     changedProperties = deltaObject.GetChangedPropertyNames();
                 }
 
-                foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> complexProperty in complexProperties)
+                if (changedProperties != null)
                 {
-                    if (changedProperties == null || changedProperties.Contains(complexProperty.Key.Name))
+                    IDictionary<IEdmStructuralProperty, PathSelectItem> propertiesToReturn
+                        = new Dictionary<IEdmStructuralProperty, PathSelectItem>();
+                    foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> complexProperty in complexProperties)
                     {
-                        IEdmTypeReference type = complexProperty.Key?.Type;
-
-                        if (type != null && type.IsStructured() && resourceContext.EdmModel != null)
+                        if (changedProperties.Contains(complexProperty.Key.Name))
                         {
-                            Type clrType = EdmLibHelpers.GetClrType(type.AsStructured(), resourceContext.EdmModel);
-
-                            if (clrType != null && clrType == typeof(ODataIdContainer))
-                            {
-                                continue;
-                            }
+                            propertiesToReturn[complexProperty.Key] = complexProperty.Value;
                         }
-
-                        yield return complexProperty;
                     }
+
+                    return propertiesToReturn;
                 }
             }
+
+            return complexProperties;
         }
 
         private IEnumerable<KeyValuePair<IEdmNavigationProperty, Type>> GetNavigationPropertiesToWrite(SelectExpandNode selectExpandNode, ResourceContext resourceContext)
diff --git a/test/UnitTest/Microsoft.AspNet.OData.Test.Shared/Builder/Conventions/ODataConventionModelBuilderTests.cs b/test/UnitTest/Microsoft.AspNet.OData.Test.Shared/Builder/Conventions/ODataConventionModelBuilderTests.cs
@@ -2374,6 +2374,30 @@ public void CanBuildModelForAnonymousTypes()
             entity.AssertHasNavigationProperty(model, "NavigationCollection", new { ID = default(int) }.GetType(), isNullable: false, multiplicity: EdmMultiplicity.Many);
         }
 
+        public class TypeContainsODataIdContainer
+        {
+            public int Id { get; set; }
+            public string Name { get; set; }
+            public ODataIdContainer Container { get; set; }
+            public IList<ODataIdContainer> Containers { get; set; }
+        }
+
+        [Fact]
+        public void CanBuildModel_OmitODataIdContainerProperties()
+        {
+            var configuration = RoutingConfigurationFactory.Create();
+            ODataConventionModelBuilder builder = ODataConventionModelBuilderFactory.Create(configuration, isQueryCompositionMode: true);
+            builder.EntityType<TypeContainsODataIdContainer>();
+
+            IEdmModel model = builder.GetEdmModel();
+
+            IEdmEntityType entity = model.AssertHasEntityType(typeof(TypeContainsODataIdContainer));
+
+            Assert.Equal(2, entity.Properties().Count());
+            entity.AssertHasKey(model, "Id", EdmPrimitiveTypeKind.Int32);
+            entity.AssertHasPrimitiveProperty(model, "Name", EdmPrimitiveTypeKind.String, true);
+        }
+
         [Theory]
         [InlineData(typeof(object[]))]
         [InlineData(typeof(IEnumerable<object>))]

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ internal static void ApplyODataIdContainer(object resource, ODataResourceWrapper`
`257`	`257`	`if (path.EdmType.AsElementType() is IEdmEntityType entityType)`
`258`	`258`	`{`
`259`	`259`	`//Setting Odataid , for POCO classes, as a property in the POCO object itself(if user has OdataIDContainer property),`
`260`		`- //for Delta and EdmEntity object setting as an added property ODataIdcontianer in those classes`
	`260`	`+ //for Delta and EdmEntity object setting as an added property ODataIdContainer in those classes`
`261`	`261`	`ODataPath odataPath = new ODataPath(path.Segments);`
`262`	`262`
`263`	`263`	`// if there is no Id on the resource, try to compute one from path`
`@@ -286,6 +286,7 @@ internal static void ApplyODataIdContainer(object resource, ODataResourceWrapper`
`286`	`286`	`}`
`287`	`287`	`else`
`288`	`288`	`{`
	`289`	`+ // TODO: the logic to use the first 'ODataIdContainer' property as the container looks simple and error`
`289`	`290`	`PropertyInfo containerPropertyInfo = EdmLibHelpers.GetClrType(entityType, readContext.Model).GetProperties().FirstOrDefault(x => x.PropertyType == typeof(ODataIdContainer));`
`290`	`291`	`if (containerPropertyInfo != null)`
`291`	`292`	`{`
Original file line number	Diff line number	Diff line change
`@@ -291,17 +291,20 @@ public static Type GetClrType(IEdmType edmType, IEdmModel edmModel, IWebApiAssem`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`string typeName = edmSchemaType.FullName();`
`294`		`- IEnumerable<Type> matchingTypes = GetMatchingTypes(typeName, assembliesResolver);`
`295`	`294`
`296`		`- if (matchingTypes.Count() > 1)`
	`295`	`+ // Calling "ToList()" to avoid multiple enumerates.`
	`296`	`+ IList<Type> matchingTypes = GetMatchingTypes(typeName, assembliesResolver).ToList();`
	`297`	`+`
	`298`	`+ if (matchingTypes.Count > 1)`
`297`	`299`	`{`
`298`	`300`	`throw Error.Argument("edmTypeReference", SRResources.MultipleMatchingClrTypesForEdmType,`
`299`		`- typeName, String.Join(",", matchingTypes.Select(type => type.AssemblyQualifiedName)));`
	`301`	`+ typeName, String.Join(",", matchingTypes.Select(t => t.AssemblyQualifiedName)));`
`300`	`302`	`}`
`301`	`303`
`302`		`- edmModel.SetAnnotationValue<ClrTypeAnnotation>(edmSchemaType, new ClrTypeAnnotation(matchingTypes.SingleOrDefault()));`
	`304`	`+ Type clrType = matchingTypes.Count == 0 ? null : matchingTypes[0];`
	`305`	`+ edmModel.SetAnnotationValue(edmSchemaType, new ClrTypeAnnotation(clrType));`
`303`	`306`
`304`		`- return matchingTypes.SingleOrDefault();`
	`307`	`+ return clrType;`
`305`	`308`	`}`
`306`	`309`
`307`	`310`	`public static bool IsNotFilterable(IEdmProperty edmProperty, IEdmProperty pathEdmProperty,`
Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,11 @@ internal void WriteDeltaComplexProperties(SelectExpandNode selectExpandNode,`
`697`	`697`	`Contract.Assert(resourceContext != null);`
`698`	`698`	`Contract.Assert(writer != null);`
`699`	`699`
`700`		`- IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);`
	`700`	`+ IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);`
	`701`	`+ if (complexProperties == null)`
	`702`	`+ {`
	`703`	`+ return;`
	`704`	`+ }`
`701`	`705`
`702`	`706`	`foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> complexProperty in complexProperties)`
`703`	`707`	`{`
`@@ -781,7 +785,11 @@ internal async Task WriteDeltaComplexPropertiesAsync(SelectExpandNode selectExpa`
`781`	`785`	`Contract.Assert(resourceContext != null);`
`782`	`786`	`Contract.Assert(writer != null);`
`783`	`787`
`784`		`- IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);`
	`788`	`+ IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);`
	`789`	`+ if (complexProperties == null)`
	`790`	`+ {`
	`791`	`+ return;`
	`792`	`+ }`
`785`	`793`
`786`	`794`	`foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> complexProperty in complexProperties)`
`787`	`795`	`{`
`@@ -1643,7 +1651,11 @@ private void WriteComplexProperties(SelectExpandNode selectExpandNode, ResourceC`
`1643`	`1651`	`Contract.Assert(resourceContext != null);`
`1644`	`1652`	`Contract.Assert(writer != null);`
`1645`	`1653`
`1646`		`- IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);`
	`1654`	`+ IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);`
	`1655`	`+ if (complexProperties == null)`
	`1656`	`+ {`
	`1657`	`+ return;`
	`1658`	`+ }`
`1647`	`1659`
`1648`	`1660`	`foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> selectedComplex in complexProperties)`
`1649`	`1661`	`{`
`@@ -1666,7 +1678,11 @@ private async Task WriteComplexPropertiesAsync(SelectExpandNode selectExpandNode`
`1666`	`1678`	`Contract.Assert(resourceContext != null);`
`1667`	`1679`	`Contract.Assert(writer != null);`
`1668`	`1680`
`1669`		`- IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);`
	`1681`	`+ IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = GetPropertiesToWrite(selectExpandNode, resourceContext);`
	`1682`	`+ if (complexProperties == null)`
	`1683`	`+ {`
	`1684`	`+ return;`
	`1685`	`+ }`
`1670`	`1686`
`1671`	`1687`	`foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> selectedComplex in complexProperties)`
`1672`	`1688`	`{`
`@@ -1734,7 +1750,7 @@ private async Task WriteStreamPropertiesAsync(SelectExpandNode selectExpandNode,`
`1734`	`1750`	`}`
`1735`	`1751`	`}`
`1736`	`1752`
`1737`		`- private IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> GetPropertiesToWrite(SelectExpandNode selectExpandNode, ResourceContext resourceContext)`
	`1753`	`+ private static IDictionary<IEdmStructuralProperty, PathSelectItem> GetPropertiesToWrite(SelectExpandNode selectExpandNode, ResourceContext resourceContext)`
`1738`	`1754`	`{`
`1739`	`1755`	`IDictionary<IEdmStructuralProperty, PathSelectItem> complexProperties = selectExpandNode.SelectedComplexTypeProperties;`
`1740`	`1756`
`@@ -1748,26 +1764,23 @@ private IEnumerable<KeyValuePair<IEdmStructuralProperty, PathSelectItem>> GetPro`
`1748`	`1764`	`changedProperties = deltaObject.GetChangedPropertyNames();`
`1749`	`1765`	`}`
`1750`	`1766`
`1751`		`- foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> complexProperty in complexProperties)`
	`1767`	`+ if (changedProperties != null)`
`1752`	`1768`	`{`
`1753`		`- if (changedProperties == null \|\| changedProperties.Contains(complexProperty.Key.Name))`
	`1769`	`+ IDictionary<IEdmStructuralProperty, PathSelectItem> propertiesToReturn`
	`1770`	`+ = new Dictionary<IEdmStructuralProperty, PathSelectItem>();`
	`1771`	`+ foreach (KeyValuePair<IEdmStructuralProperty, PathSelectItem> complexProperty in complexProperties)`
`1754`	`1772`	`{`
`1755`		`- IEdmTypeReference type = complexProperty.Key?.Type;`
`1756`		`-`
`1757`		`- if (type != null && type.IsStructured() && resourceContext.EdmModel != null)`
	`1773`	`+ if (changedProperties.Contains(complexProperty.Key.Name))`
`1758`	`1774`	`{`
`1759`		`- Type clrType = EdmLibHelpers.GetClrType(type.AsStructured(), resourceContext.EdmModel);`
`1760`		`-`
`1761`		`- if (clrType != null && clrType == typeof(ODataIdContainer))`
`1762`		`- {`
`1763`		`- continue;`
`1764`		`- }`
	`1775`	`+ propertiesToReturn[complexProperty.Key] = complexProperty.Value;`
`1765`	`1776`	`}`
`1766`		`-`
`1767`		`- yield return complexProperty;`
`1768`	`1777`	`}`
	`1778`	`+`
	`1779`	`+ return propertiesToReturn;`
`1769`	`1780`	`}`
`1770`	`1781`	`}`
	`1782`	`+`
	`1783`	`+ return complexProperties;`
`1771`	`1784`	`}`
`1772`	`1785`
`1773`	`1786`	`private IEnumerable<KeyValuePair<IEdmNavigationProperty, Type>> GetNavigationPropertiesToWrite(SelectExpandNode selectExpandNode, ResourceContext resourceContext)`