Clean up import statements in java code. No logical changes.

Jonahss · Jan 14, 2014 · 9f485ad · 9f485ad
1 parent 0b20158
commit 9f485ad
Show file tree

Hide file tree

Showing 140 changed files with 501 additions and 538 deletions.
diff --git a/java/server/src/cybervillains/ca/Generator.java b/java/server/src/cybervillains/ca/Generator.java
@@ -8,9 +8,13 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.lang.InterruptedException;
 import java.math.BigInteger;
-import java.security.*;
+import java.security.InvalidKeyException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.SignatureException;
+import java.security.UnrecoverableKeyException;
 import java.security.cert.CRLException;
 import java.security.cert.CertificateParsingException;
 import java.security.cert.X509CRL;

diff --git a/java/server/src/cybervillains/ca/KeyStoreManager.java b/java/server/src/cybervillains/ca/KeyStoreManager.java
@@ -1,7 +1,7 @@
 package cybervillains.ca;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.openqa.selenium.security.CertificateGenerator;
 import org.openqa.selenium.security.KeyAndCert;
 

diff --git a/java/server/src/org/openqa/grid/common/GridDocHelper.java b/java/server/src/org/openqa/grid/common/GridDocHelper.java
@@ -17,14 +17,12 @@
 
 package org.openqa.grid.common;
 
+import org.openqa.selenium.server.cli.RemoteControlLauncher;
+
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintStream;
-import java.lang.System;
 import java.util.Properties;
 
