ContractResolverForDataProperty property for custom contract resolver…

… on data property release 3.1.0
jsreport · Aug 13, 2020 · 31e1a14 · 31e1a14
1 parent 267d679
commit 31e1a14
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 15 deletions.
diff --git a/jsreport.Client.Test/ReportingServiceTest.cs b/jsreport.Client.Test/ReportingServiceTest.cs
@@ -9,14 +9,15 @@
 using Shouldly;
 using jsreport.Binary;
 using jsreport.Types;
+using Newtonsoft.Json.Serialization;
 
 namespace jsreport.Client.Test
 {
     [TestFixture]
     [SingleThreaded]
     public class ReportingServiceTest
     {
-        private IReportingService _reportingService;
+        private ReportingService _reportingService;
         private ILocalWebServerReportingService _localReportingService;        
 
         [SetUp]
@@ -52,6 +53,31 @@ public async Task ChromePdfTest()
             }
         }
 
+        [Test]
+        public async Task SerializationDataContractResolverTest()
+        {
+            _reportingService.ContractResolverForDataProperty = new CamelCasePropertyNamesContractResolver();
+            var result = await _reportingService.RenderAsync(new
+            {
+                template = new
+                {
+                    content = "{{helloWorld}}",
+                    engine = "handlebars",
+                    recipe = "html"
+                },
+                data = new
+                {
+                    HelloWorld = "foo"
+                }
+            });
+
+            using (var reader = new StreamReader(result.Content))
+            {
+                reader.ReadToEnd().ShouldStartWith("foo");
+            }
+        }
+
+
         [Test]
         public async Task HtmlTest()
         {

diff --git a/jsreport.Client.Test/jsreport.Client.Test.csproj b/jsreport.Client.Test/jsreport.Client.Test.csproj
@@ -24,8 +24,8 @@
     <Otherwise>
       <ItemGroup>
         <ProjectReference Include="..\jsreport.Client\jsreport.Client.csproj" />
-        <PackageReference Include="jsreport.Local" Version="2.0.0" />
-        <PackageReference Include="jsreport.Binary" Version="2.4.0" />        
+        <PackageReference Include="jsreport.Local" Version="2.2.3" />
+        <PackageReference Include="jsreport.Binary" Version="2.9.0" />        
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/jsreport.Client/ReportingService.cs b/jsreport.Client/ReportingService.cs
@@ -12,6 +12,7 @@
 using Newtonsoft.Json;
 using jsreport.Types;
 using jsreport.Shared;
+using Newtonsoft.Json.Serialization;
 
 namespace jsreport.Client
 {
@@ -44,6 +45,11 @@ public class ReportingService : IReportingService
         /// Timeout for http client requests
         /// </summary>
         public TimeSpan? HttpClientTimeout { get; set; }
+
+        /// <summary>
+        /// json.net contract resolver used for serializing rendering request data property
+        /// </summary>
+        public IContractResolver ContractResolverForDataProperty { get; set; }
 
         public ReportingService(string serviceUri, string username, string password) : this(serviceUri)
         {
@@ -81,7 +87,7 @@ protected virtual HttpClient CreateClient()
         /// <returns>Report result promise</returns>
         public Task<Report> RenderAsync(RenderRequest request, CancellationToken ct = default(CancellationToken))
         {
-            return RenderAsync(SerializerHelper.SerializeRenderRequest(request), ct);
+            return RenderAsync(SerializerHelper.SerializeRenderRequest(request, ContractResolverForDataProperty), ct);
         }
 
         // <summary>
@@ -93,7 +99,7 @@ protected virtual HttpClient CreateClient()
         /// <returns>Report result promise</returns>
         public Task<Report> RenderAsync(string templateShortid, object data, CancellationToken ct = default(CancellationToken))
         {
-            return RenderAsync(SerializerHelper.SerializeRenderRequest(templateShortid, data), ct);
+            return RenderAsync(SerializerHelper.SerializeRenderRequest(templateShortid, data, ContractResolverForDataProperty), ct);
         }
 
         /// <summary>
@@ -105,7 +111,7 @@ protected virtual HttpClient CreateClient()
         /// <returns>Report result promise</returns>
         public Task<Report> RenderAsync(string templateShortid, string jsonData, CancellationToken ct = default(CancellationToken))
         {
-            return RenderAsync(SerializerHelper.SerializeRenderRequest(templateShortid, jsonData), ct);
+            return RenderAsync(SerializerHelper.SerializeRenderRequest(templateShortid, jsonData, ContractResolverForDataProperty), ct);
         }
 
         /// <summary>
@@ -116,7 +122,7 @@ protected virtual HttpClient CreateClient()
         /// <returns>Report result promise</returns>
         public Task<Report> RenderAsync(object request, CancellationToken ct = default(CancellationToken))
         {
-            return RenderAsync(SerializerHelper.SerializeRenderRequest(request), ct);
+            return RenderAsync(SerializerHelper.SerializeRenderRequest(request, ContractResolverForDataProperty), ct);
         }
 
         /// <summary>
@@ -128,7 +134,7 @@ protected virtual HttpClient CreateClient()
         /// <returns>Report result promise</returns>
         public Task<Report> RenderByNameAsync(string templateName, string jsonData, CancellationToken ct = default(CancellationToken))
         {
-            return RenderAsync(SerializerHelper.SerializeRenderRequestForName(templateName, jsonData), ct);
+            return RenderAsync(SerializerHelper.SerializeRenderRequestForName(templateName, jsonData, ContractResolverForDataProperty), ct);
         }
 
         /// <summary>
@@ -140,7 +146,7 @@ protected virtual HttpClient CreateClient()
         /// <returns>Report result promise</returns>
         public Task<Report> RenderByNameAsync(string templateName, object data, CancellationToken ct = default(CancellationToken))
         {
-            return RenderAsync(SerializerHelper.SerializeRenderRequestForName(templateName, data), ct);
+            return RenderAsync(SerializerHelper.SerializeRenderRequestForName(templateName, data, ContractResolverForDataProperty), ct);
         }
 
         private async Task<Report> RenderAsync(string request, CancellationToken ct = default(CancellationToken))

diff --git a/jsreport.Client/jsreport.Client.csproj b/jsreport.Client/jsreport.Client.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <PackageId>jsreport.Client</PackageId>
     <Title>jsreport Client</Title>
     <Authors>Jan Blaha</Authors>
@@ -12,12 +12,12 @@
     <PackageTags>jsreport;report;pdf</PackageTags>
     <RepositoryUrl>https://github.com/jsreport/net</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>3.0.1</Version>
-    <AssemblyVersion>3.0.1</AssemblyVersion>
+    <Version>3.1.0</Version>
+    <AssemblyVersion>3.1.0</AssemblyVersion>
     <Company>jsreport</Company>
     <PackageReleaseNotes>Release notes are at https://github.com/jsreport/jsreport-dotnet-client/releases</PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <FileVersion>3.0.1.0</FileVersion>
+    <FileVersion>3.1.0.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
@@ -34,8 +34,8 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="jsreport.Types" Version="2.2.7" />        
-        <PackageReference Include="jsreport.Shared" Version="2.0.1" />
+        <PackageReference Include="jsreport.Types" Version="2.7.0" />        
+        <PackageReference Include="jsreport.Shared" Version="2.3.0" />
       </ItemGroup>
     </Otherwise>
   </Choose>