Skip to content

Commit

Permalink
Rename SerializableBiConsumer into Setter
Browse files Browse the repository at this point in the history
  • Loading branch information
Ilia Motornyi committed Dec 15, 2016
1 parent 809a486 commit 10d4d70
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 25 deletions.
6 changes: 3 additions & 3 deletions server/src/main/java/com/vaadin/data/BeanBinder.java
Expand Up @@ -36,7 +36,7 @@
import com.vaadin.annotations.PropertyId;
import com.vaadin.data.util.BeanUtil;
import com.vaadin.data.validator.BeanValidator;
import com.vaadin.server.SerializableBiConsumer;
import com.vaadin.server.Setter;
import com.vaadin.server.SerializableFunction;
import com.vaadin.server.SerializablePredicate;
import com.vaadin.ui.Label;
Expand Down Expand Up @@ -161,7 +161,7 @@ public default BeanBindingBuilder<BEAN, TARGET> withStatusLabel(
* if the property has no accessible getter
*
* @see BindingBuilder#bind(ValueProvider,
* SerializableBiConsumer)
* Setter)
*/
public Binding<BEAN, TARGET> bind(String propertyName);
}
Expand Down Expand Up @@ -361,7 +361,7 @@ public <FIELDVALUE> BeanBindingBuilder<BEAN, FIELDVALUE> forField(
* @throws IllegalArgumentException
* if the property has no accessible getter
*
* @see #bind(HasValue, ValueProvider, SerializableBiConsumer)
* @see #bind(HasValue, ValueProvider, Setter)
*/
public <FIELDVALUE> Binding<BEAN, FIELDVALUE> bind(
HasValue<FIELDVALUE> field, String propertyName) {
Expand Down
24 changes: 12 additions & 12 deletions server/src/main/java/com/vaadin/data/Binder.java
Expand Up @@ -34,7 +34,7 @@
import com.vaadin.data.converter.StringToIntegerConverter;
import com.vaadin.event.EventRouter;
import com.vaadin.server.ErrorMessage;
import com.vaadin.server.SerializableBiConsumer;
import com.vaadin.server.Setter;
import com.vaadin.server.SerializableFunction;
import com.vaadin.server.SerializablePredicate;
import com.vaadin.server.UserError;
Expand Down Expand Up @@ -173,7 +173,7 @@ public interface BindingBuilder<BEAN, TARGET> extends Serializable {
*/
public Binding<BEAN, TARGET> bind(
ValueProvider<BEAN, TARGET> getter,
com.vaadin.server.SerializableBiConsumer<BEAN, TARGET> setter);
Setter<BEAN, TARGET> setter);

/**
* Adds a validator to this binding. Validators are applied, in
Expand Down Expand Up @@ -255,7 +255,7 @@ public default BindingBuilder<BEAN, TARGET> withValidator(
* which must match the current target data type of the binding, and a
* model type, which can be any data type and becomes the new target
* type of the binding. When invoking
* {@link #bind(ValueProvider, SerializableBiConsumer)}, the
* {@link #bind(ValueProvider, Setter)}, the
* target type of the binding must match the getter/setter types.
* <p>
* For instance, a {@code TextField} can be bound to an integer-typed
Expand All @@ -281,7 +281,7 @@ public <NEWTARGET> BindingBuilder<BEAN, NEWTARGET> withConverter(
* type, which must match the current target data type of the binding,
* and a model type, which can be any data type and becomes the new
* target type of the binding. When invoking
* {@link #bind(ValueProvider, SerializableBiConsumer)}, the
* {@link #bind(ValueProvider, Setter)}, the
* target type of the binding must match the getter/setter types.
* <p>
* For instance, a {@code TextField} can be bound to an integer-typed
Expand Down Expand Up @@ -316,7 +316,7 @@ public default <NEWTARGET> BindingBuilder<BEAN, NEWTARGET> withConverter(
* type, which must match the current target data type of the binding,
* and a model type, which can be any data type and becomes the new
* target type of the binding. When invoking
* {@link #bind(ValueProvider, SerializableBiConsumer)}, the
* {@link #bind(ValueProvider, Setter)}, the
* target type of the binding must match the getter/setter types.
* <p>
* For instance, a {@code TextField} can be bound to an integer-typed
Expand Down Expand Up @@ -534,7 +534,7 @@ protected BindingBuilderImpl(Binder<BEAN> binder,
@Override
public Binding<BEAN, TARGET> bind(
ValueProvider<BEAN, TARGET> getter,
SerializableBiConsumer<BEAN, TARGET> setter) {
Setter<BEAN, TARGET> setter) {
checkUnbound();
Objects.requireNonNull(getter, "getter cannot be null");

Expand Down Expand Up @@ -673,7 +673,7 @@ protected static class BindingImpl<BEAN, FIELDVALUE, TARGET>
private final BindingValidationStatusHandler statusHandler;

private final SerializableFunction<BEAN, TARGET> getter;
private final SerializableBiConsumer<BEAN, TARGET> setter;
private final Setter<BEAN, TARGET> setter;

// Not final since we temporarily remove listener while changing values
private Registration onValueChange;
Expand All @@ -686,7 +686,7 @@ protected static class BindingImpl<BEAN, FIELDVALUE, TARGET>

public BindingImpl(BindingBuilderImpl<BEAN, FIELDVALUE, TARGET> builder,
SerializableFunction<BEAN, TARGET> getter,
SerializableBiConsumer<BEAN, TARGET> setter) {
Setter<BEAN, TARGET> setter) {
this.binder = builder.getBinder();
this.field = builder.field;
this.statusHandler = builder.statusHandler;
Expand Down Expand Up @@ -976,7 +976,7 @@ public BEAN getBean() {
/**
* Creates a new binding for the given field. The returned builder may be
* further configured before invoking
* {@link BindingBuilder#bind(ValueProvider, SerializableBiConsumer)}
* {@link BindingBuilder#bind(ValueProvider, Setter)}
* which completes the binding. Until {@code Binding.bind} is called, the
* binding has no effect.
* <p>
Expand All @@ -993,7 +993,7 @@ public BEAN getBean() {
* the field to be bound, not null
* @return the new binding
*
* @see #bind(HasValue, ValueProvider, SerializableBiConsumer)
* @see #bind(HasValue, ValueProvider, Setter)
*/
public <FIELDVALUE> BindingBuilder<BEAN, FIELDVALUE> forField(
HasValue<FIELDVALUE> field) {
Expand Down Expand Up @@ -1061,7 +1061,7 @@ public <FIELDVALUE> BindingBuilder<BEAN, FIELDVALUE> forField(
public <FIELDVALUE> Binding<BEAN, FIELDVALUE> bind(
HasValue<FIELDVALUE> field,
ValueProvider<BEAN, FIELDVALUE> getter,
SerializableBiConsumer<BEAN, FIELDVALUE> setter) {
Setter<BEAN, FIELDVALUE> setter) {
return forField(field).bind(getter, setter);
}

Expand Down Expand Up @@ -1473,7 +1473,7 @@ public BinderValidationStatusHandler<BEAN> getValidationStatusHandler() {
* <li>{@link #setBean(Object)} is called
* <li>{@link #removeBean()} is called
* <li>
* {@link BindingBuilder#bind(ValueProvider, SerializableBiConsumer)}
* {@link BindingBuilder#bind(ValueProvider, Setter)}
* is called
* <li>{@link Binder#validate()} or {@link Binding#validate()} is called
* </ul>
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/com/vaadin/data/StatusChangeEvent.java
Expand Up @@ -19,7 +19,7 @@

import com.vaadin.data.Binder.Binding;
import com.vaadin.data.Binder.BindingBuilder;
import com.vaadin.server.SerializableBiConsumer;
import com.vaadin.server.Setter;

/**
* Binder status change event.
Expand All @@ -32,7 +32,7 @@
* <li>{@link Binder#readBean(Object)} is called
* <li>{@link Binder#setBean(Object)} is called
* <li>{@link Binder#removeBean()} is called
* <li>{@link BindingBuilder#bind(ValueProvider, SerializableBiConsumer)}
* <li>{@link BindingBuilder#bind(ValueProvider, Setter)}
* is called
* <li>{@link Binder#validate()} or {@link Binding#validate()} is called
* </ul>
Expand Down
Expand Up @@ -15,24 +15,37 @@
*/
package com.vaadin.server;

import com.vaadin.data.Binder;
import com.vaadin.data.HasValue;

import java.io.Serializable;
import java.util.function.BiConsumer;

/**
* A {@link BiConsumer} that is also {@link Serializable}.
* The function to write the field value to the bean property
*
* @see BiConsumer
* @param <T>
* the type of the first argument to the operation
* @param <U>
* the type of the second argument to the operation
* @see Binder#bind(HasValue, SerializableFunction, Setter)
* @param <BEAN>
* the type of the target bean
* @param <FIELDVALUE>
* the field value type to be written to the bean
*
* @since 8.0
* @author Vaadin Ltd
*
*/
@FunctionalInterface
public interface SerializableBiConsumer<T, U>
extends BiConsumer<T, U>, Serializable {
// Only method inherited from BiConsumer
public interface Setter<BEAN, FIELDVALUE>
extends BiConsumer<BEAN, FIELDVALUE>, Serializable {

/** Save value to the bean property
*
* @param bean
* the target bean
* @param fieldvalue
* the field value to be written to the bean
*/
@Override
void accept(BEAN bean, FIELDVALUE fieldvalue);
}

0 comments on commit 10d4d70

Please sign in to comment.