Skip to content

Commit df75993

Browse files
committed
Make RequestBuilder's queryParams less confusing
1 parent 0f18dbe commit df75993

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

api/src/main/java/org/asynchttpclient/RequestBuilderBase.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public String toString() {
292292
private final Class<T> derived;
293293
protected final RequestImpl request;
294294
protected UriEncoder uriEncoder;
295-
protected List<Param> queryParams;
295+
protected List<Param> rbQueryParams;
296296
protected SignatureCalculator signatureCalculator;
297297

298298
protected RequestBuilderBase(Class<T> derived, String method, boolean disableUrlEncoding) {
@@ -412,7 +412,7 @@ public void resetCookies() {
412412
}
413413

414414
public void resetQuery() {
415-
queryParams = null;
415+
rbQueryParams = null;
416416
request.uri = request.uri.withNewQuery(null);
417417
}
418418

@@ -481,17 +481,17 @@ public T setBody(BodyGenerator bodyGenerator) {
481481
}
482482

483483
public T addQueryParam(String name, String value) {
484-
if (queryParams == null)
485-
queryParams = new ArrayList<>(1);
486-
queryParams.add(new Param(name, value));
484+
if (rbQueryParams == null)
485+
rbQueryParams = new ArrayList<>(1);
486+
rbQueryParams.add(new Param(name, value));
487487
return derived.cast(this);
488488
}
489489

490490
public T addQueryParams(List<Param> params) {
491-
if (queryParams == null)
492-
queryParams = params;
491+
if (rbQueryParams == null)
492+
rbQueryParams = params;
493493
else
494-
queryParams.addAll(params);
494+
rbQueryParams.addAll(params);
495495
return derived.cast(this);
496496
}
497497

@@ -516,7 +516,7 @@ public T setQueryParams(List<Param> params) {
516516
// reset existing query
517517
if (isNonEmpty(request.uri.getQuery()))
518518
request.uri = request.uri.withNewQuery(null);
519-
queryParams = params;
519+
rbQueryParams = params;
520520
return derived.cast(this);
521521
}
522522

@@ -604,7 +604,7 @@ private void executeSignatureCalculator() {
604604
*/
605605
if (signatureCalculator != null) {
606606
RequestBuilder rb = new RequestBuilder(request).setSignatureCalculator(null);
607-
rb.queryParams = this.queryParams;
607+
rb.rbQueryParams = this.rbQueryParams;
608608
Request unsignedRequest = rb.build();
609609
signatureCalculator.calculateAndAddSignature(unsignedRequest, this);
610610
}
@@ -652,7 +652,7 @@ private void computeFinalUri() {
652652
validateSupportedScheme(request.uri);
653653
}
654654

655-
request.uri = uriEncoder.encode(request.uri, queryParams);
655+
request.uri = uriEncoder.encode(request.uri, rbQueryParams);
656656
}
657657

658658
public Request build() {

0 commit comments

Comments
 (0)