diff options
| -rw-r--r-- | server/src/main/java/com/vaadin/server/data/AppendableFilterDataProvider.java | 2 | ||||
| -rw-r--r-- | server/src/main/java/com/vaadin/server/data/DataProvider.java | 4 | ||||
| -rw-r--r-- | server/src/main/java/com/vaadin/server/data/DataProviderWrapper.java (renamed from server/src/main/java/com/vaadin/server/data/FilteringDataProviderWrapper.java) | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/server/src/main/java/com/vaadin/server/data/AppendableFilterDataProvider.java b/server/src/main/java/com/vaadin/server/data/AppendableFilterDataProvider.java index b6c57f03da..871365bf48 100644 --- a/server/src/main/java/com/vaadin/server/data/AppendableFilterDataProvider.java +++ b/server/src/main/java/com/vaadin/server/data/AppendableFilterDataProvider.java @@ -40,7 +40,7 @@ public interface AppendableFilterDataProvider<T, F> extends DataProvider<T, F> { */ public default AppendableFilterDataProvider<T, F> applyFilter(F filter) { Objects.requireNonNull(filter, "The applied filter can't be null"); - return FilteringDataProviderWrapper.chain(this, filter); + return DataProviderWrapper.chain(this, filter); } /** diff --git a/server/src/main/java/com/vaadin/server/data/DataProvider.java b/server/src/main/java/com/vaadin/server/data/DataProvider.java index a373128358..ef71378b8f 100644 --- a/server/src/main/java/com/vaadin/server/data/DataProvider.java +++ b/server/src/main/java/com/vaadin/server/data/DataProvider.java @@ -101,7 +101,7 @@ public interface DataProvider<T, F> extends Serializable { */ public default DataProvider<T, Void> setFilter(F filter) { Objects.requireNonNull(filter, "Filter can't be null"); - return FilteringDataProviderWrapper.filter(this, filter); + return DataProviderWrapper.filter(this, filter); } /** @@ -135,7 +135,7 @@ public interface DataProvider<T, F> extends Serializable { public default <M> DataProvider<T, M> convertFilter( SerializableFunction<M, F> mapper) { Objects.requireNonNull(mapper, "Filter mapper can't be null"); - return FilteringDataProviderWrapper.convert(this, mapper); + return DataProviderWrapper.convert(this, mapper); } /** diff --git a/server/src/main/java/com/vaadin/server/data/FilteringDataProviderWrapper.java b/server/src/main/java/com/vaadin/server/data/DataProviderWrapper.java index b888fd79c7..4bbb83b84c 100644 --- a/server/src/main/java/com/vaadin/server/data/FilteringDataProviderWrapper.java +++ b/server/src/main/java/com/vaadin/server/data/DataProviderWrapper.java @@ -21,9 +21,9 @@ import com.vaadin.server.SerializableFunction; import com.vaadin.shared.Registration; /** - * Wrapper class for modifying, chaining and replacing filters in a query. Used - * to create a suitable {@link Query} for the underlying data provider with - * correct filters. + * Wrapper class for modifying, chaining and replacing filters and sorting in a + * query. Used to create a suitable {@link Query} for the underlying data + * provider with correct filters and sorting. * * @author Vaadin Ltd. * @since @@ -35,7 +35,7 @@ import com.vaadin.shared.Registration; * @param <M> * underlying data provider filter type */ -public abstract class FilteringDataProviderWrapper<T, F, M> +public abstract class DataProviderWrapper<T, F, M> implements DataProvider<T, F> { /** @@ -47,7 +47,7 @@ public abstract class FilteringDataProviderWrapper<T, F, M> * the data provider filter type */ protected abstract static class AppendableFilterDataProviderWrapper<T, F> - extends FilteringDataProviderWrapper<T, F, F> + extends DataProviderWrapper<T, F, F> implements AppendableFilterDataProvider<T, F> { /** @@ -80,7 +80,7 @@ public abstract class FilteringDataProviderWrapper<T, F, M> * @param dataProvider * the wrapped data provider */ - protected FilteringDataProviderWrapper(DataProvider<T, M> dataProvider) { + protected DataProviderWrapper(DataProvider<T, M> dataProvider) { this.dataProvider = dataProvider; } @@ -141,7 +141,7 @@ public abstract class FilteringDataProviderWrapper<T, F, M> */ public static <T, F> DataProvider<T, Void> filter( DataProvider<T, F> dataProvider, F filter) { - return new FilteringDataProviderWrapper<T, Void, F>(dataProvider) { + return new DataProviderWrapper<T, Void, F>(dataProvider) { @Override protected F getFilter(Query<T, Void> query) { @@ -173,7 +173,7 @@ public abstract class FilteringDataProviderWrapper<T, F, M> public static <T, F, M> DataProvider<T, F> convert( DataProvider<T, M> dataProvider, SerializableFunction<F, M> mapper) { - return new FilteringDataProviderWrapper<T, F, M>(dataProvider) { + return new DataProviderWrapper<T, F, M>(dataProvider) { @Override protected M getFilter(Query<T, F> query) { |