fix: use correct null check in setTooltipGenerator (#4236) (#4239)

Co-authored-by: Serhii Kulykov <[email protected]>
vaadin · Nov 28, 2022 · c39b1a9 · c39b1a9
1 parent e4f09be
commit c39b1a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/Grid.java b/...-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/Grid.java
@@ -1044,7 +1044,7 @@ public Column<T> setClassNameGenerator(
          */
         public Column<T> setTooltipGenerator(
                 SerializableFunction<T, String> tooltipGenerator) {
-            Objects.requireNonNull(classNameGenerator,
+            Objects.requireNonNull(tooltipGenerator,
                     "Tooltip generator can not be null");
 
             if (!getGrid().getElement().getChildren().anyMatch(

diff --git a/...parent/vaadin-grid-flow/src/test/java/com/vaadin/flow/component/grid/GridTooltipTest.java b/...parent/vaadin-grid-flow/src/test/java/com/vaadin/flow/component/grid/GridTooltipTest.java
@@ -71,6 +71,11 @@ public void setAnotherTooltipGenerator_hasOneTooltipElement() {
         Assert.assertEquals(1, getTooltipElements(grid).count());
     }
 
+    @Test(expected = NullPointerException.class)
+    public void setNullTooltipGenerator_throws() {
+        grid.addColumn(item -> item).setTooltipGenerator(null);
+    }
+
     private Optional<Element> getTooltipElement(Grid<?> grid) {
         return getTooltipElements(grid).findFirst();
     }