LoadFromJSON procedure overload

viniciussanchez · Jul 25, 2019 · 0245a3b · 0245a3b
1 parent b9b9ea7
commit 0245a3b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
diff --git a/samples/src/DataSet.Serialize.Samples.dfm b/samples/src/DataSet.Serialize.Samples.dfm
@@ -24,7 +24,7 @@ object FrmSamples: TFrmSamples
     Top = 0
     Width = 994
     Height = 571
-    ActivePage = tabJSONNested
+    ActivePage = tabJSON
     Align = alClient
     TabOrder = 0
     object tabDataSet: TTabSheet

diff --git a/samples/src/DataSet.Serialize.Samples.pas b/samples/src/DataSet.Serialize.Samples.pas
@@ -110,7 +110,7 @@ procedure TFrmSamples.Append;
 
 procedure TFrmSamples.Button10Click(Sender: TObject);
 begin
-  mtJSONNested.LoadFromJSON(TJSONObject.ParseJSONValue(TEncoding.ASCII.GetBytes(mmJSONNested.Lines.Text),0) as TJSONArray);
+  mtJSONNested.LoadFromJSON(mmJSONNested.Lines.Text);
 end;
 
 procedure TFrmSamples.Button1Click(Sender: TObject);
@@ -147,13 +147,13 @@ procedure TFrmSamples.Button5Click(Sender: TObject);
 procedure TFrmSamples.Button6Click(Sender: TObject);
 begin
   if ValidateStructure then
-    mtJSON.LoadFromJSON(TJSONObject.ParseJSONValue(TEncoding.ASCII.GetBytes(mmJSONObject.Lines.Text),0) as TJSONObject);
+    mtJSON.LoadFromJSON(mmJSONObject.Lines.Text);
 end;
 
 procedure TFrmSamples.Button7Click(Sender: TObject);
 begin
   if ValidateStructure then
-    mtJSON.LoadFromJSON(TJSONObject.ParseJSONValue(TEncoding.ASCII.GetBytes(mmJSONArray.Lines.Text),0) as TJSONArray);
+    mtJSON.LoadFromJSON(mmJSONArray.Lines.Text);
 end;
 
 procedure TFrmSamples.Button8Click(Sender: TObject);
@@ -165,10 +165,10 @@ procedure TFrmSamples.Button8Click(Sender: TObject);
 
 procedure TFrmSamples.Button9Click(Sender: TObject);
 var
-  JSON: TJSONObject;
+  LJSONObject: TJSONObject;
 begin
-  JSON := TJSONObject.ParseJSONValue(TEncoding.ASCII.GetBytes(mmValidateJSON.Lines.Text),0) as TJSONObject;
-  mmJSONArrayValidate.Lines.Text := mtJSON.ValidateJSON(JSON, TLanguageType.ptBR).ToString;
+  LJSONObject := TJSONObject.ParseJSONValue(TEncoding.ASCII.GetBytes(mmValidateJSON.Lines.Text),0) as TJSONObject;
+  mmJSONArrayValidate.Lines.Text := mtJSON.ValidateJSON(LJSONObject, TLanguageType.ptBR).ToString;
 end;
 
 procedure TFrmSamples.ClearFields;

diff --git a/src/core/DataSet.Serialize.DS.Impl.pas b/src/core/DataSet.Serialize.DS.Impl.pas
@@ -126,8 +126,8 @@   TDataSetSerialize = class(TInterfacedObject, IDataSetSerialize)
 
 implementation
 
-uses BooleanField.Types, System.DateUtils, Data.FmtBcd, System.SysUtils, Providers.DataSet.Serialize,
-  Providers.DataSet.Serialize.Constants, System.Classes, System.NetEncoding, System.TypInfo;
+uses BooleanField.Types, System.DateUtils, Data.FmtBcd, System.SysUtils, Providers.DataSet.Serialize, System.TypInfo,
+  Providers.DataSet.Serialize.Constants, System.Classes, System.NetEncoding;
 
 { TDataSetSerialize }
 

diff --git a/src/core/DataSet.Serialize.JSON.Impl.pas b/src/core/DataSet.Serialize.JSON.Impl.pas
@@ -183,8 +183,7 @@   TJSONSerialize = class(TInterfacedObject, IJSONSerialize)
 
 implementation
 
-uses System.Classes, System.SysUtils, System.NetEncoding, System.TypInfo,
-  System.DateUtils, Providers.DataSet.Serialize.Constants;
+uses System.Classes, System.SysUtils, System.NetEncoding, System.TypInfo, System.DateUtils, Providers.DataSet.Serialize.Constants;
 
 { TJSONSerialize }
 

diff --git a/src/helpers/DataSet.Serialize.Helper.pas b/src/helpers/DataSet.Serialize.Helper.pas
@@ -67,6 +67,17 @@   TDataSetSerializeHelper = class Helper for TDataSet
     /// </remarks>
     procedure LoadFromJSON(const JSONArray: TJSONArray); overload;
     /// <summary>
+    ///   Loads the DataSet with data from a JSON (string format).
+    /// </summary>
+    /// <param name="JSONString">
+    ///   Refers to JSON that you want to load.
+    /// </param>
+    /// <remarks>
+    ///   Only the keys that make up the DataSet field list will be loaded. The JSON keys must have the same name as the
+    ///   DataSet fields. It's not case-sensitive.
+    /// </remarks>
+    procedure LoadFromJSON(const JSONString: string); overload;
+    /// <summary>
     ///   Updates the DataSet data with JSON object data.
     /// </summary>
     /// <param name="JSONObject">
@@ -94,7 +105,7 @@   TDataSetSerializeHelper = class Helper for TDataSet
 
 implementation
 
-uses DataSet.Serialize.Impl;
+uses DataSet.Serialize.Impl, System.SysUtils;
 
 function TDataSetSerializeHelper.ToJSONArray: TJSONArray;
 begin
@@ -126,6 +137,14 @@ procedure TDataSetSerializeHelper.LoadFromJSON(const JSONObject: TJSONObject);
   TSerialize.New.SetJSONObject(JSONObject).ToDataSet(Self);
 end;
 
+procedure TDataSetSerializeHelper.LoadFromJSON(const JSONString: string);
+begin
+  if Trim(JSONString).StartsWith('{') then
+    LoadFromJSON(TJSONObject.ParseJSONValue(TEncoding.ASCII.GetBytes(JSONString),0) as TJSONObject)
+  else if Trim(JSONString).StartsWith('[') then
+    LoadFromJSON(TJSONObject.ParseJSONValue(TEncoding.ASCII.GetBytes(JSONString),0) as TJSONArray);
+end;
+
 procedure TDataSetSerializeHelper.LoadStructure(const JSONArray: TJSONArray);
 begin
   TSerialize.New.SetJSONArray(JSONArray).LoadStructure(Self);