Skip to content

Commit

Permalink
Rename setRequired to asRequired since it's logically not a setter (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Legioth authored and ahie committed Dec 14, 2016
1 parent fc011f6 commit b2e3aa2
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
10 changes: 5 additions & 5 deletions server/src/main/java/com/vaadin/data/BeanBinder.java
Expand Up @@ -97,13 +97,13 @@ default BeanBindingBuilder<BEAN, TARGET> withNullRepresentation(
} }


@Override @Override
public BeanBindingBuilder<BEAN, TARGET> setRequired( public BeanBindingBuilder<BEAN, TARGET> asRequired(
ErrorMessageProvider errorMessageProvider); ErrorMessageProvider errorMessageProvider);


@Override @Override
public default BeanBindingBuilder<BEAN, TARGET> setRequired( public default BeanBindingBuilder<BEAN, TARGET> asRequired(
String errorMessage) { String errorMessage) {
return (BeanBindingBuilder<BEAN, TARGET>) BindingBuilder.super.setRequired( return (BeanBindingBuilder<BEAN, TARGET>) BindingBuilder.super.asRequired(
errorMessage); errorMessage);
} }


Expand Down Expand Up @@ -222,9 +222,9 @@ public BeanBindingBuilder<BEAN, TARGET> withValidationStatusHandler(
} }


@Override @Override
public BeanBindingBuilder<BEAN, TARGET> setRequired( public BeanBindingBuilder<BEAN, TARGET> asRequired(
ErrorMessageProvider errorMessageProvider) { ErrorMessageProvider errorMessageProvider) {
return (BeanBindingBuilder<BEAN, TARGET>) super.setRequired( return (BeanBindingBuilder<BEAN, TARGET>) super.asRequired(
errorMessageProvider); errorMessageProvider);
} }


Expand Down
12 changes: 6 additions & 6 deletions server/src/main/java/com/vaadin/data/Binder.java
Expand Up @@ -445,21 +445,21 @@ public BindingBuilder<BEAN, TARGET> withValidationStatusHandler(
* <li>the field value is validated for not being empty*</li> * <li>the field value is validated for not being empty*</li>
* </ol> * </ol>
* For localizing the error message, use * For localizing the error message, use
* {@link #setRequired(SerializableFunction)}. * {@link #asRequired(ErrorMessageProvider)}.
* <p> * <p>
* *Value not being the equal to what {@link HasValue#getEmptyValue()} * *Value not being the equal to what {@link HasValue#getEmptyValue()}
* returns. * returns.
* *
* @see #setRequired(SerializableFunction) * @see #asRequired(ErrorMessageProvider)
* @see HasValue#setRequiredIndicatorVisible(boolean) * @see HasValue#setRequiredIndicatorVisible(boolean)
* @see HasValue#isEmpty() * @see HasValue#isEmpty()
* @param errorMessage * @param errorMessage
* the error message to show for the invalid value * the error message to show for the invalid value
* @return this binding, for chaining * @return this binding, for chaining
*/ */
public default BindingBuilder<BEAN, TARGET> setRequired( public default BindingBuilder<BEAN, TARGET> asRequired(
String errorMessage) { String errorMessage) {
return setRequired(context -> errorMessage); return asRequired(context -> errorMessage);
} }


/** /**
Expand All @@ -477,7 +477,7 @@ public default BindingBuilder<BEAN, TARGET> setRequired(
* the provider for localized validation error message * the provider for localized validation error message
* @return this binding, for chaining * @return this binding, for chaining
*/ */
public BindingBuilder<BEAN, TARGET> setRequired( public BindingBuilder<BEAN, TARGET> asRequired(
ErrorMessageProvider errorMessageProvider); ErrorMessageProvider errorMessageProvider);
} }


Expand Down Expand Up @@ -587,7 +587,7 @@ public BindingBuilder<BEAN, TARGET> withValidationStatusHandler(
} }


@Override @Override
public BindingBuilder<BEAN, TARGET> setRequired( public BindingBuilder<BEAN, TARGET> asRequired(
ErrorMessageProvider errorMessageProvider) { ErrorMessageProvider errorMessageProvider) {
checkUnbound(); checkUnbound();
field.setRequiredIndicatorVisible(true); field.setRequiredIndicatorVisible(true);
Expand Down
4 changes: 2 additions & 2 deletions server/src/test/java/com/vaadin/data/BinderTest.java
Expand Up @@ -334,7 +334,7 @@ public void setRequired_withErrorMessage_fieldGetsRequiredIndicatorAndValidator(
BindingBuilder<Person, String> binding = binder.forField(textField); BindingBuilder<Person, String> binding = binder.forField(textField);
Assert.assertFalse(textField.isRequiredIndicatorVisible()); Assert.assertFalse(textField.isRequiredIndicatorVisible());


binding.setRequired("foobar"); binding.asRequired("foobar");
Assert.assertTrue(textField.isRequiredIndicatorVisible()); Assert.assertTrue(textField.isRequiredIndicatorVisible());


binding.bind(Person::getFirstName, Person::setFirstName); binding.bind(Person::getFirstName, Person::setFirstName);
Expand All @@ -361,7 +361,7 @@ public void setRequired_withErrorMessageProvider_fieldGetsRequiredIndicatorAndVa
Assert.assertFalse(textField.isRequiredIndicatorVisible()); Assert.assertFalse(textField.isRequiredIndicatorVisible());
AtomicInteger invokes = new AtomicInteger(); AtomicInteger invokes = new AtomicInteger();


binding.setRequired(context -> { binding.asRequired(context -> {
invokes.incrementAndGet(); invokes.incrementAndGet();
Assert.assertSame(Locale.CANADA, context.getLocale().get()); Assert.assertSame(Locale.CANADA, context.getLocale().get());
return "foobar"; return "foobar";
Expand Down
Expand Up @@ -33,13 +33,14 @@
* This validator can be suitable for fields that have been marked as required * This validator can be suitable for fields that have been marked as required
* with {@link HasValue#setRequiredIndicatorVisible(boolean)}. * with {@link HasValue#setRequiredIndicatorVisible(boolean)}.
* <p> * <p>
* Note that {@link BindingBuilder#setRequired(com.vaadin.data.ErrorMessageProvider)} * Note that
* does almost the same thing, but verifies against the value NOT being equal to * {@link BindingBuilder#asRequired(com.vaadin.data.ErrorMessageProvider)} does
* what {@link HasValue#getEmptyValue()} returns and sets the required indicator * almost the same thing, but verifies against the value NOT being equal to what
* {@link HasValue#getEmptyValue()} returns and sets the required indicator
* visible with {@link HasValue#setRequiredIndicatorVisible(boolean)}. * visible with {@link HasValue#setRequiredIndicatorVisible(boolean)}.
* *
* @see HasValue#setRequiredIndicatorVisible(boolean) * @see HasValue#setRequiredIndicatorVisible(boolean)
* @see BindingBuilder#setRequired(com.vaadin.data.ErrorMessageProvider) * @see BindingBuilder#asRequired(com.vaadin.data.ErrorMessageProvider)
* @author Vaadin Ltd * @author Vaadin Ltd
* @since 8.0 * @since 8.0
* *
Expand Down

0 comments on commit b2e3aa2

Please sign in to comment.