[grid] Helping json to map properly Slot.java

diemol · diemol · commit 4cc82845e9a2 · 2021-12-13T13:07:28.000+01:00
This was causing an issue that ended up mapping the id value incorrectly. Fixes #10073
diff --git a/java/src/org/openqa/selenium/grid/data/Slot.java b/java/src/org/openqa/selenium/grid/data/Slot.java
@@ -17,14 +17,18 @@
 
 package org.openqa.selenium.grid.data;
 
+import static java.util.Collections.unmodifiableMap;
+
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.json.JsonInput;
 
 import java.io.Serializable;
 import java.time.Instant;
+import java.util.Map;
 import java.util.Objects;
+import java.util.TreeMap;
 
 public class Slot implements Serializable {
 
@@ -42,44 +46,6 @@ public Slot(SlotId id, Capabilities stereotype, Instant lastStarted, Session ses
     this.slotMatcher = new DefaultSlotMatcher();
   }
 
-  public SlotId getId() {
-    return id;
-  }
-
-  public Capabilities getStereotype() {
-    return stereotype;
-  }
-
-  public Instant getLastStarted() {
-    return lastStarted;
-  }
-
-  public Session getSession() {
-    return session;
-  }
-
-  public boolean isSupporting(Capabilities caps) {
-    return slotMatcher.matches(getStereotype(), caps);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (!(o instanceof Slot)) {
-      return false;
-    }
-
-    Slot that = (Slot) o;
-    return Objects.equals(this.id, that.id) &&
-      Objects.equals(this.stereotype, that.stereotype) &&
-      Objects.equals(this.session, that.session) &&
-      Objects.equals(this.lastStarted.toEpochMilli(), that.lastStarted.toEpochMilli());
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, stereotype, session, lastStarted.toEpochMilli());
-  }
-
   private static Slot fromJson(JsonInput input) {
     SlotId id = null;
     Capabilities stereotype = null;
@@ -115,4 +81,51 @@ private static Slot fromJson(JsonInput input) {
 
     return new Slot(id, stereotype, lastStarted, session);
   }
+
+  private Map<String, Object> toJson() {
+    Map<String, Object> toReturn = new TreeMap<>();
+    toReturn.put("id", getId());
+    toReturn.put("lastStarted", getLastStarted());
+    toReturn.put("session", getSession());
+    toReturn.put("stereotype", getStereotype());
+    return unmodifiableMap(toReturn);
+  }
+
+  public SlotId getId() {
+    return id;
+  }
+
+  public Capabilities getStereotype() {
+    return stereotype;
+  }
+
+  public Instant getLastStarted() {
+    return lastStarted;
+  }
+
+  public Session getSession() {
+    return session;
+  }
+
+  public boolean isSupporting(Capabilities caps) {
+    return slotMatcher.matches(getStereotype(), caps);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (!(o instanceof Slot)) {
+      return false;
+    }
+
+    Slot that = (Slot) o;
+    return Objects.equals(this.id, that.id) &&
+           Objects.equals(this.stereotype, that.stereotype) &&
+           Objects.equals(this.session, that.session) &&
+           Objects.equals(this.lastStarted.toEpochMilli(), that.lastStarted.toEpochMilli());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, stereotype, session, lastStarted.toEpochMilli());
+  }
 }
