Expose all DriverService.Builders to the service loader

Author: shs96c

java/client/src/org/openqa/selenium/chrome/BUCK

@@ -9,6 +9,17 @@ java_library(
   exported_deps = [
     '//java/client/src/org/openqa/selenium/remote:remote',
   ],
+  provided_deps = [
+    '//third_party/java/service:auto-service',
+  ],
+  annotation_processor_deps = [
+    '//third_party/java/auto:auto-common',
+    '//third_party/java/service:auto-service',
+    '//third_party/java/guava:guava',
+  ],
+  annotation_processors = [
+    'com.google.auto.service.processor.AutoServiceProcessor',
+  ],
   deps = [
     '//third_party/java/guava:guava',
   ],

java/client/src/org/openqa/selenium/chrome/ChromeDriverService.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.chrome;
 
+import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
@@ -91,6 +92,7 @@ public static ChromeDriverService createDefaultService() {
   /**
    * Builder used to configure new {@link ChromeDriverService} instances.
    */
+  @AutoService(DriverService.Builder.class)
   public static class Builder extends DriverService.Builder<
       ChromeDriverService, ChromeDriverService.Builder> {
 

java/client/src/org/openqa/selenium/edge/BUCK

@@ -9,6 +9,17 @@ java_library(
   exported_deps = [
     '//java/client/src/org/openqa/selenium/remote:remote',
   ],
+  provided_deps = [
+    '//third_party/java/service:auto-service',
+  ],
+  annotation_processor_deps = [
+    '//third_party/java/auto:auto-common',
+    '//third_party/java/service:auto-service',
+    '//third_party/java/guava:guava',
+  ],
+  annotation_processors = [
+    'com.google.auto.service.processor.AutoServiceProcessor',
+  ],
   deps = [
     '//third_party/java/guava:guava',
   ],

java/client/src/org/openqa/selenium/edge/EdgeDriverService.java

@@ -16,6 +16,7 @@
 // under the License.
 package org.openqa.selenium.edge;
 
+import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
@@ -67,6 +68,7 @@ public static EdgeDriverService createDefaultService() {
     return new Builder().build();
   }
 
+  @AutoService(DriverService.Builder.class)
   public static class Builder extends DriverService.Builder<
      EdgeDriverService, EdgeDriverService.Builder> {
 

java/client/src/org/openqa/selenium/firefox/BUCK

@@ -14,8 +14,18 @@ java_library(name = 'firefox',
   exported_deps = [
     '//java/client/src/org/openqa/selenium/remote:remote',
   ],
+  provided_deps = [
+    '//third_party/java/service:auto-service',
+  ],
+  annotation_processor_deps = [
+    '//third_party/java/auto:auto-common',
+    '//third_party/java/service:auto-service',
+    '//third_party/java/guava:guava',
+  ],
+  annotation_processors = [
+    'com.google.auto.service.processor.AutoServiceProcessor',
+  ],
   deps = [
-    ':prefs',
     '//third_party/java/guava:guava',
   ],
   visibility = [ 'PUBLIC' ],

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

@@ -20,6 +20,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.ByteStreams;
@@ -105,6 +106,7 @@ protected boolean hasShutdownEndpoint() {
   /**
    * Builder used to configure new {@link GeckoDriverService} instances.
    */
+  @AutoService(DriverService.Builder.class)
   public static class Builder extends DriverService.Builder<
     GeckoDriverService, GeckoDriverService.Builder> {
 

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

@@ -22,6 +22,7 @@
 import static org.openqa.selenium.firefox.FirefoxOptions.FIREFOX_OPTIONS;
 import static org.openqa.selenium.firefox.FirefoxProfile.PORT_PREFERENCE;
 
+import com.google.auto.service.AutoService;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -239,16 +240,12 @@ public static Builder builder() {
     return new Builder();
   }
 
+  @AutoService(DriverService.Builder.class)
   public static class Builder extends DriverService.Builder<XpiDriverService, XpiDriverService.Builder> {
 
     private FirefoxBinary binary = null;
     private FirefoxProfile profile = null;
 
-
-    private Builder() {
-      // Only available through the static factory method in the XpiDriverService
-    }
-
     public Builder withBinary(FirefoxBinary binary) {
       this.binary = Preconditions.checkNotNull(binary);
       return this;

java/client/src/org/openqa/selenium/ie/BUCK

@@ -8,6 +8,17 @@ java_library(name = 'ie',
   exported_deps = [
     '//java/client/src/org/openqa/selenium/remote:remote',
   ],
+  provided_deps = [
+    '//third_party/java/service:auto-service',
+  ],
+  annotation_processor_deps = [
+    '//third_party/java/auto:auto-common',
+    '//third_party/java/service:auto-service',
+    '//third_party/java/guava:guava',
+  ],
+  annotation_processors = [
+    'com.google.auto.service.processor.AutoServiceProcessor',
+  ],
   deps = [
     '//third_party/java/guava:guava',
   ],

java/client/src/org/openqa/selenium/ie/InternetExplorerDriverService.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.ie;
 
+import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
@@ -96,6 +97,7 @@ public static InternetExplorerDriverService createDefaultService() {
   /**
    * Builder used to configure new {@link InternetExplorerDriverService} instances.
    */
+  @AutoService(DriverService.Builder.class)
   public static class Builder extends DriverService.Builder<
       InternetExplorerDriverService, InternetExplorerDriverService.Builder> {
 

java/client/src/org/openqa/selenium/opera/BUCK

@@ -9,6 +9,17 @@ java_library(
   exported_deps = [
     '//java/client/src/org/openqa/selenium/remote:remote',
   ],
+  provided_deps = [
+    '//third_party/java/service:auto-service',
+  ],
+  annotation_processor_deps = [
+    '//third_party/java/auto:auto-common',
+    '//third_party/java/service:auto-service',
+    '//third_party/java/guava:guava',
+  ],
+  annotation_processors = [
+    'com.google.auto.service.processor.AutoServiceProcessor',
+  ],
   deps = [
     '//third_party/java/guava:guava',
   ],