Skip to content

Remove order of properties in serialized JSON. #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 26, 2021
Merged

Remove order of properties in serialized JSON. #333

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42faf6a
Remove order of properties in serialized JSON.
AlejandroP Apr 15, 2021
4ebc9bf
Merge branch 'master' into removeorder
AlejandroP Apr 19, 2021
5266d38
Merge branch 'master' into removeorder
AlejandroP Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions dotnet/src/dotnetframework/GxClasses/Services/GxRestWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ internal static class Synchronizer
internal const string SYNCHRONIZER_INFO = "gxTpr_Synchronizer";
}

public class OrderedContractResolver : Newtonsoft.Json.Serialization.DefaultContractResolver
{
protected override System.Collections.Generic.IList<Newtonsoft.Json.Serialization.JsonProperty> CreateProperties(System.Type type, Newtonsoft.Json.MemberSerialization memberSerialization)
{
return base.CreateProperties(type, memberSerialization).OrderBy(p => p.PropertyName).ToList();
}
}

#if NETCORE
public class GxRestWrapper
#else
Expand Down Expand Up @@ -141,7 +133,7 @@ public virtual Task MethodBodyExecute(object key)
setWorkerStatus(_procWorker);
_procWorker.cleanup();
RestProcess(outputParameters);
return Serialize(outputParameters, wrapped, _procWorker.IsApiObject);
return Serialize(outputParameters, wrapped);
}
catch (Exception e)
{
Expand Down Expand Up @@ -283,7 +275,7 @@ public virtual Task MethodUrlExecute(object key)
RestProcess(outputParameters);
bool wrapped = false;
wrapped = GetWrappedStatus(_procWorker, wrapped, outputParameters);
return Serialize(outputParameters, wrapped, _procWorker.IsApiObject);
return Serialize(outputParameters, wrapped);
}
catch (Exception e)
{
Expand Down Expand Up @@ -636,12 +628,10 @@ public Task WebException(Exception ex)
GXLogging.Error(log, "WebException", ex);
return SetError("500", ex.Message);
}
protected Task Serialize(Dictionary<string, object> parameters, bool wrapped, bool ordered)
protected Task Serialize(Dictionary<string, object> parameters, bool wrapped)
{
var serializer = new Newtonsoft.Json.JsonSerializer();

if (ordered)
serializer.ContractResolver = new OrderedContractResolver();
serializer.Converters.Add(new SDTConverter());
TextWriter ms = new StringWriter();
if (parameters.Count == 1 && !wrapped) //In Dataproviders, with one parameter BodyStyle is WebMessageBodyStyle.Bare, Both requests and responses are not wrapped.
Expand Down