Skip to content

Prepare for json serializer replacement. #208

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 8 commits into from
Sep 19, 2020
Merged

Prepare for json serializer replacement. #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
983a15f
Prepare for json serializer replacement.
cmurialdo Aug 22, 2020
30e2c4f
Merge branch 'master' into NewJsonSerializer
claudiamurialdo Aug 22, 2020
5ddb25d
Avoid _jsonArr clear exception
cmurialdo Aug 24, 2020
6272af0
Fix GetControlProps
cmurialdo Aug 24, 2020
6ca931e
Merge branch 'master' into NewJsonSerializer
claudiamurialdo Sep 9, 2020
6a19c0f
Merge branch 'master' into NewJsonSerializer
claudiamurialdo Sep 15, 2020
b0fcd9a
Merge branch 'master' into NewJsonSerializer
claudiamurialdo Sep 19, 2020
1ea4e32
Merge branch 'master' into NewJsonSerializer
claudiamurialdo Sep 19, 2020
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
9 changes: 3 additions & 6 deletions dotnet/src/dotnetcore/GxClasses/Helpers/GXGeographyCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
using System;
using System.Collections;
using System.Globalization;
using System.Runtime.Serialization;
using System.Collections;
using Jayrock.Json;
using GeographicLib;
using log4net;
using System.Reflection;
using GeneXus.Metadata;
using NetTopologySuite.IO;
using NetTopologySuite.Geometries;
using GxClasses.Helpers;
using GeographicLib;
using NetTopologySuite.IO;

namespace GeneXus.Utils
{
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxClasses/Services/CoreWebAPI/Controller/GXBCRestService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GeneXus.Utils;
using Jayrock.Json;

using Microsoft.AspNetCore.Http;
using System;
using System.IO;
Expand Down
77 changes: 43 additions & 34 deletions dotnet/src/dotnetframework/GxClasses/Core/Web/HttpAjaxContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,12 @@ public void ajax_rspStartCmp(String CmpId)
{
WebComponents.Put(CmpId, "");
}
catch (JsonException)
catch (Exception ex)
{
GXLogging.Error(log, "ajax_rspStartCmp error", ex);
}
}
context.CmpDrawLvl++;
context.CmpDrawLvl++;
cmpContents.Push(new GXCmpContent(CmpId));
}

Expand All @@ -211,12 +212,13 @@ public void ajax_rspEndCmp()
((GXCmpContent)cmpContents.Peek()).Content += cmp.Content;
}
}
catch (JsonException)
catch (Exception ex)
{
GXLogging.Error(log, "ajax_rspEndCmp error", ex);
}
}

private JObject GetGxObject(JArray array, String CmpContext, bool IsMasterPage)
private JObject GetGxObject(JArray array, String CmpContext, bool IsMasterPage)
{
try
{
Expand All @@ -235,10 +237,12 @@ private JObject GetGxObject(JArray array, String CmpContext, bool IsMasterPage)
array.Add(obj);
return obj;
}
catch (JsonException)
{
}
return null;
catch (Exception ex)
{
GXLogging.Error(log, "GetGxObject error", ex);
}

return null;
}

public void ajax_rsp_assign_attri(String CmpContext, bool IsMasterPage, String AttName, Object AttValue)
Expand All @@ -255,8 +259,9 @@ public void ajax_rsp_assign_attri(String CmpContext, bool IsMasterPage, String A
obj.Put(AttName, AttValue);
}
}
catch (JsonException)
catch (Exception ex)
{
GXLogging.Error(log, "ajax_rsp_assign_attri error", ex);
}
}
}
Expand Down Expand Up @@ -288,8 +293,9 @@ public void ajax_rsp_assign_sdt_attri(String CmpContext, bool IsMasterPage, Stri
}
}
}
catch (JsonException)
catch (Exception ex)
{
GXLogging.Error(log, "ajax_rsp_assign_sdt_attri error", ex);
}
}
}
Expand Down Expand Up @@ -326,8 +332,9 @@ private void ajax_rsp_assign_hidden(String AttName, object AttValue)
#endif
HiddenValues.Put(AttName, AttValue);
}
catch (JsonException)
catch (Exception ex)
{
GXLogging.Error(log, "ajax_rsp_assign_hidden error", ex);
}
}
public void ajax_rsp_assign_hidden_sdt(String SdtName, Object SdtObj)
Expand All @@ -349,8 +356,9 @@ public void ajax_rsp_assign_hidden_sdt(String SdtName, Object SdtObj)
}
}
}
catch (JsonException)
catch (Exception ex)
{
GXLogging.Error(log, "ajax_rsp_assign_hidden_sdt error", ex);
}

}
Expand All @@ -372,8 +380,9 @@ private JObject GetControlProps(JObject obj, String Control)
obj.Put(Control, ctrlProps);
}
}
catch (JsonException)
catch (Exception ex)
{
GXLogging.Error(log, "GetControlProps error", ex);
}
return ctrlProps;
}
Expand Down Expand Up @@ -420,8 +429,9 @@ public void ajax_rsp_assign_prop(String CmpContext, bool IsMasterPage, String Co
ajax_rsp_assign_hidden(Control + "_" + Property.Substring(0, 1) + Property.Substring(1).ToLower(), Value);
}
}
catch (JsonException)
catch (Exception ex)
{
GXLogging.Error(log, "ajax_rsp_assign_prop error", ex);
}
}
}
Expand All @@ -443,10 +453,11 @@ public void ajax_rsp_assign_grid(String GridName, Object GridObj)
{
Grids.Add(((IGxJSONAble)GridObj).GetJSONObject());
}
catch (JsonException)
{
}
}
catch (Exception ex)
{
GXLogging.Error(log, "ajax_rsp_assign_grid error", ex);
}
}

