server: Hiding data behind methods

Author: barancev

java/server/src/org/openqa/grid/common/GridRole.java

@@ -17,6 +17,8 @@
 
 package org.openqa.grid.common;
 
+import com.google.common.collect.ImmutableList;
+
 import org.openqa.grid.common.exception.GridConfigurationException;
 
 import java.util.ArrayList;
@@ -25,6 +27,23 @@
 public enum GridRole {
   NOT_GRID, HUB, NODE;
 
+  private static List<String> rcAliases = new ImmutableList.Builder<String>()
+    .add("rc")
+    .add("remotecontrol")
+    .add("remote-control")
+    .build();
+
+  private static List<String> wdAliases = new ImmutableList.Builder<String>()
+    .add("wd")
+    .add("webdriver")
+    .build();
+
+  private static List<String> nodeAliases = new ImmutableList.Builder<String>()
+    .add("node")
+    .addAll(rcAliases)
+    .addAll(wdAliases)
+    .build();
+
   /**
    * finds the requested role from the parameters.
    *
@@ -42,7 +61,7 @@ public static GridRole find(String[] args) {
               "-role needs to be followed by the role of this component in the grid.");
         } else {
           String role = args[i + 1].toLowerCase();
-          if (NodeAliases().contains(role)) {
+          if (nodeAliases.contains(role)) {
             return NODE;
           } else if ("hub".equals(role)) {
             return HUB;
@@ -56,26 +75,11 @@ public static GridRole find(String[] args) {
     return NOT_GRID;
   }
 
-  private static List<String> NodeAliases() {
-    List<String> res = new ArrayList<String>();
-    res.add("node");
-    res.addAll(RCAliases());
-    res.addAll(WDAliases());
-    return res;
-  }
-
-  public static List<String> RCAliases() {
-    List<String> res = new ArrayList<String>();
-    res.add("rc");
-    res.add("remotecontrol");
-    res.add("remote-control");
-    return res;
+  public static boolean isRC(String nodeType) {
+    return rcAliases.contains(nodeType);
   }
 
-  public static List<String> WDAliases() {
-    List<String> res = new ArrayList<String>();
-    res.add("wd");
-    res.add("webdriver");
-    return res;
+  public static boolean isWebDriver(String nodeType) {
+    return wdAliases.contains(nodeType);
   }
 }

java/server/src/org/openqa/grid/common/RegistrationRequest.java

@@ -366,17 +366,15 @@ public static RegistrationRequest build(String... args) {
 
     res.role = GridRole.find(args);
 
-
     String defaultConfig = "defaults/DefaultNode.json";
     String nodeType = helper.getParamValue("-role");
-    if (GridRole.RCAliases().contains(nodeType)) {
+    if (GridRole.isRC(nodeType)) {
       defaultConfig = "defaults/DefaultNodeSelenium.json";
     }
-    if (GridRole.WDAliases().contains(nodeType)) {
+    if (GridRole.isWebDriver(nodeType)) {
       defaultConfig = "defaults/DefaultNodeWebDriver.json";
     }
 
-
     res.loadFromJSON(defaultConfig);
 
     // -file *.json ?
@@ -398,7 +396,7 @@ public static RegistrationRequest build(String... args) {
       }
       if (cap.getCapability(SELENIUM_PROTOCOL) == null) {
         cap.setCapability(SELENIUM_PROTOCOL,
-          GridRole.RCAliases().contains(nodeType)
+          GridRole.isRC(nodeType)
             ? SeleniumProtocol.Selenium.toString() : SeleniumProtocol.WebDriver.toString());
       }
     }

java/server/src/org/openqa/grid/common/Utils.java

@@ -19,8 +19,16 @@
 
 import org.openqa.selenium.remote.BrowserType;
 
+/**
+ * @deprecated This class is not used in Selenium code, to be removed in the next release
+ */
+@Deprecated
 public class Utils {
 
+  /**
+   * @deprecated This method is not used in Selenium code, to be removed in the next release
+   */
+  @Deprecated
   public static String getSelenium1Equivalent(String webDriverBrowserName) {
     if (BrowserType.FIREFOX.equals(webDriverBrowserName)) {
       return "*firefox";