- Fix serialization of BusinessComponents for API object to be consistent with SDTs.

 The old format ( key + description ) is only for Dataproviders and Procedures.

Author: AlejandroP

dotnet/src/dotnetcore/GxClasses.Web/Middleware/GXBCRestService.cs

@@ -43,10 +43,10 @@ public override Task Post()
 				bool gxinsertorupdate = IsRestParameter(INSERT_OR_UPDATE_PARAMETER);
 
 				GxSilentTrnSdt entity = (GxSilentTrnSdt)Activator.CreateInstance(_worker.GetType(), new Object[] { _gxContext });
-				var entity_interface = MakeRestType(entity);
+				var entity_interface = MakeRestType(entity, false);
 				entity_interface = ReadRequestBodySDTObj(entity_interface.GetType());
 
-				var worker_interface = MakeRestType(_worker);
+				var worker_interface = MakeRestType(_worker, false);
 
 				worker_interface.GetType().GetMethod("CopyFrom").Invoke(worker_interface, new object[] { entity_interface });
 				if (gxcheck)
@@ -72,7 +72,7 @@ public override Task Post()
 						SetStatusCode(HttpStatusCode.Created);
 					}
 					SetMessages(_worker.trn.GetMessages());
-					return Serialize(MakeRestType(_worker));
+					return Serialize(MakeRestType(_worker, false));
 				}
 				else
 				{
@@ -119,7 +119,7 @@ public override Task Get(object parameters)
 					if (_worker.Success())
 					{
 						SetMessages(_worker.trn.GetMessages());
-						return Serialize(MakeRestType(_worker));
+						return Serialize(MakeRestType(_worker, false));
 					}
 					else
 					{
@@ -157,7 +157,7 @@ public override Task Delete(object parameters)
 					{
 						_worker.trn.context.CommitDataStores();
 						SetMessages(_worker.trn.GetMessages());
-						return Serialize(MakeRestType(_worker));
+						return Serialize(MakeRestType(_worker, false));
 					}
 					else
 					{
@@ -191,12 +191,12 @@ public override Task Put(object parameters)
 				{
 					bool gxcheck = IsRestParameter(CHECK_PARAMETER);
 					GxSilentTrnSdt entity = (GxSilentTrnSdt)Activator.CreateInstance(_worker.GetType(), new Object[] { _gxContext });
-					var entity_interface = MakeRestType(entity);
+					var entity_interface = MakeRestType(entity, false);
 					entity_interface = ReadRequestBodySDTObj(entity_interface.GetType());
 					string entityHash = entity_interface.GetType().GetProperty("Hash").GetValue(entity_interface) as string;
 
 					ReflectionHelper.CallBCMethod(_worker, LOAD_METHOD, key);
-					var worker_interface = MakeRestType(_worker);
+					var worker_interface = MakeRestType(_worker, false);
 					string currentHash = worker_interface.GetType().GetProperty("Hash").GetValue(worker_interface) as string;
 					if (entityHash == currentHash)
 					{

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

@@ -396,7 +396,7 @@ private string GetStringFromStream(Stream stream)
 		public override string ToString()
 		{
 			if (_httpReq == null)
-				return String.Empty;
+				return string.Empty;
 #if NETCORE
 			return _httpReq.GetRawBodyString();
 #else

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

@@ -1241,6 +1241,7 @@ private void WebExecute(string method, string name)
 				_statusCode = (short)resp.StatusCode;
 				_statusDescription = resp.StatusDescription;
 				resp.Close();
+
 				GXLogging.DebugSanitized(log, "_responseString " + ToString());
 			}
 			ClearSendStream();

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

@@ -258,9 +258,9 @@ public string GetJsonStr(string varName)
 			else if (_responseData.Count >= 1 && !_responseData.ContainsKey(varName.ToLower()))
 			{
 #if NETCORE
-				sdt.FromJSonString(JsonSerializer.Serialize(_responseData), null);
+				sdt.FromJSonString("{" + varName + ":" + JsonSerializer.Serialize(_responseData) + "}", null);
 #else
-				sdt.FromJSonString(JSONHelper.Serialize(_responseData), null);
+				sdt.FromJSonString("{" + varName + ":" + JSONHelper.Serialize(_responseData) + "}", null);
 #endif
 			}
 			return sdt;

dotnet/src/dotnetframework/GxClasses/Services/GxRestWrapper.cs

@@ -141,7 +141,7 @@ public virtual Task MethodBodyExecute(object key)
 				Dictionary<string, string> formatParameters = ReflectionHelper.ParametersFormat(_procWorker, innerMethod);				
 				setWorkerStatus(_procWorker);
 				_procWorker.cleanup();
-				RestProcess(outputParameters);
+				RestProcess(_procWorker, outputParameters);
 				wrapped = GetWrappedStatus(_procWorker, wrapped, outputParameters, outputParameters.Count);
 				ServiceHeaders();
 				return Serialize(outputParameters, formatParameters, wrapped);
@@ -329,7 +329,7 @@ public virtual Task  MethodUrlExecute(object key)
 				int parCount = outputParameters.Count;
 				setWorkerStatus(_procWorker);
 				_procWorker.cleanup();
-				RestProcess(outputParameters);			  
+				RestProcess(_procWorker, outputParameters);			  
 				bool wrapped = false;
 				wrapped = GetWrappedStatus(_procWorker, wrapped, outputParameters, parCount);
 				ServiceHeaders();
@@ -799,7 +799,7 @@ protected void Deserialize(string value, ref GxSilentTrnSdt sdt)
 			sdt.FromJSonString(value);
 		}
 
-		private static void RestProcess(Dictionary<string, object> outputParameters)
+		private static void RestProcess(GXBaseObject worker, Dictionary<string, object> outputParameters)
 		{
 			foreach (string k in outputParameters.Keys.ToList())
 			{
@@ -810,7 +810,7 @@ private static void RestProcess(Dictionary<string, object> outputParameters)
 				}
 				else
 				{
-					object o = MakeRestType(outputParameters[k]);
+					object o = MakeRestType(outputParameters[k], worker.IsApiObject);
 					if (p !=null && p.SdtSerializeAsNull())
 					{						
 						outputParameters[k] = JNull.Value;
@@ -826,15 +826,15 @@ private static void RestProcess(Dictionary<string, object> outputParameters)
 			}			
 		}
 
-		protected static object MakeRestType(object v)
+		protected static object MakeRestType( object v, bool isApiObject)
 		{
 			Type vType = v.GetType();
 			Type itemType;
 			if (vType.IsConstructedGenericType && typeof(IGxCollection).IsAssignableFrom(vType)) 
 			{
 				Type restItemType=null;
 				itemType = v.GetType().GetGenericArguments()[0];
-				if (typeof(IGXBCCollection).IsAssignableFrom(vType))//Collection<BCType> convert to GxGenericCollection<BCType_RESTLInterface>
+				if ((typeof(IGXBCCollection).IsAssignableFrom(vType)) && !isApiObject)//Collection<BCType> convert to GxGenericCollection<BCType_RESTLInterface>
 				{
 					restItemType = ClassLoader.FindType(Config.CommonAssemblyName, itemType.FullName + "_RESTLInterface", null);
 				}