DriverSessions: Remove methods that would never work

Since the only production implementation of DriverSessions is
the PretendDriverSessions and this no-ops or throws exceptions
with many methods, it's best to clean things up. Removing the
methods from the interface, and any implementations that might
be hanging from it.

Author: shs96c

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

@@ -18,22 +18,13 @@
 
 package org.openqa.selenium.remote.server;
 
-import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.SessionId;
 
 import java.util.Set;
-import java.util.stream.Stream;
 
 public interface DriverSessions {
-  SessionId newSession(Stream<Capabilities> desiredCapabilities) throws Exception;
 
   Session get(SessionId sessionId);
 
-  void deleteSession(SessionId sessionId);
-
-  void registerDriver(Capabilities capabilities, Class<? extends WebDriver> implementation);
-
   Set<SessionId> getSessions();
-
 }

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

@@ -39,7 +39,6 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.logging.Logger;
-import java.util.stream.Stream;
 
 class InMemorySession implements ActiveSession {
 
@@ -52,8 +51,7 @@ class InMemorySession implements ActiveSession {
   private final TemporaryFilesystem filesystem;
   private final JsonHttpCommandHandler handler;
 
-  private InMemorySession(WebDriver driver, Capabilities capabilities, Dialect downstream)
-      throws IOException {
+  private InMemorySession(WebDriver driver, Capabilities capabilities, Dialect downstream) {
     this.driver = Preconditions.checkNotNull(driver);
 
     Capabilities caps;
@@ -132,7 +130,7 @@ public Optional<ActiveSession> apply(Set<Dialect> downstreamDialects, Capabiliti
       // Assume the blob fits in the available memory.
       try {
         if (!provider.canCreateDriverInstanceFor(caps)) {
-          return null;
+          return Optional.empty();
         }
 
         WebDriver driver = provider.newInstance(caps);
@@ -142,7 +140,7 @@ public Optional<ActiveSession> apply(Set<Dialect> downstreamDialects, Capabiliti
                              Dialect.OSS :
                              downstreamDialects.iterator().next();
         return Optional.of(new InMemorySession(driver, caps, downstream));
-      } catch (IOException | IllegalStateException e) {
+      } catch (IllegalStateException e) {
         return Optional.empty();
       }
     }
@@ -158,32 +156,15 @@ private class PretendDriverSessions implements DriverSessions {
 
     private final Session session;
 
-    private PretendDriverSessions() throws IOException {
+    private PretendDriverSessions() {
       this.session = new ActualSession();
     }
 
-    @Override
-    public SessionId newSession(Stream<Capabilities> desiredCapabilities) throws Exception {
-      throw new UnsupportedOperationException("newSession");
-    }
-
     @Override
     public Session get(SessionId sessionId) {
       return getId().equals(sessionId) ? session : null;
     }
 
-    @Override
-    public void deleteSession(SessionId sessionId) {
-      // no-op
-    }
-
-    @Override
-    public void registerDriver(
-        Capabilities capabilities,
-        Class<? extends WebDriver> implementation) {
-      throw new UnsupportedOperationException("registerDriver");
-    }
-
     @Override
     public Set<SessionId> getSessions() {
       return ImmutableSet.of(getId());
@@ -195,7 +176,7 @@ private class ActualSession implements Session {
     private final KnownElements knownElements;
     private volatile String screenshot;
 
-    private ActualSession() throws IOException {
+    private ActualSession() {
       knownElements = new KnownElements();
     }
 

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

@@ -18,7 +18,6 @@
 package org.openqa.selenium.remote.server;
 
 import static org.openqa.selenium.remote.DriverCommand.*;
-import static org.openqa.selenium.remote.http.HttpMethod.POST;
 
 import org.openqa.selenium.UnsupportedCommandException;
 import org.openqa.selenium.remote.Command;
@@ -33,7 +32,6 @@
 import org.openqa.selenium.remote.http.JsonHttpResponseCodec;
 import org.openqa.selenium.remote.http.W3CHttpCommandCodec;
 import org.openqa.selenium.remote.server.handler.AcceptAlert;
-import org.openqa.selenium.remote.server.handler.AddConfig;
 import org.openqa.selenium.remote.server.handler.AddCookie;
 import org.openqa.selenium.remote.server.handler.CaptureScreenshot;
 import org.openqa.selenium.remote.server.handler.ChangeUrl;
@@ -90,7 +88,6 @@
 import org.openqa.selenium.remote.server.handler.ImeIsActivated;
 import org.openqa.selenium.remote.server.handler.ImplicitlyWait;
 import org.openqa.selenium.remote.server.handler.MaximizeWindow;
-import org.openqa.selenium.remote.server.handler.NewSession;
 import org.openqa.selenium.remote.server.handler.RefreshPage;
 import org.openqa.selenium.remote.server.handler.Rotate;
 import org.openqa.selenium.remote.server.handler.SendKeys;
@@ -150,8 +147,6 @@
 
 public class JsonHttpCommandHandler {
 
-  private static final String ADD_CONFIG_COMMAND_NAME = "-selenium-add-config";
-
   private final DriverSessions sessions;
   private final Logger log;
   private final Set<CommandCodec<HttpRequest>> commandCodecs;
@@ -229,15 +224,8 @@ private Command decode(HttpRequest request) {
   }
 
   private void setUpMappings() {
-    for (CommandCodec<HttpRequest> codec : commandCodecs) {
-      codec.defineCommand(ADD_CONFIG_COMMAND_NAME, POST, "/config/drivers");
-    }
-
-    addNewMapping(ADD_CONFIG_COMMAND_NAME, AddConfig.class);
-
     addNewMapping(STATUS, Status.class);
     addNewMapping(GET_ALL_SESSIONS, GetAllSessions.class);
-    addNewMapping(NEW_SESSION, NewSession.class);
     addNewMapping(GET_CAPABILITIES, GetSessionCapabilities.class);
     addNewMapping(QUIT, DeleteSession.class);
 

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

@@ -148,7 +148,6 @@ public Response handle(Command command) throws Exception {
       final PerSessionLogHandler logHandler = LoggingManager.perSessionLogHandler();
       logHandler.transferThreadTempLogsToSessionLogs(sessionId);
       logHandler.removeSessionLogs(sessionId);
-      sessions.deleteSession(sessionId);
     }
     return response;
   }