Merge pull request #2651 from FirelyTeam/bugfix/2583-modify-json-opti…

…ons-instead-of-creating-new

Modify JsonSerializationOptions instead of creating a new instance

src/Hl7.Fhir.Base/Serialization/JsonSerializerOptionsExtensions.cs

@@ -79,49 +79,40 @@ FhirJsonPocoDeserializerSettings deserializerSettings
  /// </summary>
  public static JsonSerializerOptions ForFhir(this JsonSerializerOptions options, FhirJsonConverterFactory converter)
  {
- var result = new JsonSerializerOptions(options)
- {
- Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
- };
 
- result.Converters.Add(converter);
- return result;
+ options.Converters.Add(converter);
+ options.Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping;
+
+ return options;
  }
 
  /// <summary>
  /// Initialize the options to serialize using the JsonFhirConverter, producing compact output without whitespace.
  /// </summary>
  public static JsonSerializerOptions ForFhir<F>(this JsonSerializerOptions options, FhirJsonConverter<F> converter) where F : Base
  {
- var result = new JsonSerializerOptions(options)
- {
- Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
- };
+ options.Converters.Add(converter);
+ options.Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping;
 
- result.Converters.Add(converter);
- return result;
+ return options;
  }
 
  /// <summary>
  /// Initialize the options to serialize using the JsonFhirConverter, producing compact output without whitespace.
  /// </summary>
  public static JsonSerializerOptions Compact(this JsonSerializerOptions options)
  {
- return new JsonSerializerOptions(options)
- {
- WriteIndented = false
- };
+ options.WriteIndented = false;
+ return options;
  }
 
  /// <summary>
  /// Initialize the options to serialize using the JsonFhirConverter, producing pretty output.
  /// </summary>
  public static JsonSerializerOptions Pretty(this JsonSerializerOptions options)
  {
- return new JsonSerializerOptions(options)
- {
- WriteIndented = true
- };
+ options.WriteIndented = true;
+ return options;
  }
  }
 }

src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/FhirJsonSerializationTests.cs

@@ -41,7 +41,8 @@ public void RoundtripEdgeCases()
  {
  var (poco, expected) = getEdgecases();
 
- var options = BaseOptions.Pretty();
+ var options = new JsonSerializerOptions().ForFhir(typeof(TestPatient).Assembly).Pretty();
+
  string actual = JsonSerializer.Serialize(poco, options);
 
  var errors = new List<string>();