Remove Extension suffix from Grid DND classes (#9035)

8 files changed, 31 insertions, 25 deletions

diff --git a/server/src/main/java/com/vaadin/event/dnd/grid/GridDragEndEvent.java b/server/src/main/java/com/vaadin/event/dnd/grid/GridDragEndEvent.java
index 8b4ceb1d4f..e58196e6b7 100644
--- a/server/src/main/java/com/vaadin/event/dnd/grid/GridDragEndEvent.java
+++ b/server/src/main/java/com/vaadin/event/dnd/grid/GridDragEndEvent.java
@@ -20,6 +20,7 @@ import java.util.Set;
 import com.vaadin.event.dnd.DragEndEvent;
 import com.vaadin.shared.ui.dnd.DropEffect;
 import com.vaadin.ui.Grid;
+import com.vaadin.ui.GridDragSource;
 
 /**
  * Drop event on an HTML5 drop target {@link Grid} row.
@@ -27,7 +28,7 @@ import com.vaadin.ui.Grid;
  * @param <T>
  *         The Grid bean type.
  * @author Vaadin Ltd.
- * @see com.vaadin.ui.GridDragSourceExtension#addGridDragStartListener(GridDragStartListener)
+ * @see GridDragSource#addGridDragStartListener(GridDragStartListener)
  * @since
  */
 public class GridDragEndEvent<T> extends DragEndEvent<Grid<T>> {
diff --git a/server/src/main/java/com/vaadin/event/dnd/grid/GridDragEndListener.java b/server/src/main/java/com/vaadin/event/dnd/grid/GridDragEndListener.java
index ad338e68db..c47a8f037f 100644
--- a/server/src/main/java/com/vaadin/event/dnd/grid/GridDragEndListener.java
+++ b/server/src/main/java/com/vaadin/event/dnd/grid/GridDragEndListener.java
@@ -18,6 +18,7 @@ package com.vaadin.event.dnd.grid;
 import java.lang.reflect.Method;
 
 import com.vaadin.event.ConnectorEventListener;
+import com.vaadin.ui.GridDragSource;
 
 /**
  * Drop listener for HTML5 drop on a Grid row.
@@ -25,7 +26,7 @@ import com.vaadin.event.ConnectorEventListener;
  * @param <T>
  *         The Grid bean type.
  * @author Vaadin Ltd.
- * @see com.vaadin.ui.GridDragSourceExtension#addGridDragEndListener(GridDragEndListener)
+ * @see GridDragSource#addGridDragEndListener(GridDragEndListener)
  * @since
  */
 @FunctionalInterface
diff --git a/server/src/main/java/com/vaadin/event/dnd/grid/GridDragStartEvent.java b/server/src/main/java/com/vaadin/event/dnd/grid/GridDragStartEvent.java
index 50130043da..ac87c296cf 100644
--- a/server/src/main/java/com/vaadin/event/dnd/grid/GridDragStartEvent.java
+++ b/server/src/main/java/com/vaadin/event/dnd/grid/GridDragStartEvent.java
@@ -20,6 +20,7 @@ import java.util.Set;
 import com.vaadin.event.dnd.DragStartEvent;
 import com.vaadin.shared.ui.dnd.EffectAllowed;
 import com.vaadin.ui.Grid;
+import com.vaadin.ui.GridDragSource;
 
 /**
  * Drag start event on an HTML5 drag source {@link Grid} row.
@@ -27,7 +28,7 @@ import com.vaadin.ui.Grid;
  * @param <T>
  *         The Grid bean type.
  * @author Vaadin Ltd.
- * @see com.vaadin.ui.GridDragSourceExtension#addGridDragStartListener(GridDragStartListener)
+ * @see GridDragSource#addGridDragStartListener(GridDragStartListener)
  * @since
  */
 public class GridDragStartEvent<T> extends DragStartEvent<Grid<T>> {
diff --git a/server/src/main/java/com/vaadin/event/dnd/grid/GridDragStartListener.java b/server/src/main/java/com/vaadin/event/dnd/grid/GridDragStartListener.java
index f7dc06b0fe..4ef1f7f205 100644
--- a/server/src/main/java/com/vaadin/event/dnd/grid/GridDragStartListener.java
+++ b/server/src/main/java/com/vaadin/event/dnd/grid/GridDragStartListener.java
@@ -18,6 +18,7 @@ package com.vaadin.event.dnd.grid;
 import java.lang.reflect.Method;
 
 import com.vaadin.event.ConnectorEventListener;
+import com.vaadin.ui.GridDragSource;
 
 /**
  * Drag start listener for HTML5 drag start on a Grid row.
@@ -25,7 +26,7 @@ import com.vaadin.event.ConnectorEventListener;
  * @param <T>
  *         The Grid bean type.
  * @author Vaadin Ltd.
- * @see com.vaadin.ui.GridDragSourceExtension#addGridDragStartListener(GridDragStartListener)
+ * @see GridDragSource#addGridDragStartListener(GridDragStartListener)
  * @since
  */
 @FunctionalInterface
diff --git a/server/src/main/java/com/vaadin/event/dnd/grid/GridDropEvent.java b/server/src/main/java/com/vaadin/event/dnd/grid/GridDropEvent.java
index 98d1b3495b..41998354d1 100644
--- a/server/src/main/java/com/vaadin/event/dnd/grid/GridDropEvent.java
+++ b/server/src/main/java/com/vaadin/event/dnd/grid/GridDropEvent.java
@@ -20,6 +20,7 @@ import com.vaadin.event.dnd.DropEvent;
 import com.vaadin.shared.ui.grid.DropLocation;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Grid;
+import com.vaadin.ui.GridDropTarget;
 
 /**
  * Drop event on an HTML5 drop target {@link Grid} row.
@@ -27,7 +28,7 @@ import com.vaadin.ui.Grid;
  * @param <T>
  *         The Grid bean type.
  * @author Vaadin Ltd.
- * @see com.vaadin.ui.GridDropTargetExtension#addGridDropListener(GridDropListener)
+ * @see GridDropTarget#addGridDropListener(GridDropListener)
  * @since
  */
 public class GridDropEvent<T> extends DropEvent<Grid<T>> {
diff --git a/server/src/main/java/com/vaadin/event/dnd/grid/GridDropListener.java b/server/src/main/java/com/vaadin/event/dnd/grid/GridDropListener.java
index 1c148eb28d..bd4ed8e2fc 100644
--- a/server/src/main/java/com/vaadin/event/dnd/grid/GridDropListener.java
+++ b/server/src/main/java/com/vaadin/event/dnd/grid/GridDropListener.java
@@ -18,6 +18,7 @@ package com.vaadin.event.dnd.grid;
 import java.lang.reflect.Method;
 
 import com.vaadin.event.ConnectorEventListener;
+import com.vaadin.ui.GridDropTarget;
 
 /**
  * Drop listener for HTML5 drop on a Grid row.
@@ -25,7 +26,7 @@ import com.vaadin.event.ConnectorEventListener;
  * @param <T>
  *         The Grid bean type.
  * @author Vaadin Ltd.
- * @see com.vaadin.ui.GridDropTargetExtension#addGridDropListener(GridDropListener)
+ * @see GridDropTarget#addGridDropListener(GridDropListener)
  * @since
  */
 @FunctionalInterface
diff --git a/server/src/main/java/com/vaadin/ui/GridDragSourceExtension.java b/server/src/main/java/com/vaadin/ui/GridDragSource.java
index ca6e1b05fd..0cfd9964e2 100644
--- a/server/src/main/java/com/vaadin/ui/GridDragSourceExtension.java
+++ b/server/src/main/java/com/vaadin/ui/GridDragSource.java
@@ -30,8 +30,8 @@ import com.vaadin.server.SerializableFunction;
 import com.vaadin.shared.Registration;
 import com.vaadin.shared.ui.dnd.DragSourceState;
 import com.vaadin.shared.ui.dnd.DropEffect;
-import com.vaadin.shared.ui.grid.GridDragSourceExtensionRpc;
-import com.vaadin.shared.ui.grid.GridDragSourceExtensionState;
+import com.vaadin.shared.ui.grid.GridDragSourceRpc;
+import com.vaadin.shared.ui.grid.GridDragSourceState;
 
 import elemental.json.JsonObject;
 
@@ -46,7 +46,7 @@ import elemental.json.JsonObject;
  * @author Vaadin Ltd.
  * @since
  */
-public class GridDragSourceExtension<T> extends DragSourceExtension<Grid<T>> {
+public class GridDragSource<T> extends DragSourceExtension<Grid<T>> {
 
     /**
      * Drag data generator that appends drag data to each row.
@@ -64,7 +64,7 @@ public class GridDragSourceExtension<T> extends DragSourceExtension<Grid<T>> {
      * @param target
      *         Grid to be extended.
      */
-    public GridDragSourceExtension(Grid<T> target) {
+    public GridDragSource(Grid<T> target) {
         super(target);
 
         // Create drag data generator
@@ -76,7 +76,7 @@ public class GridDragSourceExtension<T> extends DragSourceExtension<Grid<T>> {
 
     @Override
     protected void registerDragSourceRpc(Grid<T> target) {
-        registerRpc(new GridDragSourceExtensionRpc() {
+        registerRpc(new GridDragSourceRpc() {
             @Override
             public void dragStart(List<String> draggedItemKeys) {
 
@@ -124,7 +124,7 @@ public class GridDragSourceExtension<T> extends DragSourceExtension<Grid<T>> {
      */
     private void generateDragData(T item, JsonObject jsonObject) {
         Optional.ofNullable(generatorFunction).ifPresent(generator -> jsonObject
-                .put(GridDragSourceExtensionState.JSONKEY_DRAG_DATA,
+                .put(GridDragSourceState.JSONKEY_DRAG_DATA,
                         generator.apply(item)));
     }
 
@@ -204,12 +204,12 @@ public class GridDragSourceExtension<T> extends DragSourceExtension<Grid<T>> {
     }
 
     @Override
-    protected GridDragSourceExtensionState getState() {
-        return (GridDragSourceExtensionState) super.getState();
+    protected GridDragSourceState getState() {
+        return (GridDragSourceState) super.getState();
     }
 
     @Override
-    protected GridDragSourceExtensionState getState(boolean markAsDirty) {
-        return (GridDragSourceExtensionState) super.getState(markAsDirty);
+    protected GridDragSourceState getState(boolean markAsDirty) {
+        return (GridDragSourceState) super.getState(markAsDirty);
     }
 }
diff --git a/server/src/main/java/com/vaadin/ui/GridDropTargetExtension.java b/server/src/main/java/com/vaadin/ui/GridDropTarget.java
index 17633fa5ce..0cd51d8634 100644
--- a/server/src/main/java/com/vaadin/ui/GridDropTargetExtension.java
+++ b/server/src/main/java/com/vaadin/ui/GridDropTarget.java
@@ -20,8 +20,8 @@ import com.vaadin.event.dnd.grid.GridDropEvent;
 import com.vaadin.event.dnd.grid.GridDropListener;
 import com.vaadin.shared.Registration;
 import com.vaadin.shared.ui.grid.DropMode;
-import com.vaadin.shared.ui.grid.GridDropTargetExtensionRpc;
-import com.vaadin.shared.ui.grid.GridDropTargetExtensionState;
+import com.vaadin.shared.ui.grid.GridDropTargetRpc;
+import com.vaadin.shared.ui.grid.GridDropTargetState;
 
 /**
  * Makes the rows of a Grid HTML5 drop targets. This is the server side
@@ -32,7 +32,7 @@ import com.vaadin.shared.ui.grid.GridDropTargetExtensionState;
  * @author Vaadin Ltd
  * @since
  */
-public class GridDropTargetExtension<T> extends DropTargetExtension<Grid<T>> {
+public class GridDropTarget<T> extends DropTargetExtension<Grid<T>> {
 
     /**
      * Extends a Grid and makes it's rows drop targets for HTML5 drag and drop.
@@ -44,7 +44,7 @@ public class GridDropTargetExtension<T> extends DropTargetExtension<Grid<T>> {
      *         Grid's row.
      * @see GridDropEvent#getDropLocation()
      */
-    public GridDropTargetExtension(Grid<T> target, DropMode dropMode) {
+    public GridDropTarget(Grid<T> target, DropMode dropMode) {
         super(target);
 
         setDropMode(dropMode);
@@ -93,7 +93,7 @@ public class GridDropTargetExtension<T> extends DropTargetExtension<Grid<T>> {
     @Override
     protected void registerDropTargetRpc(Grid<T> target) {
         registerRpc(
-                (GridDropTargetExtensionRpc) (dataTransferText, rowKey, dropLocation) -> {
+                (GridDropTargetRpc) (dataTransferText, rowKey, dropLocation) -> {
 
                     T dropTargetRow = target.getDataCommunicator()
                             .getKeyMapper().get(rowKey);
@@ -107,12 +107,12 @@ public class GridDropTargetExtension<T> extends DropTargetExtension<Grid<T>> {
     }
 
     @Override
-    protected GridDropTargetExtensionState getState() {
-        return (GridDropTargetExtensionState) super.getState();
+    protected GridDropTargetState getState() {
+        return (GridDropTargetState) super.getState();
     }
 
     @Override
-    protected GridDropTargetExtensionState getState(boolean markAsDirty) {
-        return (GridDropTargetExtensionState) super.getState(markAsDirty);
+    protected GridDropTargetState getState(boolean markAsDirty) {
+        return (GridDropTargetState) super.getState(markAsDirty);
     }
 }