Skip to content

Commit 8d333d4

Browse files
committed
[java] Removing deprecated LocationContext related classes.
Related to #10397
1 parent 49084ad commit 8d333d4

File tree

7 files changed

+1
-263
lines changed

7 files changed

+1
-263
lines changed

java/src/org/openqa/selenium/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ java_export(
1313
srcs = glob([
1414
"*.java",
1515
"federatedcredentialmanagement/*.java",
16-
"html5/*.java",
1716
"internal/*.java",
1817
"interactions/**/*.java",
1918
"logging/**/*.java",

java/src/org/openqa/selenium/chromium/ChromiumDriver.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,13 @@
5252
import org.openqa.selenium.devtools.DevTools;
5353
import org.openqa.selenium.devtools.HasDevTools;
5454
import org.openqa.selenium.devtools.noop.NoOpCdpInfo;
55-
import org.openqa.selenium.html5.Location;
56-
import org.openqa.selenium.html5.LocationContext;
5755
import org.openqa.selenium.internal.Require;
5856
import org.openqa.selenium.json.TypeToken;
5957
import org.openqa.selenium.logging.EventType;
6058
import org.openqa.selenium.logging.HasLogEvents;
6159
import org.openqa.selenium.remote.CommandExecutor;
6260
import org.openqa.selenium.remote.FileDetector;
6361
import org.openqa.selenium.remote.RemoteWebDriver;
64-
import org.openqa.selenium.remote.html5.RemoteLocationContext;
6562
import org.openqa.selenium.remote.http.ClientConfig;
6663
import org.openqa.selenium.remote.http.ConnectionFailedException;
6764
import org.openqa.selenium.remote.http.HttpClient;
@@ -79,15 +76,13 @@ public class ChromiumDriver extends RemoteWebDriver
7976
HasLaunchApp,
8077
HasLogEvents,
8178
HasNetworkConditions,
82-
HasPermissions,
83-
LocationContext {
79+
HasPermissions {
8480

8581
public static final Predicate<String> IS_CHROMIUM_BROWSER =
8682
name -> CHROME.is(name) || EDGE.is(name) || OPERA.is(name);
8783
private static final Logger LOG = Logger.getLogger(ChromiumDriver.class.getName());
8884

8985
private final Capabilities capabilities;
90-
private final RemoteLocationContext locationContext;
9186
private final HasNetworkConditions networkConditions;
9287
private final HasPermissions permissions;
9388
private final HasLaunchApp launch;
@@ -102,7 +97,6 @@ public class ChromiumDriver extends RemoteWebDriver
10297
protected ChromiumDriver(
10398
CommandExecutor commandExecutor, Capabilities capabilities, String capabilityKey) {
10499
super(commandExecutor, capabilities);
105-
locationContext = new RemoteLocationContext(getExecuteMethod());
106100
permissions = new AddHasPermissions().getImplementation(getCapabilities(), getExecuteMethod());
107101
networkConditions =
108102
new AddHasNetworkConditions().getImplementation(getCapabilities(), getExecuteMethod());
@@ -280,19 +274,6 @@ public void register(Predicate<URI> whenThisMatches, Supplier<Credentials> useTh
280274
getDevTools().getDomains().network().addAuthHandler(whenThisMatches, useTheseCredentials);
281275
}
282276

283-
@Override
284-
@Deprecated
285-
public Location location() {
286-
return locationContext.location();
287-
}
288-
289-
@Override
290-
@Deprecated
291-
public void setLocation(Location location) {
292-
Require.nonNull("Location", location);
293-
locationContext.setLocation(location);
294-
}
295-
296277
@Override
297278
public void launchApp(String id) {
298279
Require.nonNull("Launch App ID", id);

java/src/org/openqa/selenium/html5/Location.java

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

java/src/org/openqa/selenium/html5/LocationContext.java

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

java/src/org/openqa/selenium/remote/html5/RemoteLocationContext.java

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

java/test/org/openqa/selenium/html5/BUILD.bazel

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

java/test/org/openqa/selenium/html5/LocationContextTest.java

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

0 commit comments

Comments
 (0)