Update NJsonSchema to v11

examples/JsonWithReferences/Program.cs

@@ -22,9 +22,9 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using NJsonSchema.Generation;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
+using NJsonSchema.NewtonsoftJson.Generation;
 
 
 /// <summary>
@@ -150,7 +150,7 @@ static async Task Main(string[] args)
  // from default one to camelCase.
  // It's also possible to add JsonProperty attributes to customize
  // serialization mapping and all available NJson attributes.
- var jsonSchemaGeneratorSettings = new JsonSchemaGeneratorSettings
+ var jsonSchemaGeneratorSettings = new NewtonsoftJsonSchemaGeneratorSettings
  {
  SerializerSettings = new JsonSerializerSettings
  {

src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj

@@ -24,7 +24,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="NJsonSchema" Version="10.9.0" />
+ <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.1" />
  </ItemGroup>
 
  <ItemGroup>

src/Confluent.SchemaRegistry.Serdes.Json/JsonDeserializer.cs

@@ -25,7 +25,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NJsonSchema;
-using NJsonSchema.Generation;
+using NJsonSchema.NewtonsoftJson.Generation;
 using NJsonSchema.Validation;
 
 
@@ -53,7 +53,7 @@ namespace Confluent.SchemaRegistry.Serdes
  /// </remarks>
  public class JsonDeserializer<T> : AsyncDeserializer<T, JsonSchema> where T : class
  {
- private readonly JsonSchemaGeneratorSettings jsonSchemaGeneratorSettings;
+ private readonly NewtonsoftJsonSchemaGeneratorSettings jsonSchemaGeneratorSettings;
 
  private JsonSchemaValidator validator = new JsonSchemaValidator();
 
@@ -69,18 +69,18 @@ public class JsonDeserializer<T> : AsyncDeserializer<T, JsonSchema> where T : cl
  /// <param name="jsonSchemaGeneratorSettings">
  /// JSON schema generator settings.
  /// </param>
- public JsonDeserializer(IEnumerable<KeyValuePair<string, string>> config = null, JsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null) :
+ public JsonDeserializer(IEnumerable<KeyValuePair<string, string>> config = null, NewtonsoftJsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null) :
  this(null, config, jsonSchemaGeneratorSettings)
  {
  }
 
- public JsonDeserializer(ISchemaRegistryClient schemaRegistryClient, IEnumerable<KeyValuePair<string, string>> config = null, JsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null) 
+ public JsonDeserializer(ISchemaRegistryClient schemaRegistryClient, IEnumerable<KeyValuePair<string, string>> config = null, NewtonsoftJsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null) 
  : this(schemaRegistryClient, config != null ? new JsonDeserializerConfig(config) : null, jsonSchemaGeneratorSettings)
  {
  }
 
  public JsonDeserializer(ISchemaRegistryClient schemaRegistryClient, JsonDeserializerConfig config, 
- JsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null, IList<IRuleExecutor> ruleExecutors = null) 
+ NewtonsoftJsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null, IList<IRuleExecutor> ruleExecutors = null) 
  : base(schemaRegistryClient, config, ruleExecutors)
  {
  this.jsonSchemaGeneratorSettings = jsonSchemaGeneratorSettings;
@@ -121,7 +121,7 @@ public JsonDeserializer(ISchemaRegistryClient schemaRegistryClient, JsonDeserial
  /// JSON schema generator settings.
  /// </param>
  public JsonDeserializer(ISchemaRegistryClient schemaRegistryClient, Schema schema, IEnumerable<KeyValuePair<string, string>> config = null,
- JsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null) : this(schemaRegistryClient, config, jsonSchemaGeneratorSettings)
+ NewtonsoftJsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null) : this(schemaRegistryClient, config, jsonSchemaGeneratorSettings)
  {
  JsonSchemaResolver utils = new JsonSchemaResolver(
  schemaRegistryClient, schema, this.jsonSchemaGeneratorSettings);
@@ -206,7 +206,7 @@ public override async Task<T> DeserializeAsync(ReadOnlyMemory<byte> data, bool i
  using (var jsonStream = new MemoryStream(array, headerSize, array.Length - headerSize))
  using (var jsonReader = new StreamReader(jsonStream, Encoding.UTF8))
  {
- JToken json = Newtonsoft.Json.JsonConvert.DeserializeObject<JToken>(jsonReader.ReadToEnd(), this.jsonSchemaGeneratorSettings?.ActualSerializerSettings);
+ JToken json = Newtonsoft.Json.JsonConvert.DeserializeObject<JToken>(jsonReader.ReadToEnd(), this.jsonSchemaGeneratorSettings?.SerializerSettings);
  json = await ExecuteMigrations(migrations, isKey, subject, topic, context.Headers, json)
  .ContinueWith(t => (JToken)t.Result)
  .ConfigureAwait(continueOnCapturedContext: false);
@@ -243,7 +243,7 @@ public override async Task<T> DeserializeAsync(ReadOnlyMemory<byte> data, bool i
  }
  }
 
- value = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(serializedString, this.jsonSchemaGeneratorSettings?.ActualSerializerSettings);
+ value = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(serializedString, this.jsonSchemaGeneratorSettings?.SerializerSettings);
  }
  }
 

src/Confluent.SchemaRegistry.Serdes.Json/JsonSchemaResolver.cs

@@ -20,6 +20,7 @@
 using NJsonSchema;
 using NJsonSchema.Generation;
 using Newtonsoft.Json.Linq;
+using NJsonSchema.NewtonsoftJson.Generation;
 
 
 namespace Confluent.SchemaRegistry.Serdes
@@ -112,7 +113,7 @@ private async Task<JsonSchema> GetSchemaUtil(Schema root)
  {
  NJsonSchema.Generation.JsonSchemaResolver schemaResolver =
  new NJsonSchema.Generation.JsonSchemaResolver(rootObject, this.jsonSchemaGeneratorSettings ??
- new JsonSchemaGeneratorSettings());
+ new NewtonsoftJsonSchemaGeneratorSettings());
 
  JsonReferenceResolver referenceResolver =
  new JsonReferenceResolver(schemaResolver);

src/Confluent.SchemaRegistry.Serdes.Json/JsonSerializer.cs

@@ -24,9 +24,9 @@
 using System.Net;
 using System.Threading.Tasks;
 using NJsonSchema;
-using NJsonSchema.Generation;
 using NJsonSchema.Validation;
 using Confluent.Kafka;
+using NJsonSchema.NewtonsoftJson.Generation;
 
 
 namespace Confluent.SchemaRegistry.Serdes
@@ -54,7 +54,7 @@ namespace Confluent.SchemaRegistry.Serdes
  /// </remarks>
  public class JsonSerializer<T> : AsyncSerializer<T, JsonSchema> where T : class
  {
- private readonly JsonSchemaGeneratorSettings jsonSchemaGeneratorSettings;
+ private readonly NewtonsoftJsonSchemaGeneratorSettings jsonSchemaGeneratorSettings;
  private readonly List<SchemaReference> ReferenceList = new List<SchemaReference>();
 
  private JsonSchemaValidator validator = new JsonSchemaValidator();
@@ -82,7 +82,7 @@ public class JsonSerializer<T> : AsyncSerializer<T, JsonSchema> where T : class
  /// JSON schema generator settings.
  /// </param>
  public JsonSerializer(ISchemaRegistryClient schemaRegistryClient, JsonSerializerConfig config = null, 
- JsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null, IList<IRuleExecutor> ruleExecutors = null)
+ NewtonsoftJsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null, IList<IRuleExecutor> ruleExecutors = null)
  : base(schemaRegistryClient, config, ruleExecutors)
  {
  this.jsonSchemaGeneratorSettings = jsonSchemaGeneratorSettings;
@@ -136,7 +136,7 @@ public JsonSerializer(ISchemaRegistryClient schemaRegistryClient, JsonSerializer
  /// JSON schema generator settings.
  /// </param>
  public JsonSerializer(ISchemaRegistryClient schemaRegistryClient, Schema schema, JsonSerializerConfig config = null, 
- JsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null, IList<IRuleExecutor> ruleExecutors = null) 
+ NewtonsoftJsonSchemaGeneratorSettings jsonSchemaGeneratorSettings = null, IList<IRuleExecutor> ruleExecutors = null) 
  : this(schemaRegistryClient, config, jsonSchemaGeneratorSettings, ruleExecutors)
  {
  foreach (var reference in schema.References)
@@ -154,7 +154,7 @@ public JsonSerializer(ISchemaRegistryClient schemaRegistryClient, Schema schema,
 
  /// <summary>
  /// Serialize an instance of type <typeparamref name="T"/> to a UTF8 encoded JSON 
- /// represenation. The serialized data is preceeded by:
+ /// representation. The serialized data is preceded by:
  /// 1. A "magic byte" (1 byte) that identifies this as a message with
  /// Confluent Platform framing.
  /// 2. The id of the schema as registered in Confluent's Schema Registry
@@ -233,7 +233,7 @@ public override async Task<byte[]> SerializeAsync(T value, SerializationContext
  .ConfigureAwait(continueOnCapturedContext: false);
  }
 
- var serializedString = Newtonsoft.Json.JsonConvert.SerializeObject(value, this.jsonSchemaGeneratorSettings?.ActualSerializerSettings);
+ var serializedString = Newtonsoft.Json.JsonConvert.SerializeObject(value, this.jsonSchemaGeneratorSettings?.SerializerSettings);
  var validationResult = validator.Validate(serializedString, this.schema);
  if (validationResult.Count > 0)
  {

test/Confluent.SchemaRegistry.Serdes.IntegrationTests/Tests_Json/UseReferences.cs

@@ -22,7 +22,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json.Linq;
-using NJsonSchema.Generation;
+using NJsonSchema.NewtonsoftJson.Generation;
 
 
 namespace Confluent.SchemaRegistry.Serdes.IntegrationTests
@@ -139,7 +139,7 @@ public static void UseReferences(string bootstrapServers, string schemaRegistryS
  var schemaRegistryConfig = new SchemaRegistryConfig { Url = schemaRegistryServers };
  var sr = new CachedSchemaRegistryClient(schemaRegistryConfig);
 
- var jsonSchemaGeneratorSettings = new JsonSchemaGeneratorSettings
+ var jsonSchemaGeneratorSettings = new NewtonsoftJsonSchemaGeneratorSettings
  {
  SerializerSettings = new JsonSerializerSettings
  {
@@ -209,7 +209,7 @@ public static void UseReferences(string bootstrapServers, string schemaRegistryS
 
  // Test producing and consuming directly a JObject
  var serializedString = Newtonsoft.Json.JsonConvert.SerializeObject(order,
- jsonSchemaGeneratorSettings.ActualSerializerSettings);
+ jsonSchemaGeneratorSettings.SerializerSettings);
  var jsonObject = JObject.Parse(serializedString);
 
  using (var producer =

test/Confluent.SchemaRegistry.Serdes.UnitTests/JsonSerializeDeserialize.cs

@@ -20,8 +20,9 @@
 using Confluent.Kafka;
 using Confluent.SchemaRegistry.Encryption;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
-using NJsonSchema.Generation;
+using NJsonSchema.NewtonsoftJson.Generation;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -176,7 +177,7 @@ public async Task WithJsonSerializerSettingsSerDe()
  {
  const int value = 1234;
  var expectedJson = $"{{\"Value\":{value * 2}}}";
- var jsonSchemaGeneratorSettings = new JsonSchemaGeneratorSettings
+ var jsonSchemaGeneratorSettings = new NewtonsoftJsonSchemaGeneratorSettings
  {
  SerializerSettings = new JsonSerializerSettings
  {
@@ -227,7 +228,7 @@ public async Task WithJsonSchemaExternalReferencesAsync()
  SubjectNameStrategy = SubjectNameStrategy.TopicRecord
  };
 
- var jsonSchemaGeneratorSettings = new JsonSchemaGeneratorSettings
+ var jsonSchemaGeneratorSettings = new NewtonsoftJsonSchemaGeneratorSettings
  {
  SerializerSettings = new JsonSerializerSettings
  {
@@ -257,15 +258,23 @@ public async Task WithJsonSchemaExternalReferencesAsync()
  }
 
  [Theory]
- [InlineData(EnumHandling.CamelCaseString, EnumType.EnumValue, "{\"Value\":\"enumValue\"}")]
- [InlineData(EnumHandling.String, EnumType.None, "{\"Value\":\"None\"}")]
- [InlineData(EnumHandling.Integer, EnumType.OtherValue, "{\"Value\":5678}")]
- public async Task WithJsonSchemaGeneratorSettingsSerDe(EnumHandling enumHandling, EnumType value,
+ [InlineData("CamelCaseString", EnumType.EnumValue, "{\"Value\":\"enumValue\"}")]
+ [InlineData("String", EnumType.None, "{\"Value\":\"None\"}")]
+ [InlineData("Integer", EnumType.OtherValue, "{\"Value\":5678}")]
+ public async Task WithJsonSchemaGeneratorSettingsSerDe(string enumHandling, EnumType value,
  string expectedJson)
  {
- var jsonSchemaGeneratorSettings = new JsonSchemaGeneratorSettings
+ var serializerSettings = enumHandling switch
  {
- DefaultEnumHandling = enumHandling
+ "CamelCaseString" => new JsonSerializerSettings { Converters = { new StringEnumConverter(new CamelCaseNamingStrategy()) } },
+ "String" => new JsonSerializerSettings { Converters = { new StringEnumConverter() } },
+ "Integer" => new JsonSerializerSettings(),
+ _ => throw new ArgumentException("Invalid enumHandling value", nameof(enumHandling)),
+ };
+
+ var jsonSchemaGeneratorSettings = new NewtonsoftJsonSchemaGeneratorSettings
+ {
+ SerializerSettings = serializerSettings,
  };
 
  var jsonSerializer = new JsonSerializer<EnumObject>(schemaRegistryClient,