Skip to content

Commit 689d42b

Browse files
MarcinVaadinMarcinVaadin
authored
refactor!: remove deprecated setDataProvider() (#4586)
1 parent afee6e3 commit 689d42b

File tree

39 files changed

+99
-264
lines changed

39 files changed

+99
-264
lines changed

‎vaadin-checkbox-flow-parent/vaadin-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroup.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,15 +331,7 @@ public void setItems(Stream<T> streamOfItems) {
331331
setItems(DataProvider.fromStream(streamOfItems));
332332
}
333333

334-
/**
335-
* {@inheritDoc}
336-
*
337-
* @deprecated use instead one of the {@code setItems} methods which provide
338-
* access to either {@link CheckboxGroupListDataView} or
339-
* {@link CheckboxGroupDataView}
340-
*/
341-
@Deprecated
342-
public void setDataProvider(DataProvider<T, ?> dataProvider) {
334+
private void setDataProvider(DataProvider<T, ?> dataProvider) {
343335
this.dataProvider.set(dataProvider);
344336
DataViewUtils.removeComponentFilterAndSortComparator(this);
345337
reset();

‎vaadin-checkbox-flow-parent/vaadin-checkbox-flow/src/test/java/com/vaadin/flow/component/checkbox/tests/CheckboxGroupTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ public void dataViewForFaultyDataProvider_throwsException() {
431431
DataProvider<String, Void> dataProvider = DataProvider
432432
.fromCallbacks(query -> Stream.of("one"), query -> 1);
433433

434-
checkboxGroup.setDataProvider(dataProvider);
434+
checkboxGroup.setItems(dataProvider);
435435

436436
checkboxGroup.getListDataView();
437437
}

‎vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/src/main/java/com/vaadin/flow/component/combobox/test/AutoFocusFilterPage.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@ public AutoFocusFilterPage() {
3131
"Option 5", "Another Option 2");
3232

3333
ComboBox<String> comboBox = new ComboBox<>("Choose option");
34-
comboBox.setDataProvider((filter, offset, limit) -> {
35-
if (filter.isEmpty())
34+
comboBox.setItems((query) -> {
35+
if (query.getFilter().get().isEmpty())
3636
return Stream.of("");
37-
return data.stream().filter(s -> s.contains(filter)).skip(offset)
38-
.limit(limit);
39-
}, (filter) -> {
40-
if (filter.isEmpty())
37+
return data.stream()
38+
.filter(s -> s.contains(query.getFilter().get()))
39+
.skip(query.getOffset()).limit(query.getLimit());
40+
}, (query) -> {
41+
if (query.getFilter().get().isEmpty())
4142
return 1;
42-
return (int) data.stream().filter(s -> s.contains(filter)).count();
43+
return (int) data.stream()
44+
.filter(s -> s.contains(query.getFilter().get())).count();
4345
});
4446

4547
comboBox.setAutofocus(true);

‎vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/src/main/java/com/vaadin/flow/component/combobox/test/ComboBoxDemoPage.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ private void createComboBoxWithCallbackLazyLoading() {
360360
* items from the given range with the given filter. The second callback
361361
* should provide the number of items that match the query.
362362
*/
363-
comboBox.setDataProvider((filter, offset, limit) -> IntStream
364-
.range(offset, offset + limit).mapToObj(i -> "Item " + i),
365-
filter -> 500);
363+
comboBox.setItems((query) -> IntStream
364+
.range(query.getOffset(), query.getOffset() + query.getLimit())
365+
.mapToObj(i -> "Item " + i), filter -> 500);
366366

367367
comboBox.setId("callback-box");
368368
add(new Div(new H2("Lazy Loading"),

‎vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/src/main/java/com/vaadin/flow/component/combobox/test/ComboBoxPage.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ private void createWithUpdateProvider() {
112112
comboBox.setId("combo");
113113

114114
NativeButton setProvider = new NativeButton("Update data provider",
115-
event -> comboBox.setDataProvider(
116-
DataProvider.ofItems("baz", "foobar")));
115+
event -> comboBox
116+
.setItems(DataProvider.ofItems("baz", "foobar")));
117117
setProvider.setId("update-provider");
118118

119119
NativeButton setItemCaptionGenerator = new NativeButton(
@@ -141,7 +141,7 @@ private void createWithRequestsSpyDataProvider() {
141141
Arrays.asList("foo", "bar", "baz"),
142142
ignore -> sizeRequestCountSpan.setText(
143143
String.valueOf(sizeRequestCounter.incrementAndGet())));
144-
comboBox.setDataProvider(dataProvider);
144+
comboBox.setItems(dataProvider);
145145

146146
NativeButton resetDataProvider = new NativeButton("Set data provider",
147147
event -> comboBox.setItems("new item"));

‎vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/src/main/java/com/vaadin/flow/component/combobox/test/ComponentRendererPage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private void itemsAfterRenderer() {
7979
private void dataProviderBeforeRenderer() {
8080
ComboBox<ComboBoxDemoPage.Song> comboBox = new ComboBox<>();
8181
List<ComboBoxDemoPage.Song> listOfSongs = createListOfSongs();
82-
comboBox.setDataProvider(
82+
comboBox.setItems(
8383
new ListDataProvider<ComboBoxDemoPage.Song>(listOfSongs));
8484
comboBox.setItemLabelGenerator(ComboBoxDemoPage.Song::getName);
8585

@@ -95,7 +95,7 @@ private void dataProviderAfterRenderer() {
9595
List<ComboBoxDemoPage.Song> listOfSongs = createListOfSongs();
9696
comboBox.setRenderer(renderer);
9797

98-
comboBox.setDataProvider(
98+
comboBox.setItems(
9999
new ListDataProvider<ComboBoxDemoPage.Song>(listOfSongs));
100100
comboBox.setItemLabelGenerator(ComboBoxDemoPage.Song::getName);
101101

‎vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/src/main/java/com/vaadin/flow/component/combobox/test/DataProviderPage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public DataProviderPage() {
5050
private void createDataProviderWithGetId() {
5151
ComboBox<TestItem> comboBoxWithGetId = new ComboBox<>();
5252
comboBoxWithGetId.setId(COMBO_BOX_WITH_GET_ID_ID);
53-
comboBoxWithGetId.setDataProvider(new ListDataProvider<TestItem>(list) {
53+
comboBoxWithGetId.setItems(new ListDataProvider<TestItem>(list) {
5454
@Override
5555
public Object getId(TestItem item) {
5656
return item.getId();
@@ -99,7 +99,7 @@ private void createRefreshWithSmallerDataSet() {
9999
DataProvider<String, String> dp = DataProvider.fromFilteringCallbacks(
100100
q -> items.stream().skip(q.getOffset()).limit(q.getLimit()),
101101
q -> items.size());
102-
cb.setDataProvider(dp);
102+
cb.setItems(dp);
103103

104104
NativeButton refreshAllWithSmallerDataSetButton = new NativeButton(
105105
"Refresh all with smaller data set", event -> {

‎vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/src/main/java/com/vaadin/flow/component/combobox/test/FilterDebouncePage.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public FilterDebouncePage() {
2020
ComboBox<String> combo = new ComboBox<>();
2121
ListDataProvider<String> dp = new ListDataProvider<>(
2222
Arrays.asList("aaa", "bbb", "ccc"));
23-
combo.setDataProvider((filter, offset, limit) -> {
23+
combo.setItems((query) -> {
2424
waitABit();
25-
return dp.fetch(
26-
new Query<>(offset, limit, null, null, filter(filter)));
27-
}, s -> {
25+
return dp.fetch(new Query<>(query.getOffset(), query.getLimit(),
26+
null, null, filter(query.getFilter().get())));
27+
}, query -> {
2828
waitABit();
29-
return dp.size(
30-
new Query<>(0, Integer.MAX_VALUE, null, null, filter(s)));
29+
return dp.size(new Query<>(0, Integer.MAX_VALUE, null, null,
30+
filter(query.getFilter().get())));
3131
});
3232
combo.setAutofocus(true);
3333
Input tf = new Input();

‎vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/src/main/java/com/vaadin/flow/component/combobox/test/FilteringPage.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public FilteringPage() {
4545

4646
List<String> items = LazyLoadingPage.generateStrings(40);
4747
ListDataProvider<String> dp = DataProvider.ofCollection(items);
48-
comboBox.setDataProvider(dp);
48+
comboBox.setItems(dp);
4949

5050
comboBox.addValueChangeListener(e -> message.setText(e.getValue()));
5151

@@ -75,7 +75,7 @@ public FilteringPage() {
7575
add(comboBox, addButton, removeButton, itemFilterButton);
7676

7777
ComboBox<String> pageSizeBox = new ComboBox<>(60);
78-
pageSizeBox.setDataProvider(dp);
78+
pageSizeBox.setItems(dp);
7979
pageSizeBox.setLabel("Page size 60");
8080
pageSizeBox.setId("page-size-60");
8181
add(new Div(), pageSizeBox);
@@ -100,16 +100,16 @@ public FilteringPage() {
100100
}, query -> {
101101
return 1;
102102
});
103-
comboBoxWithFilterableDataProvider
104-
.setDataProvider(dataProviderWithFiltering);
103+
comboBoxWithFilterableDataProvider.setItems(dataProviderWithFiltering);
105104
add(new Div(), comboBoxWithFilterableDataProvider);
106105

107106
ComboBox<String> comboBoxWithEmptyFilterReturnsNone = new ComboBox<>();
108-
comboBoxWithEmptyFilterReturnsNone.setDataProvider(
109-
(filter, offset, limit) -> IntStream
110-
.range(offset, offset + limit)
107+
comboBoxWithEmptyFilterReturnsNone.setItems(
108+
(query) -> IntStream
109+
.range(query.getOffset(),
110+
query.getOffset() + query.getLimit())
111111
.mapToObj(i -> "Item " + i),
112-
filter -> filter.isEmpty() ? 0 : 1);
112+
query -> query.getFilter().get().isEmpty() ? 0 : 1);
113113
comboBoxWithEmptyFilterReturnsNone.setId("empty-filter-returns-none");
114114
add(new Div(), comboBoxWithEmptyFilterReturnsNone);
115115

‎vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/src/main/java/com/vaadin/flow/component/combobox/test/LazyLoadingPage.java‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private void createListDataProviderWithStringsAutoOpenDisabled() {
8080

8181
List<String> items = generateStrings(1000);
8282
ListDataProvider<String> dp = DataProvider.ofCollection(items);
83-
comboBox.setDataProvider(dp);
83+
comboBox.setItems(dp);
8484

8585
comboBox.addValueChangeListener(e -> message.setText(e.getValue()));
8686

@@ -93,7 +93,7 @@ private void createListDataProviderWithStrings() {
9393
comboBox.setId("lazy-strings");
9494

9595
List<String> items = generateStrings(1000);
96-
comboBox.setDataProvider(DataProvider.ofCollection(items));
96+
comboBox.setItems(DataProvider.ofCollection(items));
9797

9898
comboBox.addValueChangeListener(e -> message.setText(e.getValue()));
9999

@@ -120,8 +120,7 @@ private void createComboBoxWithCustomPageSize() {
120120
addTitle("ListDataProvider with custom page size 180");
121121
ComboBox<String> comboBox = new ComboBox<>(180);
122122
comboBox.setId("pagesize");
123-
comboBox.setDataProvider(
124-
DataProvider.ofCollection(generateStrings(1000)));
123+
comboBox.setItems(DataProvider.ofCollection(generateStrings(1000)));
125124

126125
NativeButton pageSizeButton = new NativeButton("set pagesize 100",
127126
e -> comboBox.setPageSize(100));
@@ -141,7 +140,7 @@ private void createListDataProviderWithBeans() {
141140
ListDataProvider<Person> personDataProvider = new ListDataProvider<>(
142141
people);
143142

144-
comboBox.setDataProvider(personDataProvider);
143+
comboBox.setItems(personDataProvider);
145144

146145
NativeButton setButton = new NativeButton("set value",
147146
e -> comboBox.setValue(people.get(3)));
@@ -165,7 +164,7 @@ private void createListDataProviderWithBeans() {
165164
altPeople);
166165
NativeButton dataProviderButton = new NativeButton(
167166
"Change data provider",
168-
e -> comboBox.setDataProvider(altPersonDataProvider));
167+
e -> comboBox.setItems(altPersonDataProvider));
169168
dataProviderButton.setId("data-provider");
170169

171170
NativeButton updateButton = new NativeButton("Update first item", e -> {
@@ -201,9 +200,8 @@ private void createDataProviderWithCustomItemFilter() {
201200
new Label("Born: " + person.getBorn()));
202201
}));
203202

204-
comboBox.setDataProvider((person, filter) -> String
205-
.valueOf(person.getBorn()).startsWith(filter),
206-
personDataProvider);
203+
comboBox.setItems((person, filter) -> String.valueOf(person.getBorn())
204+
.startsWith(filter), personDataProvider);
207205
add(comboBox);
208206
}
209207

@@ -227,7 +225,7 @@ private void createCallbackDataProvider() {
227225
return 210;
228226
});
229227

230-
comboBox.setDataProvider(dataProvider);
228+
comboBox.setItems(dataProvider);
231229

232230
add(comboBox, sizeRequestCountSpan);
233231
}
@@ -238,8 +236,7 @@ private void createComboBoxInATemplate() {
238236
comboBoxInATemplate.setId("template");
239237
ComboBox<String> comboBox = comboBoxInATemplate.getComboBox();
240238

241-
comboBox.setDataProvider(
242-
DataProvider.ofCollection(generateStrings(1000)));
239+
comboBox.setItems(DataProvider.ofCollection(generateStrings(1000)));
243240
comboBox.addValueChangeListener(e -> message.setText(e.getValue()));
244241

245242
add(comboBoxInATemplate);
@@ -254,8 +251,7 @@ private void createCallbackDataProviderWhichReturnsZeroItems() {
254251
CallbackDataProvider.FetchCallback<String, String> fetch = query -> items
255252
.stream().limit(query.getLimit()).skip(query.getOffset());
256253
CallbackDataProvider.CountCallback<String, String> count = query -> 0;
257-
comboBox.setDataProvider(
258-
DataProvider.fromFilteringCallbacks(fetch, count));
254+
comboBox.setItems(DataProvider.fromFilteringCallbacks(fetch, count));
259255

260256
add(comboBox);
261257
}
@@ -265,7 +261,7 @@ private void createComboBoxWithCustomPageSizeAndLazyLoading() {
265261
ComboBox<String> comboBox = new ComboBox<>(42);
266262
comboBox.setId("lazy-custom-page-size");
267263

268-
comboBox.setDataProvider(DataProvider.fromFilteringCallbacks(query -> {
264+
comboBox.setItems(DataProvider.fromFilteringCallbacks(query -> {
269265
Stream<String> stream = IntStream.range(0, 500)
270266
.mapToObj(String::valueOf);
271267
message.setText(String.valueOf(query.getPageSize()));

0 commit comments

Comments
 (0)