Skip to content

Jayrock replacement with System.Text.Json in .NET (core) #894

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

Jump to bottom
Merged
merged 17 commits into from
Dec 22, 2023
Merged

Jayrock replacement with System.Text.Json in .NET (core) #894

merged 17 commits into from
Dec 22, 2023

Conversation

@claudiamurialdo
Copy link
Collaborator

@claudiamurialdo claudiamurialdo commented Oct 25, 2023

Added new methods in preparation for Jayrock replacement.
It applies only to .NET (core) generator.
Issue:84678

@genexusbot
Copy link
Collaborator

genexusbot commented Oct 25, 2023

Cherry pick to beta success

@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests October 25, 2023 12:37 — with GitHub Actions Inactive
@genexusbot
Copy link
Collaborator

genexusbot commented Oct 25, 2023

Cherry pick to beta success

@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests October 25, 2023 14:15 — with GitHub Actions Inactive
@genexusbot
Copy link
Collaborator

genexusbot commented Oct 25, 2023

Cherry pick to beta success

@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests October 25, 2023 19:15 — with GitHub Actions Inactive
@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests October 31, 2023 12:47 — with GitHub Actions Inactive
@genexusbot
Copy link
Collaborator

genexusbot commented Oct 31, 2023

Cherry pick to beta success

@claudiamurialdo
Remove jayrock dependency from .NET (Core) classes and use System.Tex…
f0612a1 
…t.Json instead.

The following methods have been changed to 'internal' due to their inclusion of 'jayrock' objects in their signature:

GeneXus.Utils.Geospatial
		String JSONPointToWKT(JArray coords)

GeneXus.Http.IHttpAjaxContext:
		JArray AttValues { get;}
		JObject HiddenValues { get;}
		JArray PropValues { get; }
		JObject WebComponents { get;}
		JObject Messages { get;}
		JArray Grids { get; }

GeneXus.Http.HttpAjaxContext
		void appendLoadData(int SId, JObject Data)
		static JArray GetParmsJArray(Object[] parms)
		void ParseGXState(JObject tokenValues)
GXAjaxCommand
		JObject JSONObject

GXAjaxCommandCollection
		JArray JSONArray

GeneXus.Http.GXJObject

GeneXus.WebControls.GXWebGrid
		List<JArray> GetColsPropsCommon()

GeneXus.SD.Store.StoreManager
		static bool GetConfigValue(string key, JObject storeConfig, out string value)

GeneXus.SD.Store.Util
		static JObject FromJSonString(string s)
@genexusbot
Copy link
Collaborator

genexusbot commented Oct 31, 2023

Cherry pick to beta failed, 6 conflicted files in commit f0612a1
  • dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj
  • dotnet/src/dotnetcore/GxClasses/Properties/AssemblyInfo.cs
  • dotnet/src/dotnetcore/GxMaps/GxMaps.csproj
  • dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj
  • dotnet/src/dotnetcore/GxSearch/GxSearch.csproj
  • dotnet/src/dotnetcore/Projects/StoreManager/StoreManager.csproj

@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests October 31, 2023 16:08 — with GitHub Actions Inactive
@genexusbot genexusbot added the conflict Conflict merging to beta branch label Oct 31, 2023
@genexusbot
Copy link
Collaborator

genexusbot commented Oct 31, 2023

Manual cherry pick to beta success

@genexusbot genexusbot removed the conflict Conflict merging to beta branch label Oct 31, 2023
@claudiamurialdo
Keep the same encoding algorithm for the JSON returned to the client-…
e1c4dd8 
…side, ensuring that it doesn't encode characters such as +, <, >, &, and double quotes (").
@genexusbot
Copy link
Collaborator

genexusbot commented Oct 31, 2023

Cherry pick to beta success

@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests October 31, 2023 17:37 — with GitHub Actions Inactive
@genexusbot
Copy link
Collaborator

genexusbot commented Oct 31, 2023

Cherry pick to beta success

@claudiamurialdo
Replace the base class 'DictionaryBase' of 'JObject' with 'OrderedDic…
89f1c08 
…tionary,' which implements the same logic as intended by 'JObject' for preserving the order of properties when serializing elements.
@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests November 1, 2023 16:19 — with GitHub Actions Inactive
@genexusbot
Copy link
Collaborator

genexusbot commented Nov 1, 2023

Cherry pick to beta success

@claudiamurialdo
Fix: The JSON array contains a trailing comma at the end which is not…
0b97173 
… supported in this mode.

Keep compatibiliy with jayrock deserialization.
@genexusbot
Copy link
Collaborator

genexusbot commented Nov 6, 2023

Cherry pick to beta success

@claudiamurialdo
Change the WriteJSON method to serialize datetimes in the 'dd/MM/yyyy…
9f26e87 
… HH:mm:ss' format to maintain compatibility with the previous Jayrock serialization
@genexusbot
Copy link
Collaborator

genexusbot commented Nov 7, 2023

Cherry pick to beta success

@genexusbot
Copy link
Collaborator

genexusbot commented Nov 8, 2023

Cherry pick to beta success

@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests November 8, 2023 19:10 — with GitHub Actions Inactive
@genexusbot
Copy link
Collaborator

genexusbot commented Nov 9, 2023

Cherry pick to beta success

@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests November 9, 2023 22:45 — with GitHub Actions Inactive
@claudiamurialdo
Enhance compatibility for TextJsonSerializer.WriteJSON<T> with JayRoc…
61ec693 
…kJsonSerializer.WriteJSON<T>, which invokes the ToString method of the datatype. This resolves the scenario when T is a string.
@genexusbot
Copy link
Collaborator

genexusbot commented Nov 10, 2023

Cherry pick to beta success

@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests November 10, 2023 14:57 — with GitHub Actions Inactive
@genexusbot
Copy link
Collaborator

genexusbot commented Nov 15, 2023

Cherry pick to beta success

@genexusbot
Copy link
Collaborator

genexusbot commented Dec 14, 2023

Cherry pick to beta failed, 5 conflicted files in commit 23bab28
  • dotnet/src/dotnetcore/GxClasses.Web/Notifications/WebSocket/WSHandler.cs
  • dotnet/src/dotnetframework/GxClasses/Domain/GxCollections.cs
  • dotnet/src/dotnetframework/GxClasses/Domain/GxGenericCollections.cs
  • dotnet/src/dotnetframework/GxClasses/Helpers/GXUtilsGeospatial.cs
  • dotnet/src/dotnetframework/Projects/StoreManager/Store/StoreManager.cs

@claudiamurialdo claudiamurialdo temporarily deployed to external-storage-tests December 14, 2023 19:47 — with GitHub Actions Inactive
@genexusbot genexusbot added the conflict Conflict merging to beta branch label Dec 14, 2023
@genexusbot
Copy link
Collaborator

genexusbot commented Dec 14, 2023

Manual cherry pick to beta success

@genexusbot genexusbot removed the conflict Conflict merging to beta branch label Dec 14, 2023
@claudiamurialdo claudiamurialdo merged commit d4fa4e0 into master Dec 22, 2023
@claudiamurialdo claudiamurialdo deleted the jayrock-to-system-text branch December 22, 2023 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmendez dmendez Awaiting requested review from dmendez

Assignees

No one assigned

Labels

bot closed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@claudiamurialdo @genexusbot