Skip to content

fix: add null check in setFooterToolbar #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paodb merged 2 commits into from
Jun 11, 2025
Merged

fix: add null check in setFooterToolbar #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc09668
fix: add null check in setFooterToolbar
google-labs-jules[bot] Jun 11, 2025
7343164
WIP: fix test case
google-labs-jules[bot] Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/flowingcode/vaadin/addons/gridhelpers/FooterToolbarGridHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.vaadin.flow.component.grid.FooterRow.FooterCell;
import com.vaadin.flow.component.grid.Grid;
import java.io.Serializable;
import java.util.Objects;
import lombok.RequiredArgsConstructor;

@SuppressWarnings("serial")
Expand All @@ -35,6 +36,7 @@ class FooterToolbarGridHelper implements Serializable {
private FooterCell footerCell;

public void setFooterToolbar(Component toolBar) {
Objects.requireNonNull(toolBar, "Toolbar component must not be null");
Grid<?> grid = helper.getGrid();
if (grid.getColumns().isEmpty()) {
throw new IllegalStateException("Cannot set footer toolbar: Grid columns have not been configured.");
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/flowingcode/vaadin/addons/gridhelpers/test/FooterToolbarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
*/
package com.flowingcode.vaadin.addons.gridhelpers.test;

import com.flowingcode.vaadin.addons.gridhelpers.GridHelper;
import com.flowingcode.vaadin.addons.gridhelpers.GridHelper;
import com.vaadin.flow.component.grid.Grid;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import org.junit.Assert;
import org.junit.Test;

public class FooterToolbarTest {
Expand All @@ -42,4 +44,16 @@ public void testSetFooterToolbarBeforeColumnsConfiguredThrowsException() {
var toolbarFooter = new HorizontalLayout();
GridHelper.addToolbarFooter(grid, toolbarFooter);
}

@Test(expected = NullPointerException.class)
public void testSetFooterToolbarWithNullToolbarThrowsException() {
Grid<Bean> grid = new Grid<>(Bean.class, false);
grid.addColumn(x -> x).setHeader("Header");
try {
GridHelper.addToolbarFooter(grid, null);
} catch (NullPointerException e) {
Assert.assertEquals("Toolbar component must not be null", e.getMessage());
throw e;
}
}
}
Loading