Skip to content

Commit

Permalink
Code improvements #123
Browse files Browse the repository at this point in the history
  • Loading branch information
@viniciussanchez
viniciussanchez committed Nov 24, 2021
1 parent 6175fd0 commit 12d3d78
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 20 deletions.
18 changes: 9 additions & 9 deletions src/DataSet.Serialize.Export.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ TDataSetSerialize = class
FOnlyUpdatedRecords: Boolean;
FChildRecord: Boolean;
FValueRecord: Boolean;
FEncodeBase64Blob : Boolean;
FEncodeBase64Blob: Boolean;
/// <summary>
/// Creates a JSON object with the data from the current record of DataSet.
/// </summary>
Expand Down Expand Up @@ -55,7 +55,7 @@ TDataSetSerialize = class
/// <remarks>
/// Invisible or null fields will not be exported.
/// </remarks>
function DataSetToJSONArray(const ADataSet: TDataSet; const IsChild: Boolean; const IsValue: Boolean = True; isEncodeBlob : boolean = true): TJSONArray;
function DataSetToJSONArray(const ADataSet: TDataSet; const IsChild: Boolean; const IsValue: Boolean = True; const IsEncodeBlob: Boolean = True): TJSONArray;
/// <summary>
/// Encrypts a blob field in Base64.
/// </summary>
Expand All @@ -80,7 +80,7 @@ TDataSetSerialize = class
/// <summary>
/// Responsible for creating a new instance of TDataSetSerialize class.
/// </summary>
constructor Create(const ADataSet: TDataSet; const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; AEncodeBase64Blob : boolean = true);
constructor Create(const ADataSet: TDataSet; const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True);
/// <summary>
/// Creates an array of JSON objects with all DataSet records.
/// </summary>
Expand Down Expand Up @@ -131,7 +131,7 @@ function TDataSetSerialize.ToJSONObject: TJSONObject;
Result := DataSetToJSONObject(FDataSet);
end;

function TDataSetSerialize.DataSetToJSONArray(const ADataSet: TDataSet; const IsChild: Boolean; const IsValue: Boolean = True; isEncodeBlob : boolean = true): TJSONArray;
function TDataSetSerialize.DataSetToJSONArray(const ADataSet: TDataSet; const IsChild: Boolean; const IsValue: Boolean = True; const IsEncodeBlob: Boolean = True): TJSONArray;
var
LBookMark: TBookmark;
begin
Expand Down Expand Up @@ -184,10 +184,10 @@ function TDataSetSerialize.DataSetToJSONArray(const ADataSet: TDataSet; const Is
Result.Add(BcdToDouble(ADataSet.Fields[0].AsBcd));
TFieldType.ftGraphic, TFieldType.ftBlob, TFieldType.ftOraBlob, TFieldType.ftStream:
begin
if isEncodeBlob then
if IsEncodeBlob then
Result.Add(EncodingBlobField(ADataSet.Fields[0]))
else
Result.Add(ADataSet.Fields[0].AsString); // Daniel: return original byte in string
Result.Add(ADataSet.Fields[0].AsString);
end;
else
raise EDataSetSerializeException.CreateFmt(FIELD_TYPE_NOT_FOUND, [ADataSet.Fields[0].FieldName]);
Expand Down Expand Up @@ -268,7 +268,7 @@ function TDataSetSerialize.DataSetToJSONObject(const ADataSet: TDataSet; const A
end;
{$ENDIF}
TFieldType.ftGraphic, TFieldType.ftBlob, TFieldType.ftOraBlob{$IF NOT DEFINED(FPC)}, TFieldType.ftStream{$ENDIF}:
Result.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}(LKey, TJSONString.Create( ifthen(FEncodeBase64Blob,EncodingBlobField(LField),LField.AsString)));
Result.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}(LKey, TJSONString.Create(IfThen(FEncodeBase64Blob, EncodingBlobField(LField), LField.AsString)));
else
raise EDataSetSerializeException.CreateFmt(FIELD_TYPE_NOT_FOUND, [LKey]);
end;
Expand Down Expand Up @@ -432,13 +432,13 @@ function TDataSetSerialize.SaveStructure: TJSONArray;
end;
end;

constructor TDataSetSerialize.Create(const ADataSet: TDataSet; const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; AEncodeBase64Blob : boolean = true);
constructor TDataSetSerialize.Create(const ADataSet: TDataSet; const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True);
begin
FDataSet := ADataSet;
FOnlyUpdatedRecords := AOnlyUpdatedRecords;
FChildRecord := AChildRecords;
FValueRecord := AValueRecords;
FEncodeBase64Blob := AEncodeBase64Blob;
FEncodeBase64Blob := AEncodeBase64Blob;
end;

