WebApiContractResolver adapter

muratcakir · muratcakir · commit 9949e135c1be · 2019-10-08T20:39:17.000+02:00
diff --git a/src/Libraries/SmartStore.Core/ComponentModel/SmartContractResolver.cs b/src/Libraries/SmartStore.Core/ComponentModel/SmartContractResolver.cs
@@ -16,5 +16,7 @@ protected override IValueProvider CreateMemberValueProvider(MemberInfo member)
 
             return base.CreateMemberValueProvider(member);
         }
+
+        public static SmartContractResolver Instance { get; } = new SmartContractResolver();
     }
 }
diff --git a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs
@@ -438,7 +438,7 @@ public static long GetObjectSizeInBytes(object obj, HashSet<object> instanceLook
 					// Serialization failed or is not supported: make JSON.
 					var json = JsonConvert.SerializeObject(obj, new JsonSerializerSettings
 					{
-                        ContractResolver = new SmartContractResolver(),
+                        ContractResolver = SmartContractResolver.Instance,
                         DateFormatHandling = DateFormatHandling.IsoDateFormat,
 						DateTimeZoneHandling = DateTimeZoneHandling.Utc,
 						MaxDepth = 10,
diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs
@@ -68,7 +68,7 @@ public virtual void Save(T block, IBlockEntity entity)
 
 			var settings = new JsonSerializerSettings
 			{
-                ContractResolver = new SmartContractResolver(),
+                ContractResolver = SmartContractResolver.Instance,
                 TypeNameHandling = TypeNameHandling.Objects,
 				ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
 				ObjectCreationHandling = ObjectCreationHandling.Replace,
diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs
@@ -161,7 +161,7 @@ private string CreateCultureJson(CultureInfo ci)
 
 			var json = JsonConvert.SerializeObject(dict, new JsonSerializerSettings
 			{
-                ContractResolver = new SmartContractResolver(),
+                ContractResolver = SmartContractResolver.Instance,
                 Formatting = Formatting.None
 			});
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs
@@ -30,7 +30,7 @@ public static JsonSerializerSettings CreateDefaultSerializerSettings()
         {
             var settings = new JsonSerializerSettings
             {
-                ContractResolver = new SmartContractResolver(),
+                ContractResolver = SmartContractResolver.Instance,
                 MissingMemberHandling = MissingMemberHandling.Ignore,
                 TypeNameHandling = TypeNameHandling.Objects,
                 ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj
@@ -465,6 +465,7 @@
     <Compile Include="WebApi\Security\WebApiAuthenticateAttribute.cs" />
     <Compile Include="WebApi\Caching\WebApiCachingControllingData.cs" />
     <Compile Include="WebApi\Caching\WebApiCachingUserData.cs" />
+    <Compile Include="WebApi\WebApiContractResolver.cs" />
     <Compile Include="WebApi\WebApiCore.cs" />
     <Compile Include="WebApi\WebApiEntityController.cs" />
     <Compile Include="WebApi\WebApiExtension.cs" />
diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Filters/AdditionalFilters.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/Filters/AdditionalFilters.cs
@@ -35,7 +35,7 @@ public static string Json(object input)
 
 			return JsonConvert.SerializeObject(input, new JsonSerializerSettings
 			{
-                ContractResolver = new SmartContractResolver(),
+                ContractResolver = SmartContractResolver.Instance,
                 ReferenceLoopHandling = ReferenceLoopHandling.Ignore
 			});
 		}
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Icons/IconExplorer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Icons/IconExplorer.cs
@@ -114,7 +114,7 @@ private Dictionary<string, IconDescription> LoadIconsMetadata()
 				// minified file did not exist: save it.
 				var settings = new JsonSerializerSettings
                 {
-                    ContractResolver = new SmartContractResolver(),
+                    ContractResolver = SmartContractResolver.Instance,
                     DefaultValueHandling = DefaultValueHandling.Ignore,
                     Formatting = Formatting.None
                 };
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiContractResolver.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiContractResolver.cs
@@ -0,0 +1,26 @@
+﻿using System;
+using System.Net.Http.Formatting;
+using System.Reflection;
+using Newtonsoft.Json.Serialization;
+using SmartStore.ComponentModel;
+
+namespace SmartStore.Web.Framework.WebApi
+{
+    internal partial class WebApiContractResolver : JsonContractResolver
+    {
+        public WebApiContractResolver(MediaTypeFormatter formatter)
+            : base(formatter)
+        {
+        }
+
+        protected override IValueProvider CreateMemberValueProvider(MemberInfo member)
+        {
+            if (member is PropertyInfo pi)
+            {
+                return new FastPropertyValueProvider(pi);
+            }
+
+            return base.CreateMemberValueProvider(member);
+        }
+    }
+}
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs
@@ -6,6 +6,8 @@
 using System.Web.Http.OData.Extensions;
 using System.Web.Http.OData.Routing;
 using System.Web.Http.OData.Routing.Conventions;
+using Newtonsoft.Json;
+using SmartStore.ComponentModel;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Web.Framework.WebApi.Configuration;
 using SmartStore.Web.Framework.WebApi.OData;
@@ -27,15 +29,16 @@ public void Execute()
 
 			config.DependencyResolver = new AutofacWebApiDependencyResolver();
 
-			config.Formatters.JsonFormatter.SerializerSettings.Formatting = Newtonsoft.Json.Formatting.Indented;
-			config.Formatters.JsonFormatter.MediaTypeMappings.Add(new QueryStringMapping("format", "json", "application/json"));
+			config.Formatters.JsonFormatter.SerializerSettings.Formatting = Formatting.Indented;
+            config.Formatters.JsonFormatter.SerializerSettings.ContractResolver = new WebApiContractResolver(config.Formatters.JsonFormatter);
+            config.Formatters.JsonFormatter.MediaTypeMappings.Add(new QueryStringMapping("format", "json", "application/json"));
 			config.Formatters.XmlFormatter.MediaTypeMappings.Add(new QueryStringMapping("format", "xml", "application/xml"));
 
 			config.AddODataQueryFilter(new WebApiQueryableAttribute());
 
 			var corsAttribute = new EnableCorsAttribute("*", "*", "*", WebApiGlobal.Header.CorsExposed);
 			config.EnableCors(corsAttribute);
-
+            
 			config.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always;
 
 			var configPublisher = (IWebApiConfigurationPublisher)config.DependencyResolver.GetService(typeof(IWebApiConfigurationPublisher));
diff --git a/src/Presentation/SmartStore.Web/Global.asax.cs b/src/Presentation/SmartStore.Web/Global.asax.cs
@@ -147,7 +147,7 @@ protected void Application_Start()
             // This settings will automatically be used by JsonConvert.SerializeObject/DeserializeObject
             JsonConvert.DefaultSettings = () => new JsonSerializerSettings
             {
-                ContractResolver = new SmartContractResolver()
+                ContractResolver = SmartContractResolver.Instance
             };
 
             if (installed)

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,7 @@ protected override IValueProvider CreateMemberValueProvider(MemberInfo member)`
`16`	`16`
`17`	`17`	`return base.CreateMemberValueProvider(member);`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+ public static SmartContractResolver Instance { get; } = new SmartContractResolver();`
`19`	`21`	`}`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ public static long GetObjectSizeInBytes(object obj, HashSet<object> instanceLook`
`438`	`438`	`// Serialization failed or is not supported: make JSON.`
`439`	`439`	`var json = JsonConvert.SerializeObject(obj, new JsonSerializerSettings`
`440`	`440`	`{`
`441`		`- ContractResolver = new SmartContractResolver(),`
	`441`	`+ ContractResolver = SmartContractResolver.Instance,`
`442`	`442`	`DateFormatHandling = DateFormatHandling.IsoDateFormat,`
`443`	`443`	`DateTimeZoneHandling = DateTimeZoneHandling.Utc,`
`444`	`444`	`MaxDepth = 10,`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public virtual void Save(T block, IBlockEntity entity)`
`68`	`68`
`69`	`69`	`var settings = new JsonSerializerSettings`
`70`	`70`	`{`
`71`		`- ContractResolver = new SmartContractResolver(),`
	`71`	`+ ContractResolver = SmartContractResolver.Instance,`
`72`	`72`	`TypeNameHandling = TypeNameHandling.Objects,`
`73`	`73`	`ReferenceLoopHandling = ReferenceLoopHandling.Ignore,`
`74`	`74`	`ObjectCreationHandling = ObjectCreationHandling.Replace,`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private string CreateCultureJson(CultureInfo ci)`
`161`	`161`
`162`	`162`	`var json = JsonConvert.SerializeObject(dict, new JsonSerializerSettings`
`163`	`163`	`{`
`164`		`- ContractResolver = new SmartContractResolver(),`
	`164`	`+ ContractResolver = SmartContractResolver.Instance,`
`165`	`165`	`Formatting = Formatting.None`
`166`	`166`	`});`
`167`	`167`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static JsonSerializerSettings CreateDefaultSerializerSettings()`
`30`	`30`	`{`
`31`	`31`	`var settings = new JsonSerializerSettings`
`32`	`32`	`{`
`33`		`- ContractResolver = new SmartContractResolver(),`
	`33`	`+ ContractResolver = SmartContractResolver.Instance,`
`34`	`34`	`MissingMemberHandling = MissingMemberHandling.Ignore,`
`35`	`35`	`TypeNameHandling = TypeNameHandling.Objects,`
`36`	`36`	`ReferenceLoopHandling = ReferenceLoopHandling.Ignore,`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static string Json(object input)`
`35`	`35`
`36`	`36`	`return JsonConvert.SerializeObject(input, new JsonSerializerSettings`
`37`	`37`	`{`
`38`		`- ContractResolver = new SmartContractResolver(),`
	`38`	`+ ContractResolver = SmartContractResolver.Instance,`
`39`	`39`	`ReferenceLoopHandling = ReferenceLoopHandling.Ignore`
`40`	`40`	`});`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ private Dictionary<string, IconDescription> LoadIconsMetadata()`
`114`	`114`	`// minified file did not exist: save it.`
`115`	`115`	`var settings = new JsonSerializerSettings`
`116`	`116`	`{`
`117`		`- ContractResolver = new SmartContractResolver(),`
	`117`	`+ ContractResolver = SmartContractResolver.Instance,`
`118`	`118`	`DefaultValueHandling = DefaultValueHandling.Ignore,`
`119`	`119`	`Formatting = Formatting.None`
`120`	`120`	`};`