-import org.openqa.selenium.server.cli.RemoteControlLauncher;
-
 
 public class GridDocHelper {
   private static Properties gridProperties = load("org/openqa/grid/common/defaults/GridParameters.properties");

diff --git a/java/server/src/org/openqa/grid/internal/ActiveTestSessions.java b/java/server/src/org/openqa/grid/internal/ActiveTestSessions.java
@@ -18,6 +18,7 @@
 package org.openqa.grid.internal;
 
 import net.jcip.annotations.ThreadSafe;
+
 import org.openqa.grid.common.exception.GridException;
 
 import java.util.Collections;

diff --git a/java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java b/java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java
@@ -17,6 +17,11 @@
 
 package org.openqa.grid.internal;
 
+import static org.openqa.grid.common.RegistrationRequest.MAX_INSTANCES;
+import static org.openqa.grid.common.RegistrationRequest.PATH;
+import static org.openqa.grid.common.RegistrationRequest.REMOTE_HOST;
+import static org.openqa.grid.common.RegistrationRequest.SELENIUM_PROTOCOL;
+
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -42,12 +47,14 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.InvalidParameterException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static org.openqa.grid.common.RegistrationRequest.*;
-
 public class BaseRemoteProxy implements RemoteProxy {
   private final RegistrationRequest request;
   // how many ms between 2 cycle checking if there are some session that have

diff --git a/java/server/src/org/openqa/grid/internal/TestSession.java b/java/server/src/org/openqa/grid/internal/TestSession.java
@@ -17,21 +17,9 @@
 
 package org.openqa.grid.internal;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.DateFormat;
-import java.util.*;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.google.common.base.Charsets;
+import com.google.common.io.ByteStreams;
+import com.google.common.net.MediaType;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
@@ -55,9 +43,26 @@
 import org.openqa.grid.web.servlet.handler.WebDriverRequest;
 import org.openqa.selenium.io.IOUtils;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.ByteStreams;
-import com.google.common.net.MediaType;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.DateFormat;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * Represent a running test for the hub/registry. A test session is created when a TestSlot becomes

diff --git a/java/server/src/org/openqa/grid/internal/utils/GridHubConfiguration.java b/java/server/src/org/openqa/grid/internal/utils/GridHubConfiguration.java
@@ -15,6 +15,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
+import static org.openqa.grid.internal.utils.ServerJsonValues.BROWSER_TIMEOUT;
+import static org.openqa.grid.internal.utils.ServerJsonValues.CLIENT_TIMEOUT;
+
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.openqa.grid.common.CommandLineOptionHelper;
@@ -35,7 +39,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import static org.openqa.grid.internal.utils.ServerJsonValues.*;
 
 public class GridHubConfiguration {
 

diff --git a/java/server/src/org/openqa/grid/internal/utils/GridNodeConfiguration.java b/java/server/src/org/openqa/grid/internal/utils/GridNodeConfiguration.java
@@ -18,17 +18,16 @@
 
 package org.openqa.grid.internal.utils;
 
-import org.openqa.selenium.remote.DesiredCapabilities;
-import org.openqa.selenium.server.RemoteControlConfiguration;
-import org.openqa.selenium.server.cli.RemoteControlLauncher;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.openqa.grid.common.CommandLineOptionHelper;
 import org.openqa.grid.common.GridRole;
 import org.openqa.grid.common.JSONConfigurationUtils;
 import org.openqa.grid.common.exception.GridConfigurationException;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.server.RemoteControlConfiguration;
+import org.openqa.selenium.server.cli.RemoteControlLauncher;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/java/server/src/org/openqa/grid/internal/utils/SelfRegisteringRemote.java b/java/server/src/org/openqa/grid/internal/utils/SelfRegisteringRemote.java
@@ -14,6 +14,8 @@
 
 package org.openqa.grid.internal.utils;
 
+import static org.openqa.grid.common.RegistrationRequest.AUTO_REGISTER;
+
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -26,17 +28,17 @@
 import org.openqa.grid.common.RegistrationRequest;
 import org.openqa.grid.common.exception.GridConfigurationException;
 import org.openqa.grid.common.exception.GridException;
-import org.openqa.selenium.remote.internal.HttpClientFactory;
 import org.openqa.grid.web.servlet.ResourceServlet;
 import org.openqa.grid.web.utils.ExtraServletUtil;
 import org.openqa.jetty.http.HttpContext;
 import org.openqa.jetty.jetty.Server;
 import org.openqa.jetty.jetty.servlet.ServletHandler;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.remote.internal.HttpClientFactory;
+import org.openqa.selenium.remote.server.log.LoggingManager;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 import org.openqa.selenium.server.SeleniumServer;
-import org.openqa.selenium.remote.server.log.LoggingManager;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -51,8 +53,6 @@
 
 import javax.servlet.Servlet;
 
-import static org.openqa.grid.common.RegistrationRequest.AUTO_REGISTER;
-
 public class SelfRegisteringRemote {
 
   private static final Logger log = Logger.getLogger(SelfRegisteringRemote.class.getName());

diff --git a/java/server/src/org/openqa/grid/selenium/GridLauncher.java b/java/server/src/org/openqa/grid/selenium/GridLauncher.java
@@ -17,11 +17,6 @@
 
 package org.openqa.grid.selenium;
 
-import org.openqa.selenium.remote.server.log.LoggingOptions;
-import org.openqa.selenium.remote.server.log.TerseFormatter;
-import org.openqa.selenium.server.SeleniumServer;
-import org.openqa.selenium.server.cli.RemoteControlLauncher;
-
 import org.openqa.grid.common.CommandLineOptionHelper;
 import org.openqa.grid.common.GridDocHelper;
 import org.openqa.grid.common.GridRole;
@@ -30,6 +25,10 @@
 import org.openqa.grid.internal.utils.GridHubConfiguration;
 import org.openqa.grid.internal.utils.SelfRegisteringRemote;
 import org.openqa.grid.web.Hub;
+import org.openqa.selenium.remote.server.log.LoggingOptions;
+import org.openqa.selenium.remote.server.log.TerseFormatter;
+import org.openqa.selenium.server.SeleniumServer;
+import org.openqa.selenium.server.cli.RemoteControlLauncher;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java b/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
@@ -17,34 +17,27 @@
 
 package org.openqa.grid.selenium.proxy;
 
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.util.EntityUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.openqa.grid.common.RegistrationRequest;
 import org.openqa.grid.common.SeleniumProtocol;
 import org.openqa.grid.common.exception.RemoteException;
 import org.openqa.grid.common.exception.RemoteNotReachableException;
 import org.openqa.grid.common.exception.RemoteUnregisterException;
+import org.openqa.grid.internal.BaseRemoteProxy;
 import org.openqa.grid.internal.Registry;
 import org.openqa.grid.internal.TestSession;
 import org.openqa.grid.internal.listeners.CommandListener;
 import org.openqa.grid.internal.listeners.SelfHealingProxy;
 import org.openqa.grid.internal.listeners.TestSessionListener;
 import org.openqa.grid.internal.listeners.TimeoutListener;
-import org.openqa.grid.internal.BaseRemoteProxy;
 import org.openqa.grid.internal.utils.HtmlRenderer;
 import org.openqa.grid.selenium.utils.WebProxyHtmlRenderer;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.CapabilityType;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;

diff --git a/java/server/src/org/openqa/grid/selenium/utils/WebProxyHtmlRenderer.java b/java/server/src/org/openqa/grid/selenium/utils/WebProxyHtmlRenderer.java
@@ -17,8 +17,6 @@
 
 package org.openqa.grid.selenium.utils;
 
-import java.util.Map;
-
 import org.openqa.grid.internal.RemoteProxy;
 import org.openqa.grid.internal.TestSession;
 import org.openqa.grid.internal.TestSlot;
@@ -28,6 +26,8 @@
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import java.util.Map;
+
 public class WebProxyHtmlRenderer implements HtmlRenderer {
 
   private RemoteProxy proxy;

diff --git a/java/server/src/org/openqa/grid/web/Hub.java b/java/server/src/org/openqa/grid/web/Hub.java
@@ -21,7 +21,6 @@
 
 import org.openqa.grid.internal.Registry;
 import org.openqa.grid.internal.utils.GridHubConfiguration;
-import org.openqa.grid.web.servlet.beta.ConsoleServlet;
 import org.openqa.grid.web.servlet.DisplayHelpServlet;
 import org.openqa.grid.web.servlet.DriverServlet;
 import org.openqa.grid.web.servlet.Grid1HeartbeatServlet;
@@ -31,6 +30,7 @@
 import org.openqa.grid.web.servlet.RegistrationServlet;
 import org.openqa.grid.web.servlet.ResourceServlet;
 import org.openqa.grid.web.servlet.TestSessionStatusServlet;
+import org.openqa.grid.web.servlet.beta.ConsoleServlet;
 import org.openqa.grid.web.utils.ExtraServletUtil;
 import org.openqa.selenium.net.NetworkUtils;
 import org.seleniumhq.jetty7.server.Server;

diff --git a/java/server/src/org/openqa/grid/web/servlet/DriverServlet.java b/java/server/src/org/openqa/grid/web/servlet/DriverServlet.java
@@ -19,16 +19,15 @@
 
 import com.google.common.io.ByteStreams;
 
-import org.openqa.grid.internal.ExternalSessionKey;
-import org.openqa.selenium.remote.ErrorCodes;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.openqa.grid.internal.ExternalSessionKey;
 import org.openqa.grid.internal.Registry;
 import org.openqa.grid.web.servlet.handler.RequestHandler;
 import org.openqa.grid.web.servlet.handler.SeleniumBasedRequest;
 import org.openqa.grid.web.servlet.handler.WebDriverRequest;
+import org.openqa.selenium.remote.ErrorCodes;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

diff --git a/java/server/src/org/openqa/grid/web/servlet/LifecycleServlet.java b/java/server/src/org/openqa/grid/web/servlet/LifecycleServlet.java
@@ -18,16 +18,16 @@
 
 package org.openqa.grid.web.servlet;
 
+import org.openqa.grid.common.exception.GridException;
+import org.openqa.grid.internal.Registry;
+import org.openqa.selenium.browserlaunchers.Sleeper;
+
 import java.io.IOException;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openqa.grid.common.exception.GridException;
-import org.openqa.grid.internal.Registry;
-import org.openqa.selenium.browserlaunchers.Sleeper;
-
 /**
  * API to manage grid lifecycle
  */

diff --git a/java/server/src/org/openqa/grid/web/servlet/ProxyStatusServlet.java b/java/server/src/org/openqa/grid/web/servlet/ProxyStatusServlet.java
@@ -17,6 +17,12 @@
 
 package org.openqa.grid.web.servlet;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.openqa.grid.common.exception.GridException;
+import org.openqa.grid.internal.Registry;
+import org.openqa.grid.internal.RemoteProxy;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -31,12 +37,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.openqa.grid.common.exception.GridException;
-import org.openqa.grid.internal.Registry;
-import org.openqa.grid.internal.RemoteProxy;
-
 public class ProxyStatusServlet extends RegistryBasedServlet {
 
   private static final long serialVersionUID = 7653463271803124556L;

diff --git a/java/server/src/org/openqa/grid/web/servlet/RegistrationServlet.java b/java/server/src/org/openqa/grid/web/servlet/RegistrationServlet.java
@@ -17,6 +17,12 @@
 
 package org.openqa.grid.web.servlet;
 
+import org.openqa.grid.common.RegistrationRequest;
+import org.openqa.grid.internal.BaseRemoteProxy;
+import org.openqa.grid.internal.Registry;
+import org.openqa.grid.internal.RemoteProxy;
+import org.openqa.grid.internal.utils.GridHubConfiguration;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -26,12 +32,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openqa.grid.common.RegistrationRequest;
-import org.openqa.grid.internal.BaseRemoteProxy;
-import org.openqa.grid.internal.Registry;
-import org.openqa.grid.internal.RemoteProxy;
-import org.openqa.grid.internal.utils.GridHubConfiguration;
-
 /**
  * entry point for the registration API the grid provides. The {@link RegistrationRequest} sent to
  * http://hub:port/grid/register will be used to create a RemoteProxy and add it to the grid.