Move Session and ActiveSession closer

The two classes are basically doing the same thing, but for
an old and new world. Doing a classic refactoring to try
and get the two to be congruent.

In this case, almost all users simply converted Capabilities
to a Map. Might as well do that in one place, and one place
alone.

Author: shs96c

java/server/src/org/openqa/selenium/remote/server/DefaultSession.java

@@ -38,6 +38,7 @@
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.support.events.EventFiringWebDriver;
 
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
@@ -63,7 +64,7 @@ public class DefaultSession implements Session {
    * Happens-before the exexutor and is thereafter thread-confined to the executor thread.
    */
   private final KnownElements knownElements;
-  private final Capabilities capabilities; // todo: Investigate memory model implications of map
+  private final Map<String, Object> capabilities;
   // elements inside capabilities.
   private volatile String base64EncodedImage;
   private TemporaryFilesystem tempFs;
@@ -142,7 +143,7 @@ public KnownElements getKnownElements() {
     return knownElements;
   }
 
-  public Capabilities getCapabilities() {
+  public Map<String, Object> getCapabilities() {
     return capabilities;
   }
 
@@ -160,7 +161,7 @@ private class BrowserCreator implements Callable<EventFiringWebDriver> {
 
     private final DriverFactory factory;
     private final Capabilities capabilities;
-    private volatile Capabilities describedCapabilities;
+    private volatile Map<String, Object> describedCapabilities;
     private volatile SessionId sessionId;
     private volatile boolean isAndroid = false;
 
@@ -185,7 +186,7 @@ public EventFiringWebDriver call() throws Exception {
       return new EventFiringWebDriver(rawDriver);
     }
 
-    public Capabilities getCapabilityDescription() {
+    public Map<String, Object> getCapabilityDescription() {
       return describedCapabilities;
     }
 
@@ -197,7 +198,7 @@ public boolean isAndroid() {
       return isAndroid;
     }
 
-    private DesiredCapabilities getDescription(WebDriver instance, Capabilities capabilities) {
+    private Map<String, Object> getDescription(WebDriver instance, Capabilities capabilities) {
       DesiredCapabilities caps = new DesiredCapabilities(capabilities.asMap());
       caps.setJavascriptEnabled(instance instanceof JavascriptExecutor);
       if (instance instanceof TakesScreenshot) {
@@ -224,7 +225,8 @@ private DesiredCapabilities getDescription(WebDriver instance, Capabilities capa
       if (instance instanceof HasTouchScreen) {
         caps.setCapability(CapabilityType.HAS_TOUCHSCREEN, true);
       }
-      return caps;
+      //noinspection unchecked
+      return (Map<String, Object>) caps.asMap();
     }
   }
 

java/server/src/org/openqa/selenium/remote/server/InMemorySession.java

@@ -234,8 +234,8 @@ public KnownElements getKnownElements() {
     }
 
     @Override
-    public Capabilities getCapabilities() {
-      return new ImmutableCapabilities(capabilities);
+    public Map<String, Object> getCapabilities() {
+      return capabilities;
     }
 
     @Override

java/server/src/org/openqa/selenium/remote/server/Session.java

@@ -17,11 +17,12 @@
 
 package org.openqa.selenium.remote.server;
 
-import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.io.TemporaryFilesystem;
 import org.openqa.selenium.remote.SessionId;
 
+import java.util.Map;
+
 public interface Session {
 
   void close();
@@ -30,7 +31,7 @@ public interface Session {
 
   KnownElements getKnownElements();
 
-  Capabilities getCapabilities();
+  Map<String, Object> getCapabilities();
 
   void attachScreenshot(String base64EncodedImage);
 

java/server/src/org/openqa/selenium/remote/server/handler/GetAllSessions.java

@@ -53,7 +53,7 @@ public Response getResponse() {
   private Function<SessionId, SessionInfo> toSessionInfo() {
     return new Function<SessionId, SessionInfo>() {
       public SessionInfo apply(SessionId id) {
-        Map<String, ?> capabilities = allSessions.get(id).getCapabilities().asMap();
+        Map<String, ?> capabilities = allSessions.get(id).getCapabilities();
         return new SessionInfo(id, capabilities);
       }
     };

java/server/src/org/openqa/selenium/remote/server/handler/GetSessionCapabilities.java

@@ -32,7 +32,7 @@ public GetSessionCapabilities(Session session) {
   @Override
   public Map<String, Object> call() {
     Session session = getSession();
-    Map<String, Object> capabilities = (Map<String, Object>) session.getCapabilities().asMap();
+    Map<String, Object> capabilities = session.getCapabilities();
     capabilities = Maps.newHashMap(capabilities);
 
     // Only servers implementing the server-side webdriver-backed selenium need

java/server/src/org/openqa/selenium/remote/server/handler/NewSession.java

@@ -63,7 +63,7 @@ public Response handle() throws Exception {
     sessionId = allSessions.newSession(Stream.of(desired));
 
     Map<String, Object> capabilities =
-        Maps.newHashMap(allSessions.get(sessionId).getCapabilities().asMap());
+        Maps.newHashMap(allSessions.get(sessionId).getCapabilities());
 
     // Only servers implementing the server-side webdriver-backed selenium need
     // to return this particular value

java/server/test/org/openqa/testing/TestSession.java

@@ -24,6 +24,7 @@
 import org.openqa.selenium.remote.server.KnownElements;
 import org.openqa.selenium.remote.server.Session;
 
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -34,19 +35,19 @@ public class TestSession implements Session {
 
   private final SessionId sessionId;
   private final WebDriver driver;
-  private final Capabilities capabilities;
+  private final Map<String, Object> capabilities;
   private final KnownElements knownElements;
   private final ExecutorService executor;
   private volatile Thread inUseWithThread = null;
 
 
   private long lastAccess;
 
-  public TestSession(SessionId sessionId, WebDriver driver,
-      Capabilities capabilities) {
+  public TestSession(SessionId sessionId, WebDriver driver, Capabilities capabilities) {
     this.sessionId = sessionId;
     this.driver = driver;
-    this.capabilities = capabilities;
+    //noinspection unchecked
+    this.capabilities = (Map<String, Object>) capabilities.asMap();
     this.knownElements = new KnownElements();
     this.executor = new ThreadPoolExecutor(1, 1, 600L, TimeUnit.SECONDS,
         new LinkedBlockingQueue<Runnable>());
@@ -81,7 +82,7 @@ public KnownElements getKnownElements() {
     return knownElements;
   }
 
-  public Capabilities getCapabilities() {
+  public Map<String, Object> getCapabilities() {
     return capabilities;
   }