Ajustes de códigos

dliocode · Dec 24, 2021 · ff0ef7a · ff0ef7a
1 parent 10a0447
commit ff0ef7a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/src/core/DataValidator.Context.pas b/src/core/DataValidator.Context.pas
@@ -623,7 +623,7 @@ function TDataValidatorContext<T>.IsLatLong(const ACheckDMS: Boolean): T;
   Result := Add(TValidatorIsLatLong.Create(ACheckDMS, 'Value is not JWT (JSON Web Token)!'));
 end;
 
-function TDataValidatorContext<T>.IsLength(const AMin, AMax: Integer): T;
+function TDataValidatorContext<T>.IsLength(const AMin: Integer; const AMax: Integer): T;
 begin
   Result := Add(TValidatorIsLength.Create(AMin, AMax, Format('Value required length min(%d) and max(%d)!', [AMin, AMax])));
 end;

diff --git a/src/core/DataValidator.Information.pas b/src/core/DataValidator.Information.pas
@@ -83,7 +83,7 @@ constructor TDataValidatorInformations.Create;
 destructor TDataValidatorInformations.Destroy;
 begin
   FList.Clear;
-  FList.DisposeOf;
+  FList.Free;
 
   inherited;
 end;
@@ -126,7 +126,7 @@ function TDataValidatorInformations.Message: string;
 
     Result := Trim(LSL.Text);
   finally
-    LSL.DisposeOf
+    LSL.Free
   end;
 end;
 

diff --git a/src/core/DataValidator.Value.pas b/src/core/DataValidator.Value.pas
@@ -72,7 +72,7 @@ constructor TDataValidatorValue.Create;
 destructor TDataValidatorValue.Destroy;
 begin
   FList.Clear;
-  FList.DisposeOf;
+  FList.Free;
 
   inherited;
 end;

diff --git a/src/validators/Validator.Custom.pas b/src/validators/Validator.Custom.pas
@@ -69,18 +69,15 @@ function TValidatorCustom.Check: IDataValidatorResult;
   LValue := GetValueAsString;
   R := False;
 
-  try
-    if Assigned(FCustomExecute) then
-      R := FCustomExecute(LValue)
-    else
-      if Assigned(FCustomMessageExecute) then
-      begin
-        LMessage := GetMessage;
-        R := FCustomMessageExecute(LValue, LMessage);
-        SetMessage(LMessage);
-      end;
-  except
-  end;
+  if Assigned(FCustomExecute) then
+    R := FCustomExecute(LValue)
+  else
+    if Assigned(FCustomMessageExecute) then
+    begin
+      LMessage := GetMessage;
+      R := FCustomMessageExecute(LValue, LMessage);
+      SetMessage(LMessage);
+    end;
 
   if FIsNot then
     R := not R;

diff --git a/src/validators/Validator.IsJWT.pas b/src/validators/Validator.IsJWT.pas
@@ -118,7 +118,7 @@ function TValidatorIsJWT.Check: IDataValidatorResult;
                 R := (LJSONValue as TJSONObject).TryGetValue<string>('alg', LJSONObjectValue);
           finally
             if Assigned(LJSONValue) then
-              LJSONValue.DisposeOf;
+              LJSONValue.Free;
           end;
 
           if not R then

diff --git a/src/validators/Validator.IsPort.pas b/src/validators/Validator.IsPort.pas
@@ -36,7 +36,7 @@ interface
 
 uses
   DataValidator.ItemBase,
-  System.Math, System.SysUtils;
+  System.SysUtils;
 
 type
   TValidatorIsPort = class(TDataValidatorItemBase, IDataValidatorItem)