Fix tests for NJsonSchema 11 (#19) (#2291)

confluentinc · Aug 26, 2024 · bebc802 · bebc802
1 parent ef89a01
commit bebc802
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj b/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj
@@ -24,7 +24,7 @@
  </PropertyGroup>
 
  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
- <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.1" />
+ <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.2" />
  </ItemGroup>
 
  <ItemGroup Condition=" '$(TargetFramework)' != 'net8.0' ">

diff --git a/src/Confluent.SchemaRegistry.Serdes.Json/JsonSerializer.cs b/src/Confluent.SchemaRegistry.Serdes.Json/JsonSerializer.cs
@@ -100,8 +100,13 @@ public JsonSerializer(ISchemaRegistryClient schemaRegistryClient, JsonSerializer
  this.jsonSchemaGeneratorSettings = jsonSchemaGeneratorSettings;
 
  this.schema = this.jsonSchemaGeneratorSettings == null
+#if NET8_0_OR_GREATER
+ ? NewtonsoftJsonSchemaGenerator.FromType<T>()
+ : NewtonsoftJsonSchemaGenerator.FromType<T>(this.jsonSchemaGeneratorSettings);
+#else
  ? JsonSchema.FromType<T>()
  : JsonSchema.FromType<T>(this.jsonSchemaGeneratorSettings);
+#endif
  this.schemaText = schema.ToJson();
  this.schemaFullname = schema.Title;
 
@@ -185,7 +190,7 @@ public JsonSerializer(ISchemaRegistryClient schemaRegistryClient, Schema schema,
  /// Context relevant to the serialize operation.
  /// </param>
  /// <returns>
- /// A <see cref="System.Threading.Tasks.Task" /> that completes with 
+ /// A <see cref="System.Threading.Tasks.Task" /> that completes with
  /// <paramref name="value" /> serialized as a byte array.
  /// </returns>
  public override async Task<byte[]> SerializeAsync(T value, SerializationContext context)