Skip to content

Commit 257c07f

Browse files
reeshika-hreeshika-h
committed
refactor: replace Newtonsoft.Json with System.Text.Json in Taxonomy and Term models
1 parent 0317c88 commit 257c07f

5 files changed

Lines changed: 61 additions & 65 deletions

File tree

‎Contentstack.Management.Core.Tests/IntegrationTest/Contentstack017_TaxonomyTest.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using Contentstack.Management.Core.Tests.Helpers;
1717
using Contentstack.Management.Core.Tests.Model;
1818
using Microsoft.VisualStudio.TestTools.UnitTesting;
19-
using Newtonsoft.Json.Linq;
19+
using System.Text.Json.Nodes;
2020

2121
namespace Contentstack.Management.Core.Tests.IntegrationTest
2222
{
@@ -195,7 +195,7 @@ public void Test009_Should_Get_Taxonomy_Locales()
195195
TestOutputLogger.LogContext("TaxonomyUid", _taxonomyUid ?? "");
196196
ContentstackResponse response = _stack.Taxonomy(_taxonomyUid).Locales();
197197
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"Locales failed: {response.OpenResponse()}", "LocalesSuccess");
198-
var jobj = response.OpenJObjectResponse();
198+
var jobj = response.OpenJsonObjectResponse();
199199
AssertLogger.IsNotNull(jobj["taxonomies"], "Taxonomies in locales response");
200200
}
201201

@@ -207,7 +207,7 @@ public async Task Test010_Should_Get_Taxonomy_Locales_Async()
207207
TestOutputLogger.LogContext("TaxonomyUid", _taxonomyUid ?? "");
208208
ContentstackResponse response = await _stack.Taxonomy(_taxonomyUid).LocalesAsync();
209209
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"LocalesAsync failed: {response.OpenResponse()}", "LocalesAsyncSuccess");
210-
var jobj = response.OpenJObjectResponse();
210+
var jobj = response.OpenJsonObjectResponse();
211211
AssertLogger.IsNotNull(jobj["taxonomies"], "Taxonomies in locales response");
212212
}
213213

@@ -219,8 +219,8 @@ public void Test011_Should_Localize_Taxonomy()
219219
_weCreatedTestLocale = false;
220220
ContentstackResponse localesResponse = _stack.Locale().Query().Find();
221221
AssertLogger.IsTrue(localesResponse.IsSuccessStatusCode, $"Query locales failed: {localesResponse.OpenResponse()}", "QueryLocalesSuccess");
222-
var jobj = localesResponse.OpenJObjectResponse();
223-
var localesArray = jobj["locales"] as JArray ?? jobj["items"] as JArray;
222+
var jobj = localesResponse.OpenJsonObjectResponse();
223+
var localesArray = jobj["locales"] as JsonArray ?? jobj["items"] as JsonArray;
224224
if (localesArray == null || localesArray.Count == 0)
225225
{
226226
AssertLogger.Inconclusive("Stack has no locales; skipping taxonomy localize tests.");
@@ -537,7 +537,7 @@ public void Test024_Should_Get_Term_Ancestors()
537537
TestOutputLogger.LogContext("ChildTermUid", _childTermUid ?? "");
538538
ContentstackResponse response = _stack.Taxonomy(_taxonomyUid).Terms(_childTermUid).Ancestors();
539539
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"Ancestors failed: {response.OpenResponse()}", "AncestorsSuccess");
540-
var jobj = response.OpenJObjectResponse();
540+
var jobj = response.OpenJsonObjectResponse();
541541
AssertLogger.IsNotNull(jobj, "Ancestors response");
542542
}
543543

@@ -550,7 +550,7 @@ public async Task Test025_Should_Get_Term_Ancestors_Async()
550550
TestOutputLogger.LogContext("ChildTermUid", _childTermUid ?? "");
551551
ContentstackResponse response = await _stack.Taxonomy(_taxonomyUid).Terms(_childTermUid).AncestorsAsync();
552552
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"AncestorsAsync failed: {response.OpenResponse()}", "AncestorsAsyncSuccess");
553-
var jobj = response.OpenJObjectResponse();
553+
var jobj = response.OpenJsonObjectResponse();
554554
AssertLogger.IsNotNull(jobj, "Ancestors async response");
555555
}
556556

