Skip to content

Fix serialization of BusinessComponents for API object #771

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
May 5, 2023
Merged

Fix serialization of BusinessComponents for API object #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba051e7
- Fix serialization of BusinessComponents for API object to be consis…
AlejandroP Feb 16, 2023
9f11211
Merge branch 'master' into bc_serialize
AlejandroP Feb 24, 2023
4669cba
Merge branch 'master' into bc_serialize
AlejandroP May 5, 2023
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
14 changes: 7 additions & 7 deletions dotnet/src/dotnetcore/GxClasses.Web/Middleware/GXBCRestService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
{
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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 });
object 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);
object 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)
{
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetframework/GxClasses/Core/Web/GxHttpServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,6 +1276,7 @@ private void WebExecute(string method, string name)
_statusCode = (short)resp.StatusCode;
_statusDescription = resp.StatusDescription;
resp.Close();

GXLogging.DebugSanitized(log, "_responseString " + ToString());
}
ClearSendStream();
Expand Down
1 change: 0 additions & 1 deletion dotnet/src/dotnetframework/GxClasses/Helpers/GXRestAPIClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ public string GetJsonStr(string varName)
}
else if (_responseData.Count >= 1) // can contain the same key (recursive unwrapped)
{

#if NETCORE
string rData = JsonSerializer.Serialize(_responseData);
if (sdt.FromJSonString(rData, null))
Expand Down
12 changes: 6 additions & 6 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 @@ -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);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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())
{
Expand All @@ -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;
Expand All @@ -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);
}
Expand Down