github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-28 11:52:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

deprecated the proxyUrl field replacing it with proxyServer; getter and setter for proxyUrl now just wrap proxyServer

Browse Source 
Former-commit-id: 5f1fbdf2eda6f05252f81dd8bf7acd44c01b7b6f
This commit is contained in:
Jeremy Long
2014-05-31 06:42:27 -04:00
parent 4539b040e0
commit 0ffef12a8b
1 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java
View File

@@ -234,26 +234,49 @@ public class DependencyCheckScanAgent {
} }
/** /**
* The Proxy URL. * The Proxy Server.
*/ */
private String proxyUrl; private String proxyServer;
/** /**
* Get the value of proxyUrl. * Get the value of proxyServer.
* *
* @return the value of proxyUrl * @return the value of proxyServer
*/ */
public String getProxyUrl() { public String getProxyServer() {
return proxyUrl; return proxyServer;
} }
/** /**
* Set the value of proxyUrl. * Set the value of proxyServer.
* *
* @param proxyUrl new value of proxyUrl * @param proxyServer new value of proxyServer
*/ */
public void setProxyServer(String proxyServer) {
this.proxyServer = proxyServer;
}
/**
* Get the value of proxyServer.
*
* @return the value of proxyServer
* @deprecated use {@link org.owasp.dependencycheck.agent.DependencyCheckScanAgent#getProxyServer()} instead
*/
@Deprecated
public String getProxyUrl() {
return proxyServer;
}
/**
* Set the value of proxyServer.
*
* @param proxyUrl new value of proxyServer
* @deprecated use {@link org.owasp.dependencycheck.agent.DependencyCheckScanAgent#setProxyServer(java.lang.String)
* } instead
*/
@Deprecated
public void setProxyUrl(String proxyUrl) { public void setProxyUrl(String proxyUrl) {
this.proxyUrl = proxyUrl; this.proxyServer = proxyUrl;
} }
/** /**
@@ -792,7 +815,7 @@ public class DependencyCheckScanAgent {
/** /**
* Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system * Takes the properties supplied and updates the dependency-check settings. Additionally, this sets the system
* properties required to change the proxy url, port, and connection timeout. * properties required to change the proxy server, port, and connection timeout.
*/ */
private void populateSettings() { private void populateSettings() {
Settings.initialize(); Settings.initialize();
@@ -808,8 +831,8 @@ public class DependencyCheckScanAgent {
Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate); Settings.setBoolean(Settings.KEYS.AUTO_UPDATE, autoUpdate);
if (proxyUrl != null && !proxyUrl.isEmpty()) { if (proxyServer != null && !proxyServer.isEmpty()) {
Settings.setString(Settings.KEYS.PROXY_SERVER, proxyUrl); Settings.setString(Settings.KEYS.PROXY_SERVER, proxyServer);
} }
if (proxyPort != null && !proxyPort.isEmpty()) { if (proxyPort != null && !proxyPort.isEmpty()) {
Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort); Settings.setString(Settings.KEYS.PROXY_PORT, proxyPort);