Cache DuplicateNameChecker in the OutputContext

OData · Nov 22, 2021 · afda687 · afda687
1 parent 18ca274
commit afda687
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 12 deletions.
diff --git a/src/Microsoft.OData.Core/Json/JsonLightInstanceAnnotationWriter.cs b/src/Microsoft.OData.Core/Json/JsonLightInstanceAnnotationWriter.cs
@@ -205,7 +205,7 @@ internal void WriteInstanceAnnotation(
                 this.valueSerializer.WriteResourceValue(resourceValue,
                     expectedType,
                     treatLikeOpenProperty,
-                    this.valueSerializer.CreateDuplicatePropertyNameChecker());
+                    this.valueSerializer.JsonLightOutputContext.DuplicatePropertyNameChecker);
                 return;
             }
 
@@ -394,7 +394,7 @@ await this.WriteInstanceAnnotationNameAsync(propertyName, annotationName)
                 await this.valueSerializer.WriteResourceValueAsync(resourceValue,
                     expectedType,
                     treatLikeOpenProperty,
-                    this.valueSerializer.CreateDuplicatePropertyNameChecker()).ConfigureAwait(false);
+                    this.valueSerializer.JsonLightOutputContext.DuplicatePropertyNameChecker).ConfigureAwait(false);
                 return;
             }
 

diff --git a/src/Microsoft.OData.Core/JsonLight/ODataJsonLightPropertySerializer.cs b/src/Microsoft.OData.Core/JsonLight/ODataJsonLightPropertySerializer.cs
@@ -82,7 +82,7 @@ internal void WriteTopLevelProperty(ODataProperty property)
                         property,
                         null /*owningType*/,
                         true /* isTopLevel */,
-                        this.CreateDuplicatePropertyNameChecker(),
+                        this.JsonLightOutputContext.DuplicatePropertyNameChecker,
                         null /* metadataBuilder */);
                     this.JsonLightValueSerializer.AssertRecursionDepthIsZero();
 
@@ -280,7 +280,7 @@ await this.WritePropertyAsync(
                         property,
                         null /*owningType*/,
                         true /* isTopLevel */,
-                        this.CreateDuplicatePropertyNameChecker(),
+                        this.JsonLightOutputContext.DuplicatePropertyNameChecker,
                         null /* metadataBuilder */).ConfigureAwait(false);
                     this.JsonLightValueSerializer.AssertRecursionDepthIsZero();
 
@@ -649,7 +649,7 @@ private void WriteResourceProperty(
                 resourceValue,
                 this.currentPropertyInfo.MetadataType.TypeReference,
                 isOpenPropertyType,
-                this.CreateDuplicatePropertyNameChecker());
+                this.JsonLightOutputContext.DuplicatePropertyNameChecker);
         }
 
         /// <summary>
@@ -1074,7 +1074,7 @@ await this.JsonLightValueSerializer.WriteResourceValueAsync(
                 resourceValue,
                 this.currentPropertyInfo.MetadataType.TypeReference,
                 isOpenPropertyType,
-                this.CreateDuplicatePropertyNameChecker()).ConfigureAwait(false);
+                this.JsonLightOutputContext.DuplicatePropertyNameChecker).ConfigureAwait(false);
         }
 
         /// <summary>

