Fix broken case with rest services returning SDT collection.

Author: claudiamurialdo

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

@@ -898,28 +898,27 @@ protected static object MakeRestType( object collectionValue, bool isApiObject)
 					{
 						restItemType = ClassLoader.FindType(Config.CommonAssemblyName, itemType.FullName + "_RESTLInterface", null);
 					}
-					else if (typeof(IGxGenericCollectionItem).IsAssignableFrom(vType))//Collection<SDTType> convert to GxGenericCollection<SDTType_RESTInterface>
+					else //Collection<SDTType> convert to GxGenericCollection<SDTType_RESTInterface>
 					{
-						restItemType = ClassLoader.FindType(Config.CommonAssemblyName, itemType.FullName + "_RESTInterface", null);
-					}
-					else if (typeof(IGxJSONSerializable).IsAssignableFrom(vType))
-					{
-						collectionObject = collectionValue;
-					}
-					if (restItemType != null)
-					{
-						object[] attributes = restItemType.GetCustomAttributes(typeof(GxJsonSerialization), false);
-						IEnumerable<object> serializationAttributes = attributes.Where(a => a.GetType() == typeof(GxJsonSerialization));
-						if (serializationAttributes != null && serializationAttributes.Any<object>())
+						if (typeof(GxUserType).IsAssignableFrom(itemType)){
+							restItemType = ClassLoader.FindType(Config.CommonAssemblyName, itemType.FullName + "_RESTInterface", null);
+						}
+						else
 						{
-							GxJsonSerialization attFmt = (GxJsonSerialization)serializationAttributes.FirstOrDefault();
-							wrappedStatus = attFmt.JsonUnwrapped;
-							isWrapped = (isApiObject) ? ((wrappedStatus == "wrapped") ? true : false) : ((wrappedStatus == "unwrapped") ? false : true);
+							restItemType = itemType;
 						}
-						isEmpty = !restItemType.IsDefined(typeof(GxOmitEmptyCollection), false);
-						Type genericListItemType = typeof(GxGenericCollection<>).MakeGenericType(restItemType);
-						collectionObject = Activator.CreateInstance(genericListItemType, new object[] { collectionValue, isWrapped, wrappedStatus });
 					}
+					object[] attributes = restItemType.GetCustomAttributes(typeof(GxJsonSerialization), false);
+					IEnumerable<object> serializationAttributes = attributes.Where(a => a.GetType() == typeof(GxJsonSerialization));
+					if (serializationAttributes != null && serializationAttributes.Any<object>())
+					{
+						GxJsonSerialization attFmt = (GxJsonSerialization)serializationAttributes.FirstOrDefault();
+						wrappedStatus = attFmt.JsonUnwrapped;
+						isWrapped = (isApiObject) ? ((wrappedStatus == "wrapped") ? true : false) : ((wrappedStatus == "unwrapped") ? false : true);
+					}
+					isEmpty = !restItemType.IsDefined(typeof(GxOmitEmptyCollection), false);
+					Type genericListItemType = typeof(GxGenericCollection<>).MakeGenericType(restItemType);
+					collectionObject = Activator.CreateInstance(genericListItemType, new object[] { collectionValue, isWrapped, wrappedStatus });
 				}
 				// Empty collection serialized w/ noproperty
 				if (collectionObject is IList restList)