No logical change: reorganise and format FirefoxDriver

Largely so that constructors are grouped together.

Author: shs96c

java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java

@@ -117,28 +117,14 @@ public static final class SystemProperty {
 
   protected FirefoxBinary binary;
 
-  public FirefoxDriver(FirefoxOptions options) {
-    this(toExecutor(options), options.toDesiredCapabilities(), options.toRequiredCapabilities());
-  }
-
-  private static CommandExecutor toExecutor(FirefoxOptions options) {
-    if (options.isLegacy()) {
-      return new FirefoxDriver.LazyCommandExecutor(options.getBinary(), options.getProfile());
-
-    } else {
-      GeckoDriverService.Builder builder = new GeckoDriverService.Builder().usingPort(0);
-      Optional<FirefoxBinary> binary = options.getBinaryOrNull();
-      if (binary.isPresent()) {
-        builder.usingFirefoxBinary(binary.get());
-      }
-      return new DriverCommandExecutor(builder.build());
-    }
-  }
-
   public FirefoxDriver() {
     this(new FirefoxOptions());
   }
 
+  public FirefoxDriver(FirefoxOptions options) {
+    this(toExecutor(options), options.toDesiredCapabilities(), options.toRequiredCapabilities());
+  }
+
   /**
    * @deprecated Prefer {@link FirefoxOptions#setBinary(FirefoxBinary)}.
    */
@@ -164,35 +150,9 @@ public FirefoxDriver(Capabilities desiredCapabilities) {
     this(getFirefoxOptions(desiredCapabilities).addDesiredCapabilities(desiredCapabilities));
   }
 
-  private static FirefoxOptions getFirefoxOptions(Capabilities capabilities) {
-    FirefoxOptions options = new FirefoxOptions();
-
-    if (capabilities == null) {
-      return options;
-    }
-
-    Object rawOptions = capabilities.getCapability(FIREFOX_OPTIONS);
-    if (rawOptions != null) {
-      if (rawOptions instanceof Map) {
-        try {
-          @SuppressWarnings("unchecked")
-          Map<String, Object> map = (Map<String, Object>) rawOptions;
-          rawOptions = FirefoxOptions.fromJsonMap(map);
-        } catch (IOException e) {
-          throw new WebDriverException(e);
-        }
-      }
-      if (rawOptions != null && !(rawOptions instanceof FirefoxOptions)) {
-        throw new WebDriverException(
-            "Firefox option was set, but is not a FirefoxOption: " + rawOptions);
-      }
-      options = (FirefoxOptions) rawOptions;
-    }
-    return options;
-  }
-
   public FirefoxDriver(Capabilities desiredCapabilities, Capabilities requiredCapabilities) {
-    this(getFirefoxOptions(desiredCapabilities).addDesiredCapabilities(desiredCapabilities)
+    this(getFirefoxOptions(desiredCapabilities)
+             .addDesiredCapabilities(desiredCapabilities)
              .addRequiredCapabilities(requiredCapabilities));
   }
 
@@ -202,7 +162,9 @@ public FirefoxDriver(Capabilities desiredCapabilities, Capabilities requiredCapa
    */
   @Deprecated
   public FirefoxDriver(FirefoxBinary binary, FirefoxProfile profile, Capabilities capabilities) {
-    this(getFirefoxOptions(capabilities).setBinary(binary).setProfile(profile)
+    this(getFirefoxOptions(capabilities)
+             .setBinary(binary)
+             .setProfile(profile)
              .addDesiredCapabilities(capabilities));
   }
 
@@ -211,10 +173,15 @@ public FirefoxDriver(FirefoxBinary binary, FirefoxProfile profile, Capabilities
    *   {@link FirefoxOptions#setProfile(FirefoxProfile)}
    */
   @Deprecated
-  public FirefoxDriver(FirefoxBinary binary, FirefoxProfile profile,
-                       Capabilities desiredCapabilities, Capabilities requiredCapabilities) {
-    this(getFirefoxOptions(desiredCapabilities).setBinary(binary).setProfile(profile)
-             .addDesiredCapabilities(desiredCapabilities).addRequiredCapabilities(requiredCapabilities));
+  public FirefoxDriver(
+      FirefoxBinary binary,
+      FirefoxProfile profile,
+      Capabilities desiredCapabilities,
+      Capabilities requiredCapabilities) {
+    this(getFirefoxOptions(desiredCapabilities)
+             .setBinary(binary).setProfile(profile)
+             .addDesiredCapabilities(desiredCapabilities)
+             .addRequiredCapabilities(requiredCapabilities));
   }
 
   /**
@@ -237,18 +204,63 @@ public FirefoxDriver(GeckoDriverService driverService, Capabilities desiredCapab
    * @deprecated No replacement.
    */
   @Deprecated
-  public FirefoxDriver(GeckoDriverService driverService, Capabilities desiredCapabilities,
+  public FirefoxDriver(
+      GeckoDriverService driverService,
+      Capabilities desiredCapabilities,
       Capabilities requiredCapabilities) {
     this(new DriverCommandExecutor(driverService), desiredCapabilities, requiredCapabilities);
   }
 
-  private FirefoxDriver(CommandExecutor executor, Capabilities desiredCapabilities,
+  private FirefoxDriver(
+      CommandExecutor executor,
+      Capabilities desiredCapabilities,
       Capabilities requiredCapabilities) {
     super(executor,
           dropCapabilities(desiredCapabilities),
           dropCapabilities(requiredCapabilities));
   }
 
+  private static CommandExecutor toExecutor(FirefoxOptions options) {
+    if (options.isLegacy()) {
+      return new FirefoxDriver.LazyCommandExecutor(options.getBinary(), options.getProfile());
+
+    } else {
+      GeckoDriverService.Builder builder = new GeckoDriverService.Builder().usingPort(0);
+      Optional<FirefoxBinary> binary = options.getBinaryOrNull();
+      if (binary.isPresent()) {
+        builder.usingFirefoxBinary(binary.get());
+      }
+      return new DriverCommandExecutor(builder.build());
+    }
+  }
+
+  private static FirefoxOptions getFirefoxOptions(Capabilities capabilities) {
+    FirefoxOptions options = new FirefoxOptions();
+
+    if (capabilities == null) {
+      return options;
+    }
+
+    Object rawOptions = capabilities.getCapability(FIREFOX_OPTIONS);
+    if (rawOptions != null) {
+      if (rawOptions instanceof Map) {
+        try {
+          @SuppressWarnings("unchecked")
+          Map<String, Object> map = (Map<String, Object>) rawOptions;
+          rawOptions = FirefoxOptions.fromJsonMap(map);
+        } catch (IOException e) {
+          throw new WebDriverException(e);
+        }
+      }
+      if (rawOptions != null && !(rawOptions instanceof FirefoxOptions)) {
+        throw new WebDriverException(
+            "Firefox option was set, but is not a FirefoxOption: " + rawOptions);
+      }
+      options = (FirefoxOptions) rawOptions;
+    }
+    return options;
+  }
+
   @Override
   public void setFileDetector(FileDetector detector) {
     throw new WebDriverException(