Fix generics

asashour · barancev · commit 138e3ab914e3 · 2017-04-13T00:50:19.000+03:00
Signed-off-by: Alexei Barantsev &lt;barancev@gmail.com&gt;
diff --git a/java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -193,7 +193,7 @@ private FirefoxDriver(
   }
 
   private static CommandExecutor toExecutor(FirefoxOptions options) {
-    DriverService.Builder builder;
+    DriverService.Builder<?, ?> builder;
 
     if (options.isLegacy()) {
       builder = XpiDriverService.builder()
diff --git a/java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java b/java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java
@@ -96,7 +96,7 @@ static FirefoxOptions fromJsonMap(Map<String, Object> map) throws IOException {
 
     if (map.containsKey("args")) {
       @SuppressWarnings("unchecked")  // #YOLO
-      List<String> list = (List) getOption(map, "args", List.class);
+      List<String> list = (List<String>) getOption(map, "args", List.class);
       options.addArguments(list);
     }
 
@@ -114,7 +114,7 @@ static FirefoxOptions fromJsonMap(Map<String, Object> map) throws IOException {
 
     if (map.containsKey("prefs")) {
       @SuppressWarnings("unchecked")  // #YOLO
-      Map<String, Object> prefs = (Map) getOption(map, "prefs", Map.class);
+      Map<String, Object> prefs = (Map<String, Object>) getOption(map, "prefs", Map.class);
       prefs.forEach((key, value) -> {
         if (value instanceof Boolean) {
           options.addPreference(key, (Boolean) value);
diff --git a/java/client/src/org/openqa/selenium/remote/JdkAugmenter.java b/java/client/src/org/openqa/selenium/remote/JdkAugmenter.java
@@ -56,7 +56,7 @@ protected RemoteWebDriver extractRemoteWebDriver(WebDriver driver) {
     } else if (Proxy.isProxyClass(driver.getClass())) {
       InvocationHandler handler = Proxy.getInvocationHandler(driver);
       if (handler instanceof JdkHandler) {
-        return ((JdkHandler) handler).driver;
+        return ((JdkHandler<?>) handler).driver;
       }
     }
     return null;
diff --git a/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java b/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java
@@ -256,11 +256,11 @@ private Object convertJsonPrimitive(JsonPrimitive json) {
     }
   }
 
-  private Enum convertEnum(Class clazz, Object text) {
+  private Enum<?> convertEnum(Class<?> clazz, Object text) {
     String toConvert = text instanceof JsonElement ?
                        ((JsonElement) text).getAsString() : String.valueOf(text);
 
-    Function<Class, Enum<?>> asEnum = (c) -> {
+    Function<Class<?>, Enum<?>> asEnum = (c) -> {
       for (Object value : c.getEnumConstants()) {
         if (value.toString().equalsIgnoreCase(toConvert)) {
           return (Enum<?>) value;
@@ -273,8 +273,8 @@ private Enum convertEnum(Class clazz, Object text) {
       return asEnum.apply(clazz);
     }
 
-    Class[] allClasses = clazz.getClasses();
-    for (Class current : allClasses) {
+    Class<?>[] allClasses = clazz.getClasses();
+    for (Class<?> current : allClasses) {
       if (current.isEnum()) {
         return asEnum.apply(current);
       }
diff --git a/java/client/src/org/openqa/selenium/remote/http/AbstractHttpCommandCodec.java b/java/client/src/org/openqa/selenium/remote/http/AbstractHttpCommandCodec.java
@@ -119,7 +119,7 @@ public abstract class AbstractHttpCommandCodec implements CommandCodec<HttpReque
   private static final Splitter PATH_SPLITTER = Splitter.on('/').omitEmptyStrings();
   private static final String SESSION_ID_PARAM = "sessionId";
 
-  private final ConcurrentHashMap<String, CommandSpec> nameToSpec = new ConcurrentHashMap();
+  private final ConcurrentHashMap<String, CommandSpec> nameToSpec = new ConcurrentHashMap<>();
   private final Map<String, String> aliases = new HashMap<>();
   private final BeanToJsonConverter beanToJsonConverter = new BeanToJsonConverter();
   private final JsonToBeanConverter jsonToBeanConverter = new JsonToBeanConverter();
diff --git a/java/client/src/org/openqa/selenium/remote/service/DriverService.java b/java/client/src/org/openqa/selenium/remote/service/DriverService.java
@@ -237,7 +237,7 @@ protected OutputStream getOutputStream() {
     return outputStream;
   }
 
-  public static abstract class Builder<DS extends DriverService, B extends Builder> {
+  public static abstract class Builder<DS extends DriverService, B extends Builder<?, ?>> {
 
     private int port = 0;
     private File exe = null;
@@ -250,6 +250,7 @@ public static abstract class Builder<DS extends DriverService, B extends Builder
      * @param file The executable to use.
      * @return A self reference.
      */
+    @SuppressWarnings("unchecked")
     public B usingDriverExecutable(File file) {
       checkNotNull(file);
       checkExecutable(file);
diff --git a/java/client/src/org/openqa/selenium/safari/SafariOptions.java b/java/client/src/org/openqa/selenium/safari/SafariOptions.java
@@ -90,7 +90,7 @@ public static SafariOptions fromCapabilities(Capabilities capabilities)
       return (SafariOptions) cap;
     } else if (cap instanceof Map) {
       try {
-        return SafariOptions.fromJsonMap((Map) cap);
+        return SafariOptions.fromJsonMap((Map<?, ?>) cap);
       } catch (IOException e) {
         throw new WebDriverException(e);
       }
diff --git a/java/client/src/org/openqa/selenium/support/ui/ExpectedConditions.java b/java/client/src/org/openqa/selenium/support/ui/ExpectedConditions.java
@@ -1509,7 +1509,7 @@ public Object apply(WebDriver driver) {
           Object value = ((JavascriptExecutor) driver).executeScript(javaScript);
 
           if (value instanceof List) {
-            return ((List) value).isEmpty() ? null : value;
+            return ((List<?>) value).isEmpty() ? null : value;
           }
           if (value instanceof String) {
             return ((String) value).isEmpty() ? null : value;
diff --git a/java/client/test/org/openqa/selenium/remote/ErrorHandlerTest.java b/java/client/test/org/openqa/selenium/remote/ErrorHandlerTest.java
@@ -441,7 +441,7 @@ public void testShouldStillIncludeScreenshotEvenIfServerSideExceptionsAreDisable
 
   @Test
   public void testStatusCodesRaisedBackToStatusMatches() {
-    Map<Integer, Class> exceptions = new HashMap<>();
+    Map<Integer, Class<?>> exceptions = new HashMap<>();
     exceptions.put(ErrorCodes.NO_SUCH_SESSION, NoSuchSessionException.class);
     exceptions.put(ErrorCodes.NO_SUCH_ELEMENT, NoSuchElementException.class);
     exceptions.put(ErrorCodes.NO_SUCH_FRAME, NoSuchFrameException.class);
@@ -470,7 +470,7 @@ public void testStatusCodesRaisedBackToStatusMatches() {
     exceptions.put(ErrorCodes.INVALID_XPATH_SELECTOR_RETURN_TYPER, InvalidSelectorException.class);
 
     Set<String> collectedFailures = new HashSet<>();
-    for (Map.Entry<Integer, Class> exception : exceptions.entrySet()) {
+    for (Map.Entry<Integer, Class<?>> exception : exceptions.entrySet()) {
       try {
         handler.throwIfResponseFailed(createResponse(exception.getKey()), 123);
         fail("Should have thrown an Exception");
diff --git a/java/client/test/org/openqa/selenium/remote/ProtocolHandshakeTest.java b/java/client/test/org/openqa/selenium/remote/ProtocolHandshakeTest.java
@@ -221,11 +221,11 @@ public void shouldNotIncludeNonProtocolExtensionKeys() throws IOException {
 
     Map<?, ?> capabilities = (Map<?, ?>) rawCaps;
 
-    Map<?, ?> always = (Map<?, ?>) capabilities.get("alwaysMatch");
+    Map<String, ?> always = (Map<String, ?>) capabilities.get("alwaysMatch");
     List<Map<?, ?>> first = (List<Map<?, ?>>) capabilities.get("firstMatch");
 
     // We don't care where they are, but we want to see "se:option" and not "option"
-    Set<String> keys = new HashSet(always.keySet());
+    Set<String> keys = new HashSet<>(always.keySet());
     keys.addAll(first.stream()
                     .map(Map::keySet)
                     .flatMap(Collection::stream)
diff --git a/java/client/test/org/openqa/selenium/remote/http/JsonHttpCommandCodecTest.java b/java/client/test/org/openqa/selenium/remote/http/JsonHttpCommandCodecTest.java
@@ -208,7 +208,7 @@ public void extractsAllParametersFromUrl() throws URISyntaxException {
     codec.defineCommand("pick", GET, "/fruit/:fruit/size/:size");
 
     Command decoded = codec.decode(request);
-    assertThat(decoded.getParameters(), is((Map) ImmutableMap.of(
+    assertThat(decoded.getParameters(), is((Map<String, String>) ImmutableMap.of(
         "fruit", "apple",
         "size", "large")));
   }
@@ -228,7 +228,7 @@ public void extractsAllParameters() throws URISyntaxException {
 
     Command decoded = codec.decode(request);
     assertThat(decoded.getSessionId(), is(new SessionId("sessionX")));
-    assertThat(decoded.getParameters(), is((Map) ImmutableMap.of(
+    assertThat(decoded.getParameters(), is((Map<String, String>) ImmutableMap.of(
         "fruit", "apple", "size", "large", "color", "red")));
   }
 
@@ -247,7 +247,7 @@ public void ignoresNullSessionIdInSessionBody() throws URISyntaxException {
 
     Command decoded = codec.decode(request);
     assertThat(decoded.getSessionId(), is(nullValue()));
-    assertThat(decoded.getParameters(), is((Map) ImmutableMap.of(
+    assertThat(decoded.getParameters(), is((Map<String, String>) ImmutableMap.of(
         "fruit", "apple", "size", "large", "color", "red")));
   }
 
@@ -290,7 +290,7 @@ public void codecRoundTrip() {
 
     assertThat(decoded.getName(), is(original.getName()));
     assertThat(decoded.getSessionId(), is(original.getSessionId()));
-    assertThat(decoded.getParameters(), is((Map) original.getParameters()));
+    assertThat(decoded.getParameters(), is((Map<?, ?>) original.getParameters()));
   }
 
   @Test
diff --git a/java/server/src/org/openqa/grid/internal/utils/configuration/StandaloneConfiguration.java b/java/server/src/org/openqa/grid/internal/utils/configuration/StandaloneConfiguration.java
@@ -273,11 +273,11 @@ protected boolean isMergeAble(Object other, Object target) {
     }
 
     if (target instanceof Collection) {
-      return !((Collection) other).isEmpty();
+      return !((Collection<?>) other).isEmpty();
     }
 
     if (target instanceof Map) {
-      return !((Map) other).isEmpty();
+      return !((Map<?, ?>) other).isEmpty();
     }
 
     return true;
@@ -303,16 +303,16 @@ public String toString() {
 
   public StringBuilder toString(String format, String name, Object value) {
     StringBuilder sb = new StringBuilder();
-    List iterator;
+    List<?> iterator;
     if (value instanceof List) {
-      iterator = (List)value;
+      iterator = (List<?>)value;
     } else {
       iterator = Arrays.asList(value);
     }
     for (Object v : iterator) {
       if (v != null &&
-          !(v instanceof Map && ((Map) v).isEmpty()) &&
-          !(v instanceof Collection && ((Collection) v).isEmpty())) {
+          !(v instanceof Map && ((Map<?, ?>) v).isEmpty()) &&
+          !(v instanceof Collection && ((Collection<?>) v).isEmpty())) {
         sb.append(String.format(format, name, v));
       }
     }
diff --git a/java/server/src/org/openqa/selenium/remote/server/rest/ResultConfig.java b/java/server/src/org/openqa/selenium/remote/server/rest/ResultConfig.java
@@ -223,7 +223,7 @@ private HandlerFactory getHandlerFactory(Class<? extends RestishHandler<?>> hand
   }
 
   private static Constructor<? extends RestishHandler<?>> getConstructor(
-      Class<? extends RestishHandler<?>> handlerClazz, Class... types) {
+      Class<? extends RestishHandler<?>> handlerClazz, Class<?>... types) {
     try {
       return handlerClazz.getConstructor(types);
     } catch (NoSuchMethodException e) {
diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/HTMLTestResults.java b/java/server/src/org/openqa/selenium/server/htmlrunner/HTMLTestResults.java
@@ -158,7 +158,7 @@ public String getNumTestPasses() {
     return numTestPasses;
   }
 
-  public Collection getTestTables() {
+  public Collection<String> getTestTables() {
     return testTables;
   }
 
@@ -239,11 +239,11 @@ public String decode(String string) {
       }
     }
 
-    public List decodeListOfStrings(List list) {
+    public List<String> decodeListOfStrings(List<String> list) {
       List<String> decodedList = new LinkedList<>();
 
-      for (Object o : list) {
-        decodedList.add(decode((String) o));
+      for (String o : list) {
+        decodedList.add(decode(o));
       }
 
       return decodedList;
diff --git a/java/server/test/org/openqa/grid/internal/utils/configuration/GridNodeConfigurationTest.java b/java/server/test/org/openqa/grid/internal/utils/configuration/GridNodeConfigurationTest.java
@@ -262,7 +262,7 @@ public void testMergeWithRealValues() {
     GridNodeConfiguration other = new GridNodeConfiguration();
     other.id = "myid";
     DesiredCapabilities dc =
-      new DesiredCapabilities(new ImmutableMap.Builder().put("chrome", "foo").build());
+      new DesiredCapabilities(new ImmutableMap.Builder<String, String>().put("chrome", "foo").build());
     other.capabilities = Arrays.asList(dc);
     other.downPollingLimit = 50;
     other.hub = "http://dummyhost";
diff --git a/java/server/test/org/openqa/testing/FakeHttpServletRequest.java b/java/server/test/org/openqa/testing/FakeHttpServletRequest.java
@@ -213,7 +213,7 @@ public Object getAttribute(String s) {
     return attributes.get(s);
   }
 
-  public Enumeration getAttributeNames() {
+  public Enumeration<String> getAttributeNames() {
     return Collections.enumeration(attributes.keySet());
   }
 
@@ -258,6 +258,7 @@ public String[] getParameterValues(String s) {
     return values.toArray(new String[values.size()]);
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public Map getParameterMap() {
     return Collections.unmodifiableMap(parameters);
   }
@@ -308,7 +309,7 @@ public Locale getLocale() {
     throw new UnsupportedOperationException();
   }
 
-  public Enumeration getLocales() {
+  public Enumeration<Locale> getLocales() {
     throw new UnsupportedOperationException();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ private FirefoxDriver(`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`private static CommandExecutor toExecutor(FirefoxOptions options) {`
`196`		`- DriverService.Builder builder;`
	`196`	`+ DriverService.Builder<?, ?> builder;`
`197`	`197`
`198`	`198`	`if (options.isLegacy()) {`
`199`	`199`	`builder = XpiDriverService.builder()`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ protected RemoteWebDriver extractRemoteWebDriver(WebDriver driver) {`
`56`	`56`	`} else if (Proxy.isProxyClass(driver.getClass())) {`
`57`	`57`	`InvocationHandler handler = Proxy.getInvocationHandler(driver);`
`58`	`58`	`if (handler instanceof JdkHandler) {`
`59`		`- return ((JdkHandler) handler).driver;`
	`59`	`+ return ((JdkHandler<?>) handler).driver;`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -256,11 +256,11 @@ private Object convertJsonPrimitive(JsonPrimitive json) {`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`
`259`		`- private Enum convertEnum(Class clazz, Object text) {`
	`259`	`+ private Enum<?> convertEnum(Class<?> clazz, Object text) {`
`260`	`260`	`String toConvert = text instanceof JsonElement ?`
`261`	`261`	`((JsonElement) text).getAsString() : String.valueOf(text);`
`262`	`262`
`263`		`- Function<Class, Enum<?>> asEnum = (c) -> {`
	`263`	`+ Function<Class<?>, Enum<?>> asEnum = (c) -> {`
`264`	`264`	`for (Object value : c.getEnumConstants()) {`
`265`	`265`	`if (value.toString().equalsIgnoreCase(toConvert)) {`
`266`	`266`	`return (Enum<?>) value;`
`@@ -273,8 +273,8 @@ private Enum convertEnum(Class clazz, Object text) {`
`273`	`273`	`return asEnum.apply(clazz);`
`274`	`274`	`}`
`275`	`275`
`276`		`- Class[] allClasses = clazz.getClasses();`
`277`		`- for (Class current : allClasses) {`
	`276`	`+ Class<?>[] allClasses = clazz.getClasses();`
	`277`	`+ for (Class<?> current : allClasses) {`
`278`	`278`	`if (current.isEnum()) {`
`279`	`279`	`return asEnum.apply(current);`
`280`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static SafariOptions fromCapabilities(Capabilities capabilities)`
`90`	`90`	`return (SafariOptions) cap;`
`91`	`91`	`} else if (cap instanceof Map) {`
`92`	`92`	`try {`
`93`		`- return SafariOptions.fromJsonMap((Map) cap);`
	`93`	`+ return SafariOptions.fromJsonMap((Map<?, ?>) cap);`
`94`	`94`	`} catch (IOException e) {`
`95`	`95`	`throw new WebDriverException(e);`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1509,7 +1509,7 @@ public Object apply(WebDriver driver) {`
`1509`	`1509`	`Object value = ((JavascriptExecutor) driver).executeScript(javaScript);`
`1510`	`1510`
`1511`	`1511`	`if (value instanceof List) {`
`1512`		`- return ((List) value).isEmpty() ? null : value;`
	`1512`	`+ return ((List<?>) value).isEmpty() ? null : value;`
`1513`	`1513`	`}`
`1514`	`1514`	`if (value instanceof String) {`
`1515`	`1515`	`return ((String) value).isEmpty() ? null : value;`