Remove unused imports/methods/fields

asashour · barancev · commit 1fee32b3a4b9 · 2017-04-13T00:41:11.000+03:00
Signed-off-by: Alexei Barantsev &lt;barancev@gmail.com&gt;
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/WebDriverCommandProcessor.java b/java/client/src/com/thoughtworks/selenium/webdriven/WebDriverCommandProcessor.java
@@ -30,7 +30,6 @@
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.internal.WrapsDriver;
-import org.openqa.selenium.remote.CapabilityType;
 
 import java.util.Map;
 import java.util.function.Supplier;
diff --git a/java/client/src/org/openqa/selenium/Platform.java b/java/client/src/org/openqa/selenium/Platform.java
@@ -160,10 +160,6 @@ public Platform family() {
   },
 
   ANDROID("android", "dalvik") {
-    public String getLineEnding() {
-      return "\n";
-    }
-
     @Override
     public Platform family() {
       return LINUX;
diff --git a/java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -28,7 +28,6 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Proxy;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.remote.BeanToJsonConverter;
 import org.openqa.selenium.remote.CommandExecutor;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.FileDetector;
diff --git a/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java b/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java
@@ -241,10 +241,6 @@ private Method getMethod(Class<?> clazz, String methodName) {
     return null;
   }
 
-  private Object convertJsonPrimitive(JsonElement json) {
-    return convertJsonPrimitive(json.getAsJsonPrimitive());
-  }
-
   private Object convertJsonPrimitive(JsonPrimitive json) {
     if (json.isBoolean()) {
       return json.getAsBoolean();
@@ -260,7 +256,6 @@ private Object convertJsonPrimitive(JsonPrimitive json) {
     }
   }
 
-  @SuppressWarnings("unchecked")
   private Enum convertEnum(Class clazz, Object text) {
     String toConvert = text instanceof JsonElement ?
                        ((JsonElement) text).getAsString() : String.valueOf(text);
diff --git a/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -908,8 +908,8 @@ public Dimension getSize() {
         return new Dimension(width, height);
       }
 
-      @SuppressWarnings({"unchecked"})
       Map<String, Object> rawPoint;
+      @SuppressWarnings("unchecked")
       public Point getPosition() {
         Response response = execute(DriverCommand.GET_CURRENT_WINDOW_POSITION,
                                     ImmutableMap.of("windowHandle", "current"));
diff --git a/java/client/test/com/thoughtworks/selenium/corebased/TestBasicAuth.java b/java/client/test/com/thoughtworks/selenium/corebased/TestBasicAuth.java
@@ -19,14 +19,10 @@
 package com.thoughtworks.selenium.corebased;
 
 import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
 
 import com.thoughtworks.selenium.InternalSelenseTestBase;
 
-import org.junit.Assume;
 import org.junit.Test;
-import org.openqa.selenium.HasCapabilities;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.environment.GlobalTestEnvironment;
 import org.openqa.selenium.environment.webserver.AppServer;
 import org.openqa.selenium.internal.WrapsDriver;
diff --git a/java/client/test/org/openqa/selenium/ReferrerTest.java b/java/client/test/org/openqa/selenium/ReferrerTest.java
@@ -19,12 +19,10 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeFalse;
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
 import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
 import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
 import static org.openqa.selenium.testing.Driver.FIREFOX;
-import static org.openqa.selenium.testing.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Driver.IE;
 import static org.openqa.selenium.testing.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Driver.PHANTOMJS;
@@ -439,7 +437,6 @@ protected void after() {
    */
   private abstract static class ServerResource extends ExternalResource {
     protected final Server server;
-    private final int port;
     private final HostAndPort hostAndPort;
 
     ServerResource() {
@@ -450,7 +447,6 @@ private abstract static class ServerResource extends ExternalResource {
       http.setPort(port);
       http.setIdleTimeout(500000);
 
-      this.port = port;
       this.server.addConnector(http);
       this.hostAndPort = HostAndPort.fromParts("localhost", port);
     }
diff --git a/java/client/test/org/openqa/selenium/TakesScreenshotTest.java b/java/client/test/org/openqa/selenium/TakesScreenshotTest.java
@@ -506,6 +506,7 @@ private boolean onlyWhite(Set<String> colors) {
    *
    * @param im image
    */
+  @SuppressWarnings("unused")
   private void saveImageToTmpFile(BufferedImage im) {
 
     File outputfile = new File( testName.getMethodName() + "_image.png");
diff --git a/java/client/test/org/openqa/selenium/TypingTest.java b/java/client/test/org/openqa/selenium/TypingTest.java
@@ -25,7 +25,6 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeFalse;
 import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
-import static org.openqa.selenium.testing.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Driver.IE;
 import static org.openqa.selenium.testing.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Driver.PHANTOMJS;
diff --git a/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java b/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java
@@ -21,7 +21,6 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
-import static org.openqa.selenium.testing.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Driver.IE;
 import static org.openqa.selenium.testing.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Driver.SAFARI;
diff --git a/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java b/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java
@@ -442,7 +442,6 @@ public void testMoveMouseByOffsetOverAndOutOfAnElement() {
 
     WebElement greenbox = driver.findElement(By.id("greenbox"));
     WebElement redbox = driver.findElement(By.id("redbox"));
-    Dimension size = redbox.getSize();
     Point greenboxPosition = greenbox.getLocation();
     Point redboxPosition = redbox.getLocation();
     int shiftX = redboxPosition.getX() - greenboxPosition.getX();
diff --git a/java/client/test/org/openqa/selenium/remote/BeanToJsonConverterTest.java b/java/client/test/org/openqa/selenium/remote/BeanToJsonConverterTest.java
@@ -238,6 +238,7 @@ public void testShouldCallToJsonMethodIfPresent() {
   @Test
   public void toJsonMethodCanConvertibleReturnedMap() {
     class ToJsonReturnsMap {
+      @SuppressWarnings("unused")
       public Map<String, Object> toJson() {
         return ImmutableMap.of("cheese", "peas");
       }
@@ -253,6 +254,7 @@ public Map<String, Object> toJson() {
   @Test
   public void toJsonMethodCanConvertReturnedCollection() {
     class ToJsonReturnsCollection {
+      @SuppressWarnings("unused")
       public Set<String> toJson() {
         return ImmutableSortedSet.of("cheese", "peas");
       }
@@ -377,6 +379,7 @@ class Bean {
         this.date = date;
       }
 
+      @SuppressWarnings("unused")
       public Date getDate() {
         return date;
       }
diff --git a/java/client/test/org/openqa/selenium/remote/ErrorHandlerTest.java b/java/client/test/org/openqa/selenium/remote/ErrorHandlerTest.java
@@ -214,7 +214,7 @@ public void testCauseStackTraceShouldBeEmptyIfTheServerDidNotProvideThatInformat
     }
   }
 
-  @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+  @SuppressWarnings("ThrowableInstanceNeverThrown")
   @Test
   public void testShouldBeAbleToRebuildASerializedException() throws Exception {
     RuntimeException serverError = new RuntimeException("foo bar baz!\nCommand duration or timeout: 123 milliseconds");
@@ -238,7 +238,7 @@ public void testShouldBeAbleToRebuildASerializedException() throws Exception {
     }
   }
 
-  @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+  @SuppressWarnings("ThrowableInstanceNeverThrown")
   @Test
   public void testShouldIncludeScreenshotIfProvided() throws Exception {
     RuntimeException serverError = new RuntimeException("foo bar baz!");
@@ -266,7 +266,7 @@ public void testShouldIncludeScreenshotIfProvided() throws Exception {
     }
   }
 
-  @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+  @SuppressWarnings("ThrowableInstanceNeverThrown")
   @Test
   public void testShouldDefaultToWebDriverExceptionIfClassIsNotSpecified()
       throws Exception {
@@ -291,7 +291,7 @@ public void testShouldDefaultToWebDriverExceptionIfClassIsNotSpecified()
     }
   }
 
-  @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+  @SuppressWarnings("ThrowableInstanceNeverThrown")
   @Test
   public void testShouldStillTryToBuildWebDriverExceptionIfClassIsNotProvidedAndStackTraceIsNotForJava() {
     Map<String, ?> data = ImmutableMap.of(
@@ -326,7 +326,7 @@ public void testShouldStillTryToBuildWebDriverExceptionIfClassIsNotProvidedAndSt
     }
   }
 
-  @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+  @SuppressWarnings("ThrowableInstanceNeverThrown")
   @Test
   public void testToleratesNonNumericLineNumber() {
     Map<String, ?> data = ImmutableMap.of(
@@ -361,7 +361,7 @@ public void testToleratesNonNumericLineNumber() {
     }
   }
 
-  @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+  @SuppressWarnings("ThrowableInstanceNeverThrown")
   @Test
   public void testToleratesNumericLineNumberAsString() {
     Map<String, ?> data = ImmutableMap.of(
@@ -396,7 +396,7 @@ public void testToleratesNumericLineNumberAsString() {
     }
   }
 
-  @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+  @SuppressWarnings("ThrowableInstanceNeverThrown")
   @Test
   public void testShouldIndicateWhenTheServerReturnedAnExceptionThatWasSuppressed()
       throws Exception {
@@ -415,7 +415,7 @@ public void testShouldIndicateWhenTheServerReturnedAnExceptionThatWasSuppressed(
     }
   }
 
-  @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+  @SuppressWarnings("ThrowableInstanceNeverThrown")
   @Test
   public void testShouldStillIncludeScreenshotEvenIfServerSideExceptionsAreDisabled()
       throws Exception {
diff --git a/java/client/test/org/openqa/selenium/remote/JsonToBeanConverterTest.java b/java/client/test/org/openqa/selenium/remote/JsonToBeanConverterTest.java
@@ -388,7 +388,6 @@ public void testShouldRecognizeNumericStatus() {
 
     assertEquals(0, response.getStatus().intValue());
     assertEquals(new ErrorCodes().toState(0), response.getState());
-    @SuppressWarnings("unchecked")
     String value = (String) response.getValue();
     assertEquals("cheese", value);
   }
@@ -400,7 +399,6 @@ public void testShouldRecognizeStringStatus() {
 
     assertEquals(0, response.getStatus().intValue());
     assertEquals(new ErrorCodes().toState(0), response.getState());
-    @SuppressWarnings("unchecked")
     String value = (String) response.getValue();
     assertEquals("cheese", value);
   }
@@ -420,7 +418,6 @@ public void testShouldRecognizeStringState() {
 
     assertEquals("success", response.getState());
     assertEquals(0, response.getStatus().intValue());
-    @SuppressWarnings("unchecked")
     String value = (String) response.getValue();
     assertEquals("cheese", value);
   }
diff --git a/java/client/test/org/openqa/selenium/remote/ProtocolHandshakeTest.java b/java/client/test/org/openqa/selenium/remote/ProtocolHandshakeTest.java
@@ -34,7 +34,6 @@
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.remote.http.W3CHttpCommandCodec;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/java/client/test/org/openqa/selenium/remote/internal/WebElementToJsonConverterTest.java b/java/client/test/org/openqa/selenium/remote/internal/WebElementToJsonConverterTest.java
@@ -92,7 +92,6 @@ public void unwrapsWrappedElements_multipleLevelsOfWrapping() {
     assertIsWebElementObject(value, "abc123");
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void convertsSimpleCollections() {
     Object converted = CONVERTER.apply(Lists.newArrayList(null, "abc", true, 123, Math.PI));
@@ -102,7 +101,6 @@ public void convertsSimpleCollections() {
     assertContentsInOrder(list, null, "abc", true, 123, Math.PI);
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void convertsNestedCollections_simpleValues() {
     List<?> innerList = Lists.newArrayList(123, "abc");
diff --git a/java/client/test/org/openqa/selenium/support/pagefactory/DefaultFieldDecoratorTest.java b/java/client/test/org/openqa/selenium/support/pagefactory/DefaultFieldDecoratorTest.java
@@ -50,8 +50,6 @@
 import java.lang.reflect.Field;
 import java.util.List;
 
-/**
- */
 @RunWith(JUnit4.class)
 public class DefaultFieldDecoratorTest {
 
diff --git a/java/client/test/org/openqa/selenium/support/pagefactory/UsingPageFactoryTest.java b/java/client/test/org/openqa/selenium/support/pagefactory/UsingPageFactoryTest.java
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-
 package org.openqa.selenium.support.pagefactory;
 
 import static org.hamcrest.Matchers.equalTo;
diff --git a/java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java b/java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java
@@ -42,6 +42,7 @@ public class OutOfProcessSeleniumServer {
 
   private String baseUrl;
   private CommandLine command;
+  @SuppressWarnings("unused")
   private boolean captureLogs = false;
 
   public void enableLogCapture() {
diff --git a/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java b/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java
@@ -113,6 +113,7 @@ private enum LogLevel {
     WARNING("WARNING", Level.WARNING),
     ERROR("ERROR", Level.SEVERE);
 
+    @SuppressWarnings("unused")
     private final String value;
     private final Level level;
 
diff --git a/java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java b/java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java
@@ -174,25 +174,6 @@ public void setupTimeoutListener() {
     }
   }
 
-  /**
-   * merge the param from config 1 and 2. If a param is present in both, config2 value is used.
-   *
-   * @param configuration1 The first configuration to merge (recessive)
-   * @param configuration2 The second configuration to merge (dominant)
-   * @return The merged collection
-   */
-  private Map<String, Object> mergeConfig(Map<String, Object> configuration1,
-                                          Map<String, Object> configuration2) {
-    Map<String, Object> res = new HashMap<>();
-    res.putAll(configuration1);
-
-    for (String key : configuration2.keySet()) {
-      res.put(key, configuration2.get(key));
-    }
-
-    return res;
-  }
-
   public String getId() {
     if (id == null) {
       throw new RuntimeException("Bug. Trying to use the id on a proxy but it hasn't been set.");
diff --git a/java/server/src/org/openqa/selenium/remote/server/DefaultDriverProvider.java b/java/server/src/org/openqa/selenium/remote/server/DefaultDriverProvider.java
@@ -22,7 +22,6 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/java/server/src/org/openqa/selenium/remote/server/DriverServlet.java b/java/server/src/org/openqa/selenium/remote/server/DriverServlet.java
@@ -233,10 +233,8 @@ private static HttpRequest createInternalRequest(HttpServletRequest servletReque
         HttpMethod.valueOf(servletRequest.getMethod().toUpperCase()),
         path);
 
-    @SuppressWarnings("unchecked")
     Enumeration<String> headerNames = servletRequest.getHeaderNames();
     for (String name : list(headerNames)) {
-      @SuppressWarnings("unchecked")
       Enumeration<String> headerValues = servletRequest.getHeaders(name);
       for (String value : list(headerValues)) {
         request.setHeader(name, value);
diff --git a/java/server/src/org/openqa/selenium/remote/server/handler/FindChildElement.java b/java/server/src/org/openqa/selenium/remote/server/handler/FindChildElement.java
@@ -34,7 +34,6 @@ public FindChildElement(Session session) {
     super(session);
   }
 
-  @SuppressWarnings("unchecked")
   public void setJsonParameters(Map<String, Object> allParameters) throws Exception {
     by = newBySelector().pickFromJsonParameters(allParameters);
   }
diff --git a/java/server/test/org/openqa/grid/e2e/node/DefaultProxyIsUnregisteredIfDownForTooLongTest.java b/java/server/test/org/openqa/grid/e2e/node/DefaultProxyIsUnregisteredIfDownForTooLongTest.java
@@ -114,14 +114,6 @@ public Boolean call() throws Exception {
     };
   }
 
-  private Callable<Boolean> isDown(final DefaultRemoteProxy proxy) {
-    return new Callable<Boolean>() {
-      public Boolean call() throws Exception {
-        return proxy.isDown();
-      }
-    };
-  }
-
   private String getProxyId() throws Exception {
     RemoteProxy p = null;
     Iterator<RemoteProxy> it = registry.getAllProxies().iterator();
diff --git a/java/server/test/org/openqa/selenium/remote/server/DriverFactoryTest.java b/java/server/test/org/openqa/selenium/remote/server/DriverFactoryTest.java
@@ -202,9 +202,11 @@ public void testShouldCallAConstructorTakingACapabilitiesArgInPreferenceToANoArg
   private static class CapabilitiesDriver extends StubDriver {
     private Capabilities caps;
 
+    @SuppressWarnings("unused")
     public CapabilitiesDriver() {
     }
 
+    @SuppressWarnings("unused")
     public CapabilitiesDriver(Capabilities caps) {
       this.caps = caps;
     }

Original file line number	Diff line number	Diff line change
`@@ -241,10 +241,6 @@ private Method getMethod(Class<?> clazz, String methodName) {`
`241`	`241`	`return null;`
`242`	`242`	`}`
`243`	`243`
`244`		`- private Object convertJsonPrimitive(JsonElement json) {`
`245`		`- return convertJsonPrimitive(json.getAsJsonPrimitive());`
`246`		`- }`
`247`		`-`
`248`	`244`	`private Object convertJsonPrimitive(JsonPrimitive json) {`
`249`	`245`	`if (json.isBoolean()) {`
`250`	`246`	`return json.getAsBoolean();`
`@@ -260,7 +256,6 @@ private Object convertJsonPrimitive(JsonPrimitive json) {`
`260`	`256`	`}`
`261`	`257`	`}`
`262`	`258`
`263`		`- @SuppressWarnings("unchecked")`
`264`	`259`	`private Enum convertEnum(Class clazz, Object text) {`
`265`	`260`	`String toConvert = text instanceof JsonElement ?`
`266`	`261`	`((JsonElement) text).getAsString() : String.valueOf(text);`
Original file line number	Diff line number	Diff line change
`@@ -908,8 +908,8 @@ public Dimension getSize() {`
`908`	`908`	`return new Dimension(width, height);`
`909`	`909`	`}`
`910`	`910`
`911`		`- @SuppressWarnings({"unchecked"})`
`912`	`911`	`Map<String, Object> rawPoint;`
	`912`	`+ @SuppressWarnings("unchecked")`
`913`	`913`	`public Point getPosition() {`
`914`	`914`	`Response response = execute(DriverCommand.GET_CURRENT_WINDOW_POSITION,`
`915`	`915`	`ImmutableMap.of("windowHandle", "current"));`
Original file line number	Diff line number	Diff line change
`@@ -506,6 +506,7 @@ private boolean onlyWhite(Set<String> colors) {`
`506`	`506`	`*`
`507`	`507`	`* @param im image`
`508`	`508`	`*/`
	`509`	`+ @SuppressWarnings("unused")`
`509`	`510`	`private void saveImageToTmpFile(BufferedImage im) {`
`510`	`511`
`511`	`512`	`File outputfile = new File( testName.getMethodName() + "_image.png");`