Skip to content

Commit d046cb4

Browse files
OMpawar-21OMpawar-21
committed
refactor: migrate modular block converter template to System.Text.Json
- Update CreateHelperClass()'s emitted FieldExists signature from JObject to JsonObject - Rewrite CreateModularBlockConverter()'s emitted converter from Newtonsoft's ReadJson()/WriteJson()/serializer.Populate() to STJ's Read()/Write(), using a parse-then-deserialize-and-replace pattern that restores the BlockType discriminator after re-deserializing the concrete block type
1 parent 07011bd commit d046cb4

1 file changed

Lines changed: 25 additions & 31 deletions

File tree

‎contentstack.model.generator/ModelGenerator.cs‎

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ private void CreateHelperClass(string nameSpace, DirectoryInfo directoryInfo)
10841084
sb.AppendLine(" }");
10851085

10861086

1087-
sb.AppendLine(" public static bool FieldExists(string fieldName, JObject jObject)");
1087+
sb.AppendLine(" public static bool FieldExists(string fieldName, JsonObject jObject)");
10881088
sb.AppendLine(" {");
10891089
sb.AppendLine(" return jObject[fieldName] != null;");
10901090
sb.AppendLine(" }");
@@ -1158,19 +1158,18 @@ private void CreateModularBlockConverter(string nameSpace, string className, Dic
11581158
var sb = new StringBuilder();
11591159

11601160
sb.AppendLine("using System;");
1161-
sb.AppendLine("using Newtonsoft.Json;");
1162-
sb.AppendLine("using System.Reflection;");
1163-
sb.AppendLine("using Newtonsoft.Json.Linq;");
1164-
sb.AppendLine("using System.ComponentModel;");
1161+
sb.AppendLine("using System.Text.Json;");
1162+
sb.AppendLine("using System.Text.Json.Nodes;");
1163+
sb.AppendLine("using System.Text.Json.Serialization;");
11651164
sb.AppendLine("using Contentstack.Core;");
1166-
// Creating namespace
1165+
// Creating namespace
11671166
AddNameSpace($"{nameSpace}.{directoryInfo.Name}", sb);
11681167
// Creating Enum
11691168
var ConverterName = $"{className}Converter";
11701169
sb.AppendLine($" [CSJsonConverter(\"{ConverterName}\")]");
11711170
AddClass($"{ConverterName} : JsonConverter<{className}>", sb);
11721171

1173-
sb.AppendLine($" protected {className} Create(Type objectType, JObject jObject)");
1172+
sb.AppendLine($" protected {className} Create(Type objectType, JsonObject jObject)");
11741173
sb.AppendLine(" {");
11751174
foreach (var blocks in blockTypes)
11761175
{
@@ -1186,35 +1185,30 @@ private void CreateModularBlockConverter(string nameSpace, string className, Dic
11861185
sb.AppendLine($" return new {className}();");
11871186
sb.AppendLine(" }");
11881187

1189-
sb.AppendLine($" public override {className}{nullableString()} ReadJson(JsonReader reader, Type objectType, {className}{nullableString()} existingValue, bool hasExistingValue, JsonSerializer serializer)");
1188+
sb.AppendLine($" public override {className}{nullableString()} Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)");
11901189
sb.AppendLine(" {");
1191-
sb.AppendLine(" JObject jObject = JObject.Load(reader);");
1192-
sb.AppendLine($" {className} target = Create(objectType, jObject);");
1193-
sb.AppendLine(" var token = jObject.GetValue(ContentstackHelper.GetDescription(target.BlockType));");
1194-
if (IsNullable)
1195-
{
1196-
sb.AppendLine($" if (token != null) {{");
1197-
}
1198-
sb.AppendLine(" serializer.Populate(token.CreateReader(), target);");
1199-
if (IsNullable)
1200-
{
1201-
sb.AppendLine($" }}");
1202-
}
1190+
sb.AppendLine(" using var doc = JsonDocument.ParseValue(ref reader);");
1191+
sb.AppendLine(" var jObject = JsonNode.Parse(doc.RootElement.GetRawText())!.AsObject();");
1192+
sb.AppendLine($" {className} target = Create(typeToConvert, jObject);");
1193+
sb.AppendLine(" var token = jObject[ContentstackHelper.GetDescription(target.BlockType)];");
1194+
sb.AppendLine(" if (token != null)");
1195+
sb.AppendLine(" {");
1196+
sb.AppendLine($" var filled = JsonSerializer.Deserialize(token.ToJsonString(), target.GetType(), new JsonSerializerOptions {{ PropertyNameCaseInsensitive = true }}) as {className};");
1197+
sb.AppendLine(" if (filled != null)");
1198+
sb.AppendLine(" {");
1199+
sb.AppendLine(" filled.BlockType = target.BlockType;");
1200+
sb.AppendLine(" return filled;");
1201+
sb.AppendLine(" }");
1202+
sb.AppendLine(" }");
12031203
sb.AppendLine(" return target;");
12041204
sb.AppendLine(" }");
12051205

1206-
sb.AppendLine($" public override void WriteJson(JsonWriter writer, {className}{nullableString()} value, JsonSerializer serializer)");
1206+
sb.AppendLine($" public override void Write(Utf8JsonWriter writer, {className}{nullableString()} value, JsonSerializerOptions options)");
12071207
sb.AppendLine(" {");
1208-
if (IsNullable)
1209-
{
1210-
sb.AppendLine($" if (value != null) {{");
1211-
}
1212-
sb.AppendLine(" JToken t = JToken.FromObject(value);");
1213-
sb.AppendLine(" t.WriteTo(writer);");
1214-
if (IsNullable)
1215-
{
1216-
sb.AppendLine($" }}");
1217-
}
1208+
sb.AppendLine(" if (value != null)");
1209+
sb.AppendLine(" {");
1210+
sb.AppendLine(" JsonSerializer.Serialize(writer, value, options);");
1211+
sb.AppendLine(" }");
12181212
sb.AppendLine(" }");
12191213

12201214
// End of namespace and Enum

0 commit comments

Comments
 (0)