Use collection for properties and pass context to called object

Author: dalvarellos

dotnet/src/dotnetframework/GxClasses/Helpers/GxDynamicCall.cs

@@ -1,20 +1,21 @@
-using GeneXus.Application;
-using GeneXus.Metadata;
-using GeneXus.Utils;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using GeneXus.Application;
+using GeneXus.Metadata;
+using GeneXus.Utils;
 
 namespace GeneXus.DynamicCall
 {
-    public class GxDynamicCall
-    {
+	public class GxDynamicCall
+	{
 		private const string defaultMethod = "execute";
 		private Assembly _assembly;
-		private GxDynCallProperties _properties;
+		private readonly IGxContext _context;
+		private GXProperties _properties;
 		private object _object;
-		public string ObjectName { get; set; }
-		public GxDynCallProperties Properties     
+		public string ExternalName { get; set; }
+		public GXProperties Properties
 		{
 			get => _properties;
 			set
@@ -23,27 +24,28 @@ public GxDynCallProperties Properties
 			}
 		}
 
-		public GxDynamicCall()
+		public GxDynamicCall(IGxContext context)
 		{
-			_assembly= null;
-			_properties = new GxDynCallProperties();
+			_context = context;
+			_assembly = null;
+			_properties = new GXProperties();
 			_object = null;
 		}
 
-		private void VerifyDefaultProperties() {
-			_properties.NameSpace = string.IsNullOrEmpty(_properties.NameSpace) ? "GeneXus.Programs" : _properties.NameSpace;
-			
+		private void VerifyDefaultProperties()
+		{
+
 			if (_assembly is null)
 			{
-				if (string.IsNullOrEmpty(_properties.AssemblyName))
+				if (string.IsNullOrEmpty(_properties.Get("AssemblyName")))
 				{
 					_assembly = Assembly.GetCallingAssembly();
 				}
 				else
 				{
 					try
 					{
-						_assembly = Assembly.LoadFrom(_properties.AssemblyName);
+						_assembly = Assembly.LoadFrom(_properties.Get("AssemblyName"));
 					}
 					catch
 					{
@@ -63,24 +65,19 @@ public void Execute(ref IList<object> parameters, out IList<SdtMessages_Message>
 			}
 		}
 
-		public void Create( IList<object> constructParms, out IList<SdtMessages_Message> errors)
+		public void Create(IList<object> constructParms, out IList<SdtMessages_Message> errors)
 		{
 			errors = new GXBaseCollection<SdtMessages_Message>();
 			string objectNameToInvoke;
 			try
 			{
 				VerifyDefaultProperties();
-				if (constructParms is null)
-				{
-					objectNameToInvoke = ObjectName;
-				}
-				else
-				{
-					objectNameToInvoke = _properties.ExternalName;
-				}
+
+				objectNameToInvoke = ExternalName;
+
 				try
 				{
-					Type objType = ClassLoader.FindType(objectNameToInvoke, _properties.NameSpace, objectNameToInvoke.ToLower().Trim(), _assembly);
+					Type objType = ClassLoader.FindType(objectNameToInvoke, objectNameToInvoke.ToLower().Trim(), _assembly);
 					object[] constructorParameters;
 					if (constructParms != null && constructParms.Count > 0)
 					{
@@ -89,27 +86,27 @@ public void Create( IList<object> constructParms, out IList<SdtMessages_Message>
 					}
 					else
 					{
-						constructorParameters = new object[] { new GxContext() };
+						constructorParameters = new object[] { _context };
 					}
 					_object = Activator.CreateInstance(objType, constructorParameters);
 				}
 				catch (Exception e)
 				{
-					GXUtil.ErrorToMessages("CreateInstance Error", e.Message, (GXBaseCollection<SdtMessages_Message>) errors);
+					GXUtil.ErrorToMessages("CreateInstance Error", e.Message, (GXBaseCollection<SdtMessages_Message>)errors);
 				}
 			}
 			catch (Exception e)
 			{
 				GXUtil.ErrorToMessages("VerifyProperties Error", e.Message, (GXBaseCollection<SdtMessages_Message>)errors);
 			}
 		}
-		public object Execute(ref IList<object> parameters, GxDynCallMethodConf methodconfiguration , out IList<SdtMessages_Message> errors)
+		public object Execute(ref IList<object> parameters, GxDynCallMethodConf methodconfiguration, out IList<SdtMessages_Message> errors)
 		{
 			object result;
 			errors = new GXBaseCollection<SdtMessages_Message>();
-			IList<object> outParms= new List<object>();
+			IList<object> outParms = new List<object>();
 
-			string methodName = methodconfiguration.MethodName; 
+			string methodName = methodconfiguration.MethodName;
 			bool isStatic = methodconfiguration.IsStatic;
 
 			if (!isStatic)
@@ -118,7 +115,7 @@ public object Execute(ref IList<object> parameters, GxDynCallMethodConf methodco
 				{
 					try
 					{
-						outParms = ReflectionHelper.CallMethod(_object, (string.IsNullOrEmpty(methodName) ? defaultMethod : methodName), parameters);
+						outParms = ReflectionHelper.CallMethod(_object, string.IsNullOrEmpty(methodName) ? defaultMethod : methodName, parameters);
 					}
 					catch (Exception e)
 					{
@@ -133,7 +130,7 @@ public object Execute(ref IList<object> parameters, GxDynCallMethodConf methodco
 			else
 			{
 				VerifyDefaultProperties();
-				Type objType = ClassLoader.FindType(_properties.ExternalName, _properties.NameSpace, _properties.ExternalName.ToLower().Trim(), _assembly);
+				Type objType = ClassLoader.FindType(ExternalName, ExternalName.ToLower().Trim(), _assembly);
 				outParms = ReflectionHelper.CallMethod(objType, (string.IsNullOrEmpty(methodName) ? defaultMethod : methodName), parameters, isStatic);
 			}
 			if (outParms.Count > parameters.Count)
@@ -169,25 +166,4 @@ public GxDynCallMethodConf()
 		}
 
 	}
-
-	public class GxDynCallProperties
-	{
-		public string ExternalName
-		{
-			get;
-			set;
-		}
-		public string AssemblyName
-		{
-			get;
-			set;
-		}
-		public string NameSpace
-		{
-			get;
-			set;
-		}
-
-	}
-}
-
+}