Simplify lambda expressions (#10198)

* Simplify lambda expressions

And remove unneeded 'return' keyword.

* Format

8 files changed, 30 insertions, 34 deletions

diff --git a/client/src/main/java/com/vaadin/client/ResourceLoader.java b/client/src/main/java/com/vaadin/client/ResourceLoader.java
index ebd0ecbb17..62c41b6067 100644
--- a/client/src/main/java/com/vaadin/client/ResourceLoader.java
+++ b/client/src/main/java/com/vaadin/client/ResourceLoader.java
@@ -492,9 +492,7 @@ public class ResourceLoader {
      */
     protected void runWhenHtmlImportsReady(Runnable runnable) {
         if (GWT.isClient() && supportsHtmlWhenReady()) {
-            addHtmlImportsReadyHandler(() -> {
-                runnable.run();
-            });
+            addHtmlImportsReadyHandler(() -> runnable.run());
         } else {
             runnable.run();
         }
diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java
index 41602fbcef..4e7055677e 100644
--- a/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java
@@ -254,7 +254,8 @@ public class GridConnector extends AbstractListingConnector
         getWidget().setRowStyleGenerator(rowRef -> {
             JsonObject json = rowRef.getRow();
             return json.hasKey(GridState.JSONKEY_ROWSTYLE)
-                    ? json.getString(GridState.JSONKEY_ROWSTYLE) : null;
+                    ? json.getString(GridState.JSONKEY_ROWSTYLE)
+                    : null;
         });
         getWidget().setCellStyleGenerator(cellRef -> {
             JsonObject row = cellRef.getRow();
@@ -401,10 +402,9 @@ public class GridConnector extends AbstractListingConnector
 
     private void updateStaticRow(RowState rowState,
             Grid.StaticSection.StaticRow row) {
-        rowState.cells.forEach((columnId, cellState) -> {
-            updateStaticCellFromState(row.getCell(getColumn(columnId)),
-                    cellState);
-        });
+        rowState.cells
+                .forEach((columnId, cellState) -> updateStaticCellFromState(
+                        row.getCell(getColumn(columnId)), cellState));
         for (Map.Entry<CellState, Set<String>> cellGroupEntry : rowState.cellGroups
                 .entrySet()) {
             Set<String> group = cellGroupEntry.getValue();
diff --git a/client/src/main/java/com/vaadin/client/extensions/DragSourceExtensionConnector.java b/client/src/main/java/com/vaadin/client/extensions/DragSourceExtensionConnector.java
index b91b0aace0..cb2870cf7a 100644
--- a/client/src/main/java/com/vaadin/client/extensions/DragSourceExtensionConnector.java
+++ b/client/src/main/java/com/vaadin/client/extensions/DragSourceExtensionConnector.java
@@ -277,9 +277,8 @@ public class DragSourceExtensionConnector extends AbstractExtensionConnector {
                 WidgetUtil.getRelativeX(draggedElement, dragStartEvent)
                         - transformXOffset,
                 WidgetUtil.getRelativeY(draggedElement, dragStartEvent));
-        AnimationScheduler.get().requestAnimationFrame(timestamp -> {
-            clonedElement.removeFromParent();
-        }, clonedElement);
+        AnimationScheduler.get().requestAnimationFrame(
+                timestamp -> clonedElement.removeFromParent(), clonedElement);
     }
 
     /**
@@ -362,10 +361,10 @@ public class DragSourceExtensionConnector extends AbstractExtensionConnector {
                     .trim();
             return Integer.parseInt(x);
         } catch (NumberFormatException nfe) {
-            Logger.getLogger(DragSourceExtensionConnector.class.getName())
-                    .info("Unable to parse \"transform: translate(...)\" matrix "
-                            + n + ". value from computed style, matrix \""
-                            + matrix + "\", drag image might not be visible");
+            Logger.getLogger(DragSourceExtensionConnector.class.getName()).info(
+                    "Unable to parse \"transform: translate(...)\" matrix " + n
+                            + ". value from computed style, matrix \"" + matrix
+                            + "\", drag image might not be visible");
         }
         return 0;
     }
@@ -393,9 +392,11 @@ public class DragSourceExtensionConnector extends AbstractExtensionConnector {
             return;
         }
         style.clearProperty("transform");
-        AnimationScheduler.get().requestAnimationFrame(timestamp -> {
-            draggedElement.getStyle().setProperty("transform", transition);
-        }, draggedElement);
+        AnimationScheduler.get()
+                .requestAnimationFrame(
+                        timestamp -> draggedElement.getStyle()
+                                .setProperty("transform", transition),
+                        draggedElement);
     }
 
     /**
diff --git a/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java b/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java
index b0f9a6a510..a4d8147f81 100644
--- a/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java
+++ b/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java
@@ -120,9 +120,8 @@ public class VRichTextArea extends Composite implements Field, KeyPressHandler,
             // Must wait until iframe is attached to be able to access body
             BodyElement rtaBody = IFrameElement.as(rta.getElement())
                     .getContentDocument().getBody();
-            addInputListener(rtaBody, event -> {
-                inputHandlers.forEach(handler -> handler.execute());
-            });
+            addInputListener(rtaBody, event -> inputHandlers
+                    .forEach(handler -> handler.execute()));
         });
 
         formatter = new VRichTextToolbar(rta);
diff --git a/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
index 8911682e0a..0e117a81c0 100644
--- a/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
@@ -54,9 +54,8 @@ public class RichTextAreaConnector extends AbstractFieldConnector
                 flush();
             }
         });
-        getWidget().addInputHandler(() -> {
-            valueChangeHandler.scheduleValueChange();
-        });
+        getWidget().addInputHandler(
+                () -> valueChangeHandler.scheduleValueChange());
 
         registerRpc(RichTextAreaClientRpc.class,
                 new RichTextAreaClientRpcImpl());
diff --git a/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java
index 79f529ae5e..9a044f0e5c 100644
--- a/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java
@@ -44,9 +44,9 @@ public class TextAreaConnector extends AbstractTextFieldConnector {
     protected void init() {
         super.init();
         getWidget().addChangeHandler(event -> sendValueChange());
-        getWidget().addDomHandler(event -> {
-            getValueChangeHandler().scheduleValueChange();
-        }, InputEvent.getType());
+        getWidget().addDomHandler(
+                event -> getValueChangeHandler().scheduleValueChange(),
+                InputEvent.getType());
 
         getWidget().addMouseUpHandler(new ResizeMouseUpHandler());
     }
diff --git a/client/src/main/java/com/vaadin/client/ui/textfield/TextFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/textfield/TextFieldConnector.java
index 84e8e7401b..e08f67093f 100644
--- a/client/src/main/java/com/vaadin/client/ui/textfield/TextFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/textfield/TextFieldConnector.java
@@ -32,9 +32,9 @@ public class TextFieldConnector extends AbstractTextFieldConnector {
     protected void init() {
         super.init();
         getWidget().addChangeHandler(event -> sendValueChange());
-        getWidget().addDomHandler(event -> {
-            getValueChangeHandler().scheduleValueChange();
-        }, InputEvent.getType());
+        getWidget().addDomHandler(
+                event -> getValueChangeHandler().scheduleValueChange(),
+                InputEvent.getType());
     }
 
     @Override
diff --git a/client/src/main/java/com/vaadin/client/ui/treegrid/TreeGridConnector.java b/client/src/main/java/com/vaadin/client/ui/treegrid/TreeGridConnector.java
index c50da18e53..847b55630a 100644
--- a/client/src/main/java/com/vaadin/client/ui/treegrid/TreeGridConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/treegrid/TreeGridConnector.java
@@ -64,9 +64,8 @@ public class TreeGridConnector extends GridConnector {
     }
 
     public TreeGridConnector() {
-        registerRpc(FocusRpc.class, (rowIndex, cellIndex) -> {
-            getWidget().focusCell(rowIndex, cellIndex);
-        });
+        registerRpc(FocusRpc.class, (rowIndex, cellIndex) -> getWidget()
+                .focusCell(rowIndex, cellIndex));
     }
 
     private String hierarchyColumnId;
@@ -237,7 +236,7 @@ public class TreeGridConnector extends GridConnector {
             GridEventHandler<?> eventHandler)
     /*-{
         var browserEventHandlers = grid.@com.vaadin.client.widgets.Grid::browserEventHandlers;
-    
+
         // FocusEventHandler is initially 5th in the list of browser event handlers
         browserEventHandlers.@java.util.List::set(*)(5, eventHandler);
     }-*/;