Skip to content

Commit 6418964

Browse files
committed
server: Deleting deprecated code
1 parent 854e6fa commit 6418964

File tree

5 files changed

+1
-34
lines changed

5 files changed

+1
-34
lines changed

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

-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ public class DefaultDriverFactory implements DriverFactory {
3535
private Map<Capabilities, DriverProvider> capabilitiesToDriverProvider =
3636
new ConcurrentHashMap<Capabilities, DriverProvider>();
3737

38-
@Deprecated
39-
public void registerDriver(Capabilities capabilities, Class<? extends WebDriver> driverClass) {
40-
registerDriverProvider(new DefaultDriverProvider(capabilities, driverClass));
41-
}
42-
4338
public void registerDriverProvider(DriverProvider driverProvider) {
4439
if (driverProvider.canCreateDriverInstances()) {
4540
capabilitiesToDriverProvider.put(driverProvider.getProvidedCapabilities(), driverProvider);

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ public boolean canCreateDriverInstances() {
5353
return getDriverClass() != null;
5454
}
5555

56-
@Override
57-
public Class<? extends WebDriver> getDriverClass() {
56+
private Class<? extends WebDriver> getDriverClass() {
5857
if (driverClass != null) {
5958
return driverClass;
6059
}

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

-14
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,6 @@ public DefaultDriverSessions(DriverFactory factory) {
7272
this(Platform.getCurrent(), factory);
7373
}
7474

75-
/**
76-
* @deprecated Use DefaultDriverSessions(DriverFactory factory) constructor
77-
* and register all drivers to the factory
78-
*/
79-
@Deprecated
80-
public DefaultDriverSessions(
81-
DriverFactory factory, Map<Capabilities, Class<? extends WebDriver>> drivers) {
82-
this.factory = factory;
83-
for (Map.Entry<Capabilities, Class<? extends WebDriver>> entry : drivers.entrySet()) {
84-
registerDriver(entry.getKey(), entry.getValue());
85-
}
86-
this.clock = new SystemClock();
87-
}
88-
8975
protected DefaultDriverSessions(Platform runningOn, DriverFactory factory) {
9076
this(runningOn, factory, new SystemClock());
9177
}

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

-6
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121

2222
public interface DriverFactory {
2323

24-
/**
25-
* @deprecated Use registerDriverProvider instead
26-
*/
27-
@Deprecated
28-
void registerDriver(Capabilities capabilities, Class<? extends WebDriver> implementation);
29-
3024
void registerDriverProvider(DriverProvider implementation);
3125

3226
WebDriver newInstance(Capabilities capabilities);

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

-7
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ public interface DriverProvider {
4343
*/
4444
Capabilities getProvidedCapabilities();
4545

46-
/**
47-
* This method was used for testing purposes only and will be removed from the interface soon.
48-
* @deprecated
49-
*/
50-
@Deprecated
51-
Class<? extends WebDriver> getDriverClass();
52-
5346
/**
5447
* Checks if the provider can create driver instances.
5548
*

0 commit comments

Comments
 (0)