Ajustes gerais

dliocode · Sep 27, 2021 · 60e1a52 · 60e1a52
1 parent efcbcf4
commit 60e1a52
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/core/DataValidator.JSON.Context.pas b/src/core/DataValidator.JSON.Context.pas
@@ -108,25 +108,25 @@ function TDataValidatorJSONContext<T>.Value: IDataValidatorJSONContextValue<T>;
 function TDataValidatorJSONContext<T>.IsOptional: IDataValidatorJSONContextKey<T>;
 begin
   Result := Self;
-  Add(TDataValidatorJSONKeyIsOptional.Create(nil, 'Key is optional!'));
+  Add(TDataValidatorJSONKeyIsOptional.Create(nil, 'Key ${key} is optional!'));
 end;
 
 function TDataValidatorJSONContext<T>.IsOptional(const AExecute: TDataValidatorFuncExecute): IDataValidatorJSONContextKey<T>;
 begin
   Result := Self;
-  Add(TDataValidatorJSONKeyIsOptional.Create(AExecute, 'Key is optional!'));
+  Add(TDataValidatorJSONKeyIsOptional.Create(AExecute, 'Key ${key} is optional!'));
 end;
 
 function TDataValidatorJSONContext<T>.IsRequired: IDataValidatorJSONContextKey<T>;
 begin
   Result := Self;
-  Add(TDataValidatorJSONKeyIsRequired.Create(nil, 'Key is required!'));
+  Add(TDataValidatorJSONKeyIsRequired.Create(nil, 'Key ${key} is required!'));
 end;
 
 function TDataValidatorJSONContext<T>.IsRequired(const AExecute: TDataValidatorFuncExecute): IDataValidatorJSONContextKey<T>;
 begin
   Result := Self;
-  Add(TDataValidatorJSONKeyIsRequired.Create(AExecute, 'Key is required!'));
+  Add(TDataValidatorJSONKeyIsRequired.Create(AExecute, 'Key ${key} is required!'));
 end;
 
 function TDataValidatorJSONContext<T>.WithMessage(const AMessage: string): IDataValidatorJSONContextKey<T>;

diff --git a/src/core/DataValidator.JSON.pas b/src/core/DataValidator.JSON.pas
@@ -71,7 +71,7 @@ implementation
 uses
   DataValidator.Information.Intf, DataValidator.ItemBase.Intf, DataValidator.Context.Intf,
   DataValidator.JSON.Base, DataValidator.Information, DataValidator.ItemBase.Sanitizer, DataValidator.ItemBase,
-  Validator.JSON.Key.IsOptional, Validator.IsOptional;
+  Validator.JSON.Key.IsRequired, Validator.JSON.Key.IsOptional, Validator.IsOptional;
 
 { TDataValidatorJSON }
 
@@ -202,6 +202,9 @@ function TDataValidatorJSON.CheckValueObject(const ACheckAll: Boolean): IDataVal
         LOK := False;
         LInfo.Add(LValidatorResult.Informations as IDataValidatorInformations);
 
+        if (LValidatorItem is TDataValidatorJSONKeyIsRequired) then
+          Break;
+
         if not ACheckAll then
           Break;
       end

diff --git a/src/validators/Validator.JSON.Key.IsRequired.pas b/src/validators/Validator.JSON.Key.IsRequired.pas
@@ -66,7 +66,7 @@ function TDataValidatorJSONKeyIsRequired.Check: IDataValidatorResult;
   LJSONPair: TJSONPair;
 begin
   LValue := GetValueAsString;
-  R := False;
+  R := True;
   LIsRequired := True;
 
   if Assigned(FFuncExecute) then