Skip to content

Commit 6863b9f

Browse files
rbrirbri
committed
HttpClientConverter.toQueryFormFields(List<NameValuePair>, Charset) are deprecated.
1 parent 97197a8 commit 6863b9f

8 files changed

Lines changed: 227 additions & 144 deletions

File tree

‎src/changes/changes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<body>
1010
<release version="4.1.0" date="April xx, 2024" description="Bugfixes">
1111
<action type="update" dev="rbri">
12-
HttpClientConverter.parseUrlQuery(String, Charset) is deprecated.
12+
HttpClientConverter.parseUrlQuery(String, Charset) and toQueryFormFields(List<NameValuePair>, Charset) are deprecated.
1313
Please use HttpUtils instead.
1414
</action>
1515
<action type="update" dev="rbri">

‎src/main/java/org/htmlunit/HttpWebConnection.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@
105105
import org.apache.http.ssl.SSLContexts;
106106
import org.apache.http.util.TextUtils;
107107
import org.htmlunit.WebRequest.HttpHint;
108+
import org.htmlunit.http.HttpUtils;
108109
import org.htmlunit.httpclient.HtmlUnitCookieSpecProvider;
109110
import org.htmlunit.httpclient.HtmlUnitCookieStore;
110111
import org.htmlunit.httpclient.HtmlUnitRedirectStrategie;
111112
import org.htmlunit.httpclient.HtmlUnitSSLConnectionSocketFactory;
112-
import org.htmlunit.httpclient.HttpClientConverter;
113113
import org.htmlunit.httpclient.SocksConnectionSocketFactory;
114114
import org.htmlunit.util.KeyDataPair;
115115
import org.htmlunit.util.MimeType;
@@ -296,17 +296,15 @@ private HttpUriRequest makeHttpMethod(final WebRequest webRequest, final HttpCli
296296
// POST, PUT and PATCH
297297
if (httpMethod instanceof HttpEntityEnclosingRequest) {
298298
// developer note:
299-
// this has to be in sync with
300-
// org.htmlunit.WebRequest.getRequestParameters()
299+
// this has to be in sync with org.htmlunit.WebRequest.getRequestParameters()
301300

302301
final HttpEntityEnclosingRequest method = (HttpEntityEnclosingRequest) httpMethod;
303302

304303
if (webRequest.getEncodingType() == FormEncodingType.URL_ENCODED && method instanceof HttpPost) {
305304
final HttpPost postMethod = (HttpPost) method;
306305
if (webRequest.getRequestBody() == null) {
307306
final List<NameValuePair> pairs = webRequest.getRequestParameters();
308-
final String query = URLEncodedUtils.format(
309-
HttpClientConverter.nameValuePairsToHttpClient(pairs), charset);
307+
final String query = HttpUtils.toQueryFormFields(pairs, charset);
310308

311309
final StringEntity urlEncodedEntity;
312310
if (webRequest.hasHint(HttpHint.IncludeCharsetInContentTypeHeader)) {
@@ -375,8 +373,7 @@ else if (FormEncodingType.MULTIPART == webRequest.getEncodingType()) {
375373
// this is the case for GET as well as TRACE, DELETE, OPTIONS and HEAD
376374
if (!webRequest.getRequestParameters().isEmpty()) {
377375
final List<NameValuePair> pairs = webRequest.getRequestParameters();
378-
final String query = URLEncodedUtils.format(
379-
HttpClientConverter.nameValuePairsToHttpClient(pairs), charset);
376+
final String query = HttpUtils.toQueryFormFields(pairs, charset);
380377
uri = UrlUtils.toURI(url, query);
381378
httpMethod.setURI(uri);
382379
}

‎src/main/java/org/htmlunit/WebRequest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.apache.http.auth.Credentials;
3737
import org.htmlunit.http.HttpUtils;
3838
import org.htmlunit.httpclient.HtmlUnitUsernamePasswordCredentials;
39-
import org.htmlunit.httpclient.HttpClientConverter;
4039
import org.htmlunit.util.NameValuePair;
4140
import org.htmlunit.util.UrlUtils;
4241

‎src/main/java/org/htmlunit/html/HtmlForm.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.htmlunit.WebClient;
4949
import org.htmlunit.WebRequest;
5050
import org.htmlunit.WebWindow;
51-
import org.htmlunit.httpclient.HttpClientConverter;
51+
import org.htmlunit.http.HttpUtils;
5252
import org.htmlunit.javascript.host.event.Event;
5353
import org.htmlunit.javascript.host.event.SubmitEvent;
5454
import org.htmlunit.protocol.javascript.JavaScriptURLConnection;
@@ -293,7 +293,7 @@ public WebRequest getWebRequest(final SubmittableElement submitElement) {
293293
if (actionUrl.contains("#")) {
294294
anchor = StringUtils.substringAfter(actionUrl, "#");
295295
}
296-
queryFormFields = HttpClientConverter.toQueryFormFields(parameters, enc);
296+
queryFormFields = HttpUtils.toQueryFormFields(parameters, enc);
297297

298298
// action may already contain some query parameters: they have to be removed
299299
actionUrl = StringUtils.substringBefore(actionUrl, "#");

0 commit comments

Comments
 (0)