Move Handlers under the commandhandlers package

Author: shs96c

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

@@ -28,6 +28,7 @@
 import org.openqa.selenium.remote.JsonToBeanConverter;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.http.HttpMethod;
+import org.openqa.selenium.remote.server.commandhandler.BeginSession;
 import org.openqa.selenium.remote.server.commandhandler.GetAllSessions;
 import org.openqa.selenium.remote.server.commandhandler.GetLogTypes;
 import org.openqa.selenium.remote.server.commandhandler.GetLogsOfType;

java/server/src/org/openqa/selenium/remote/server/BUCK

@@ -70,10 +70,8 @@ java_library(
     'ActiveSessionFactory.java',
     'ActiveSessionListener.java',
     'ActiveSessions.java',
-    'BeginSession.java',
     'AllHandlers.java',
     'CommandHandler.java',
-    'ExceptionHandler.java',
     'InMemorySession.java',
     'Passthrough.java',
     'ProtocolConverter.java',

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

@@ -29,6 +29,7 @@
 
 import org.openqa.selenium.logging.LoggingHandler;
 import org.openqa.selenium.remote.SessionId;
+import org.openqa.selenium.remote.server.commandhandler.ExceptionHandler;
 import org.openqa.selenium.remote.server.log.LoggingManager;
 import org.openqa.selenium.remote.server.log.PerSessionLogHandler;
 import org.openqa.selenium.remote.server.xdrpc.CrossDomainRpc;

java/server/src/org/openqa/selenium/remote/server/BeginSession.java renamed to java/server/src/org/openqa/selenium/remote/server/commandhandler/BeginSession.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.server;
+package org.openqa.selenium.remote.server.commandhandler;
 
 import static com.google.common.net.MediaType.JSON_UTF_8;
 import static java.net.HttpURLConnection.HTTP_OK;
@@ -30,14 +30,19 @@
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
+import org.openqa.selenium.remote.server.ActiveSession;
+import org.openqa.selenium.remote.server.ActiveSessionFactory;
+import org.openqa.selenium.remote.server.ActiveSessions;
+import org.openqa.selenium.remote.server.CommandHandler;
+import org.openqa.selenium.remote.server.NewSessionPayload;
 import org.openqa.selenium.remote.server.log.LoggingManager;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.logging.Level;
 
-class BeginSession implements CommandHandler {
+public class BeginSession implements CommandHandler {
 
   private final ActiveSessionFactory sessionFactory;
   private final ActiveSessions allSessions;

java/server/src/org/openqa/selenium/remote/server/ExceptionHandler.java renamed to java/server/src/org/openqa/selenium/remote/server/commandhandler/ExceptionHandler.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.server;
+package org.openqa.selenium.remote.server.commandhandler;
 
 import static com.google.common.net.MediaType.JSON_UTF_8;
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
@@ -29,6 +29,7 @@
 import org.openqa.selenium.remote.ErrorCodes;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
+import org.openqa.selenium.remote.server.CommandHandler;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -39,7 +40,7 @@
  * Takes an exception and formats it for a local end that speaks either the OSS or W3C dialect of
  * the wire protocol.
  */
-class ExceptionHandler implements CommandHandler {
+public class ExceptionHandler implements CommandHandler {
 
   private final static ErrorCodes ERRORS = new ErrorCodes();
   private final static BeanToJsonConverter toJson = new BeanToJsonConverter();

java/server/test/org/openqa/selenium/remote/server/ExceptionHandlerTest.java renamed to java/server/test/org/openqa/selenium/remote/server/commandhandler/ExceptionHandlerTest.java

@@ -15,9 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.server;
+package org.openqa.selenium.remote.server.commandhandler;
 
-import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
 import static org.junit.Assert.assertEquals;
 
@@ -32,6 +31,7 @@
 import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
+import org.openqa.selenium.remote.server.commandhandler.ExceptionHandler;
 
 import java.lang.reflect.Type;
 import java.util.Map;