@@ -563,7 +563,7 @@ public void Test026_Should_Get_Term_Descendants()
563563
TestOutputLogger.LogContext("RootTermUid", _rootTermUid ?? "");
564564
ContentstackResponse response = _stack.Taxonomy(_taxonomyUid).Terms(_rootTermUid).Descendants();
565565
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"Descendants failed: {response.OpenResponse()}", "DescendantsSuccess");
566-
var jobj = response.OpenJObjectResponse();
566+
var jobj = response.OpenJsonObjectResponse();
567567
AssertLogger.IsNotNull(jobj, "Descendants response");
568568
}
569569

@@ -576,7 +576,7 @@ public async Task Test027_Should_Get_Term_Descendants_Async()
576576
TestOutputLogger.LogContext("RootTermUid", _rootTermUid ?? "");
577577
ContentstackResponse response = await _stack.Taxonomy(_taxonomyUid).Terms(_rootTermUid).DescendantsAsync();
578578
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"DescendantsAsync failed: {response.OpenResponse()}", "DescendantsAsyncSuccess");
579-
var jobj = response.OpenJObjectResponse();
579+
var jobj = response.OpenJsonObjectResponse();
580580
AssertLogger.IsNotNull(jobj, "Descendants async response");
581581
}
582582

@@ -589,7 +589,7 @@ public void Test028_Should_Get_Term_Locales()
589589
TestOutputLogger.LogContext("RootTermUid", _rootTermUid ?? "");
590590
ContentstackResponse response = _stack.Taxonomy(_taxonomyUid).Terms(_rootTermUid).Locales();
591591
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"Term Locales failed: {response.OpenResponse()}", "TermLocalesSuccess");
592-
var jobj = response.OpenJObjectResponse();
592+
var jobj = response.OpenJsonObjectResponse();
593593
AssertLogger.IsNotNull(jobj["terms"], "Terms in locales response");
594594
}
595595

@@ -602,7 +602,7 @@ public async Task Test029_Should_Get_Term_Locales_Async()
602602
TestOutputLogger.LogContext("RootTermUid", _rootTermUid ?? "");
603603
ContentstackResponse response = await _stack.Taxonomy(_taxonomyUid).Terms(_rootTermUid).LocalesAsync();
604604
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"Term LocalesAsync failed: {response.OpenResponse()}", "TermLocalesAsyncSuccess");
605-
var jobj = response.OpenJObjectResponse();
605+
var jobj = response.OpenJsonObjectResponse();
606606
AssertLogger.IsNotNull(jobj["terms"], "Terms in locales async response");
607607
}
608608

@@ -710,7 +710,7 @@ public void Test034_Should_Search_Terms()
710710
TestOutputLogger.LogContext("TaxonomyUid", _taxonomyUid ?? "");
711711
ContentstackResponse response = _stack.Taxonomy(_taxonomyUid).Terms().Search("Root");
712712
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"Search terms failed: {response.OpenResponse()}", "SearchTermsSuccess");
713-
var jobj = response.OpenJObjectResponse();
713+
var jobj = response.OpenJsonObjectResponse();
714714
AssertLogger.IsNotNull(jobj["terms"] ?? jobj["items"], "Terms or items in search response");
715715
}
716716

@@ -722,7 +722,7 @@ public async Task Test035_Should_Search_Terms_Async()
722722
TestOutputLogger.LogContext("TaxonomyUid", _taxonomyUid ?? "");
723723
ContentstackResponse response = await _stack.Taxonomy(_taxonomyUid).Terms().SearchAsync("Root");
724724
AssertLogger.IsTrue(response.IsSuccessStatusCode, $"SearchAsync terms failed: {response.OpenResponse()}", "SearchAsyncTermsSuccess");
725-
var jobj = response.OpenJObjectResponse();
725+
var jobj = response.OpenJsonObjectResponse();
726726
AssertLogger.IsNotNull(jobj["terms"] ?? jobj["items"], "Terms or items in search async response");
727727
}
728728

