CR comments.

OData · Nov 13, 2018 · 455f5bd · 455f5bd
1 parent fd97a44
commit 455f5bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/src/Microsoft.OData.Core/JsonLight/ODataJsonLightPropertySerializer.cs b/src/Microsoft.OData.Core/JsonLight/ODataJsonLightPropertySerializer.cs
@@ -186,8 +186,6 @@ private void WriteProperty(
         {
             WriterValidationUtils.ValidatePropertyNotNull(property);
 
-            ODataValue value = property.ODataValue;
-
             string propertyName = property.Name;
 
             if (this.JsonLightOutputContext.MessageWriterSettings.Validations != ValidationKinds.None)
@@ -204,6 +202,9 @@ private void WriteProperty(
                 this.currentPropertyInfo = this.JsonLightOutputContext.PropertyCacheHandler.GetProperty(propertyName, owningType);
             }
 
+            WriterValidationUtils.ValidatePropertyDefined(this.currentPropertyInfo, this.MessageWriterSettings.ThrowOnUndeclaredPropertyForNonOpenType);
+
+            duplicatePropertyNameChecker.ValidatePropertyUniqueness(property);
 
             if (currentPropertyInfo.MetadataType.IsUndeclaredProperty)
             {
@@ -212,9 +213,7 @@ private void WriteProperty(
 
             WriteInstanceAnnotation(property, isTopLevel, currentPropertyInfo.MetadataType.IsUndeclaredProperty);
 
-            WriterValidationUtils.ValidatePropertyDefined(this.currentPropertyInfo, this.MessageWriterSettings.ThrowOnUndeclaredPropertyForNonOpenType);
-
-            duplicatePropertyNameChecker.ValidatePropertyUniqueness(property);
+            ODataValue value = property.ODataValue;
 
             bool isNullValue = (value == null || value is ODataNullValue);
             if (isNullValue && omitNullValues)

diff --git a/src/Microsoft.OData.Core/SelectedPropertiesNode.cs b/src/Microsoft.OData.Core/SelectedPropertiesNode.cs
@@ -492,32 +492,11 @@ internal IEnumerable<IEdmProperty> GetSelectedProperties(IEdmStructuredType stru
         }
 
         /// <summary>
-        /// Return names of dynamic properties.
-        /// </summary>
-        /// <param name="structuredType">The current structured type.</param>
-        /// <returns>The names of dynamic properties.</returns>
-        internal IEnumerable<string> GetSelectedDynamicProperties(IEdmStructuredType structuredType)
-        {
-            IEnumerable<string> dynamicProperties = Enumerable.Empty<string>();
-
-            if (this.selectedProperties != null && this.selectedProperties.Count > 0)
-            {
-                dynamicProperties = this.selectedProperties.Select(
-                    prop => structuredType.FindProperty(prop) == null
-                    ? prop
-                    : null)
-                    .OfType<string>();
-            }
-
-            return dynamicProperties;
-        }
-
-        /// <summary>
-        /// Gets the list of names for selected declared or dynamic properties having values of null.
+        /// Gets the list of names for selected nullable declared or dynamic properties missing from payload.
         /// </summary>
         /// <param name="structuredType">The current structured type.</param>
         /// <param name="resourceState">The current resource state.</param>
-        /// <returns>The list of property names with null values.</returns>
+        /// <returns>The list of property names missing from payload.</returns>
         internal IList<string> GetSelectedNullValueProperties(IEdmStructuredType structuredType,
             IODataJsonLightReaderResourceState resourceState)
         {