fix: remove serializer settings override code (#197)

mohitpubnub · pubnub-release-bot · web-flow · commit 895c7f558b04 · 2023-10-31T16:41:26.000+05:30
* fix: do not override serializer settings

* PubNub SDK v6.19.3.0 release.

---------

Co-authored-by: PubNub Release Bot &lt;120067856+pubnub-release-bot@users.noreply.github.com&gt;
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,8 +1,13 @@
 name: c-sharp
-version: "6.19.2"
+version: "6.19.3"
 schema: 1
 scm: github.com/pubnub/c-sharp
 changelog:
+  - date: 2023-10-31
+    version: v6.19.3
+    changes:
+      - type: bug
+        text: "Fixes issue of applying default serializer settings."
   - date: 2023-10-30
     version: v6.19.2
     changes:
@@ -751,7 +756,7 @@ features:
     - QUERY-PARAM
 supported-platforms:
   -
-    version: Pubnub 'C#' 6.19.2
+    version: Pubnub 'C#' 6.19.3
     platforms:
       - Windows 10 and up
       - Windows Server 2008 and up
@@ -761,7 +766,7 @@ supported-platforms:
       - .Net Framework 4.5
       - .Net Framework 4.6.1+
   -
-    version: PubnubPCL 'C#' 6.19.2
+    version: PubnubPCL 'C#' 6.19.3
     platforms:
       - Xamarin.Android
       - Xamarin.iOS
@@ -781,7 +786,7 @@ supported-platforms:
       - .Net Core
       - .Net 6.0
   -
-    version: PubnubUWP 'C#' 6.19.2
+    version: PubnubUWP 'C#' 6.19.3
     platforms:
       - Windows Phone 10
       - Universal Windows Apps
@@ -805,7 +810,7 @@ sdks:
             distribution-type: source
             distribution-repository: GitHub
             package-name: Pubnub
-            location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.2.0
+            location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.3.0
             requires:
               -
                 name: ".Net"
@@ -1088,7 +1093,7 @@ sdks:
             distribution-type: source
             distribution-repository: GitHub
             package-name: PubNubPCL
-            location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.2.0
+            location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.3.0
             requires:
               -
                 name: ".Net Core"
@@ -1447,7 +1452,7 @@ sdks:
             distribution-type: source
             distribution-repository: GitHub
             package-name: PubnubUWP
-            location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.2.0
+            location: https://github.com/pubnub/c-sharp/releases/tag/v6.19.3.0
             requires:
               -
                 name: "Universal Windows Platform Development"
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+v6.19.3 - October 31 2023
+-----------------------------
+- Fixed: fixes issue of applying default serializer settings.
+
 v6.19.2 - October 30 2023
 -----------------------------
 - Modified: changed license to PubNub Software Development Kit License.
diff --git a/src/Api/PubnubApi/NewtonsoftJsonDotNet.cs b/src/Api/PubnubApi/NewtonsoftJsonDotNet.cs
@@ -13,6 +13,7 @@ public class NewtonsoftJsonDotNet : IJsonPluggableLibrary
     {
         private readonly PNConfiguration config;
         private readonly IPubnubLog pubnubLog;
+        private readonly JsonSerializerSettings defaultJsonSerializerSettings;
         #region "IL2CPP workarounds"
         //Got an exception when using JSON serialisation for [],
         //IL2CPP needs to know about the array type at compile time.
@@ -44,7 +45,7 @@ public NewtonsoftJsonDotNet(PNConfiguration pubnubConfig, IPubnubLog log)
         {
             this.config = pubnubConfig;
             this.pubnubLog = log;
-            JsonConvert.DefaultSettings = () => new JsonSerializerSettings { MaxDepth = 64 };
+            defaultJsonSerializerSettings = new JsonSerializerSettings { MaxDepth = 64 };
         }
 
         #region IJsonPlugableLibrary methods implementation
@@ -135,12 +136,12 @@ public bool IsDictionaryCompatible(string jsonString, PNOperationType operationT
 
         public string SerializeToJsonString(object objectToSerialize)
         {
-            return JsonConvert.SerializeObject(objectToSerialize);
+            return JsonConvert.SerializeObject(objectToSerialize, defaultJsonSerializerSettings);
         }
 
         public List<object> DeserializeToListOfObject(string jsonString)
         {
-            List<object> result = JsonConvert.DeserializeObject<List<object>>(jsonString);
+            List<object> result = JsonConvert.DeserializeObject<List<object>>(jsonString, defaultJsonSerializerSettings);
 
             return result;
         }
@@ -170,7 +171,7 @@ public object DeserializeToObject(string jsonString)
 
         public void PopulateObject(string value, object target)
         {
-            JsonConvert.PopulateObject(value, target);
+            JsonConvert.PopulateObject(value, target, defaultJsonSerializerSettings);
         }
 
         public virtual T DeserializeToObject<T>(string jsonString)
@@ -244,7 +245,7 @@ private T DeserializeMessageToObjectBasedOnPlatform<T>(List<object> listObject)
                     JToken token = listObject[0] as JToken;
                     if (dataProp.PropertyType == typeof(string))
                     {
-                        userMessage = JsonConvert.SerializeObject(token);
+                        userMessage = JsonConvert.SerializeObject(token, defaultJsonSerializerSettings);
                     }
                     else
                     {
@@ -317,7 +318,7 @@ private T DeserializeMessageToObjectBasedOnPlatform<T>(List<object> listObject)
                     JToken token = listObject[0] as JToken;
                     if (dataProp.PropertyType == typeof(string))
                     {
-                        userMessage = JsonConvert.SerializeObject(token);
+                        userMessage = JsonConvert.SerializeObject(token, defaultJsonSerializerSettings);
                     }
                     else
                     {
@@ -1240,7 +1241,7 @@ public Dictionary<string, object> DeserializeToDictionaryOfObject(string jsonStr
             {
                 if (JsonFastCheck(jsonString))
                 {
-                    result = JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString);
+                    result = JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString, defaultJsonSerializerSettings);
                 }
             }
             catch
diff --git a/src/Api/PubnubApi/Properties/AssemblyInfo.cs b/src/Api/PubnubApi/Properties/AssemblyInfo.cs
@@ -11,8 +11,8 @@
 [assembly: AssemblyProduct("Pubnub C# SDK")]
 [assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("6.19.2.0")]
-[assembly: AssemblyFileVersion("6.19.2.0")]
+[assembly: AssemblyVersion("6.19.3.0")]
+[assembly: AssemblyFileVersion("6.19.3.0")]
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj
@@ -14,15 +14,15 @@
 
   <PropertyGroup>
     <PackageId>Pubnub</PackageId>
-    <PackageVersion>6.19.2.0</PackageVersion>
+    <PackageVersion>6.19.3.0</PackageVersion>
     <Title>PubNub C# .NET - Web Data Push API</Title>
     <Authors>Pandu Masabathula</Authors>
     <Owners>PubNub</Owners>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
-    <PackageReleaseNotes>Changed license to PubNub Software Development Kit License.</PackageReleaseNotes>
+    <PackageReleaseNotes>Fixes issue of applying default serializer settings.</PackageReleaseNotes>
     <PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
     <!--<Summary>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Summary>-->
     <Description>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Description>
diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -15,15 +15,15 @@
 
   <PropertyGroup>
     <PackageId>PubnubPCL</PackageId>
-    <PackageVersion>6.19.2.0</PackageVersion>
+    <PackageVersion>6.19.3.0</PackageVersion>
     <Title>PubNub C# .NET - Web Data Push API</Title>
     <Authors>Pandu Masabathula</Authors>
     <Owners>PubNub</Owners>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
-    <PackageReleaseNotes>Changed license to PubNub Software Development Kit License.</PackageReleaseNotes>
+    <PackageReleaseNotes>Fixes issue of applying default serializer settings.</PackageReleaseNotes>
     <PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
     <!--<Summary>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Summary>-->
     <Description>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Description>
diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -16,15 +16,15 @@
 
   <PropertyGroup>
     <PackageId>PubnubUWP</PackageId>
-    <PackageVersion>6.19.2.0</PackageVersion>
+    <PackageVersion>6.19.3.0</PackageVersion>
     <Title>PubNub C# .NET - Web Data Push API</Title>
     <Authors>Pandu Masabathula</Authors>
     <Owners>PubNub</Owners>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
-    <PackageReleaseNotes>Changed license to PubNub Software Development Kit License.</PackageReleaseNotes>
+    <PackageReleaseNotes>Fixes issue of applying default serializer settings.</PackageReleaseNotes>
     <PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
     <!--<Summary>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Summary>-->
     <Description>PubNub is a Massively Scalable Web Push Service for Web and Mobile Games.  This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously</Description>
diff --git a/src/Api/PubnubApiUnity/PubnubApiUnity.csproj b/src/Api/PubnubApiUnity/PubnubApiUnity.csproj
@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <PackageId>PubnubApiUnity</PackageId>
-    <PackageVersion>6.19.2.0</PackageVersion>
+    <PackageVersion>6.19.3.0</PackageVersion>
     <Title>PubNub C# .NET - Web Data Push API</Title>
     <Authors>Pandu Masabathula</Authors>
     <Owners>PubNub</Owners>

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public class NewtonsoftJsonDotNet : IJsonPluggableLibrary`
`13`	`13`	`{`
`14`	`14`	`private readonly PNConfiguration config;`
`15`	`15`	`private readonly IPubnubLog pubnubLog;`
	`16`	`+ private readonly JsonSerializerSettings defaultJsonSerializerSettings;`
`16`	`17`	`#region "IL2CPP workarounds"`
`17`	`18`	`//Got an exception when using JSON serialisation for [],`
`18`	`19`	`//IL2CPP needs to know about the array type at compile time.`
`@@ -44,7 +45,7 @@ public NewtonsoftJsonDotNet(PNConfiguration pubnubConfig, IPubnubLog log)`
`44`	`45`	`{`
`45`	`46`	`this.config = pubnubConfig;`
`46`	`47`	`this.pubnubLog = log;`
`47`		`- JsonConvert.DefaultSettings = () => new JsonSerializerSettings { MaxDepth = 64 };`
	`48`	`+ defaultJsonSerializerSettings = new JsonSerializerSettings { MaxDepth = 64 };`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`#region IJsonPlugableLibrary methods implementation`
`@@ -135,12 +136,12 @@ public bool IsDictionaryCompatible(string jsonString, PNOperationType operationT`
`135`	`136`
`136`	`137`	`public string SerializeToJsonString(object objectToSerialize)`
`137`	`138`	`{`
`138`		`- return JsonConvert.SerializeObject(objectToSerialize);`
	`139`	`+ return JsonConvert.SerializeObject(objectToSerialize, defaultJsonSerializerSettings);`
`139`	`140`	`}`
`140`	`141`
`141`	`142`	`public List<object> DeserializeToListOfObject(string jsonString)`
`142`	`143`	`{`
`143`		`- List<object> result = JsonConvert.DeserializeObject<List<object>>(jsonString);`
	`144`	`+ List<object> result = JsonConvert.DeserializeObject<List<object>>(jsonString, defaultJsonSerializerSettings);`
`144`	`145`
`145`	`146`	`return result;`
`146`	`147`	`}`
`@@ -170,7 +171,7 @@ public object DeserializeToObject(string jsonString)`
`170`	`171`
`171`	`172`	`public void PopulateObject(string value, object target)`
`172`	`173`	`{`
`173`		`- JsonConvert.PopulateObject(value, target);`
	`174`	`+ JsonConvert.PopulateObject(value, target, defaultJsonSerializerSettings);`
`174`	`175`	`}`
`175`	`176`
`176`	`177`	`public virtual T DeserializeToObject<T>(string jsonString)`
`@@ -244,7 +245,7 @@ private T DeserializeMessageToObjectBasedOnPlatform<T>(List<object> listObject)`
`244`	`245`	`JToken token = listObject[0] as JToken;`
`245`	`246`	`if (dataProp.PropertyType == typeof(string))`
`246`	`247`	`{`
`247`		`- userMessage = JsonConvert.SerializeObject(token);`
	`248`	`+ userMessage = JsonConvert.SerializeObject(token, defaultJsonSerializerSettings);`
`248`	`249`	`}`
`249`	`250`	`else`
`250`	`251`	`{`
`@@ -317,7 +318,7 @@ private T DeserializeMessageToObjectBasedOnPlatform<T>(List<object> listObject)`
`317`	`318`	`JToken token = listObject[0] as JToken;`
`318`	`319`	`if (dataProp.PropertyType == typeof(string))`
`319`	`320`	`{`
`320`		`- userMessage = JsonConvert.SerializeObject(token);`
	`321`	`+ userMessage = JsonConvert.SerializeObject(token, defaultJsonSerializerSettings);`
`321`	`322`	`}`
`322`	`323`	`else`
`323`	`324`	`{`
`@@ -1240,7 +1241,7 @@ public Dictionary<string, object> DeserializeToDictionaryOfObject(string jsonStr`
`1240`	`1241`	`{`
`1241`	`1242`	`if (JsonFastCheck(jsonString))`
`1242`	`1243`	`{`
`1243`		`- result = JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString);`
	`1244`	`+ result = JsonConvert.DeserializeObject<Dictionary<string, object>>(jsonString, defaultJsonSerializerSettings);`
`1244`	`1245`	`}`
`1245`	`1246`	`}`
`1246`	`1247`	`catch`