Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename configureWebClient() to modifyWebClientInternal() in HtmlUnit support

Browse Source 
This commit renames the configureWebClient() method in
WebConnectionHtmlUnitDriver to modifyWebClientInternal() in order to
better convey the relationship to HtmlUnitDriver#modifyWebClient().

Issues SPR-13158
This commit is contained in:
Sam Brannen
2015-07-27 18:04:13 +02:00
parent 484ac5e242
commit 680936f4a2
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriver.java
View File

@@ -59,31 +59,35 @@ public class WebConnectionHtmlUnitDriver extends HtmlUnitDriver {
}
/**
* Modify the supplied {@link WebClient}, {@linkplain #configureWebClient
* configure} it, and retain a reference to it so that its {@link WebConnection}
* is {@linkplain #getWebConnection accessible} for later use.
* Modify the supplied {@link WebClient} and retain a reference to it
* so that its {@link WebConnection} is {@linkplain #getWebConnection
* accessible} for later use.
* <p>Delegates to {@link HtmlUnitDriver#modifyWebClient(WebClient)}
* for default behavior and to {@link #modifyWebClientInternal(WebClient)}
* for further customization.
* @param webClient the client to modify
* @return the modified client
* @see org.openqa.selenium.htmlunit.HtmlUnitDriver#modifyWebClient(WebClient)
* @see HtmlUnitDriver#modifyWebClient(WebClient)
* @see #modifyWebClientInternal(WebClient)
*/
@Override
protected final WebClient modifyWebClient(WebClient webClient) {
this.webClient = super.modifyWebClient(webClient);
this.webClient = configureWebClient(this.webClient);
this.webClient = modifyWebClientInternal(this.webClient);
return this.webClient;
}
/**
* Configure the supplied {@link WebClient}.
* Modify the supplied {@link WebClient}.
* <p>The default implementation simply returns the supplied client
* unmodified.
* <p>Subclasses can override this method to customize the {@code WebClient}
* that the {@link HtmlUnitDriver} driver uses.
* @param client the client to configure
* @return the configured client
* that the {@link HtmlUnitDriver} uses.
* @param webClient the client to modify
* @return the modified client
*/
protected WebClient configureWebClient(WebClient client) {
return client;
protected WebClient modifyWebClientInternal(WebClient webClient) {
return webClient;
}
/**