Don't use synthetic methods for listener classes. (#10135)

Fixes #9504

5 files changed, 16 insertions, 11 deletions

diff --git a/server/src/main/java/com/vaadin/ui/components/grid/EditorImpl.java b/server/src/main/java/com/vaadin/ui/components/grid/EditorImpl.java
index 502f530d9a..4d5e91b671 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/EditorImpl.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/EditorImpl.java
@@ -37,6 +37,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.Grid.AbstractGridExtension;
 import com.vaadin.ui.Grid.Column;
+import com.vaadin.util.ReflectTools;
 
 import elemental.json.JsonObject;
 
@@ -338,19 +339,19 @@ public class EditorImpl<T> extends AbstractGridExtension<T>
     @Override
     public Registration addSaveListener(EditorSaveListener<T> listener) {
         return eventRouter.addListener(EditorSaveEvent.class, listener,
-                EditorSaveListener.class.getDeclaredMethods()[0]);
+                ReflectTools.getMethod(EditorSaveListener.class));
     }
 
     @Override
     public Registration addCancelListener(EditorCancelListener<T> listener) {
         return eventRouter.addListener(EditorCancelEvent.class, listener,
-                EditorCancelListener.class.getDeclaredMethods()[0]);
+                ReflectTools.getMethod(EditorCancelListener.class));
     }
 
     @Override
     public Registration addOpenListener(EditorOpenListener<T> listener) {
         return eventRouter.addListener(EditorOpenEvent.class, listener,
-                EditorOpenListener.class.getDeclaredMethods()[0]);
+                ReflectTools.getMethod(EditorOpenListener.class));
     }
 
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/GridDragEndListener.java b/server/src/main/java/com/vaadin/ui/components/grid/GridDragEndListener.java
index d41a58bbb6..4d2abf47e2 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/GridDragEndListener.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/GridDragEndListener.java
@@ -18,6 +18,7 @@ package com.vaadin.ui.components.grid;
 import java.lang.reflect.Method;
 
 import com.vaadin.event.ConnectorEventListener;
+import com.vaadin.util.ReflectTools;
 
 /**
  * Drop listener for HTML5 drop on a Grid row.
@@ -31,8 +32,8 @@ import com.vaadin.event.ConnectorEventListener;
 @FunctionalInterface
 public interface GridDragEndListener<T> extends ConnectorEventListener {
 
-    static final Method DRAG_END_METHOD = GridDragEndListener.class
-            .getDeclaredMethods()[0];
+    static final Method DRAG_END_METHOD = ReflectTools
+            .getMethod(GridDragEndListener.class);
 
     /**
      * Invoked when the user has dropped the dragged grid rows, or canceled the
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/GridDragStartListener.java b/server/src/main/java/com/vaadin/ui/components/grid/GridDragStartListener.java
index 10f57e85c1..97acc34fcf 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/GridDragStartListener.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/GridDragStartListener.java
@@ -18,6 +18,7 @@ package com.vaadin.ui.components.grid;
 import java.lang.reflect.Method;
 
 import com.vaadin.event.ConnectorEventListener;
+import com.vaadin.util.ReflectTools;
 
 /**
  * Drag start listener for HTML5 drag start on a Grid row.
@@ -31,8 +32,8 @@ import com.vaadin.event.ConnectorEventListener;
 @FunctionalInterface
 public interface GridDragStartListener<T> extends ConnectorEventListener {
 
-    static final Method DRAG_START_METHOD = GridDragStartListener.class
-            .getDeclaredMethods()[0];
+    static final Method DRAG_START_METHOD = ReflectTools
+            .getMethod(GridDragStartListener.class);
 
     /**
      * Invoked when the user has started dragging grid's rows.
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/GridDropListener.java b/server/src/main/java/com/vaadin/ui/components/grid/GridDropListener.java
index efac802ae7..2cf6ed06dd 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/GridDropListener.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/GridDropListener.java
@@ -18,6 +18,7 @@ package com.vaadin.ui.components.grid;
 import java.lang.reflect.Method;
 
 import com.vaadin.event.ConnectorEventListener;
+import com.vaadin.util.ReflectTools;
 
 /**
  * Drop listener for HTML5 drop on a Grid row.
@@ -31,8 +32,8 @@ import com.vaadin.event.ConnectorEventListener;
 @FunctionalInterface
 public interface GridDropListener<T> extends ConnectorEventListener {
 
-    static final Method DROP_METHOD = GridDropListener.class
-            .getDeclaredMethods()[0];
+    static final Method DROP_METHOD = ReflectTools
+            .getMethod(GridDropListener.class);
 
     /**
      * Called when drop event is fired on a Grid row.
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/TreeGridDropListener.java b/server/src/main/java/com/vaadin/ui/components/grid/TreeGridDropListener.java
index d413a7b42b..5db82c6246 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/TreeGridDropListener.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/TreeGridDropListener.java
@@ -18,6 +18,7 @@ package com.vaadin.ui.components.grid;
 import java.lang.reflect.Method;
 
 import com.vaadin.event.ConnectorEventListener;
+import com.vaadin.util.ReflectTools;
 
 /**
  * Drop listener for HTML5 drop on a TreeGrid row.
@@ -31,8 +32,8 @@ import com.vaadin.event.ConnectorEventListener;
 @FunctionalInterface
 public interface TreeGridDropListener<T> extends ConnectorEventListener {
 
-    static final Method DROP_METHOD = TreeGridDropListener.class
-            .getDeclaredMethods()[0];
+    static final Method DROP_METHOD = ReflectTools
+            .getMethod(TreeGridDropListener.class);
 
     /**
      * Called when drop event is fired on a Grid row.