function TDataSetSerialize.ToJSONArray: TJSONArray;
Expand Down
34 changes: 23 additions & 11 deletions src/DataSet.Serialize.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,16 @@ TDataSetSerializeHelper = class Helper for TDataSet
/// <param name="AValueRecords">
/// Inform if it's to export only field values (when there is only 1 field in the DataSet)
/// </param>
/// <param name="AEncodeBase64Blob">
/// Convert blob fields to base64.
/// </param>
/// <returns>
/// Returns a JSON string containing the record data.
/// </returns>
/// <remarks>
/// Invisible fields will not be generated.
/// </remarks>
function ToJSONObjectString(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; AValueRecords: Boolean = True): string;
function ToJSONObjectString(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True): string;
/// <summary>
/// Creates an array of JSON objects with all DataSet records.
/// </summary>
Expand All @@ -52,13 +55,16 @@ TDataSetSerializeHelper = class Helper for TDataSet
/// <param name="AValueRecords">
/// Inform if it's to export only field values (when there is only 1 field in the DataSet)
/// </param>
/// <param name="AEncodeBase64Blob">
/// Convert blob fields to base64.
/// </param>
/// <returns>
/// Returns a JSON string with all records from the DataSet.
/// </returns>
/// <remarks>
/// Invisible fields will not be generated.
/// </remarks>
function ToJSONArrayString(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; AValueRecords: Boolean = True): string;
function ToJSONArrayString(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True): string;
/// <summary>
/// Creates a JSON object with the data from the current record of DataSet.
/// </summary>
Expand All @@ -71,13 +77,16 @@ TDataSetSerializeHelper = class Helper for TDataSet
/// <param name="AValueRecords">
/// Inform if it's to export only field values (when there is only 1 field in the DataSet)
/// </param>
/// <param name="AEncodeBase64Blob">
/// Convert blob fields to base64.
/// </param>
/// <returns>
/// Returns a JSON object containing the record data.
/// </returns>
/// <remarks>
/// Invisible fields will not be generated.
/// </remarks>
function ToJSONObject(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; AValueRecords: Boolean = True): TJSONObject;
function ToJSONObject(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True): TJSONObject;
/// <summary>
/// Creates an array of JSON objects with all DataSet records.
/// </summary>
Expand All @@ -90,13 +99,16 @@ TDataSetSerializeHelper = class Helper for TDataSet
/// <param name="AValueRecords">
/// Inform if it's to export only field values (when there is only 1 field in the DataSet)
/// </param>
/// <param name="AEncodeBase64Blob">
/// Convert blob fields to base64.
/// </param>
/// <returns>
/// Returns a JSONArray with all records from the DataSet.
/// </returns>
/// <remarks>
/// Invisible fields will not be generated.
/// </remarks>
function ToJSONArray(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; AValueRecords: Boolean = True; AEncodeBase64Blob : Boolean = true): TJSONArray;
function ToJSONArray(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True): TJSONArray;
/// <summary>
/// Responsible for exporting the structure of a DataSet in JSON Array format.
/// </summary>
Expand Down Expand Up @@ -229,7 +241,7 @@ implementation
{$ENDIF}
DataSet.Serialize.Export, DataSet.Serialize.Import;

function TDataSetSerializeHelper.ToJSONArray(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; AValueRecords: Boolean = True; AEncodeBase64Blob : Boolean = true): TJSONArray;
function TDataSetSerializeHelper.ToJSONArray(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True): TJSONArray;
var
LDataSetSerialize: TDataSetSerialize;
begin
Expand All @@ -241,35 +253,35 @@ function TDataSetSerializeHelper.ToJSONArray(const AOnlyUpdatedRecords: Boolean
end;
end;

function TDataSetSerializeHelper.ToJSONObject(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; AValueRecords: Boolean = True): TJSONObject;
function TDataSetSerializeHelper.ToJSONObject(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True): TJSONObject;
var
LDataSetSerialize: TDataSetSerialize;
begin
LDataSetSerialize := TDataSetSerialize.Create(Self, AOnlyUpdatedRecords, AChildRecords, AValueRecords);
LDataSetSerialize := TDataSetSerialize.Create(Self, AOnlyUpdatedRecords, AChildRecords, AValueRecords, AEncodeBase64Blob);
try
Result := LDataSetSerialize.ToJSONObject;
finally
LDataSetSerialize.Free;
end;
end;

function TDataSetSerializeHelper.ToJSONObjectString(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; AValueRecords: Boolean = True): string;
function TDataSetSerializeHelper.ToJSONObjectString(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True): string;
var
LJSONObject: TJSONObject;
begin
LJSONObject := Self.ToJSONObject(AOnlyUpdatedRecords, AChildRecords, AValueRecords);
LJSONObject := Self.ToJSONObject(AOnlyUpdatedRecords, AChildRecords, AValueRecords, AEncodeBase64Blob);
try
Result := {$IF DEFINED(FPC)}LJSONObject.AsJSON{$ELSE}LJSONObject.ToString{$ENDIF};
finally
LJSONObject.Free;
end;
end;

function TDataSetSerializeHelper.ToJSONArrayString(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; AValueRecords: Boolean = True): string;
function TDataSetSerializeHelper.ToJSONArrayString(const AOnlyUpdatedRecords: Boolean = False; const AChildRecords: Boolean = True; const AValueRecords: Boolean = True; const AEncodeBase64Blob: Boolean = True): string;
var
LJSONArray: TJSONArray;
begin
LJSONArray := Self.ToJSONArray(AOnlyUpdatedRecords, AChildRecords, AValueRecords);
LJSONArray := Self.ToJSONArray(AOnlyUpdatedRecords, AChildRecords, AValueRecords, AEncodeBase64Blob);
try
Result := {$IF DEFINED(FPC)}LJSONArray.AsJSON{$ELSE}LJSONArray.ToString{$ENDIF};
finally
Expand Down

0 comments on commit 12d3d78

Please sign in to comment.