Improve TryGetInheritanceDiscriminatorName

aboryczko · Feb 18, 2022 · d5b6ed7 · d5b6ed7
1 parent eb20a66
commit d5b6ed7
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/NJsonSchema/Generation/JsonSchemaGenerator.cs b/src/NJsonSchema/Generation/JsonSchemaGenerator.cs
@@ -1205,14 +1205,12 @@ private object TryGetInheritanceDiscriminatorConverter(Type type)
             return null;
         }
 
-        private string TryGetInheritanceDiscriminatorName(dynamic jsonInheritanceConverter)
+        private string TryGetInheritanceDiscriminatorName(object jsonInheritanceConverter)
         {
-            if (ObjectExtensions.HasProperty(jsonInheritanceConverter, nameof(JsonInheritanceConverter.DiscriminatorName)))
-            {
-                return jsonInheritanceConverter.DiscriminatorName;
-            }
-
-            return JsonInheritanceConverter.DefaultDiscriminatorName;
+            return ObjectExtensions.TryGetPropertyValue(
+                jsonInheritanceConverter,
+                nameof(JsonInheritanceConverter.DiscriminatorName),
+                JsonInheritanceConverter.DefaultDiscriminatorName);
         }
 
         private void LoadPropertyOrField(JsonProperty jsonProperty, ContextualAccessorInfo accessorInfo, Type parentType, JsonSchema parentSchema, JsonSchemaResolver schemaResolver)