‎Contentstack.Management.Core.Unit.Tests/Models/TaxonomyTest.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Contentstack.Management.Core.Queryable;
66
using Contentstack.Management.Core.Unit.Tests.Mokes;
77
using Microsoft.VisualStudio.TestTools.UnitTesting;
8-
using Newtonsoft.Json;
8+
using System.Text.Json;
99

1010
namespace Contentstack.Management.Core.Unit.Tests.Models
1111
{
@@ -62,7 +62,7 @@ public void Should_Create_Taxonomy()
6262
ContentstackResponse response = _stack.Taxonomy().Create(_fixture.Create<TaxonomyModel>());
6363

6464
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
65-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
65+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
6666
}
6767

6868
[TestMethod]
@@ -71,7 +71,7 @@ public async System.Threading.Tasks.Task Should_Create_Taxonomy_Async()
7171
ContentstackResponse response = await _stack.Taxonomy().CreateAsync(_fixture.Create<TaxonomyModel>());
7272

7373
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
74-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
74+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
7575
}
7676

7777
[TestMethod]
@@ -80,7 +80,7 @@ public void Should_Query_Taxonomy()
8080
ContentstackResponse response = _stack.Taxonomy().Query().Find();
8181

8282
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
83-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
83+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
8484
}
8585

8686
[TestMethod]
@@ -89,7 +89,7 @@ public async System.Threading.Tasks.Task Should_Query_Taxonomy_Async()
8989
ContentstackResponse response = await _stack.Taxonomy().Query().FindAsync();
9090

9191
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
92-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
92+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
9393
}
9494

9595
[TestMethod]
@@ -98,7 +98,7 @@ public void Should_Fetch_Taxonomy()
9898
ContentstackResponse response = _stack.Taxonomy(_fixture.Create<string>()).Fetch();
9999

100100
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
101-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
101+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
102102
}
103103

104104
[TestMethod]
@@ -107,7 +107,7 @@ public async System.Threading.Tasks.Task Should_Fetch_Taxonomy_Async()
107107
ContentstackResponse response = await _stack.Taxonomy(_fixture.Create<string>()).FetchAsync();
108108

109109
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
110-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
110+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
111111
}
112112

113113
[TestMethod]
@@ -182,7 +182,7 @@ public void Query_Throws_When_Uid_Is_Set()
182182
public void Localize_When_Api_Returns_400_Returns_Unsuccessful_Response()
183183
{
184184
var httpMsg = MockResponse.Create(HttpStatusCode.BadRequest, null, "{\"error_message\":\"Invalid locale\",\"error_code\":400}");
185-
var badResponse = new ContentstackResponse(httpMsg, JsonSerializer.Create(new JsonSerializerSettings()));
185+
var badResponse = new ContentstackResponse(httpMsg, new JsonSerializerOptions());
186186
var client = new ContentstackClient();
187187
client.ContentstackPipeline.ReplaceHandler(new MockHttpHandler(badResponse));
188188
client.contentstackOptions.Authtoken = _fixture.Create<string>();

‎Contentstack.Management.Core.Unit.Tests/Models/TermTest.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void Should_Create_Term()
6060
ContentstackResponse response = _stack.Taxonomy(taxonomyUid).Terms().Create(_fixture.Create<TermModel>());
6161

6262
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
63-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
63+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
6464
}
6565

6666
[TestMethod]
@@ -70,7 +70,7 @@ public async System.Threading.Tasks.Task Should_Create_Term_Async()
7070
ContentstackResponse response = await _stack.Taxonomy(taxonomyUid).Terms().CreateAsync(_fixture.Create<TermModel>());
7171

7272
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
73-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
73+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
7474
}
7575

7676
[TestMethod]
@@ -80,7 +80,7 @@ public void Should_Query_Terms()
8080
ContentstackResponse response = _stack.Taxonomy(taxonomyUid).Terms().Query().Find();
8181

8282
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
83-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
83+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
8484
}
8585

