Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions java/src/org/openqa/selenium/Proxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public String toString() {
}

private static final String PROXY_TYPE = "proxyType";
private static final String FTP_PROXY = "ftpProxy";
@Deprecated private static final String FTP_PROXY = "ftpProxy";
private static final String HTTP_PROXY = "httpProxy";
private static final String NO_PROXY = "noProxy";
private static final String SSL_PROXY = "sslProxy";
Expand All @@ -80,7 +80,7 @@ public String toString() {

private ProxyType proxyType = ProxyType.UNSPECIFIED;
private boolean autodetect = false;
private @Nullable String ftpProxy;
@Deprecated private @Nullable String ftpProxy;
private @Nullable String httpProxy;
private @Nullable String noProxy;
private @Nullable String sslProxy;
Expand Down Expand Up @@ -225,7 +225,9 @@ public Proxy setAutodetect(boolean autodetect) {
* Gets the FTP proxy.
*
* @return the FTP proxy hostname if present, or null if not set
* @deprecated getFtpProxy is deprecated and will be removed in a future release.
*/
@Deprecated
public @Nullable String getFtpProxy() {
return ftpProxy;
}
Expand All @@ -235,7 +237,9 @@ public Proxy setAutodetect(boolean autodetect) {
*
* @param ftpProxy the proxy host, expected format is <code>hostname.com:1234</code>
* @return reference to self
* @deprecated setFtpProxy is deprecated and will be removed in a future release.
*/
@Deprecated
public Proxy setFtpProxy(String ftpProxy) {
verifyProxyTypeCompatibility(ProxyType.MANUAL);
this.proxyType = ProxyType.MANUAL;
Expand Down
Loading