Improve ajax deserialization performance at BeforeInvoke.

Author: claudiamurialdo

dotnet/src/dotnetframework/GxClasses/Core/Web/HttpAjaxContext.cs

@@ -346,7 +346,7 @@ public void ajax_rsp_assign_sdt_attri(String CmpContext, bool IsMasterPage, Stri
 					try
 					{
 						JObject obj = GetGxObject(AttValues, CmpContext, IsMasterPage);
-						if (obj != null && (DynAjaxEventContext.isParmModified(AttName, SdtObj) || !isUndefinedOutParam( AttName, SdtObj)))
+						if (obj != null && (!isUndefinedOutParam(AttName, SdtObj) || DynAjaxEventContext.isParmModified(AttName, SdtObj)))
 						{
 							IGxJSONAble SdtObjJson = SdtObj as IGxJSONAble;
 							if (SdtObjJson != null)

dotnet/src/dotnetframework/GxClasses/Domain/GxCollections.cs

@@ -1045,7 +1045,7 @@ public class GxUserType : IGxXMLSerializable, ICloneable, IGxJSONAble, IGxJSONSe
 	{
 		static readonly IGXLogger log = GXLoggerFactory.GetLogger<GxUserType>();
 		protected GXProperties dirties = new GXProperties();
-
+		private const string PROPERTY_PREFIX = "gxtpr_";
 		static object setupChannelObject = null;
 		static bool setupChannelInitialized;
 		[XmlIgnore]
@@ -1602,27 +1602,29 @@ public Object GetJSONObject()
 			ToJSON();
 			return JsonObj;
 		}
-
 		private ICollection getFromJSONObjectOrderIterator(ICollection it)
 		{
-			List<string> v = new List<string>();
+			if (GxUploadAttrs.IsEmpty && !typeof(GxSilentTrnSdt).IsAssignableFrom(this.GetType()))
+			{
+				return it;
+			}
+			List<string> _JsonObjectOrderIterator = new List<string>();
+
 			List<string> vAtEnd = new List<string>();
 			foreach (string name in it)
 			{
-				string map = JsonMap(name);
-				PropertyInfo objProperty = GetTypeProperty("gxtpr_" + (!string.IsNullOrEmpty(map) ? map : name).ToLower());
-				if (name.EndsWith("_N") || objProperty != null && IsGxUploadAttribute(objProperty))
+				if (name.EndsWith("_N") || IsGxUploadAttribute(name))
 				{
 					vAtEnd.Add(name);
 				}
 				else
 				{
-					v.Add(name);//keep the order of attributes that do not end with _N.
+					_JsonObjectOrderIterator.Add(name);//keep the order of attributes that do not end with _N.
 				}
 			}
 			if (vAtEnd.Count > 0)
-				v.AddRange(vAtEnd);
-			return v;
+				_JsonObjectOrderIterator.AddRange(vAtEnd);
+			return _JsonObjectOrderIterator;
 		}
 
 		public void FromJSONObject(dynamic obj)
@@ -1635,9 +1637,7 @@ public void FromJSONObject(dynamic obj)
 			foreach (string name in jsonIterator)
 			{
 				object currObj = jobj[name];
-				string map = JsonMap(name);
-				PropertyInfo objProperty = GetTypeProperty("gxtpr_" + (map != null ? map : name).ToLower());
-
+				PropertyInfo objProperty = GetTypeProperty(JsonNameToInternalName(name));
 				if (objProperty != null)
 				{
 					if (!JSONHelper.IsJsonNull(currObj))
@@ -1897,32 +1897,64 @@ private bool TryConvertValueToProperty(object Value, PropertyInfo property, out
 			return success;
 		}
 
-		[System.Diagnostics.CodeAnalysis.SuppressMessage("GxFxCopRules", "CR1000:EnforceThreadSafeType")]
-		private Dictionary<string, bool> gxuploadAttrs = new Dictionary<string, bool>();
-		private bool IsGxUploadAttribute(PropertyInfo property)
+		private static ConcurrentDictionary<string, byte> _gxuploadAttrs;
+		private bool IsGxUploadAttribute(string jsonPropertyName)
+		{
+			return GxUploadAttrs.ContainsKey(JsonNameToInternalName(jsonPropertyName));
+		}
+		private bool IsGxUploadAttribute(PropertyInfo propertyInfo)
+		{
+			return GxUploadAttrs.ContainsKey(propertyInfo.Name);
+		}
+		private string JsonNameToInternalName(string jsonPropertyName)
 		{
-			string key = property.Name;
-			if (!gxuploadAttrs.ContainsKey(key))
+			string map = JsonMap(jsonPropertyName);
+			if (!string.IsNullOrEmpty(map))
+				return PROPERTY_PREFIX + map.ToLower();
+			else
+				return PROPERTY_PREFIX + jsonPropertyName.ToLower();
+		}
+		private ConcurrentDictionary<string, byte> GxUploadAttrs
+		{
+			get
 			{
-				bool hasAtt = property.IsDefined(typeof(GxUpload), false);
-				gxuploadAttrs.Add(key, hasAtt);
+				if (_gxuploadAttrs == null)
+				{
+					_gxuploadAttrs = new ConcurrentDictionary<string, byte>();
+					foreach (PropertyInfo property in TypeProperties.Values)
+					{
+						bool hasAtt = property.IsDefined(typeof(GxUpload), false);
+						if (hasAtt)
+						{
+							_gxuploadAttrs.TryAdd(property.Name.ToLower(), 1);
+						}
+					}
+				}
+				return _gxuploadAttrs;
 			}
-			return gxuploadAttrs[key];
 		}
-
-		private Hashtable props;
+		private static ConcurrentDictionary<string, PropertyInfo> _typeProps;
 
 		private PropertyInfo GetTypeProperty(string propName)
 		{
-			if (props == null)
-			{
-				props = new Hashtable();
-				foreach (PropertyInfo prop in this.GetType().GetProperties())
+			return TypeProperties[propName];
+		}
+		private ConcurrentDictionary<string, PropertyInfo> TypeProperties
+		{
+			get {
+				if (_typeProps == null)
 				{
-					props.Add(prop.Name.ToLower(), prop);
+					_typeProps = new ConcurrentDictionary<string, PropertyInfo>();
+					foreach (PropertyInfo prop in this.GetType().GetProperties())
+					{
+						if (prop.Name.StartsWith(PROPERTY_PREFIX, StringComparison.OrdinalIgnoreCase))
+						{
+							_typeProps.TryAdd(prop.Name.ToLower(), prop);
+						}
+					}
 				}
+				return _typeProps;
 			}
-			return (PropertyInfo)props[propName];
 		}
 
 		private Hashtable methods;