Code cleanup and introducing RegistrationInfo class

hub/src/main/java/com/thoughtworks/selenium/grid/hub/HttpCommandParser.java

@@ -1,9 +1,9 @@
 package com.thoughtworks.selenium.grid.hub;
 
+import com.thoughtworks.selenium.grid.HttpParameters;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.NewBrowserSessionCommand;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.SeleneseCommand;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.TestCompleteCommand;
-import com.thoughtworks.selenium.grid.HttpParameters;
 
 /**
  * Parse HTTP commands targeting a Remote Control

hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubRegistry.java

@@ -2,12 +2,12 @@
 
 import com.thoughtworks.selenium.grid.configuration.EnvironmentConfiguration;
 import com.thoughtworks.selenium.grid.configuration.GridConfiguration;
-import com.thoughtworks.selenium.grid.configuration.ResourceLocator;
 import com.thoughtworks.selenium.grid.configuration.HubConfiguration;
+import com.thoughtworks.selenium.grid.configuration.ResourceLocator;
+import com.thoughtworks.selenium.grid.hub.management.LifecycleManager;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.GlobalRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPoller;
-import com.thoughtworks.selenium.grid.hub.management.LifecycleManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServlet.java

@@ -1,8 +1,8 @@
 package com.thoughtworks.selenium.grid.hub;
 
-import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
-import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.SeleneseCommand;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/LifecycleManagerServlet.java

@@ -3,9 +3,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import java.io.IOException;
 
 /**

hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServlet.java

@@ -1,5 +1,6 @@
 package com.thoughtworks.selenium.grid.hub.management.console;
 
+import com.thoughtworks.selenium.grid.hub.HubRegistry;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -9,8 +10,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import com.thoughtworks.selenium.grid.hub.HubRegistry;
-
 /**
  * Gateway to Selenium Farm.
  *

hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommand.java

@@ -1,12 +1,12 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import com.thoughtworks.selenium.grid.hub.Environment;
 import com.thoughtworks.selenium.grid.HttpParameters;
 import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.Environment;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.io.IOException;
 import java.util.regex.Matcher;

hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommand.java

@@ -1,9 +1,9 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
 
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import com.thoughtworks.selenium.grid.Response;
-import com.thoughtworks.selenium.grid.HttpParameters;
 
 import java.io.IOException;
 

hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommand.java

@@ -1,8 +1,8 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
 
+import com.thoughtworks.selenium.grid.HttpParameters;
 import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
-import com.thoughtworks.selenium.grid.HttpParameters;
 
 import java.io.IOException;
 

hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/LocalHostResolverTest.java

@@ -1,5 +1,7 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol;
 
+import org.junit.Test;
+
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
@@ -9,8 +11,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.junit.Test;
-
 /**
  * Experimenting on educated guess for which address a remote control should
  * listen to by default when it is not explicitely provided.

hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/RequestProxyTest.java

@@ -1,14 +1,12 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol;
 
+import com.thoughtworks.selenium.grid.HttpClient;
+import com.thoughtworks.selenium.grid.Response;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
-
-import java.io.IOException;
-
 import org.junit.Test;
 
-import com.thoughtworks.selenium.grid.HttpClient;
-import com.thoughtworks.selenium.grid.Response;
+import java.io.IOException;
 
 public class RequestProxyTest {
 

hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/SeleniumRCProxyIntegrationTest.java

@@ -1,15 +1,13 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol;
 
+import com.thoughtworks.selenium.grid.HttpClient;
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
-
-import java.io.IOException;
-
 import org.junit.Test;
 
-import com.thoughtworks.selenium.grid.HttpClient;
-import com.thoughtworks.selenium.grid.HttpParameters;
-import com.thoughtworks.selenium.grid.Response;
+import java.io.IOException;
 
 public class SeleniumRCProxyIntegrationTest {
 

hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubRegistryTest.java

@@ -1,8 +1,8 @@
 package com.thoughtworks.selenium.grid.hub;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
 

hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubServletTest.java

@@ -1,9 +1,9 @@
 package com.thoughtworks.selenium.grid.hub;
 
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import com.thoughtworks.selenium.grid.Response;
-import com.thoughtworks.selenium.grid.HttpParameters;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 import org.jbehave.classmock.UsingClassMock;

hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServletTest.java

@@ -4,8 +4,8 @@
 import org.jbehave.core.mock.Mock;
 import org.junit.Test;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 

hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPoolTest.java

@@ -10,8 +10,8 @@
 import static junit.framework.Assert.assertTrue;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
-import org.junit.Test;
 import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
 
 import java.util.Date;
 import java.util.List;

hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlSessionTest.java

@@ -2,8 +2,8 @@
 
 import org.jbehave.classmock.UsingClassMock;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import java.util.Date;

hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommandTest.java

@@ -1,14 +1,14 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
 
-import com.thoughtworks.selenium.grid.hub.Environment;
 import com.thoughtworks.selenium.grid.HttpParameters;
 import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.Environment;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
 import static junit.framework.Assert.assertEquals;
-import org.jbehave.core.mock.Mock;
 import org.jbehave.classmock.UsingClassMock;
+import org.jbehave.core.mock.Mock;
 import org.junit.Test;
 
 import java.io.IOException;

hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommandTest.java

@@ -1,12 +1,12 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
 
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import com.thoughtworks.selenium.grid.Response;
-import com.thoughtworks.selenium.grid.HttpParameters;
 import static junit.framework.Assert.assertEquals;
-import org.jbehave.core.mock.Mock;
 import org.jbehave.classmock.UsingClassMock;
+import org.jbehave.core.mock.Mock;
 import org.junit.Test;
 
 import java.io.IOException;

hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommandTest.java

@@ -1,9 +1,9 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
 
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import com.thoughtworks.selenium.grid.Response;
-import com.thoughtworks.selenium.grid.HttpParameters;
 import static junit.framework.Assert.assertEquals;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;

infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpParametersTest.java

@@ -6,9 +6,9 @@
 import org.jbehave.classmock.UsingClassMock;
 import org.junit.Test;
 
-import java.util.Set;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 public class HttpParametersTest extends UsingClassMock {
 

infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/IOHelperTest.java

@@ -5,7 +5,13 @@
 import org.jbehave.core.mock.Mock;
 import org.junit.Test;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.net.Socket;
 
 public class IOHelperTest extends UsingClassMock {

infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/configuration/ResourceLocatorTest.java

@@ -1,7 +1,7 @@
 package com.thoughtworks.selenium.grid.configuration;
 
-import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
 import org.junit.Test;
 
 

infrastructure/webserver/src/test/unit/java/com/thoughtworks/selenium/grid/webserver/MainServletTest.java

@@ -1,5 +1,6 @@
 package com.thoughtworks.selenium.grid.webserver;
 
+import com.thoughtworks.selenium.grid.HttpParameters;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
 import static org.junit.Assert.assertEquals;
@@ -14,10 +15,8 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.Field;
-import java.util.Map;
 import java.util.HashMap;
-
-import com.thoughtworks.selenium.grid.HttpParameters;
+import java.util.Map;
 
 public class MainServletTest extends UsingClassMock {
 

regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/HugeRequestTests.java

@@ -1,7 +1,7 @@
 package com.thoughtworks.selenium.grid.regressiontests;
 
-import org.testng.annotations.Parameters;
 import com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage;
+import org.testng.annotations.Parameters;
 
 /**
  * Check that Selenium Grid handles Unicode Characters properly

regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/InactivityTests.java

@@ -1,7 +1,6 @@
 package com.thoughtworks.selenium.grid.regressiontests;
 
 import com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage;
-import org.testng.AssertJUnit;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 

regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/UnicodeTests.java

@@ -1,6 +1,8 @@
 package com.thoughtworks.selenium.grid.regressiontests;
 
-import static com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage.*;
+import static com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage.closeSeleniumSession;
+import static com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage.session;
+import static com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage.startSeleniumSession;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;

remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequest.java

@@ -1,7 +1,7 @@
 package com.thoughtworks.selenium.grid.remotecontrol;
 
-import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
 
 import java.io.IOException;
 

remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationInfo.java

@@ -0,0 +1,35 @@
+package com.thoughtworks.selenium.grid.remotecontrol;
+
+/**
+ * Information required when registering the Remote Control to the Hub
+ */
+public class RegistrationInfo {
+    private final String seleniumHubURL;
+    private final String environment;
+    private final String host;
+    private final String port;
+
+    public RegistrationInfo(String seleniumHubURL, String environment, String host, String port) {
+        this.seleniumHubURL = seleniumHubURL;
+        this.environment = environment;
+        this.host = host;
+        this.port = port;
+    }
+
+    public String hubURL() {
+        return seleniumHubURL;
+    }
+
+    public String environment() {
+        return environment;
+    }
+
+    public String host() {
+        return host;
+    }
+
+    public String port() {
+        return port;
+    }
+
+}

remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/instrumentation/EchoRemoteControl.java

@@ -1,7 +1,6 @@
 package com.thoughtworks.selenium.grid.remotecontrol.instrumentation;
 
 import com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControl;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;