Skip to content

Commit ab7b35b

Browse files
tomivirkkitomivirkki
authored
refactor!: remove deprecated setItems method from Grid (#4601)
1 parent 8ec5c0f commit ab7b35b

File tree

9 files changed

+40
-37
lines changed

9 files changed

+40
-37
lines changed

‎vaadin-date-picker-flow-parent/vaadin-date-picker-flow-integration-tests/src/main/java/com/vaadin/flow/component/datepicker/DatePickerInAGridHeaderPage.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.vaadin.flow.component.datepicker;
1717

1818
import java.util.Locale;
19+
import java.util.stream.Collectors;
1920
import java.util.stream.IntStream;
2021

2122
import com.vaadin.flow.component.grid.Grid;
@@ -34,7 +35,8 @@ public DatePickerInAGridHeaderPage() {
3435
header.setId("date-picker");
3536

3637
grid.addColumn(ValueProvider.identity()).setHeader(header);
37-
grid.setItems(IntStream.range(0, 100).mapToObj(i -> "Item " + i));
38+
grid.setItems(IntStream.range(0, 100).mapToObj(i -> "Item " + i)
39+
.collect(Collectors.toList()));
3840

3941
add(grid);
4042
}

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/main/java/com/vaadin/flow/component/grid/contextmenu/ContextMenuGridPage.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.vaadin.flow.component.grid.contextmenu;
1717

18+
import java.util.stream.Collectors;
1819
import java.util.stream.IntStream;
1920

2021
import com.vaadin.flow.component.grid.Grid;
@@ -49,7 +50,8 @@ private void gridWithContextMenu() {
4950
grid.addColumn(Person::getFirstName).setHeader("Name").setId("Name-Id");
5051
grid.addColumn(Person::getAge).setHeader("Born").setId("Born-Id");
5152
grid.setItems(IntStream.range(0, 77)
52-
.mapToObj(i -> new Person("Person " + i, 1900 + i)));
53+
.mapToObj(i -> new Person("Person " + i, 1900 + i))
54+
.collect(Collectors.toList()));
5355

5456
GridContextMenu<Person> contextMenu = grid.addContextMenu();
5557
addItems(contextMenu);
@@ -87,8 +89,8 @@ private void gridInATemplateWithContextMenu() {
8789
GridInATemplate template = new GridInATemplate();
8890
Grid<String> gridInATemplate = template.getGrid();
8991
gridInATemplate.addColumn(s -> s).setHeader("Item");
90-
gridInATemplate
91-
.setItems(IntStream.range(0, 26).mapToObj(i -> "Item " + i));
92+
gridInATemplate.setItems(IntStream.range(0, 26)
93+
.mapToObj(i -> "Item " + i).collect(Collectors.toList()));
9294

9395
GridContextMenu<String> contextMenu = gridInATemplate.addContextMenu();
9496
contextMenu.addItem("Show name of context menu target item",

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/main/java/com/vaadin/flow/component/grid/contextmenu/DynamicContextMenuGridPage.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.vaadin.flow.component.grid.contextmenu;
1717

18+
import java.util.stream.Collectors;
1819
import java.util.stream.IntStream;
1920

2021
import com.vaadin.flow.component.grid.Grid;
@@ -35,7 +36,8 @@ private void gridWithDynamicContextMenu() {
3536
grid.addColumn(Person::getAge).setHeader("Born").setId("Born-Id");
3637

3738
grid.setItems(IntStream.range(0, 50)
38-
.mapToObj(i -> new Person("Person " + i, i)));
39+
.mapToObj(i -> new Person("Person " + i, i))
40+
.collect(Collectors.toList()));
3941

4042
GridContextMenu<Person> contextMenu = grid.addContextMenu();
4143

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/main/java/com/vaadin/flow/component/grid/it/GridMultiSelectionColumnPage.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.ArrayList;
1919
import java.util.Arrays;
2020
import java.util.List;
21+
import java.util.stream.Collectors;
2122
import java.util.stream.IntStream;
2223
import java.util.stream.Stream;
2324

@@ -90,8 +91,8 @@ private void createUnknownItemCountLazyGrid() {
9091

9192
private void createInMemoryGrid() {
9293
Grid<String> grid = new Grid<>();
93-
grid.setItems(
94-
IntStream.range(0, ITEM_COUNT).mapToObj(Integer::toString));
94+
grid.setItems(IntStream.range(0, ITEM_COUNT).mapToObj(Integer::toString)
95+
.collect(Collectors.toList()));
9596
setUp(grid);
9697
grid.setId(IN_MEMORY_GRID_ID);
9798
add(new H2("In-memory grid"), grid);
@@ -138,8 +139,8 @@ private void setUp(Grid<String> grid) {
138139

139140
private void createBasicGridFromSingleToMultiBeforeAttached() {
140141
Grid<String> grid = new Grid<>();
141-
grid.setItems(
142-
IntStream.range(0, ITEM_COUNT).mapToObj(Integer::toString));
142+
grid.setItems(IntStream.range(0, ITEM_COUNT).mapToObj(Integer::toString)
143+
.collect(Collectors.toList()));
143144
setUp(grid);
144145
grid.setId("in-testing-multi-selection-mode-grid");
145146
add(new H2("in-testing-multi-selection-mode-grid"), grid);
@@ -151,8 +152,8 @@ private void createBasicGridFromSingleToMultiBeforeAttached() {
151152

152153
private void createBasicGridFromMultiToSingleBeforeAttached() {
153154
Grid<String> grid = new Grid<>();
154-
grid.setItems(
155-
IntStream.range(0, ITEM_COUNT).mapToObj(Integer::toString));
155+
grid.setItems(IntStream.range(0, ITEM_COUNT).mapToObj(Integer::toString)
156+
.collect(Collectors.toList()));
156157
setUp(grid);
157158
grid.setId("in-testing-multi-selection-mode-grid-single");
158159
add(new H2("in-testing-multi-selection-mode-grid-single"), grid);
@@ -164,8 +165,8 @@ private void createBasicGridFromMultiToSingleBeforeAttached() {
164165

165166
private void setAutoWidthIsTrueOfSelectionColumn() {
166167
Grid<String> grid = new Grid<>();
167-
grid.setItems(
168-
IntStream.range(0, ITEM_COUNT).mapToObj(Integer::toString));
168+
grid.setItems(IntStream.range(0, ITEM_COUNT).mapToObj(Integer::toString)
169+
.collect(Collectors.toList()));
169170
setUp(grid);
170171
grid.setId("set-auto-width-true");
171172
add(new H2("In-set-auto-width-true"), grid);
@@ -177,7 +178,8 @@ private void setAutoWidthIsTrueOfSelectionColumn() {
177178
private void createBasicGridMultiAllRowsSelected() {
178179
Grid<String> grid = new Grid<>();
179180
grid.setId(MULTI_SELECT_GRID_ALL_SELECTED_GRID_ID);
180-
grid.setItems(IntStream.range(0, 2).mapToObj(Integer::toString));
181+
grid.setItems(IntStream.range(0, 2).mapToObj(Integer::toString)
182+
.collect(Collectors.toList()));
181183
grid.addColumn(i -> i).setHeader("text");
182184
grid.addColumn(i -> String.valueOf(i.length())).setHeader("length");
183185
grid.setSelectionMode(Grid.SelectionMode.MULTI);
@@ -198,7 +200,8 @@ private void createBasicGridMultiAllRowsSelected() {
198200
private void createBasicGridMultiOneRowDeSelected() {
199201
Grid<String> grid = new Grid<>();
200202
grid.setId(MULTI_SELECT_GRID_ONE_NOT_SELECTED_GRID_ID);
201-
grid.setItems(IntStream.range(0, 2).mapToObj(Integer::toString));
203+
grid.setItems(IntStream.range(0, 2).mapToObj(Integer::toString)
204+
.collect(Collectors.toList()));
202205
grid.addColumn(i -> i).setHeader("text");
203206
grid.addColumn(i -> String.valueOf(i.length())).setHeader("length");
204207
grid.setSelectionMode(Grid.SelectionMode.MULTI);

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/main/java/com/vaadin/flow/component/grid/it/GridScrollToPage.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44
import java.util.List;
5+
import java.util.stream.Collectors;
56
import java.util.stream.IntStream;
67

78
import com.vaadin.flow.component.grid.Grid;
@@ -15,7 +16,8 @@ public GridScrollToPage() {
1516
Grid<String> grid = new Grid<>();
1617
grid.setId("data-grid");
1718

18-
grid.setItems(IntStream.rangeClosed(0, 1000).mapToObj(String::valueOf));
19+
grid.setItems(IntStream.rangeClosed(0, 1000).mapToObj(String::valueOf)
20+
.collect(Collectors.toList()));
1921

2022
grid.addColumn(item -> item).setHeader("Data");
2123

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/main/java/com/vaadin/flow/component/grid/it/GridSingleSelectionDeselectAllowedPage.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.vaadin.flow.component.grid.it;
1717

18+
import java.util.stream.Collectors;
1819
import java.util.stream.IntStream;
1920

2021
import com.vaadin.flow.component.button.Button;
@@ -65,7 +66,8 @@ private Grid<String> buildGrid(boolean deselectAllowed, String id) {
6566
Grid<String> grid = new Grid<>();
6667
grid.addColumn(string -> String.valueOf(Math.random())) // NOSONAR
6768
.setHeader("column 1");
68-
grid.setItems(IntStream.rangeClosed(1, 3).mapToObj(String::valueOf));
69+
grid.setItems(IntStream.rangeClosed(1, 3).mapToObj(String::valueOf)
70+
.collect(Collectors.toList()));
6971
grid.setAllRowsVisible(true);
7072
if (!deselectAllowed) {
7173
((GridSingleSelectionModel) grid.getSelectionModel())
@@ -79,7 +81,8 @@ private Grid<String> buildGrid(boolean deselectAllowed, String id) {
7981
private Grid<String> setItemsGrid(Grid grid, String id) {
8082
grid.addColumn(string -> String.valueOf(Math.random())) // NOSONAR
8183
.setHeader("column 1");
82-
grid.setItems(IntStream.rangeClosed(1, 3).mapToObj(String::valueOf));
84+
grid.setItems(IntStream.rangeClosed(1, 3).mapToObj(String::valueOf)
85+
.collect(Collectors.toList()));
8386
grid.setAllRowsVisible(true);
8487
grid.setId(id);
8588
return grid;

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/main/java/com/vaadin/flow/component/grid/it/GridTestScrollingOver100kLines.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.vaadin.flow.component.grid.it;
1717

1818
import java.time.LocalDate;
19+
import java.util.stream.Collectors;
1920
import java.util.stream.IntStream;
2021

2122
import com.vaadin.flow.component.grid.Grid;
@@ -46,8 +47,8 @@ public GridTestScrollingOver100kLines() {
4647
grid.setWidth("100%");
4748
grid.setHeight("300px");
4849

49-
grid.setItems(
50-
IntStream.rangeClosed(1, 100500).mapToObj(String::valueOf));
50+
grid.setItems(IntStream.rangeClosed(1, 100500).mapToObj(String::valueOf)
51+
.collect(Collectors.toList()));
5152
add(grid);
5253
}
5354

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/src/main/java/com/vaadin/flow/component/grid/it/ToggleVisibilityPage.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.vaadin.flow.component.grid.it;
1717

18+
import java.util.stream.Collectors;
1819
import java.util.stream.IntStream;
1920

2021
import com.vaadin.flow.component.grid.Grid;
@@ -34,13 +35,13 @@ public class ToggleVisibilityPage extends Div {
3435

3536
public ToggleVisibilityPage() {
3637
Grid<String> grid1 = new Grid<>();
37-
grid1.setItems(
38-
IntStream.range(0, 100).mapToObj(i -> "Grid1 Item " + i));
38+
grid1.setItems(IntStream.range(0, 100).mapToObj(i -> "Grid1 Item " + i)
39+
.collect(Collectors.toList()));
3940
grid1.addColumn(ValueProvider.identity());
4041

4142
Grid<String> grid2 = new Grid<>();
42-
grid2.setItems(
43-
IntStream.range(0, 100).mapToObj(i -> "Grid2 Item " + i));
43+
grid2.setItems(IntStream.range(0, 100).mapToObj(i -> "Grid2 Item " + i)
44+
.collect(Collectors.toList()));
4445
grid2.addColumn(ValueProvider.identity());
4546

4647
Div parent1 = new Div(grid1);

‎vaadin-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/Grid.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2449,19 +2449,6 @@ public void setDataProvider(DataProvider<T, ?> dataProvider) {
24492449
}
24502450
}
24512451

2452-
/**
2453-
* {@inheritDoc}
2454-
*
2455-
* @deprecated Because the stream is collected to a list anyway, use
2456-
* {@link HasListDataView#setItems(Collection)} or
2457-
* {@link #setItems(CallbackDataProvider.FetchCallback)}
2458-
* instead.
2459-
*/
2460-
@Deprecated
2461-
public void setItems(Stream<T> streamOfItems) {
2462-
setItems(DataProvider.fromStream(streamOfItems));
2463-
}
2464-
24652452
/**
24662453
* Returns the data provider of this grid.
24672454
* <p>

0 commit comments

Comments
 (0)