Skip to content

Commit

Permalink
Change plural validators to validator for binding
Browse files Browse the repository at this point in the history
  • Loading branch information
@tepi
tepi committed Jan 31, 2024
1 parent 642b5be commit beb1bf5
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
54 changes: 27 additions & 27 deletions flow-data/src/main/java/com/vaadin/flow/data/binder/Binder.java
View file
Expand Up @@ -257,28 +257,28 @@ default BindingValidationStatus<TARGET> validate() {

/**
* Sets up this binding to either disable or enable the default field
* validators (e.g. min/max validators in DatePicker). This
* validator (e.g. min/max validators in DatePicker). This
* binding-level setting will override the Binder-level setting for this
* property.
*
* Defaults to {@literal false}.
*
* @param defaultValidatorsDisabled
* {@literal true} to disable default validators for this
* binding, {@literal false} to enable them, {@literal null}
* @param defaultValidatorDisabled
* {@literal true} to disable default validator for this
* binding, {@literal false} to enable it, {@literal null}
* to reset (fallback to Binder-level setting)
* @see Binder#setDefaultValidatorsDisabled(boolean) for faster way to
* disable default validators for all bound fields.
*/
void setDefaultValidatorsDisabled(boolean defaultValidatorsDisabled);
void setDefaultValidatorDisabled(boolean defaultValidatorDisabled);

/**
* Returns if default validators of bound field are disabled..
* Returns if default validator of bound field is disabled.
*
* @return {@literal true} if default validators are disabled for this
* binding, {@literal false} if they are enabled
* @return {@literal true} if default validator is disabled for this
* binding, {@literal false} if it is enabled
*/
boolean isDefaultValidatorsDisabled();
boolean isDefaultValidatorDisabled();

/**
* Define whether the value should be converted back to the presentation
Expand Down Expand Up @@ -851,22 +851,22 @@ BindingBuilder<BEAN, TARGET> withValidationStatusHandler(

/**
* Sets up this binding to either disable or enable the default field
* validators (e.g. min/max validators in DatePicker). This
* validator (e.g. min/max validators in DatePicker). This
* binding-level setting will override the Binder-level setting for this
* property.
*
* Defaults to {@literal false}.
*
* @param defaultValidatorsDisabled
* {@literal true} to disable default validators for this
* binding, {@literal false} to enable them, {@literal null}
* @param defaultValidatorDisabled
* {@literal true} to disable default validator for this
* binding, {@literal false} to enable it, {@literal null}
* to reset (fallback to Binder-level setting)
* @return this binding, for chaining
* @see Binder#setDefaultValidatorsDisabled(boolean) for faster way to
* disable default validators for all bound fields.
*/
BindingBuilder<BEAN, TARGET> setDefaultValidatorsDisabled(
boolean defaultValidatorsDisabled);
BindingBuilder<BEAN, TARGET> setDefaultValidatorDisabled(
boolean defaultValidatorDisabled);

/**
* Sets the field to be required. This means two things:
Expand Down Expand Up @@ -982,7 +982,7 @@ protected static class BindingBuilderImpl<BEAN, FIELDVALUE, TARGET>

private boolean asRequiredSet;

private Boolean defaultValidatorsDisabled;
private Boolean defaultValidatorDisabled;

/**
* Creates a new binding builder associated with the given field.
Expand All @@ -1009,7 +1009,7 @@ protected BindingBuilderImpl(Binder<BEAN> binder,

if (field instanceof HasValidator hasValidator) {
withValidator(
(val, ctx) -> binding.isDefaultValidatorsDisabled()
(val, ctx) -> binding.isDefaultValidatorDisabled()
? ValidationResult.ok()
: hasValidator.getDefaultValidator().apply(val,
ctx));
Expand Down Expand Up @@ -1158,10 +1158,10 @@ public BindingBuilder<BEAN, TARGET> withValidationStatusHandler(
}

@Override
public BindingBuilder<BEAN, TARGET> setDefaultValidatorsDisabled(
boolean defaultValidatorsDisabled) {
public BindingBuilder<BEAN, TARGET> setDefaultValidatorDisabled(
boolean defaultValidatorDisabled) {
checkUnbound();
this.defaultValidatorsDisabled = defaultValidatorsDisabled;
this.defaultValidatorDisabled = defaultValidatorDisabled;
return this;
}

Expand Down Expand Up @@ -1300,7 +1300,7 @@ protected static class BindingImpl<BEAN, FIELDVALUE, TARGET>

private Registration onValidationStatusChange;

private Boolean defaultValidatorsDisabled;
private Boolean defaultValidatorDisabled;

public BindingImpl(BindingBuilderImpl<BEAN, FIELDVALUE, TARGET> builder,
ValueProvider<BEAN, TARGET> getter,
Expand All @@ -1311,7 +1311,7 @@ public BindingImpl(BindingBuilderImpl<BEAN, FIELDVALUE, TARGET> builder,
this.asRequiredSet = builder.asRequiredSet;
converterValidatorChain = ((Converter<FIELDVALUE, TARGET>) builder.converterValidatorChain);

defaultValidatorsDisabled = builder.defaultValidatorsDisabled;
defaultValidatorDisabled = builder.defaultValidatorDisabled;

onValueChange = getField().addValueChangeListener(
event -> handleFieldValueChange(event));
Expand Down Expand Up @@ -1633,14 +1633,14 @@ public boolean isValidatorsDisabled() {
}

@Override
public void setDefaultValidatorsDisabled(
boolean defaultValidatorsDisabled) {
this.defaultValidatorsDisabled = defaultValidatorsDisabled;
public void setDefaultValidatorDisabled(
boolean defaultValidatorDisabled) {
this.defaultValidatorDisabled = defaultValidatorDisabled;
}

@Override
public boolean isDefaultValidatorsDisabled() {
return Optional.ofNullable(defaultValidatorsDisabled)
public boolean isDefaultValidatorDisabled() {
return Optional.ofNullable(defaultValidatorDisabled)
.orElse(getBinder().isDefaultValidatorsDisabled());
}

Expand Down
8 changes: 4 additions & 4 deletions flow-data/src/test/java/com/vaadin/flow/data/binder/BinderTest.java
View file
Expand Up @@ -1578,7 +1578,7 @@ public void disableDefaultValidator_testSingleBindingLevelDisabled_whenBinderLev
binder.forField(field1).bind(Person::getFirstName,
Person::setFirstName);
Binding<Person, String> binding = binder.forField(field2)
.setDefaultValidatorsDisabled(true)
.setDefaultValidatorDisabled(true)
.bind(Person::getLastName, Person::setLastName);

// One binding has default validators disabled
Expand All @@ -1589,7 +1589,7 @@ public void disableDefaultValidator_testSingleBindingLevelDisabled_whenBinderLev
1, status.getValidationErrors().size());

// Re-enable default validators of binding
binding.setDefaultValidatorsDisabled(false);
binding.setDefaultValidatorDisabled(false);
status = binder.validate();
assertEquals(
"Validation should have two errors. "
Expand All @@ -1612,7 +1612,7 @@ public void skipDefaultValidator_crossToggleSingleBindingAndBinderState() {
binder.forField(field1).bind(Person::getFirstName,
Person::setFirstName);
Binding<Person, String> binding = binder.forField(field2)
.setDefaultValidatorsDisabled(false)
.setDefaultValidatorDisabled(false)
.bind(Person::getLastName, Person::setLastName);

// Initial case: binder disabled & binding overrides to enable
Expand All @@ -1629,7 +1629,7 @@ public void skipDefaultValidator_crossToggleSingleBindingAndBinderState() {

// Cross-toggle false <-> true
binder.setDefaultValidatorsDisabled(false);
binding.setDefaultValidatorsDisabled(true);
binding.setDefaultValidatorDisabled(true);
status = binder.validate();
assertEquals(
"Validation should have one error. "
Expand Down

0 comments on commit beb1bf5

Please sign in to comment.