Optional is useless in parameters, it does not prevent NPE, just makes harder to call methods.

Author: barancev

java/client/src/org/openqa/selenium/interactions/Actions.java

@@ -37,7 +37,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.IntConsumer;
 import java.util.logging.Logger;
@@ -56,10 +55,8 @@ public class Actions {
 
   // W3C
   private final Map<InputSource, Sequence> sequences = new HashMap<>();
-  private final PointerInput defaultMouse = new PointerInput(
-      MOUSE,
-      Optional.of("default mouse"));
-  private final KeyInput defaultKeyboard = new KeyInput(Optional.of("default keyboard"));
+  private final PointerInput defaultMouse = new PointerInput(MOUSE, "default mouse");
+  private final KeyInput defaultKeyboard = new KeyInput("default keyboard");
 
   // JSON-wire protocol
   private final Keyboard jsonKeyboard;

java/client/src/org/openqa/selenium/interactions/KeyInput.java

@@ -29,8 +29,8 @@ public class KeyInput implements InputSource, Encodable {
 
   private final String name;
 
-  public KeyInput(Optional<String> name) {
-    this.name = name.orElse(UUID.randomUUID().toString());
+  public KeyInput(String name) {
+    this.name = Optional.ofNullable(name).orElse(UUID.randomUUID().toString());
   }
 
   @Override

java/client/src/org/openqa/selenium/interactions/PointerInput.java

@@ -36,9 +36,9 @@ public class PointerInput implements InputSource, Encodable {
   private final Kind kind;
   private final String name;
 
-  public PointerInput(Kind kind, Optional<String> name) {
+  public PointerInput(Kind kind, String name) {
     this.kind = Preconditions.checkNotNull(kind, "Must set kind of pointer device");
-    this.name = name.orElse(UUID.randomUUID().toString());
+    this.name = Optional.ofNullable(name).orElse(UUID.randomUUID().toString());
   }
 
   @Override