private bool ShouldLogAjaxControlProperty(string Property)
{
Expand Down Expand Up @@ -474,9 +485,10 @@ public void PrintReportAtClient(string reportFile, string printerRule)
obj.Put("reportFile", reportFile);
obj.Put("printerRule", printerRule);
}
catch (JsonException)
{
}
catch (Exception ex)
{
GXLogging.Error(log, "PrintReportAtClient error", ex);
}
commands.AppendCommand(new GXAjaxCommand("print", obj));
}

Expand Down Expand Up @@ -520,10 +532,11 @@ public string getJSONContainerResponse(IGxJSONAble Container)
jsonCmdWrapper.Put("gxContainer", Container.GetJSONObject());

}
catch (JsonException)
{
}
return jsonCmdWrapper.ToString();
catch (Exception ex)
{
GXLogging.Error(log, "getJSONContainerResponse error", ex);
}
return jsonCmdWrapper.ToString();
}

internal string getJSONResponse(string cmpContext)
Expand Down Expand Up @@ -554,10 +567,11 @@ internal string getJSONResponse(string cmpContext)
jsonCmdWrapper.Put("gxCommands", commands.JSONArray);
}
}
catch (JsonException)
catch (Exception ex)
{
GXLogging.Error(log, "getJSONResponse error", ex);
}
return jsonCmdWrapper.ToString();
return jsonCmdWrapper.ToString();
}

public static JArray GetParmsJArray(Object[] parms)
Expand Down Expand Up @@ -668,12 +682,7 @@ private JObject GetGXStateTokens(string state)
{
state = Encoding.UTF8.GetString(Convert.FromBase64String(state));
}
JsonReader reader = new JsonTextReader(new StringReader(state));
JsonToken token = reader.ReadToken();
if (token == JsonToken.Object)
{
return (JObject)reader.DeserializeNext();
}
return JSONHelper.ReadJSON<JObject>(state);
}
}
catch (Exception e)
Expand Down Expand Up @@ -859,7 +868,7 @@ public object GetJSONObject(bool includeState)
return GetJSONObject();
}

public void FromJSONObject(IJsonFormattable obj)
public void FromJSONObject(dynamic obj)
{
throw new Exception("The method or operation is not implemented.");
}
Expand Down
12 changes: 4 additions & 8 deletions dotnet/src/dotnetframework/GxClasses/Domain/GXGeolocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,7 @@ public static List<string> GetAddress(String location)
{
if (!string.IsNullOrEmpty(response))
{
StringReader sr = new StringReader(response);
JsonTextReader tr = new JsonTextReader(sr);
JObject json = (JObject)(tr.DeserializeNext());
JObject json = JSONHelper.ReadJSON<JObject>(response);
if (json.Contains("results"))
{
JArray results = (JArray)json["results"];
Expand All @@ -180,7 +178,7 @@ public static List<string> GetAddress(String location)
}
}
}
catch (JsonException ex)
catch (Exception ex)
{
GXLogging.Error(log, "getAddress error json:" + response, ex);
}
Expand Down Expand Up @@ -217,9 +215,7 @@ public static List<Geospatial> GetLocationGeography(String address)
{
if (!string.IsNullOrEmpty(response))
{
StringReader sr = new StringReader(response);
JsonTextReader tr = new JsonTextReader(sr);
JObject json = (JObject)(tr.DeserializeNext());
JObject json = JSONHelper.ReadJSON<JObject>(response);
if (json.Contains("results"))
{
JArray results = (JArray)json["results"];
Expand All @@ -243,7 +239,7 @@ public static List<Geospatial> GetLocationGeography(String address)
}
}
}
catch (JsonException ex)
catch (Exception ex)
{
GXLogging.Error(log, "getLocation error json:" + response, ex);
}
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetframework/GxClasses/Domain/GXWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public object GetJSONObject(bool includeState)
return GetJSONObject();
}

public void FromJSONObject(IJsonFormattable obj)
public void FromJSONObject(dynamic obj)
{
}

Expand Down
Loading