Make Config.getClass return a meaningful type

SeleniumHQ · Jun 18, 2020 · 002dc3f · 002dc3f
1 parent bd085e8
commit 002dc3f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/java/server/src/org/openqa/selenium/grid/config/Config.java b/java/server/src/org/openqa/selenium/grid/config/Config.java
@@ -43,7 +43,7 @@ default Optional<Boolean> getBool(String section, String option) {
     return get(section, option).map(Boolean::parseBoolean);
   }
 
-  default <X> Object getClass(String section, String option, Class<X> typeOfClass, String defaultClazz) {
+  default <X> X getClass(String section, String option, Class<X> typeOfClass, String defaultClazz) {
     String clazz = get(section, option).orElse(defaultClazz);
 
     try {
@@ -60,7 +60,7 @@ default <X> Object getClass(String section, String option, Class<X> typeOfClass,
             "Class %s's `create(Config)` method must be static", clazz));
       }
 
-      return create.invoke(null, this);
+      return typeOfClass.cast(create.invoke(null, this));
     } catch (NoSuchMethodException e) {
       throw new IllegalArgumentException(String.format(
           "Class %s must have a static `create(Config)` method", clazz));

diff --git a/java/server/src/org/openqa/selenium/grid/distributor/config/DistributorOptions.java b/java/server/src/org/openqa/selenium/grid/distributor/config/DistributorOptions.java
@@ -75,6 +75,6 @@ public URI getDistributorUri() {
   }
 
   public Distributor getDistributor(String defaultClass) {
-    return (Distributor) config.getClass(DISTRIBUTOR_SECTION, "implementation", Distributor.class, defaultClass);
+    return config.getClass(DISTRIBUTOR_SECTION, "implementation", Distributor.class, defaultClass);
   }
 }
diff --git a/java/server/src/org/openqa/selenium/grid/server/EventBusOptions.java b/java/server/src/org/openqa/selenium/grid/server/EventBusOptions.java
@@ -21,8 +21,6 @@
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.internal.Require;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.logging.Logger;
 
 public class EventBusOptions {
@@ -50,6 +48,6 @@ public EventBus getEventBus() {
   }
 
   private EventBus createBus() {
-    return (EventBus) config.getClass("events", "implementation", EventBus.class, DEFAULT_CLASS);
+    return config.getClass("events", "implementation", EventBus.class, DEFAULT_CLASS);
   }
 }
diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/config/SessionMapOptions.java b/java/server/src/org/openqa/selenium/grid/sessionmap/config/SessionMapOptions.java
@@ -76,6 +76,6 @@ public URI getSessionMapUri() {
   }
 
   public SessionMap getSessionMap() {
-    return  (SessionMap) config.getClass(SESSIONS_SECTION, "implementation", SessionMap.class, DEFAULT_SESSION_MAP);
+    return config.getClass(SESSIONS_SECTION, "implementation", SessionMap.class, DEFAULT_SESSION_MAP);
   }
 }