Skip to content

Commit e1797c2

Browse files
committed
Fix up IJ build for Windows developers
On macOS and Linux, it's easy to use the bazel plugin to manage the project (and it's recommended to do so). However, on Windows, the bazel IJ plugin doesn't work, and so we need to continue including the pre-configured project. bazelbuild/intellij#113
1 parent ee03118 commit e1797c2

File tree

4 files changed

+9
-204
lines changed

4 files changed

+9
-204
lines changed

java/server/src/org/openqa/selenium/grid/commands/Hub.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717

1818
package org.openqa.selenium.grid.commands;
1919

20+
import com.google.auto.service.AutoService;
21+
2022
import com.beust.jcommander.JCommander;
2123
import com.beust.jcommander.ParameterException;
22-
import com.google.auto.service.AutoService;
23-
import io.opentracing.Tracer;
24+
2425
import org.openqa.selenium.BuildInfo;
2526
import org.openqa.selenium.cli.CliCommand;
2627
import org.openqa.selenium.events.EventBus;
@@ -46,6 +47,8 @@
4647
import org.openqa.selenium.netty.server.NettyServer;
4748
import org.openqa.selenium.remote.http.HttpClient;
4849

50+
import io.opentracing.Tracer;
51+
4952
import java.util.logging.Logger;
5053

5154
@AutoService(CliCommand.class)

java/server/src/org/openqa/selenium/remote/server/DefaultPipeline.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java

Lines changed: 0 additions & 166 deletions
This file was deleted.

java/server/test/org/openqa/selenium/remote/server/ActiveSessionFactoryTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import org.openqa.selenium.grid.session.SessionFactory;
3434
import org.openqa.selenium.remote.Dialect;
3535

36+
import io.opentracing.noop.NoopTracerFactory;
37+
3638
import java.util.Optional;
3739

3840
public class ActiveSessionFactoryTest {
@@ -43,7 +45,7 @@ public void factoriesFoundViaServiceLoadersAreUsedFirst() {
4345
Capabilities caps = new ImmutableCapabilities("browserName", "chrome");
4446
DriverProvider provider = new StubbedProvider(caps, driver);
4547

46-
ActiveSessionFactory sessionFactory = new ActiveSessionFactory() {
48+
ActiveSessionFactory sessionFactory = new ActiveSessionFactory(NoopTracerFactory.create()) {
4749
@Override
4850
protected Iterable<DriverProvider> loadDriverProviders() {
4951
return ImmutableSet.of(provider);
@@ -60,7 +62,7 @@ protected Iterable<DriverProvider> loadDriverProviders() {
6062
public void canBindNewFactoriesAtRunTime() {
6163
ActiveSession session = Mockito.mock(ActiveSession.class);
6264

63-
ActiveSessionFactory sessionFactory = new ActiveSessionFactory()
65+
ActiveSessionFactory sessionFactory = new ActiveSessionFactory(NoopTracerFactory.create())
6466
.bind(caps ->
6567
"cheese".equals(caps.getBrowserName()),
6668
new SessionFactory() {

0 commit comments

Comments
 (0)