Make it possible for grid drop target to accept dragged data when grid is empty (#9332)

* Make it possible for grid drop target to accept dragged data when grid is empty (#9068)
* Make return type of getDropTargetRow() optional

1 files changed, 5 insertions, 3 deletions

diff --git a/server/src/main/java/com/vaadin/ui/components/grid/GridDropEvent.java b/server/src/main/java/com/vaadin/ui/components/grid/GridDropEvent.java
index 08d0dad956..80eab4d1fd 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/GridDropEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/GridDropEvent.java
@@ -16,6 +16,7 @@
 package com.vaadin.ui.components.grid;
 
 import java.util.Map;
+import java.util.Optional;
 
 import com.vaadin.shared.ui.dnd.DropEffect;
 import com.vaadin.shared.ui.grid.DropLocation;
@@ -69,10 +70,11 @@ public class GridDropEvent<T> extends DropEvent<Grid<T>> {
     /**
      * Get the row item source of this event.
      *
-     * @return The row item this event was originated from.
+     * @return The optional row item if the event was originated from a row,
+     * otherwise an empty optional.
      */
-    public T getDropTargetRow() {
-        return dropTargetRow;
+    public Optional<T> getDropTargetRow() {
+        return Optional.ofNullable(dropTargetRow);
     }
 
     /**