Move "type" to SourceType

Signed-off-by: Alexei Barantsev <barancev@gmail.com>
guandalf · Nov 25, 2017 · b039ab1 · b039ab1
1 parent f267357
commit b039ab1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/java/client/src/org/openqa/selenium/interactions/KeyInput.java b/java/client/src/org/openqa/selenium/interactions/KeyInput.java
@@ -50,7 +50,7 @@ public Interaction createKeyUp(int codePoint) {
   public Map<String, Object> encode() {
     Map<String, Object> toReturn = new HashMap<>();
 
-    toReturn.put("type", "key");
+    toReturn.put("type", getInputType().getType());
     toReturn.put("id", name);
 
     return toReturn;

diff --git a/java/client/src/org/openqa/selenium/interactions/PointerInput.java b/java/client/src/org/openqa/selenium/interactions/PointerInput.java
@@ -51,7 +51,7 @@ public SourceType getInputType() {
   public Map<String, Object> encode() {
     Map<String, Object> toReturn = new HashMap<>();
 
-    toReturn.put("type", "pointer");
+    toReturn.put("type", getInputType().getType());
     toReturn.put("id", name);
 
     Map<String, Object> parameters = new HashMap<>();

diff --git a/java/client/src/org/openqa/selenium/interactions/SourceType.java b/java/client/src/org/openqa/selenium/interactions/SourceType.java
@@ -21,7 +21,17 @@
  * One of the allowing types for an {@link InputSource}.
  */
 public enum SourceType {
-  KEY,
-  NONE,
-  POINTER,
+  KEY("key"),
+  NONE(null),
+  POINTER("pointer");
+
+  private final String type;
+
+  SourceType(String type) {
+    this.type = type;
+  }
+
+  public String getType() {
+    return type;
+  }
 }