Merge branch 'develop'

Author: dampee

.gitattributes

@@ -47,3 +47,13 @@
 *.fsproj text=auto merge=union 
 *.dbproj text=auto merge=union 
 *.sln text=auto eol=crlf merge=union 
+PAYNLFormsApp/DebugForm.cs -text diff=csharp
+PAYNLFormsApp/Form1.cs -text diff=csharp
+PAYNLFormsApp/PAYNLFormsApp.csproj -text
+PAYNLSDK/API/Banktransfer/Add/Request.cs -text diff=csharp
+PAYNLSDK/API/Refund/Add/Request.cs -text diff=csharp
+PAYNLSDK/API/Refund/Add/Response.cs -text diff=csharp
+PAYNLSDK/API/Transaction/Approve/Request.cs -text diff=csharp
+PAYNLSDK/API/Transaction/Approve/Response.cs -text diff=csharp
+PAYNLSDK/API/Transaction/Decline/Request.cs -text diff=csharp
+PAYNLSDK/API/Transaction/Decline/Response.cs -text diff=csharp

PAYNLFormsApp/DebugForm.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using PayNLSdk.Utilities;
 using PAYNLFormsApp.Fixtures;
 using PAYNLSDK;
 using PAYNLSDK.API;

PAYNLFormsApp/Fixtures/RefundInfo.cs

@@ -2,7 +2,7 @@
 using PAYNLSDK.Objects;
 using PAYNLSDK;
 using PAYNLSDK.Enums;
