Skip to content

Commit b8e0c46

Browse files
author
Stephane Landelle
committed
Rename FluentStringsMap/FluentCaseInsensitiveStringsMap replace into replaceWith, for Java8 compat
1 parent 5e08297 commit b8e0c46

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎api/src/main/java/org/asynchttpclient/FluentCaseInsensitiveStringsMap.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ public FluentCaseInsensitiveStringsMap addAll(Map<String, Collection<String>> sr
183183
* @param values The new values
184184
* @return This object
185185
*/
186-
public FluentCaseInsensitiveStringsMap replace(final String key, final String... values) {
187-
return replace(key, Arrays.asList(values));
186+
public FluentCaseInsensitiveStringsMap replaceWith(final String key, final String... values) {
187+
return replaceWith(key, Arrays.asList(values));
188188
}
189189

190190
/**
@@ -194,7 +194,7 @@ public FluentCaseInsensitiveStringsMap replace(final String key, final String...
194194
* @param values The new values
195195
* @return This object
196196
*/
197-
public FluentCaseInsensitiveStringsMap replace(final String key, final Collection<String> values) {
197+
public FluentCaseInsensitiveStringsMap replaceWith(final String key, final Collection<String> values) {
198198
if (key != null) {
199199
List<String> nonNullValues = fetchValues(values);
200200
String lcKkey = key.toLowerCase(Locale.ENGLISH);
@@ -226,7 +226,7 @@ public FluentCaseInsensitiveStringsMap replace(final String key, final Collectio
226226
public FluentCaseInsensitiveStringsMap replaceAll(FluentCaseInsensitiveStringsMap src) {
227227
if (src != null) {
228228
for (Map.Entry<String, List<String>> header : src) {
229-
replace(header.getKey(), header.getValue());
229+
replaceWith(header.getKey(), header.getValue());
230230
}
231231
}
232232
return this;
@@ -242,7 +242,7 @@ public FluentCaseInsensitiveStringsMap replaceAll(FluentCaseInsensitiveStringsMa
242242
public FluentCaseInsensitiveStringsMap replaceAll(Map<? extends String, ? extends Collection<String>> src) {
243243
if (src != null) {
244244
for (Map.Entry<? extends String, ? extends Collection<String>> header : src.entrySet()) {
245-
replace(header.getKey(), header.getValue());
245+
replaceWith(header.getKey(), header.getValue());
246246
}
247247
}
248248
return this;
@@ -259,7 +259,7 @@ public List<String> put(String key, List<String> value) {
259259

260260
List<String> oldValue = get(key);
261261

262-
replace(key, value);
262+
replaceWith(key, value);
263263
return oldValue;
264264
}
265265

‎api/src/main/java/org/asynchttpclient/FluentStringsMap.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ public FluentStringsMap addAll(Map<String, Collection<String>> src) {
138138
* @param values The new values
139139
* @return This object
140140
*/
141-
public FluentStringsMap replace(final String key, final String... values) {
142-
return replace(key, Arrays.asList(values));
141+
public FluentStringsMap replaceWith(final String key, final String... values) {
142+
return replaceWith(key, Arrays.asList(values));
143143
}
144144

145145
/**
@@ -149,7 +149,7 @@ public FluentStringsMap replace(final String key, final String... values) {
149149
* @param values The new values
150150
* @return This object
151151
*/
152-
public FluentStringsMap replace(final String key, final Collection<String> values) {
152+
public FluentStringsMap replaceWith(final String key, final Collection<String> values) {
153153
if (key != null) {
154154
if (values == null) {
155155
this.values.remove(key);
@@ -170,7 +170,7 @@ public FluentStringsMap replace(final String key, final Collection<String> value
170170
public FluentStringsMap replaceAll(FluentStringsMap src) {
171171
if (src != null) {
172172
for (Map.Entry<String, List<String>> header : src) {
173-
replace(header.getKey(), header.getValue());
173+
replaceWith(header.getKey(), header.getValue());
174174
}
175175
}
176176
return this;
@@ -186,7 +186,7 @@ public FluentStringsMap replaceAll(FluentStringsMap src) {
186186
public FluentStringsMap replaceAll(Map<? extends String, ? extends Collection<String>> src) {
187187
if (src != null) {
188188
for (Map.Entry<? extends String, ? extends Collection<String>> header : src.entrySet()) {
189-
replace(header.getKey(), header.getValue());
189+
replaceWith(header.getKey(), header.getValue());
190190
}
191191
}
192192
return this;
@@ -203,7 +203,7 @@ public List<String> put(String key, List<String> value) {
203203

204204
List<String> oldValue = get(key);
205205

206-
replace(key, value);
206+
replaceWith(key, value);
207207
return oldValue;
208208
}
209209

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public T setVirtualHost(String virtualHost) {
308308
}
309309

310310
public T setHeader(String name, String value) {
311-
request.headers.replace(name, value);
311+
request.headers.replaceWith(name, value);
312312
return derived.cast(this);
313313
}
314314

‎api/src/test/java/org/asynchttpclient/async/FluentCaseInsensitiveStringsMapTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ public void replaceTest() {
392392
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
393393
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
394394

395-
map.replace("Foo", "blub", "bla");
395+
map.replaceWith("Foo", "blub", "bla");
396396

397397
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("Foo", "baz")));
398398
assertEquals(map.getFirstValue("foo"), "blub");
@@ -418,7 +418,7 @@ public void replaceUndefinedTest() {
418418
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
419419
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
420420

421-
map.replace("bar", Arrays.asList("blub"));
421+
map.replaceWith("bar", Arrays.asList("blub"));
422422

423423
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz", "bar")));
424424
assertEquals(map.getFirstValue("foo"), "bar");
@@ -447,7 +447,7 @@ public void replaceNullTest() {
447447
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
448448
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
449449

450-
map.replace(null, Arrays.asList("blub"));
450+
map.replaceWith(null, Arrays.asList("blub"));
451451

452452
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz")));
453453
assertEquals(map.getFirstValue("foo"), "bar");
@@ -473,7 +473,7 @@ public void replaceValueWithNullTest() {
473473
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
474474
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
475475

476-
map.replace("baZ", (Collection<String>) null);
476+
map.replaceWith("baZ", (Collection<String>) null);
477477

478478
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo")));
479479
assertEquals(map.getFirstValue("foo"), "bar");

‎api/src/test/java/org/asynchttpclient/async/FluentStringsMapTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ public void replaceArrayTest() {
467467
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
468468
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
469469

470-
map.replace("foo", "blub", "bla");
470+
map.replaceWith("foo", "blub", "bla");
471471

472472
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz")));
473473
assertEquals(map.getFirstValue("foo"), "blub");
@@ -493,7 +493,7 @@ public void replaceCollectionTest() {
493493
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
494494
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
495495

496-
map.replace("foo", Arrays.asList("blub", "bla"));
496+
map.replaceWith("foo", Arrays.asList("blub", "bla"));
497497

498498
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz")));
499499
assertEquals(map.getFirstValue("foo"), "blub");
@@ -519,7 +519,7 @@ public void replaceDifferentCaseTest() {
519519
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
520520
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
521521

522-
map.replace("Foo", Arrays.asList("blub", "bla"));
522+
map.replaceWith("Foo", Arrays.asList("blub", "bla"));
523523

524524
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz", "Foo")));
525525
assertEquals(map.getFirstValue("foo"), "bar");
@@ -548,7 +548,7 @@ public void replaceUndefinedTest() {
548548
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
549549
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
550550

551-
map.replace("bar", Arrays.asList("blub"));
551+
map.replaceWith("bar", Arrays.asList("blub"));
552552

553553
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz", "bar")));
554554
assertEquals(map.getFirstValue("foo"), "bar");
@@ -577,7 +577,7 @@ public void replaceNullTest() {
577577
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
578578
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
579579

580-
map.replace(null, Arrays.asList("blub"));
580+
map.replaceWith(null, Arrays.asList("blub"));
581581

582582
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz")));
583583
assertEquals(map.getFirstValue("foo"), "bar");
@@ -603,7 +603,7 @@ public void replaceValueWithNullTest() {
603603
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
604604
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));
605605

606-
map.replace("baz", (Collection<String>) null);
606+
map.replaceWith("baz", (Collection<String>) null);
607607

608608
assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo")));
609609
assertEquals(map.getFirstValue("foo"), "bar");

0 commit comments

Comments
 (0)