Skip to content

Rename replace() to replaceWith() since Java 1.8 introduces Map.replace() #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Rename replace() to replaceWith() since Java 1.8 introduces Map.replace() #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34d8e0d
Rename replace() to replaceWith() since Java 1.8 introduces Map.repla…
gerdriesselmann Aug 21, 2014
cac67ca
Find more occurences of replace() and substitute with replaceWith()
gerdriesselmann Aug 21, 2014
67f809b
And even more replacements
gerdriesselmann Aug 21, 2014
f5736c1
Java 8 Compatibility Fixes
gerdriesselmann Sep 2, 2014
b37a46f
Merge branch '1.9.x-Java8' of github.com:gerdriesselmann/async-http-c…
gerdriesselmann Sep 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/com/ning/http/client/FluentCaseInsensitiveStringsMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ public FluentCaseInsensitiveStringsMap addAll(Map<String, Collection<String>> sr
* @param values The new values
* @return This object
*/
public FluentCaseInsensitiveStringsMap replace(final String key, final String... values) {
return replace(key, Arrays.asList(values));
public FluentCaseInsensitiveStringsMap replaceWith(final String key, final String... values) {
return replaceWith(key, Arrays.asList(values));
}

/**
Expand All @@ -194,7 +194,7 @@ public FluentCaseInsensitiveStringsMap replace(final String key, final String...
* @param values The new values
* @return This object
*/
public FluentCaseInsensitiveStringsMap replace(final String key, final Collection<String> values) {
public FluentCaseInsensitiveStringsMap replaceWith(final String key, final Collection<String> values) {
if (key != null) {
List<String> nonNullValues = fetchValues(values);
String lcKkey = key.toLowerCase(Locale.ENGLISH);
Expand Down Expand Up @@ -226,7 +226,7 @@ public FluentCaseInsensitiveStringsMap replace(final String key, final Collectio
public FluentCaseInsensitiveStringsMap replaceAll(FluentCaseInsensitiveStringsMap src) {
if (src != null) {
for (Map.Entry<String, List<String>> header : src) {
replace(header.getKey(), header.getValue());
replaceWith(header.getKey(), header.getValue());
}
}
return this;
Expand All @@ -242,7 +242,7 @@ public FluentCaseInsensitiveStringsMap replaceAll(FluentCaseInsensitiveStringsMa
public FluentCaseInsensitiveStringsMap replaceAll(Map<? extends String, ? extends Collection<String>> src) {
if (src != null) {
for (Map.Entry<? extends String, ? extends Collection<String>> header : src.entrySet()) {
replace(header.getKey(), header.getValue());
replaceWith(header.getKey(), header.getValue());
}
}
return this;
Expand All @@ -256,7 +256,7 @@ public List<String> put(String key, List<String> value) {

List<String> oldValue = get(key);

replace(key, value);
replaceWith(key, value);
return oldValue;
}

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/ning/http/client/FluentStringsMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ public FluentStringsMap addAll(Map<String, Collection<String>> src) {
* @param values The new values
* @return This object
*/
public FluentStringsMap replace(final String key, final String... values) {
return replace(key, Arrays.asList(values));
public FluentStringsMap replaceWith(final String key, final String... values) {
return replaceWith(key, Arrays.asList(values));
}

/**
Expand All @@ -149,7 +149,7 @@ public FluentStringsMap replace(final String key, final String... values) {
* @param values The new values
* @return This object
*/
public FluentStringsMap replace(final String key, final Collection<String> values) {
public FluentStringsMap replaceWith(final String key, final Collection<String> values) {
if (key != null) {
if (values == null) {
this.values.remove(key);
Expand All @@ -170,7 +170,7 @@ public FluentStringsMap replace(final String key, final Collection<String> value
public FluentStringsMap replaceAll(FluentStringsMap src) {
if (src != null) {
for (Map.Entry<String, List<String>> header : src) {
replace(header.getKey(), header.getValue());
replaceWith(header.getKey(), header.getValue());
}
}
return this;
Expand All @@ -186,7 +186,7 @@ public FluentStringsMap replaceAll(FluentStringsMap src) {
public FluentStringsMap replaceAll(Map<? extends String, ? extends Collection<String>> src) {
if (src != null) {
for (Map.Entry<? extends String, ? extends Collection<String>> header : src.entrySet()) {
replace(header.getKey(), header.getValue());
replaceWith(header.getKey(), header.getValue());
}
}
return this;
Expand All @@ -200,7 +200,7 @@ public List<String> put(String key, List<String> value) {

List<String> oldValue = get(key);

replace(key, value);
replaceWith(key, value);
return oldValue;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ning/http/client/RequestBuilderBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public T setVirtualHost(String virtualHost) {
}

public T setHeader(String name, String value) {
request.headers.replace(name, value);
request.headers.replaceWith(name, value);
return derived.cast(this);
}

Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/ning/http/client/async/FluentCaseInsensitiveStringsMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ public void replaceTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace("Foo", "blub", "bla");
map.replaceWith("Foo", "blub", "bla");

assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("Foo", "baz")));
assertEquals(map.getFirstValue("foo"), "blub");
Expand All @@ -417,7 +417,7 @@ public void replaceUndefinedTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace("bar", Arrays.asList("blub"));
map.replaceWith("bar", Arrays.asList("blub"));

assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz", "bar")));
assertEquals(map.getFirstValue("foo"), "bar");
Expand Down Expand Up @@ -446,7 +446,7 @@ public void replaceNullTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace(null, Arrays.asList("blub"));
map.replaceWith(null, Arrays.asList("blub"));

assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz")));
assertEquals(map.getFirstValue("foo"), "bar");
Expand All @@ -472,7 +472,7 @@ public void replaceValueWithNullTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace("baZ", (Collection<String>) null);
map.replaceWith("baZ", (Collection<String>) null);

assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo")));
assertEquals(map.getFirstValue("foo"), "bar");
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/com/ning/http/client/async/FluentStringsMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ public void replaceArrayTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace("foo", "blub", "bla");
map.replaceWith("foo", "blub", "bla");

assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz")));
assertEquals(map.getFirstValue("foo"), "blub");
Expand All @@ -492,7 +492,7 @@ public void replaceCollectionTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace("foo", Arrays.asList("blub", "bla"));
map.replaceWith("foo", Arrays.asList("blub", "bla"));

assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz")));
assertEquals(map.getFirstValue("foo"), "blub");
Expand All @@ -518,7 +518,7 @@ public void replaceDifferentCaseTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace("Foo", Arrays.asList("blub", "bla"));
map.replaceWith("Foo", Arrays.asList("blub", "bla"));

assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz", "Foo")));
assertEquals(map.getFirstValue("foo"), "bar");
Expand Down Expand Up @@ -547,7 +547,7 @@ public void replaceUndefinedTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace("bar", Arrays.asList("blub"));
map.replaceWith("bar", Arrays.asList("blub"));

assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz", "bar")));
assertEquals(map.getFirstValue("foo"), "bar");
Expand Down Expand Up @@ -576,7 +576,7 @@ public void replaceNullTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace(null, Arrays.asList("blub"));
map.replaceWith(null, Arrays.asList("blub"));

assertEquals(map.keySet(), new LinkedHashSet<String>(Arrays.asList("foo", "baz")));
assertEquals(map.getFirstValue("foo"), "bar");
Expand All @@ -602,7 +602,7 @@ public void replaceValueWithNullTest() {
assertEquals(map.getJoinedValue("baz", ", "), "foo, bar");
assertEquals(map.get("baz"), Arrays.asList("foo", "bar"));

map.replace("baz", (Collection<String>) null);
map.replaceWith("baz", (Collection<String>) null);

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