-using Newtonsoft.Json;
+using PayNLSdk.Utilities;
 
 namespace PAYNLFormsApp.Fixtures
 {
@@ -11,7 +11,7 @@ public class TransactionRefundInfo
         static public PAYNLSDK.Objects.RefundInfo GetRefundInfoFixture()
         {
             String json = GetJsonFixture();
-            PAYNLSDK.Objects.RefundInfo info = JsonConvert.DeserializeObject<PAYNLSDK.Objects.RefundInfo>(json);
+            PAYNLSDK.Objects.RefundInfo info = JsonSerialization.Deserialize<PAYNLSDK.Objects.RefundInfo>(json);
             return info;
         }
 

PAYNLFormsApp/Form1.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using PayNLSdk.Utilities;
 using PAYNLFormsApp.Fixtures;
 using PAYNLSDK.API;
 using PAYNLSDK.Exceptions;
@@ -133,7 +133,7 @@ private void transactionStartproductsToolStripMenuItem_Click(object sender, Even
             //string qs = fixture.ToQueryString();
             //AddDebug(qs);
             //NameValueCollection nvc = HttpUtility.ParseQueryString(qs);
-            //string json = JsonConvert.SerializeObject(NvcToDictionary(nvc, true));
+            //string json = JsonSerialization.Serialize(NvcToDictionary(nvc, true));
             AddDebug("-----");
             //DumpNvc(nvc);
             AddDebug("-----");
@@ -249,8 +249,8 @@ private void Form1_Load(object sender, EventArgs e)
             AddDebug(PAYNLSDK.Enums.Util.ToEnumString(PAYNLSDK.Enums.TaxClass.High, typeof(PAYNLSDK.Enums.TaxClass)));
 
             string ser = @"{'gender':'m'}";
-            X x = JsonConvert.DeserializeObject<X>(ser);
-            AddDebug(JsonConvert.SerializeObject(x));
+            X x = JsonSerialization.Deserialize<X>(ser);
+            AddDebug(JsonSerialization.Serialize(x));
             */
         }
 
@@ -379,7 +379,7 @@ private void testDateTimeConversionToolStripMenuItem_Click(object sender, EventA
                 AddDebug("Can not test this use case");
             //    try
             //    {
-            //        TestYMD testObj = JsonConvert.DeserializeObject<TestYMD>(dateString);
+            //        TestYMD testObj = JsonSerialization.Deserialize<TestYMD>(dateString);
             //        AddDebug(String.Format("Converted '{0}' to {1}.", dateString, testObj.DT.ToString()));
             //    }
             //    catch (Exception e0)
@@ -392,7 +392,7 @@ private void testDateTimeConversionToolStripMenuItem_Click(object sender, EventA
             //{
             //    try
             //    {
-            //        TestDMY testObj = JsonConvert.DeserializeObject<TestDMY>(dateString);
+            //        TestDMY testObj = JsonSerialization.Deserialize<TestDMY>(dateString);
             //        AddDebug(String.Format("Converted '{0}' to {1}.", dateString, testObj.DT.ToString()));
             //    }
             //    catch (Exception e1)
@@ -405,7 +405,7 @@ private void testDateTimeConversionToolStripMenuItem_Click(object sender, EventA
             //{
             //    try
             //    {
-            //        TestYMDHIS testObj = JsonConvert.DeserializeObject<TestYMDHIS>(dateString);
+            //        TestYMDHIS testObj = JsonSerialization.Deserialize<TestYMDHIS>(dateString);
             //        AddDebug(String.Format("Converted '{0}' to {1}.", dateString, testObj.DT.ToString()));
             //    }
             //    catch (Exception e2)
@@ -429,7 +429,7 @@ private void refundtransactionToolStripMenuItem_Click(object sender, EventArgs e
             //string qs = fixture.ToQueryString();
             //AddDebug(qs);
             //NameValueCollection nvc = HttpUtility.ParseQueryString(qs);
-            //string json = JsonConvert.SerializeObject(NvcToDictionary(nvc, true));
+            //string json = JsonSerialization.Serialize(NvcToDictionary(nvc, true));
             AddDebug("-----");
             //AddDebug("PARAMS AS JSON");
             //AddDebug(json);
@@ -450,7 +450,7 @@ private void refundTrasactionProductsToolStripMenuItem_Click(object sender, Even
             //string qs = fixture.ToQueryString();
             //AddDebug(qs);
             //NameValueCollection nvc = HttpUtility.ParseQueryString(qs);
-            //string json = JsonConvert.SerializeObject(NvcToDictionary(nvc, true));
+            //string json = JsonSerialization.Serialize(NvcToDictionary(nvc, true));
             //AddDebug("-----");
             ////AddDebug("PARAMS AS JSON");
             ////AddDebug(json);
@@ -481,7 +481,7 @@ private void refundInfoToolStripMenuItem_Click(object sender, EventArgs e)
         /*
         class X
         {
-            [JsonProperty("gender"), JsonConverter(typeof(PAYNLSDK.Converters.GenderConverter))]
+            [JsonPropertyName("gender"), JsonConverter(typeof(PAYNLSDK.Converters.GenderConverter))]
             public PAYNLSDK.Enums.Gender Gender { get; set; }
 
         }
@@ -493,7 +493,7 @@ class X
     //    /// <summary>
     //    /// Merchant ID
     //    /// </summary>
-    //    [JsonProperty("dt"), JsonConverter(typeof(PAYNLSDK.Converters.YMDConverter))]
+    //    [JsonPropertyName("dt"), JsonConverter(typeof(PAYNLSDK.Converters.YMDConverter))]
     //    public DateTime? DT { get; set; }
 
     //}
@@ -502,7 +502,7 @@ class X
     //    /// <summary>
     //    /// Merchant ID
     //    /// </summary>
-    //    [JsonProperty("dt"), JsonConverter(typeof(PAYNLSDK.Converters.DMYConverter))]
+    //    [JsonPropertyName("dt"), JsonConverter(typeof(PAYNLSDK.Converters.DMYConverter))]
     //    public DateTime? DT { get; set; }
     //}
 
@@ -511,7 +511,7 @@ class X
     //    /// <summary>
     //    /// Merchant ID
     //    /// </summary>
-    //    [JsonProperty("dt"), JsonConverter(typeof(PAYNLSDK.Converters.YMDHISConverter))]
+    //    [JsonPropertyName("dt"), JsonConverter(typeof(PAYNLSDK.Converters.YMDHISConverter))]
     //    public DateTime? DT { get; set; }
 
     //}

PAYNLFormsApp/PAYNLFormsApp.csproj

@@ -65,8 +65,8 @@
     <Reference Include="LightInject, Version=5.1.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\LightInject.5.1.1\lib\netstandard1.1\LightInject.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="System.Text.Json">
+      <HintPath>..\packages\System.Text.Json.7.0.3\lib\netstandard2.0\System.Text.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -226,11 +226,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.1\build\NETStandard.Library.targets'))" />
   </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>

PAYNLFormsApp/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="Microsoft.NETCore.Platforms" version="2.0.1" targetFramework="net45" />
   <package id="NETStandard.Library" version="2.0.1" targetFramework="net45" requireReinstallation="true" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
+  <package id="System.Text.Json" version="7.0.3" targetFramework="net462" />
   <package id="System.Collections" version="4.3.0" targetFramework="net45" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />

PAYNLSDK.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30204.135
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36301.6 d17.14
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PayNLSdk", "PAYNLSDK\PayNLSdk.csproj", "{C8AB15F6-3F29-490B-8424-F3A337177543}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PayNlSdk", "PAYNLSDK\PayNlSdk.csproj", "{C8AB15F6-3F29-490B-8424-F3A337177543}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PayNLSdk.Tests", "PayNLSdk.Tests\PayNLSdk.Tests.csproj", "{4C691697-D689-4A00-9E3B-45C05D9F7817}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PayNlSdk.Tests", "PayNLSdk.Tests\PayNlSdk.Tests.csproj", "{4C691697-D689-4A00-9E3B-45C05D9F7817}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DACFE405-2E22-4BEB-8B31-60A285F03EA0}"
 	ProjectSection(SolutionItems) = preProject

PAYNLSDK/API/Alliance/AddInvoice/AddInvoiceResult.cs

@@ -1,29 +1,28 @@
-using Newtonsoft.Json;
-using PAYNLSDK.API;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
-namespace PAYNLSDK.API.Alliance.AddInvoice
+namespace PayNLSdk.Api.Alliance.AddInvoice;
+
+/// <summary>
+/// The result of the Alliance/GetMerchant call
+/// Implements the <see cref="ResponseBase" />
+/// </summary>
+/// <seealso cref="ResponseBase" />
+public class AddInvoiceResult : ResponseBase
 {
     /// <summary>
-    /// The result of the Alliance/GetMerchant call
-    /// Implements the <see cref="PAYNLSDK.API.ResponseBase" />
+    /// Gets or sets the reference id for the payment.
     /// </summary>
-    /// <seealso cref="PAYNLSDK.API.ResponseBase" />
-    public class AddInvoiceResult : ResponseBase
-    {
-        /// <summary>
-        /// Gets or sets the reference id for the payment.
-        /// </summary>
-        /// <value>The reference identifier.</value>
-        [JsonProperty("referenceId")]
-        public string ReferenceId { get; set; }
+    /// <value>The reference identifier.</value>
+    [JsonPropertyName("referenceId")]
+    public string ReferenceId { get; set; }
 
-        /// <summary>
-        /// Returns a <see cref="System.String" /> that represents this instance.
-        /// </summary>
-        /// <returns>A <see cref="System.String" /> that represents this instance.</returns>
-        public override string ToString()
-        {
-            return $"AddInvoiceResult (referenceId={ReferenceId})";
-        }
+    /// <summary>
+    /// Returns a <see cref="System.String" /> that represents this instance.
+    /// </summary>
+    /// <returns>A <see cref="System.String" /> that represents this instance.</returns>
+    public override string ToString()
+    {
+        return $"AddInvoiceResult (referenceId={ReferenceId})";
     }
-}
+}