diff --git a/src/Microsoft.OData.Core/JsonLight/ODataJsonLightValueSerializer.cs b/src/Microsoft.OData.Core/JsonLight/ODataJsonLightValueSerializer.cs
@@ -245,7 +245,7 @@ public virtual void WriteCollectionValue(
                     {
                         if (duplicatePropertyNamesChecker == null)
                         {
-                            duplicatePropertyNamesChecker = this.CreateDuplicatePropertyNameChecker();
+                            duplicatePropertyNamesChecker = this.JsonLightOutputContext.DuplicatePropertyNameChecker;
                         }
 
                         this.WriteResourceValue(
@@ -567,7 +567,7 @@ await this.AsynchronousODataAnnotationWriter.WriteODataTypeInstanceAnnotationAsy
                     {
                         if (duplicatePropertyNamesChecker == null)
                         {
-                            duplicatePropertyNamesChecker = this.CreateDuplicatePropertyNameChecker();
+                            duplicatePropertyNamesChecker = this.JsonLightOutputContext.DuplicatePropertyNameChecker;
                         }
 
                         await this.WriteResourceValueAsync(

diff --git a/src/Microsoft.OData.Core/ODataCollectionWriterCore.cs b/src/Microsoft.OData.Core/ODataCollectionWriterCore.cs
@@ -106,7 +106,7 @@ protected IDuplicatePropertyNameChecker DuplicatePropertyNameChecker
             {
                 return duplicatePropertyNameChecker
                        ?? (duplicatePropertyNameChecker
-                           = outputContext.MessageWriterSettings.Validator.CreateDuplicatePropertyNameChecker());
+                           = outputContext.DuplicatePropertyNameChecker);
             }
         }
 

diff --git a/src/Microsoft.OData.Core/ODataOutputContext.cs b/src/Microsoft.OData.Core/ODataOutputContext.cs
@@ -56,6 +56,11 @@ public abstract class ODataOutputContext : IDisposable
         /// </summary>
         private readonly ODataSimplifiedOptions odataSimplifiedOptions;
 
+        /// <summary>
+        /// Checker to detect duplicate property names.
+        /// </summary>
+        private readonly IDuplicatePropertyNameChecker duplicatePropertyNameChecker;
+
         /// <summary>
         /// Constructor.
         /// </summary>
@@ -81,6 +86,7 @@ protected ODataOutputContext(
             this.payloadValueConverter = ODataPayloadValueConverter.GetPayloadValueConverter(this.container);
             this.writerValidator = messageWriterSettings.Validator;
             this.odataSimplifiedOptions = ODataSimplifiedOptions.GetODataSimplifiedOptions(this.container, messageWriterSettings.Version);
+            this.duplicatePropertyNameChecker = MessageWriterSettings.Validator.CreateDuplicatePropertyNameChecker();
         }
 
         /// <summary>
@@ -139,6 +145,17 @@ public IODataPayloadUriConverter PayloadUriConverter
             }
         }
 
+        /// <summary>
+        /// Checker to detect duplicate property names.
+        /// </summary>
+        internal IDuplicatePropertyNameChecker DuplicatePropertyNameChecker
+        {
+            get
+            {
+                return this.duplicatePropertyNameChecker;
+            }
+        }
+
         /// <summary>
         /// The optional dependency injection container to get related services for message writing.
         /// </summary>

diff --git a/src/Microsoft.OData.Core/ODataParameterWriterCore.cs b/src/Microsoft.OData.Core/ODataParameterWriterCore.cs
@@ -83,8 +83,7 @@ protected IDuplicatePropertyNameChecker DuplicatePropertyNameChecker
             {
                 return this.duplicatePropertyNameChecker ??
                        (this.duplicatePropertyNameChecker =
-                           outputContext.MessageWriterSettings.Validator
-                           .CreateDuplicatePropertyNameChecker());
+                           outputContext.DuplicatePropertyNameChecker);
             }
         }
 

diff --git a/src/Microsoft.OData.Core/Uri/ODataUriConversionUtils.cs b/src/Microsoft.OData.Core/Uri/ODataUriConversionUtils.cs
@@ -265,7 +265,7 @@ internal static string ConvertToResourceLiteral(ODataResourceValue resourceValue
                         resourceValue, /* resourceValue */
                         null, /* metadataTypeReference */
                         true, /* isOpenPropertyType */
-                        serializer.CreateDuplicatePropertyNameChecker()));
+                        serializer.JsonLightOutputContext.DuplicatePropertyNameChecker));
             }
 
             return builder.ToString();