Merge branch 'develop'

Quick.Json.Serializer.pas

@@ -5,9 +5,9 @@
   Unit        : Quick.JSON.Serializer
   Description : Json Serializer
   Author      : Kike Pérez
-  Version     : 1.4
+  Version     : 1.5
   Created     : 21/05/2018
-  Modified    : 16/10/2018
+  Modified    : 06/12/2018
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
@@ -50,6 +50,9 @@ uses
     {$IFDEF DELPHIXE7_UP}
     System.Json,
     {$ENDIF}
+    {$IFDEF DELPHIRX103_UP}
+    System.Generics.Collections,
+    {$ENDIF}
   {$ENDIF}
   DateUtils,
   Quick.Commons,
@@ -465,11 +468,19 @@ begin
 
   if not rValue.IsEmpty then
   begin
+    {$IFDEF DELPHIRX103_UP}
+    if (TObjectList<TObject>(aObject) <> nil) and (rvalue.IsArray) then
+    begin
+      for i := 0 to rvalue.GetArrayLength - 1 do
+      begin
+        TObjectList<TObject>(aObject).Add(rvalue.GetArrayElement(i).AsObject);
+      end;
+    end;
+    {$ELSE}
     for rfield in rType.GetFields do
     begin
       if rfield.Name = 'FOwnsObjects' then rfield.SetValue(aObject,True);
       //if rfield.Name = 'FCount' then rfield.SetValue(aObject,i);
-
       if rfield.Name = 'FItems' then
       begin
         //if TList(aObject) <> nil then TList(aObject).Clear;
@@ -480,6 +491,7 @@ begin
     end;
     rProp := rType.GetProperty('Count');
     rProp.SetValue(aObject,i);
+    {$ENDIF}
   end;
 end;
 {$ENDIF}
@@ -564,7 +576,12 @@ begin
         begin
           {$IFNDEF FPC}
           //avoid return unicode escaped chars if string
-          if aProperty.PropertyType.TypeKind in [tkString, tkLString, tkWString, tkUString] then rValue := DeserializeType(aObject,aProperty.PropertyType.TypeKind,aProperty.GetValue(aObject).TypeInfo,member.JsonString.ToString)
+          if aProperty.PropertyType.TypeKind in [tkString, tkLString, tkWString, tkUString] then
+            {$IFDEF DELPHIRX103_UP}
+            rValue := DeserializeType(aObject,aProperty.PropertyType.TypeKind,aProperty.GetValue(aObject).TypeInfo,TJsonValue(member).value)
+            {$ELSE}
+            rValue := DeserializeType(aObject,aProperty.PropertyType.TypeKind,aProperty.GetValue(aObject).TypeInfo,member.JsonString.ToString)
+            {$ENDIF}
             else rValue := DeserializeType(aObject,aProperty.PropertyType.TypeKind,aProperty.GetValue(aObject).TypeInfo,member.ToJSON);
           {$ELSE}
           rValue := DeserializeType(aObject,aProperty.PropertyType.TypeKind,aName,member.ToJSON);
@@ -990,8 +1007,11 @@ begin
               try
                 //jValue := TJsonValue(jPair.JsonValue.Clone);
                 jValue := jPair.JsonValue;
-                jArray.AddElement(jValue);
-                if jPair.JsonValue <> nil then jPair.JsonValue.Owned := False;
+                if jValue <> nil then
+                begin
+                  jArray.AddElement(jValue);
+                  jPair.JsonValue.Owned := False;
+                end;
               finally
                 jPair.Free;
                 if jValue <> nil then jValue.Owned := True;

QuickLib.inc

@@ -124,6 +124,10 @@
         {$define DELPHILINUX}
       {$ifend}
     {$ifend}
+    {$if CompilerVersion >= 33.0} //Delphi RX10.3 Rio
+      {$define DELPHIRX103_UP}
+	    {$define DELPHIRIO_UP}
+    {$ifend}
   {$else}
     //Delphi 5 or older
     {$define DELPHI6OROLDER}

samples/delphi/QuickJsonSerializer/main.pas

@@ -109,6 +109,7 @@ type
     fSurname : string;
     fAge : Integer;
     fAddress : string;
+    fPath : string;
     fOptions : TOptions;
     fLastConnections : TConnectionArray;
     fMarried : Boolean;
@@ -134,6 +135,7 @@ type
     property Genre : TGenre read fGenre write fGenre;
     property Department : TDepartment read fDepartment write fDepartment;
     property Address : string read fAddress write fAddress;
+    property Path : string read fPath write fPath;
     property Balance : Double read fBalance write fBalance;
     [TCustomNameProperty('IsMarried')]
     property Married : Boolean read fMarried write fMarried;
@@ -183,6 +185,7 @@ begin
   if User2 <> nil then User2.Free;
   User2 := TUser.Create;
   User2.FromJson(Memo1.Text);
+  //User2 := TUser.CreateFromJson(Memo1.Text);
   //User2.CreateFromJson(Memo1.Text);
   Memo1.Lines.Add('User2 as json:');
   Memo1.Lines.Add(User2.ToJson(True));
@@ -218,6 +221,7 @@ begin
   user.Age := 30;
   user.Married := True;
   user.Address := 'Sunset st. 2 \b';
+  User.Path := 'C:\documents\files';
   user.Options.Option1 := 1;
   user.Options.Option2 := 'good';
   user.Options.AllowGroups := gtExternal;
@@ -231,13 +235,13 @@ begin
   department.Id := 10;
   department.Name := 'IT';
   user.Department := department;
-  //user.Status := TUserStatus.usOnVacation;
-  //lastcon.IP := '127.0.0.1';
-  //lastcon.ConnectionDate := Now();
-  //User.LastConnections := [lastcon];
-  //lastcon.IP := '192.0.0.1';
-  //lastcon.ConnectionDate := Now();
-  //User.LastConnections := User.LastConnections + [lastcon];
+  user.Status := TUserStatus.usOnVacation;
+  lastcon.IP := '127.0.0.1';
+  lastcon.ConnectionDate := Now();
+  User.LastConnections := [lastcon];
+  lastcon.IP := '192.0.0.1';
+  lastcon.ConnectionDate := Now();
+  User.LastConnections := User.LastConnections + [lastcon];
   group := TGroup.Create;
   group.Id := 1;
   group.GType := gtInternal;