8686
[TestMethod]
@@ -90,7 +90,7 @@ public async System.Threading.Tasks.Task Should_Query_Terms_Async()
9090
ContentstackResponse response = await _stack.Taxonomy(taxonomyUid).Terms().Query().FindAsync();
9191

9292
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
93-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
93+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
9494
}
9595

9696
[TestMethod]
@@ -101,7 +101,7 @@ public void Should_Fetch_Term()
101101
ContentstackResponse response = _stack.Taxonomy(taxonomyUid).Terms(termUid).Fetch();
102102

103103
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
104-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
104+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
105105
}
106106

107107
[TestMethod]
@@ -112,7 +112,7 @@ public async System.Threading.Tasks.Task Should_Fetch_Term_Async()
112112
ContentstackResponse response = await _stack.Taxonomy(taxonomyUid).Terms(termUid).FetchAsync();
113113

114114
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
115-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
115+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
116116
}
117117

118118
[TestMethod]
@@ -122,7 +122,7 @@ public void Should_Search_Terms()
122122
ContentstackResponse response = _stack.Taxonomy(taxonomyUid).Terms().Search("test");
123123

124124
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
125-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
125+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
126126
}
127127

128128
[TestMethod]
@@ -132,7 +132,7 @@ public async System.Threading.Tasks.Task Should_Search_Terms_Async()
132132
ContentstackResponse response = await _stack.Taxonomy(taxonomyUid).Terms().SearchAsync("test");
133133

134134
Assert.AreEqual(_contentstackResponse.OpenResponse(), response.OpenResponse());
135-
Assert.AreEqual(_contentstackResponse.OpenJObjectResponse().ToString(), response.OpenJObjectResponse().ToString());
135+
Assert.AreEqual(_contentstackResponse.OpenJsonObjectResponse().ToString(), response.OpenJsonObjectResponse().ToString());
136136
}
137137

138138
[TestMethod]

‎Contentstack.Management.Core/Models/TaxonomyModel.cs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
1-
using Newtonsoft.Json;
1+
using System.Text.Json.Serialization;
22

33
namespace Contentstack.Management.Core.Models
44
{
55
/// <summary>
66
/// Model for Taxonomy create/update and API response.
77
/// </summary>
8-
[JsonObject(ItemNullValueHandling = NullValueHandling.Ignore)]
98
public class TaxonomyModel
109
{
11-
[JsonProperty(propertyName: "uid")]
10+
[JsonPropertyName("uid")]
1211
public string Uid { get; set; }
1312

14-
[JsonProperty(propertyName: "name")]
13+
[JsonPropertyName("name")]
1514
public string Name { get; set; }
1615

17-
[JsonProperty(propertyName: "description")]
16+
[JsonPropertyName("description")]
1817
public string Description { get; set; }
1918

20-
[JsonProperty(propertyName: "locale")]
19+
[JsonPropertyName("locale")]
2120
public string Locale { get; set; }
2221

23-
[JsonProperty(propertyName: "terms_count")]
22+
[JsonPropertyName("terms_count")]
2423
public int? TermsCount { get; set; }
2524

26-
[JsonProperty(propertyName: "referenced_terms_count")]
25+
[JsonPropertyName("referenced_terms_count")]
2726
public int? ReferencedTermsCount { get; set; }
2827

29-
[JsonProperty(propertyName: "referenced_entries_count")]
28+
[JsonPropertyName("referenced_entries_count")]
3029
public int? ReferencedEntriesCount { get; set; }
3130

32-
[JsonProperty(propertyName: "referenced_content_type_count")]
31+
[JsonPropertyName("referenced_content_type_count")]
3332
public int? ReferencedContentTypeCount { get; set; }
3433

35-
[JsonProperty(propertyName: "created_at")]
34+
[JsonPropertyName("created_at")]
3635
public string CreatedAt { get; set; }
3736

38-
[JsonProperty(propertyName: "updated_at")]
37+
[JsonPropertyName("updated_at")]
3938
public string UpdatedAt { get; set; }
4039

41-
[JsonProperty(propertyName: "uuid")]
40+
[JsonPropertyName("uuid")]
4241
public string Uuid { get; set; }
4342
}
4443
}

0 commit comments

Comments
 (0)