Add a configuration key to disable the flattening of API object output (#891)

* Add a configuration key to disable the flattening of API object output when it's a single SDT.

* wrapped must be initialized in true at MethodUrlExecute.

* For non api objects, wrapped is false by default.

* Fix wron condition on FlattenSingleApiOutput.

* Rename FlattenSingleApiOutput to WrapSingleApiOutput

Author: claudiamurialdo

dotnet/src/dotnetframework/GxClasses/Core/gxconfig.cs

@@ -1377,7 +1377,17 @@ public static int SessionTimeout {
 				return sessionTimeout;
 			}
 		}
-
+		const bool DefaultWrapSingleApiOutput = false;
+		internal static bool WrapSingleApiOutput
+		{
+			get
+			{
+				if (Config.GetValueOf("WRAP_SINGLE_API_OUTPUT", out string flatten))
+					return (int.TryParse(flatten, out int value) && value == 1);
+				else
+					return DefaultWrapSingleApiOutput;
+			}
+		}
 		internal static string CorsAllowedOrigins()
 		{
 			if (Config.GetValueOf("CORS_ALLOW_ORIGIN", out string corsOrigin))

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

@@ -142,8 +142,9 @@ public virtual Task MethodBodyExecute(object key)
 				Dictionary<string, string> formatParameters = ReflectionHelper.ParametersFormat(_procWorker, innerMethod);				
 				setWorkerStatus(_procWorker);
 				_procWorker.cleanup();
+				int originalParameterCount = outputParameters.Count;
 				RestProcess(_procWorker, outputParameters);
-				wrapped = GetWrappedStatus(_procWorker, wrapped, outputParameters, outputParameters.Count);
+				wrapped = GetWrappedStatus(_procWorker, wrapped, outputParameters, outputParameters.Count, originalParameterCount);
 				return Serialize(outputParameters, formatParameters, wrapped);
 			}
 			catch (Exception e)
@@ -330,9 +331,10 @@ public virtual Task  MethodUrlExecute(object key)
 				int parCount = outputParameters.Count;
 				setWorkerStatus(_procWorker);
 				_procWorker.cleanup();
+				int originalParameterCount = outputParameters.Count;
 				RestProcess(_procWorker, outputParameters);			  
 				bool wrapped = false;
-				wrapped = GetWrappedStatus(_procWorker, wrapped, outputParameters, parCount);
+				wrapped = GetWrappedStatus(_procWorker, wrapped, outputParameters, parCount, originalParameterCount);
 				return Serialize(outputParameters, formatParameters, wrapped);
 			}
 			catch (Exception e)
@@ -344,29 +346,37 @@ public virtual Task  MethodUrlExecute(object key)
 				Cleanup();
 			}
 		}
-		bool GetWrappedStatus(GXBaseObject worker, bool wrapped, Dictionary<string, object> outputParameters, int parCount)
+		bool GetWrappedStatus(GXBaseObject worker, bool defaultWrapped, Dictionary<string, object> outputParameters, int parCount, int originalParCount)
 		{
+			bool wrapped = defaultWrapped;
 			if (worker.IsApiObject)
 			{
 				if (outputParameters.Count == 1)
 				{
-					wrapped = false;
-					Object v = outputParameters.First().Value;
-
-					if (v.GetType().GetInterfaces().Contains(typeof(IGxGenericCollectionWrapped)))
+					if ((originalParCount == 1) || (originalParCount > 1 && !Preferences.WrapSingleApiOutput))
 					{
-						IGxGenericCollectionWrapped icollwrapped = v as IGxGenericCollectionWrapped;
-						if (icollwrapped != null) 
-							wrapped = icollwrapped.GetIsWrapped();
-					}
-					if (v is IGxGenericCollectionItem item)
-					{
-						if (item.Sdt is GxSilentTrnSdt)
+						wrapped = false;
+						Object v = outputParameters.First().Value;
+
+						if (v.GetType().GetInterfaces().Contains(typeof(IGxGenericCollectionWrapped)))
 						{
-							wrapped = (parCount>1)?true:false;
+							IGxGenericCollectionWrapped icollwrapped = v as IGxGenericCollectionWrapped;
+							if (icollwrapped != null)
+								wrapped = icollwrapped.GetIsWrapped();
+						}
+						if (v is IGxGenericCollectionItem item)
+						{
+							if (item.Sdt is GxSilentTrnSdt)
+							{
+								wrapped = (parCount > 1) ? true : false;
+							}
 						}
 					}
-				}			
+					if (originalParCount > 1 && Preferences.WrapSingleApiOutput)
+					{
+						wrapped = true; //Ignore defaultWrapped parameter.
+					}
+				}
 			}
 			return wrapped;
 		}