diff --git a/src/NJsonSchema.NewtonsoftJson/Converters/JsonExceptionConverter.cs b/src/NJsonSchema.NewtonsoftJson/Converters/JsonExceptionConverter.cs index ede8ed679..b4ee2779a 100644 --- a/src/NJsonSchema.NewtonsoftJson/Converters/JsonExceptionConverter.cs +++ b/src/NJsonSchema.NewtonsoftJson/Converters/JsonExceptionConverter.cs @@ -53,13 +53,17 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s { var resolver = serializer.ContractResolver as DefaultContractResolver ?? _defaultContractResolver; - var jObject = new JObject(); - jObject.Add(resolver.GetResolvedPropertyName("discriminator"), exception.GetType().Name); - jObject.Add(resolver.GetResolvedPropertyName("Message"), exception.Message); - jObject.Add(resolver.GetResolvedPropertyName("StackTrace"), _hideStackTrace ? "HIDDEN" : exception.StackTrace); - jObject.Add(resolver.GetResolvedPropertyName("Source"), exception.Source); - jObject.Add(resolver.GetResolvedPropertyName("InnerException"), - exception.InnerException != null ? JToken.FromObject(exception.InnerException, serializer) : null); + var jObject = new JObject + { + { resolver.GetResolvedPropertyName("discriminator"), exception.GetType().Name }, + { resolver.GetResolvedPropertyName("Message"), exception.Message }, + { resolver.GetResolvedPropertyName("StackTrace"), _hideStackTrace ? "HIDDEN" : exception.StackTrace }, + { resolver.GetResolvedPropertyName("Source"), exception.Source }, + { + resolver.GetResolvedPropertyName("InnerException"), + exception.InnerException != null ? JToken.FromObject(exception.InnerException, serializer) : null + } + }; foreach (var property in GetExceptionProperties(value.GetType())) { diff --git a/src/NJsonSchema/Converters/JsonInheritanceConverter.cs b/src/NJsonSchema/Converters/JsonInheritanceConverter.cs index 8256255f6..4b49c726d 100644 --- a/src/NJsonSchema/Converters/JsonInheritanceConverter.cs +++ b/src/NJsonSchema/Converters/JsonInheritanceConverter.cs @@ -203,14 +203,14 @@ private static Type GetSubtypeFromKnownTypeAttributes(Type objectType, string di return null; } - private static Type GetObjectSubtype(Type baseType, string discriminatorName) + private static Type GetObjectSubtype(Type baseType, string discriminatorValue) { var jsonInheritanceAttributes = baseType .GetTypeInfo() .GetCustomAttributes(true) .OfType(); - return jsonInheritanceAttributes.SingleOrDefault(a => a.Key == discriminatorName)?.Type; + return jsonInheritanceAttributes.SingleOrDefault(a => a.Key == discriminatorValue)?.Type; } private static string GetSubtypeDiscriminator(Type objectType)